Skip to content

Commit cf492f0

Browse files
manaswinidasmanaswinidas
authored
fix: align MR and MC route paths (kubeflow#1702)
* fix: align MR route paths with URL generation functions Signed-off-by: manaswinidas <[email protected]> * Fix Cypress tests for the routes change Signed-off-by: manaswinidas <[email protected]> * Fix linting issues Signed-off-by: manaswinidas <[email protected]> * Fix Cypress tests for the routes change Signed-off-by: manaswinidas <[email protected]> * Cleanup Signed-off-by: manaswinidas <[email protected]> * Add TODO for breaking changes Signed-off-by: manaswinidas <[email protected]> * Don't introduce ai-hub/ routes Signed-off-by: manaswinidas <[email protected]> * Cleanup Cypress tests Signed-off-by: manaswinidas <[email protected]> --------- Signed-off-by: manaswinidas <[email protected]>
1 parent c9a06d4 commit cf492f0

23 files changed

+105
-83
lines changed

‎clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/modelVersionArchive.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ class ModelVersionArchive {
5757
visit() {
5858
const rmId = '1';
5959
const preferredModelRegistry = 'modelregistry-sample';
60-
cy.visit(`/model-registry/${preferredModelRegistry}/registeredModels/${rmId}/versions/archive`);
60+
cy.visit(
61+
`/model-registry/${preferredModelRegistry}/registered-models/${rmId}/versions/archive`,
62+
);
6163
this.wait();
6264
}
6365

@@ -66,22 +68,24 @@ class ModelVersionArchive {
6668
const rmId = '1';
6769
const preferredModelRegistry = 'modelregistry-sample';
6870
cy.visit(
69-
`/model-registry/${preferredModelRegistry}/registeredModels/${rmId}/versions/archive/${mvId}`,
71+
`/model-registry/${preferredModelRegistry}/registered-models/${rmId}/versions/archive/${mvId}`,
7072
);
7173
}
7274

7375
visitModelVersionList() {
7476
const rmId = '1';
7577
const preferredModelRegistry = 'modelregistry-sample';
76-
cy.visit(`/model-registry/${preferredModelRegistry}/registeredModels/${rmId}/versions`);
78+
cy.visit(`/model-registry/${preferredModelRegistry}/registered-models/${rmId}/versions`);
7779
this.wait();
7880
}
7981

8082
visitModelVersionDetails() {
8183
const mvId = '3';
8284
const rmId = '1';
8385
const preferredModelRegistry = 'modelregistry-sample';
84-
cy.visit(`/model-registry/${preferredModelRegistry}/registeredModels/${rmId}/versions/${mvId}`);
86+
cy.visit(
87+
`/model-registry/${preferredModelRegistry}/registered-models/${rmId}/versions/${mvId}`,
88+
);
8589
this.wait();
8690
}
8791

‎clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/modelVersionDetails.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ class ModelVersionDetails {
2020
const preferredModelRegistry = 'modelregistry-sample';
2121
const rmId = '1';
2222
const mvId = '1';
23-
cy.visit(`/model-registry/${preferredModelRegistry}/registeredModels/${rmId}/versions/${mvId}`);
23+
cy.visit(
24+
`/model-registry/${preferredModelRegistry}/registered-models/${rmId}/versions/${mvId}`,
25+
);
2426
this.wait();
2527
}
2628

‎clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/registerModelPage.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class RegisterModelPage {
2121

2222
visit() {
2323
const preferredModelRegistry = 'modelregistry-sample';
24-
cy.visit(`/model-registry/${preferredModelRegistry}/registerModel`);
24+
cy.visit(`/model-registry/${preferredModelRegistry}/register/model`);
2525
this.wait();
2626
}
2727

‎clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/registerVersionPage.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ class RegisterVersionPage {
1818
const preferredModelRegistry = 'modelregistry-sample';
1919
cy.visit(
2020
registeredModelId
21-
? `/model-registry/${preferredModelRegistry}/registeredModels/${registeredModelId}/registerVersion`
22-
: `/model-registry/${preferredModelRegistry}/registerVersion`,
21+
? `/model-registry/${preferredModelRegistry}/registered-models/${registeredModelId}/register/version`
22+
: `/model-registry/${preferredModelRegistry}/register/version`,
2323
);
2424
this.wait();
2525
}

‎clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/registeredModelArchive.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,20 +60,22 @@ class ModelArchive {
6060

6161
visit() {
6262
const preferredModelRegistry = 'modelregistry-sample';
63-
cy.visit(`/model-registry/${preferredModelRegistry}/registeredModels/archive`);
63+
cy.visit(`/model-registry/${preferredModelRegistry}/registered-models/archive`);
6464
this.wait();
6565
}
6666

6767
visitArchiveModelDetail() {
6868
const rmId = '2';
6969
const preferredModelRegistry = 'modelregistry-sample';
70-
cy.visit(`/model-registry/${preferredModelRegistry}/registeredModels/archive/${rmId}`);
70+
cy.visit(`/model-registry/${preferredModelRegistry}/registered-models/archive/${rmId}`);
7171
}
7272

7373
visitArchiveModelVersionList() {
7474
const rmId = '2';
7575
const preferredModelRegistry = 'modelregistry-sample';
76-
cy.visit(`/model-registry/${preferredModelRegistry}/registeredModels/archive/${rmId}/versions`);
76+
cy.visit(
77+
`/model-registry/${preferredModelRegistry}/registered-models/archive/${rmId}/versions`,
78+
);
7779
}
7880

7981
visitModelList() {
@@ -84,7 +86,7 @@ class ModelArchive {
8486
visitModelDetails() {
8587
const rmId = '2';
8688
const preferredModelRegistry = 'modelregistry-sample';
87-
cy.visit(`/model-registry/${preferredModelRegistry}/registeredModels/${rmId}`);
89+
cy.visit(`/model-registry/${preferredModelRegistry}/registered-models/${rmId}`);
8890
this.wait();
8991
}
9092

‎clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelDetailsCard.cy.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ describe('Model Details Card', () => {
104104
});
105105

106106
it('displays model details correctly', () => {
107-
cy.visit('/model-registry/modelregistry-sample/registeredModels/1/overview');
107+
cy.visit('/model-registry/modelregistry-sample/registered-models/1/overview');
108108

109109
cy.contains('Model details').should('be.visible');
110110

@@ -120,7 +120,7 @@ describe('Model Details Card', () => {
120120
});
121121

122122
it('displays labels section correctly', () => {
123-
cy.visit('/model-registry/modelregistry-sample/registeredModels/1/overview');
123+
cy.visit('/model-registry/modelregistry-sample/registered-models/1/overview');
124124

125125
cy.contains('Labels').should('be.visible');
126126
cy.contains('label1').should('be.visible');
@@ -130,7 +130,7 @@ describe('Model Details Card', () => {
130130
});
131131

132132
it('displays properties in expandable section', () => {
133-
cy.visit('/model-registry/modelregistry-sample/registeredModels/1/overview');
133+
cy.visit('/model-registry/modelregistry-sample/registered-models/1/overview');
134134

135135
cy.contains('Properties').should('be.visible');
136136
cy.contains('Properties').parent().find('.pf-v6-c-badge').should('contain', '3'); // property1, property2, url-property
@@ -149,7 +149,7 @@ describe('Model Details Card', () => {
149149
});
150150

151151
it('shows add property button and validates input', () => {
152-
cy.visit('/model-registry/modelregistry-sample/registeredModels/1/overview');
152+
cy.visit('/model-registry/modelregistry-sample/registered-models/1/overview');
153153

154154
cy.contains('Properties').click();
155155

@@ -168,7 +168,7 @@ describe('Model Details Card', () => {
168168
});
169169

170170
it('validates property key length correctly', () => {
171-
cy.visit('/model-registry/modelregistry-sample/registeredModels/1/overview');
171+
cy.visit('/model-registry/modelregistry-sample/registered-models/1/overview');
172172

173173
cy.contains('Properties').click();
174174

@@ -208,7 +208,7 @@ describe('Model Details Card', () => {
208208
manyPropertiesModel,
209209
);
210210

211-
cy.visit('/model-registry/modelregistry-sample/registeredModels/1/overview');
211+
cy.visit('/model-registry/modelregistry-sample/registered-models/1/overview');
212212

213213
cy.contains('Properties').click();
214214

@@ -248,15 +248,15 @@ describe('Model Details Card', () => {
248248
archivedModel,
249249
);
250250

251-
cy.visit('/model-registry/modelregistry-sample/registeredModels/1/overview');
251+
cy.visit('/model-registry/modelregistry-sample/registered-models/1/overview');
252252

253253
cy.contains('Properties').click();
254254

255255
modelDetailsCard.findAddPropertyButton().should('not.exist');
256256
});
257257

258258
it('shows the correct tab structure and navigation', () => {
259-
cy.visit('/model-registry/modelregistry-sample/registeredModels/1/overview');
259+
cy.visit('/model-registry/modelregistry-sample/registered-models/1/overview');
260260

261261
cy.findByTestId('model-versions-page-tabs').should('exist');
262262
cy.findByTestId('model-overview-tab').should('exist');
@@ -270,7 +270,7 @@ describe('Model Details Card', () => {
270270
// These tests need investigation of exact DOM structure of mod-arch-shared components
271271

272272
it('allows editing model description', () => {
273-
cy.visit('/model-registry/modelregistry-sample/registeredModels/1/overview');
273+
cy.visit('/model-registry/modelregistry-sample/registered-models/1/overview');
274274

275275
cy.findByText('Test model description').should('be.visible');
276276

‎clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelRegistry.cy.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,17 +232,17 @@ describe('Model Registry core', () => {
232232
registeredModelRow.findLatestVersion().contains('new model version');
233233
registeredModelRow.findLatestVersion().click();
234234
verifyRelativeURL(
235-
`/model-registry/modelregistry-sample/registeredModels/1/versions/1/details`,
235+
`/model-registry/modelregistry-sample/registered-models/1/versions/1/details`,
236236
);
237237
});
238238

239239
it('table kebab actions', () => {
240240
const registeredModelRow = modelRegistry.getRow('Fraud detection model');
241241
registeredModelRow.findKebabAction('Versions').click();
242-
verifyRelativeURL(`/model-registry/modelregistry-sample/registeredModels/1/versions`);
242+
verifyRelativeURL(`/model-registry/modelregistry-sample/registered-models/1/versions`);
243243
cy.go('back');
244244
registeredModelRow.findKebabAction('Overview').click();
245-
verifyRelativeURL(`/model-registry/modelregistry-sample/registeredModels/1/overview`);
245+
verifyRelativeURL(`/model-registry/modelregistry-sample/registered-models/1/overview`);
246246
});
247247

248248
it('Renders labels in modal', () => {
@@ -368,8 +368,8 @@ describe('Register Model button', () => {
368368
modelRegistry.findRegisterModelButton().click();
369369
cy.findByTestId('app-page-title').should('contain', 'Register model');
370370
const expectedUrlPattern =
371-
'/model-registry/modelregistry-sample/registeredModels/test-model-id/versions/test-version-id';
372-
cy.url().should('include', '/model-registry/modelregistry-sample/registerModel');
371+
'/model-registry/modelregistry-sample/registered-models/test-model-id/versions/test-version-id';
372+
cy.url().should('include', '/model-registry/modelregistry-sample/register/model');
373373
cy.log(`Expected redirect URL: ${expectedUrlPattern}`);
374374
});
375375
});

‎clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelVersionArchive.cy.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ describe('Model version archive list', () => {
166166
it('No archive versions in the selected registered model', () => {
167167
initIntercepts({ modelVersions: [mockModelVersion({ id: '3', name: 'model version 2' })] });
168168
modelVersionArchive.visitModelVersionList();
169-
verifyRelativeURL('/model-registry/modelregistry-sample/registeredModels/1/versions');
169+
verifyRelativeURL('/model-registry/modelregistry-sample/registered-models/1/versions');
170170
modelVersionArchive
171171
.findModelVersionsTableKebab()
172172
.findDropdownItem('View archived versions')
@@ -177,23 +177,23 @@ describe('Model version archive list', () => {
177177
it('Archived version details browser back button should lead to archived versions table', () => {
178178
initIntercepts({});
179179
modelVersionArchive.visit();
180-
verifyRelativeURL('/model-registry/modelregistry-sample/registeredModels/1/versions/archive');
180+
verifyRelativeURL('/model-registry/modelregistry-sample/registered-models/1/versions/archive');
181181
modelVersionArchive.findArchiveVersionBreadcrumbItem().contains('Archived version');
182182
const archiveVersionRow = modelVersionArchive.getRow('model version 2');
183183
archiveVersionRow.findName().contains('model version 2').click();
184184
verifyRelativeURL(
185-
'/model-registry/modelregistry-sample/registeredModels/1/versions/archive/2/details',
185+
'/model-registry/modelregistry-sample/registered-models/1/versions/archive/2/details',
186186
);
187187
cy.go('back');
188-
verifyRelativeURL('/model-registry/modelregistry-sample/registeredModels/1/versions/archive');
188+
verifyRelativeURL('/model-registry/modelregistry-sample/registered-models/1/versions/archive');
189189
modelVersionArchive.findArchiveVersionBreadcrumbItem().contains('Archived version');
190190
archiveVersionRow.findName().contains('model version 2').should('exist');
191191
});
192192

193193
it('Archive version list', () => {
194194
initIntercepts({});
195195
modelVersionArchive.visit();
196-
verifyRelativeURL('/model-registry/modelregistry-sample/registeredModels/1/versions/archive');
196+
verifyRelativeURL('/model-registry/modelregistry-sample/registered-models/1/versions/archive');
197197

198198
//breadcrumb
199199
modelVersionArchive.findArchiveVersionBreadcrumbItem().contains('Archived version');
@@ -230,7 +230,7 @@ describe('Model version archive list', () => {
230230
it('Archived model versions table', () => {
231231
initIntercepts({});
232232
modelVersionArchive.visit();
233-
verifyRelativeURL('/model-registry/modelregistry-sample/registeredModels/1/versions/archive');
233+
verifyRelativeURL('/model-registry/modelregistry-sample/registered-models/1/versions/archive');
234234

235235
// filtering by keyword then both
236236
modelVersionArchive.findArchiveVersionTableSearch().type('model version 1');

‎clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelVersionDetails.cy.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ describe('Model version details', () => {
258258

259259
it('Model version details page header', () => {
260260
verifyRelativeURL(
261-
'/model-registry/modelregistry-sample/registeredModels/1/versions/1/details',
261+
'/model-registry/modelregistry-sample/registered-models/1/versions/1/details',
262262
);
263263
cy.findByTestId('app-page-title').should('contain.text', 'Version 1');
264264
cy.findByTestId('breadcrumb-version-name').should('have.text', 'Version 1');
@@ -554,7 +554,7 @@ describe('Model version details', () => {
554554
// Verify we navigated to the versions list page
555555
cy.url().should(
556556
'include',
557-
'/model-registry/modelregistry-sample/registeredModels/1/versions',
557+
'/model-registry/modelregistry-sample/registered-models/1/versions',
558558
);
559559
cy.findByTestId('model-versions-tab-content').should('exist');
560560
});

‎clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelRegistry/modelVersions.cy.ts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ describe('Model Versions', () => {
142142
modelRegistry.visit();
143143
const registeredModelRow = modelRegistry.getRow('Fraud detection model');
144144
registeredModelRow.findName().contains('Fraud detection model').click();
145-
verifyRelativeURL(`/model-registry/modelregistry-sample/registeredModels/1/overview`);
145+
verifyRelativeURL(`/model-registry/modelregistry-sample/registered-models/1/overview`);
146146

147147
modelRegistry.shouldModelVersionsEmpty();
148148
});
@@ -155,7 +155,7 @@ describe('Model Versions', () => {
155155
modelRegistry.visit();
156156
const registeredModelRow = modelRegistry.getRow('Fraud detection model');
157157
registeredModelRow.findName().contains('Fraud detection model').click();
158-
verifyRelativeURL(`/model-registry/modelregistry-sample/registeredModels/1/overview`);
158+
verifyRelativeURL(`/model-registry/modelregistry-sample/registered-models/1/overview`);
159159
cy.go('back');
160160
verifyRelativeURL(`/model-registry/modelregistry-sample`);
161161
registeredModelRow.findName().contains('Fraud detection model').should('exist');
@@ -176,7 +176,7 @@ describe('Model Versions', () => {
176176
//cy.reload();
177177
const registeredModelRow = modelRegistry.getRow('Fraud detection model');
178178
registeredModelRow.findName().contains('Fraud detection model').click();
179-
verifyRelativeURL(`/model-registry/modelregistry-sample/registeredModels/1/overview`);
179+
verifyRelativeURL(`/model-registry/modelregistry-sample/registered-models/1/overview`);
180180
modelRegistry.findModelBreadcrumbItem().contains('test');
181181

182182
// Navigate to versions tab
@@ -264,10 +264,12 @@ describe('Model Versions', () => {
264264
cy.findByTestId('model-versions-tab').click();
265265
const modelVersionRow = modelRegistry.getModelVersionRow('model version');
266266
modelVersionRow.findModelVersionName().contains('model version').click();
267-
verifyRelativeURL('/model-registry/modelregistry-sample/registeredModels/1/versions/1/details');
267+
verifyRelativeURL(
268+
'/model-registry/modelregistry-sample/registered-models/1/versions/1/details',
269+
);
268270
cy.findByTestId('app-page-title').should('contain.text', 'test');
269271
cy.findByTestId('breadcrumb-version-name').should('have.text', 'model version');
270272
cy.go('back');
271-
verifyRelativeURL('/model-registry/modelregistry-sample/registeredModels/1/versions');
273+
verifyRelativeURL('/model-registry/modelregistry-sample/registered-models/1/versions');
272274
});
273275
});

0 commit comments

Comments
 (0)