Skip to content

Commit edf5253

Browse files
ashley-o0oashley-o0o
committed
Hide wizard summary page
1 parent dbdb02f commit edf5253

File tree

4 files changed

+25
-19
lines changed

4 files changed

+25
-19
lines changed

‎frontend/src/__tests__/cypress/cypress/pages/modelServing.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,6 +1192,10 @@ class ModelServingWizard extends Wizard {
11921192
findErrorMessageAlert() {
11931193
return cy.findByTestId('error-message-alert');
11941194
}
1195+
1196+
findUpdateDeploymentButton() {
1197+
return cy.findByRole('button', { name: 'Update deployment' });
1198+
}
11951199
}
11961200

11971201
export const modelServingGlobal = new ModelServingGlobal();

‎frontend/src/__tests__/cypress/cypress/tests/mocked/modelServing/modelServingDeploy.cy.ts‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -410,14 +410,11 @@ describe('Model Serving Deploy Wizard', () => {
410410
modelServingWizard.findServiceNameAlert().should('not.exist');
411411
modelServingWizard.findRemoveServiceAccountByIndex(1).click();
412412
modelServingWizard.findServiceAccountByIndex(0).clear();
413-
modelServingWizard.findNextButton().should('be.disabled');
413+
modelServingWizard.findSubmitButton().should('be.disabled'); //TODO: Change back to findNextButton() when submit page is added
414414
modelServingWizard.findServiceAccountByIndex(0).clear().type('new name');
415-
modelServingWizard.findNextButton().should('be.enabled');
416-
417-
modelServingWizard.findNextButton().should('be.enabled').click();
415+
// modelServingWizard.findNextButton().should('be.enabled').click(); //TODO: Uncomment when submit page is added
418416

419417
// Step 4: Summary
420-
421418
modelServingWizard.findSubmitButton().should('be.enabled').click();
422419

423420
// dry run request
@@ -688,7 +685,7 @@ describe('Model Serving Deploy Wizard', () => {
688685
modelServingWizard.findEnvVariableName('0').clear().type('valid_name');
689686
modelServingWizard.findEnvVariableValue('0').type('test-value');
690687

691-
modelServingWizard.findNextButton().should('be.enabled').click();
688+
// modelServingWizard.findNextButton().should('be.enabled').click(); //TODO: Uncomment when submit page is added
692689

693690
// Step 4: Summary
694691

@@ -820,7 +817,7 @@ describe('Model Serving Deploy Wizard', () => {
820817
modelServingWizard.findServingRuntimeTemplateSearchSelector().click();
821818
modelServingWizard.findGlobalScopedTemplateOption('OpenVINO').should('exist').click();
822819
modelServingWizard.findNextButton().should('be.enabled').click();
823-
modelServingWizard.findNextButton().should('be.enabled').click();
820+
// modelServingWizard.findNextButton().should('be.enabled').click(); //TODO: Uncomment when submit page is added
824821

825822
// test submitting form, an error should appear
826823
modelServingWizard.findSubmitButton().should('be.enabled').click();
@@ -991,7 +988,7 @@ describe('Model Serving Deploy Wizard', () => {
991988
modelServingWizard.findNextButton().should('be.enabled').click();
992989

993990
// Verify submit is enabled before testing env vars
994-
modelServingWizard.findNextButton().should('be.enabled');
991+
modelServingWizard.findSubmitButton().should('be.enabled'); //TODO: Change back to findNextButton() when submit page is added
995992

996993
// Add environment variable with invalid name
997994
modelServingWizard.findEnvVariablesCheckbox().click();
@@ -1001,23 +998,23 @@ describe('Model Serving Deploy Wizard', () => {
1001998
'Environment variable name must start with a letter or underscore and contain only letters, numbers, and underscores',
1002999
).should('be.visible');
10031000
// Verify submit is disabled with invalid env var
1004-
modelServingWizard.findNextButton().should('be.disabled');
1001+
modelServingWizard.findSubmitButton().should('be.disabled'); //TODO: Change back to findNextButton() when submit page is added
10051002

10061003
// Test invalid env var name with special characters
10071004
modelServingWizard.findEnvVariableName('0').clear().type('invalid@name');
10081005
cy.findByText(
10091006
'Environment variable name must start with a letter or underscore and contain only letters, numbers, and underscores',
10101007
).should('be.visible');
10111008
// Verify submit is disabled with invalid env var
1012-
modelServingWizard.findNextButton().should('be.disabled');
1009+
modelServingWizard.findSubmitButton().should('be.disabled'); //TODO: Change back to findNextButton() when submit page is added
10131010

10141011
// Test valid env var name
10151012
modelServingWizard.findEnvVariableName('0').clear().type('VALID_NAME');
10161013
cy.findByText(
10171014
'Environment variable name must start with a letter or underscore and contain only letters, numbers, and underscores',
10181015
).should('not.exist');
10191016
// Verify submit is enabled with valid env var
1020-
modelServingWizard.findNextButton().should('be.enabled');
1017+
modelServingWizard.findSubmitButton().should('be.enabled'); //TODO: Change back to findNextButton() when submit page is added
10211018
});
10221019

10231020
it('Deploy OCI Model and check paste functionality', () => {
@@ -1078,7 +1075,7 @@ describe('Model Serving Deploy Wizard', () => {
10781075
modelServingWizard.findGlobalScopedTemplateOption('OpenVINO').should('exist').click();
10791076
modelServingWizard.findNextButton().should('be.enabled').click();
10801077
//Step 3: Advanced Options
1081-
modelServingWizard.findNextButton().should('be.enabled').click();
1078+
// modelServingWizard.findNextButton().should('be.enabled').click(); //TODO: Uncomment when submit page is added
10821079
//Step 4: Summary
10831080
modelServingWizard.findSubmitButton().should('be.enabled').click();
10841081

@@ -1219,7 +1216,7 @@ describe('Model Serving Deploy Wizard', () => {
12191216
modelServingWizard.findGlobalScopedTemplateOption('OpenVINO').should('exist').click();
12201217
modelServingWizard.findNextButton().should('be.enabled').click();
12211218
//Step 3: Advanced Options
1222-
modelServingWizard.findNextButton().should('be.enabled').click();
1219+
// modelServingWizard.findNextButton().should('be.enabled').click(); //TODO: Uncomment when submit page is added
12231220
//Step 4: Summary
12241221
modelServingWizard.findSubmitButton().should('be.enabled').click();
12251222

@@ -1368,7 +1365,7 @@ describe('Model Serving Deploy Wizard', () => {
13681365
modelServingWizardEdit.findExternalRouteCheckbox().should('be.checked');
13691366
modelServingWizardEdit.findTokenAuthenticationCheckbox().click();
13701367
modelServingWizardEdit.findServiceAccountByIndex(0).should('have.value', 'default-name');
1371-
modelServingWizardEdit.findNextButton().should('be.enabled').click();
1368+
modelServingWizardEdit.findUpdateDeploymentButton().should('be.enabled').click(); //TODO: Change back to findNextButton() when submit page is added
13721369
});
13731370

13741371
it('Verify cpu and memory request and limits values when editing KServe model', () => {
@@ -1526,7 +1523,7 @@ describe('Model Serving Deploy Wizard', () => {
15261523

15271524
// Step 3: Advanced Options
15281525
modelServingWizard.findAdvancedOptionsStep().should('be.enabled');
1529-
modelServingWizard.findNextButton().should('be.enabled').click();
1526+
// modelServingWizard.findNextButton().should('be.enabled').click(); //TODO: Uncomment when submit page is added
15301527

15311528
// Step 4: Summary
15321529
modelServingWizard.findSubmitButton().should('be.enabled').click();

‎frontend/src/__tests__/cypress/cypress/tests/mocked/modelServing/modelServingLlmd.cy.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ describe('Model Serving LLMD', () => {
308308
modelServingWizard.findNextButton().should('be.enabled').click();
309309

310310
// Step 3: Advanced Options
311-
modelServingWizard.findNextButton().should('be.enabled');
311+
modelServingWizard.findSubmitButton().should('be.enabled'); //TODO: Change back to findNextButton() when submit page is added
312312
modelServingWizard.findExternalRouteCheckbox().should('not.exist');
313313
modelServingWizard.findTokenAuthenticationCheckbox().click();
314314
modelServingWizard.findTokenWarningAlert().should('exist');
@@ -318,7 +318,7 @@ describe('Model Serving LLMD', () => {
318318
modelServingWizard.findAddVariableButton().click();
319319
modelServingWizard.findEnvVariableName('0').clear().type('MY_ENV');
320320
modelServingWizard.findEnvVariableValue('0').type('MY_VALUE');
321-
modelServingWizard.findNextButton().should('be.enabled').click();
321+
// modelServingWizard.findNextButton().should('be.enabled').click(); //TODO: Uncomment when submit page is added
322322

323323
// Step 4: Summary
324324
modelServingWizard.findSubmitButton().should('be.enabled').click();

‎packages/model-serving/src/components/deploymentWizard/ModelDeploymentWizard.tsx‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,10 @@ const ModelDeploymentWizard: React.FC<ModelDeploymentWizardProps> = ({
173173
<WizardStep
174174
name="Advanced settings (optional)"
175175
id="advanced-options-step"
176+
footer={{
177+
nextButtonText: primaryButtonText,
178+
isNextDisabled: !validation.isAdvancedSettingsStepValid,
179+
}} //TODO: Remove this footer when summary page is added
176180
isDisabled={!validation.isModelSourceStepValid || !validation.isModelDeploymentStepValid}
177181
>
178182
{wizardState.loaded.advancedOptionsLoaded ? (
@@ -181,7 +185,8 @@ const ModelDeploymentWizard: React.FC<ModelDeploymentWizardProps> = ({
181185
<Spinner />
182186
)}
183187
</WizardStep>
184-
<WizardStep
188+
{/* TODO: Uncomment when summary page is added */}
189+
{/* <WizardStep
185190
name="Summary"
186191
id="summary-step"
187192
isDisabled={
@@ -191,7 +196,7 @@ const ModelDeploymentWizard: React.FC<ModelDeploymentWizardProps> = ({
191196
}
192197
>
193198
{wizardState.loaded.summaryLoaded ? 'Review step content' : <Spinner />}
194-
</WizardStep>
199+
</WizardStep> */}
195200
</Wizard>
196201
</ApplicationsPage>
197202
);

0 commit comments

Comments
 (0)