Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Istio overlay for UI integration with Central Dashboard #595

Merged
merged 1 commit into from
Jan 12, 2025
Merged

Add Istio overlay for UI integration with Central Dashboard #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions clients/ui/frontend/config/dotenv.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ const setupDotenvFilesForEnv = ({ env }) => {
const PROXY_PORT = process.env.PROXY_PORT || process.env.PORT || 4000;
const DEV_MODE = process.env.DEV_MODE || undefined;
const OUTPUT_ONLY = process.env._OUTPUT_ONLY === 'true';
const DEPLOYMENT_MODE = process.env.DEPLOYMENT_MODE || 'integrated';

process.env._RELATIVE_DIRNAME = RELATIVE_DIRNAME;
process.env._IS_PROJECT_ROOT_DIR = IS_ROOT;
Expand All @@ -172,6 +173,7 @@ const setupDotenvFilesForEnv = ({ env }) => {
process.env._PROXY_PORT = PROXY_PORT;
process.env._OUTPUT_ONLY = OUTPUT_ONLY;
process.env._DEV_MODE = DEV_MODE;
process.env._DEPLOYMENT_MODE = DEPLOYMENT_MODE;
};

module.exports = { setupWebpackDotenvFilesForEnv, setupDotenvFilesForEnv };
5 changes: 4 additions & 1 deletion clients/ui/frontend/config/webpack.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ const OUTPUT_ONLY = process.env._OUTPUT_ONLY;
const FAVICON = process.env.FAVICON;
const PRODUCT_NAME = process.env.PRODUCT_NAME;
const COVERAGE = process.env.COVERAGE;
const DEPLOYMENT_MODE = process.env._DEPLOYMENT_MODE;
const BASE_PATH = DEPLOYMENT_MODE === 'integrated' ? '/model-registry/' : PUBLIC_PATH;

if (OUTPUT_ONLY !== 'true') {
console.info(
Expand Down Expand Up @@ -173,7 +175,7 @@ module.exports = (env) => {
output: {
filename: '[name].bundle.js',
path: DIST_DIR,
publicPath: PUBLIC_PATH,
publicPath: BASE_PATH,
},
plugins: [
...setupWebpackDotenvFilesForEnv({
Expand All @@ -184,6 +186,7 @@ module.exports = (env) => {
template: path.join(SRC_DIR, 'index.html'),
title: PRODUCT_NAME,
favicon: path.join(SRC_DIR, 'images', FAVICON),
baseUrl: BASE_PATH
}),
new CopyPlugin({
patterns: [
Expand Down
2 changes: 1 addition & 1 deletion clients/ui/frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"cypress:open:mock": "CY_MOCK=1 npm run cypress:open -- ",
"cypress:run": "cypress run -b chrome --project src/__tests__/cypress",
"cypress:run:mock": "CY_MOCK=1 npm run cypress:run -- ",
"cypress:server:build": "DIST_DIR=./public-cypress POLL_INTERVAL=9999999 FAST_POLL_INTERVAL=9999999 npm run build",
"cypress:server:build": "DIST_DIR=./public-cypress POLL_INTERVAL=9999999 DEPLOYMENT_MODE=standalone MOCK_AUTH=true npm run build",
"cypress:server": "serve ./public-cypress -p 9001 -s -L"
},
"devDependencies": {
Expand Down
9 changes: 9 additions & 0 deletions clients/ui/frontend/src/__mocks__/mockNamespace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { Namespace } from '~/shared/types';

type MockNamespace = {
name?: string;
};

export const mockNamespace = ({ name = 'kubeflow' }: MockNamespace): Namespace => ({
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also fixing mock tests by adding the mock for Namespaces

name,
});
2 changes: 1 addition & 1 deletion clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class ModelRegistry {
}

visit() {
cy.visit(`/modelRegistry`);
cy.visit(`/model-registry`);
this.wait();
}

Expand Down
2 changes: 1 addition & 1 deletion clients/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistrySettings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export enum DatabaseDetailsTestId {

class ModelRegistrySettings {
visit(wait = true) {
cy.visit('/modelRegistrySettings');
cy.visit('/model-registry-settings');
if (wait) {
this.wait();
}
Expand Down
8 changes: 4 additions & 4 deletions .../ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/modelVersionArchive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class ModelVersionArchive {
visit() {
const rmId = '1';
const preferredModelRegistry = 'modelregistry-sample';
cy.visit(`/modelRegistry/${preferredModelRegistry}/registeredModels/${rmId}/versions/archive`);
cy.visit(`/model-registry/${preferredModelRegistry}/registeredModels/${rmId}/versions/archive`);
this.wait();
}

Expand All @@ -66,22 +66,22 @@ class ModelVersionArchive {
const rmId = '1';
const preferredModelRegistry = 'modelregistry-sample';
cy.visit(
`/modelRegistry/${preferredModelRegistry}/registeredModels/${rmId}/versions/archive/${mvId}`,
`/model-registry/${preferredModelRegistry}/registeredModels/${rmId}/versions/archive/${mvId}`,
);
}

visitModelVersionList() {
const rmId = '1';
const preferredModelRegistry = 'modelregistry-sample';
cy.visit(`/modelRegistry/${preferredModelRegistry}/registeredModels/${rmId}/versions`);
cy.visit(`/model-registry/${preferredModelRegistry}/registeredModels/${rmId}/versions`);
this.wait();
}

visitModelVersionDetails() {
const mvId = '3';
const rmId = '1';
const preferredModelRegistry = 'modelregistry-sample';
cy.visit(`/modelRegistry/${preferredModelRegistry}/registeredModels/${rmId}/versions/${mvId}`);
cy.visit(`/model-registry/${preferredModelRegistry}/registeredModels/${rmId}/versions/${mvId}`);
this.wait();
}

Expand Down
2 changes: 1 addition & 1 deletion .../ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/modelVersionDetails.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class ModelVersionDetails {
const preferredModelRegistry = 'modelregistry-sample';
const rmId = '1';
const mvId = '1';
cy.visit(`/modelRegistry/${preferredModelRegistry}/registeredModels/${rmId}/versions/${mvId}`);
cy.visit(`/model-registry/${preferredModelRegistry}/registeredModels/${rmId}/versions/${mvId}`);
this.wait();
}

Expand Down
2 changes: 1 addition & 1 deletion ...ts/ui/frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/registerModelPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export enum FormFieldSelector {
class RegisterModelPage {
visit() {
const preferredModelRegistry = 'modelregistry-sample';
cy.visit(`/modelRegistry/${preferredModelRegistry}/registerModel`);
cy.visit(`/model-registry/${preferredModelRegistry}/registerModel`);
this.wait();
}

Expand Down
10 changes: 5 additions & 5 deletions .../frontend/src/__tests__/cypress/cypress/pages/modelRegistryView/registeredModelArchive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,31 +56,31 @@ class ModelArchive {

visit() {
const preferredModelRegistry = 'modelregistry-sample';
cy.visit(`/modelRegistry/${preferredModelRegistry}/registeredModels/archive`);
cy.visit(`/model-registry/${preferredModelRegistry}/registeredModels/archive`);
this.wait();
}

visitArchiveModelDetail() {
const rmId = '2';
const preferredModelRegistry = 'modelregistry-sample';
cy.visit(`/modelRegistry/${preferredModelRegistry}/registeredModels/archive/${rmId}`);
cy.visit(`/model-registry/${preferredModelRegistry}/registeredModels/archive/${rmId}`);
}

visitArchiveModelVersionList() {
const rmId = '2';
const preferredModelRegistry = 'modelregistry-sample';
cy.visit(`/modelRegistry/${preferredModelRegistry}/registeredModels/archive/${rmId}/versions`);
cy.visit(`/model-registry/${preferredModelRegistry}/registeredModels/archive/${rmId}/versions`);
}

visitModelList() {
cy.visit('/modelRegistry/modelregistry-sample');
cy.visit('/model-registry/modelregistry-sample');
this.wait();
}

visitModelDetails() {
const rmId = '2';
const preferredModelRegistry = 'modelregistry-sample';
cy.visit(`/modelRegistry/${preferredModelRegistry}/registeredModels/${rmId}`);
cy.visit(`/model-registry/${preferredModelRegistry}/registeredModels/${rmId}`);
this.wait();
}

Expand Down
7 changes: 6 additions & 1 deletion clients/ui/frontend/src/__tests__/cypress/cypress/support/commands/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import type {
RegisteredModel,
RegisteredModelList,
} from '~/app/types';
import type { UserSettings } from '~/shared/types';
import type { Namespace, UserSettings } from '~/shared/types';

const MODEL_REGISTRY_API_VERSION = 'v1';
export { MODEL_REGISTRY_API_VERSION };
Expand Down Expand Up @@ -108,6 +108,11 @@ declare global {
type: 'GET /api/:apiVersion/user',
options: { path: { apiVersion: string } },
response: ApiResponse<UserSettings>,
) => Cypress.Chainable<null>) &
((
type: 'GET /api/:apiVersion/namespaces',
options: { path: { apiVersion: string } },
response: ApiResponse<Namespace[]>,
) => Cypress.Chainable<null>);
}
}
Expand Down
11 changes: 11 additions & 0 deletions clients/ui/frontend/src/__tests__/cypress/cypress/support/e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import '@cypress/code-coverage/support';
import { mockUserSettings } from '~/__mocks__/mockUserSettings';
import 'cypress-mochawesome-reporter/register';
import './commands';
import { mockNamespace } from '~/__mocks__/mockNamespace';
import { MODEL_REGISTRY_API_VERSION } from './commands/api';

chai.use(chaiSubset);
Expand All @@ -40,5 +41,15 @@ beforeEach(() => {
},
mockUserSettings({}),
);

cy.interceptApi(
'GET /api/:apiVersion/namespaces',
{
path: {
apiVersion: MODEL_REGISTRY_API_VERSION,
},
},
[mockNamespace({})],
);
}
});
10 changes: 5 additions & 5 deletions clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelVersionArchive.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ describe('Model version archive list', () => {
it('No archive versions in the selected registered model', () => {
initIntercepts({ modelVersions: [mockModelVersion({ id: '3', name: 'model version 2' })] });
modelVersionArchive.visitModelVersionList();
verifyRelativeURL('/modelRegistry/modelregistry-sample/registeredModels/1/versions');
verifyRelativeURL('/model-registry/modelregistry-sample/registeredModels/1/versions');
modelVersionArchive
.findModelVersionsTableKebab()
.findDropdownItem('View archived versions')
Expand All @@ -140,23 +140,23 @@ describe('Model version archive list', () => {
it('Archived version details browser back button should lead to archived versions table', () => {
initIntercepts({});
modelVersionArchive.visit();
verifyRelativeURL('/modelRegistry/modelregistry-sample/registeredModels/1/versions/archive');
verifyRelativeURL('/model-registry/modelregistry-sample/registeredModels/1/versions/archive');
modelVersionArchive.findArchiveVersionBreadcrumbItem().contains('Archived version');
const archiveVersionRow = modelVersionArchive.getRow('model version 2');
archiveVersionRow.findName().contains('model version 2').click();
verifyRelativeURL(
'/modelRegistry/modelregistry-sample/registeredModels/1/versions/archive/2/details',
'/model-registry/modelregistry-sample/registeredModels/1/versions/archive/2/details',
);
cy.go('back');
verifyRelativeURL('/modelRegistry/modelregistry-sample/registeredModels/1/versions/archive');
verifyRelativeURL('/model-registry/modelregistry-sample/registeredModels/1/versions/archive');
modelVersionArchive.findArchiveVersionBreadcrumbItem().contains('Archived version');
archiveVersionRow.findName().contains('model version 2').should('exist');
});

it('Archive version list', () => {
initIntercepts({});
modelVersionArchive.visit();
verifyRelativeURL('/modelRegistry/modelregistry-sample/registeredModels/1/versions/archive');
verifyRelativeURL('/model-registry/modelregistry-sample/registeredModels/1/versions/archive');

//breadcrumb
modelVersionArchive.findArchiveVersionBreadcrumbItem().contains('Archived version');
Expand Down
2 changes: 1 addition & 1 deletion clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelVersionDetails.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ describe('Model version details', () => {

it('Model version details page header', () => {
verifyRelativeURL(
'/modelRegistry/modelregistry-sample/registeredModels/1/versions/1/details',
'/model-registry/modelregistry-sample/registeredModels/1/versions/1/details',
);
cy.findByTestId('app-page-title').should('have.text', 'Version 1');
cy.findByTestId('breadcrumb-version-name').should('have.text', 'Version 1');
Expand Down
12 changes: 6 additions & 6 deletions clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/modelVersions.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ describe('Model Versions', () => {
modelRegistry.visit();
const registeredModelRow = modelRegistry.getRow('Fraud detection model');
registeredModelRow.findName().contains('Fraud detection model').click();
verifyRelativeURL(`/modelRegistry/modelregistry-sample/registeredModels/1/versions`);
verifyRelativeURL(`/model-registry/modelregistry-sample/registeredModels/1/versions`);
modelRegistry.shouldmodelVersionsEmpty();
});

Expand All @@ -122,9 +122,9 @@ describe('Model Versions', () => {
modelRegistry.visit();
const registeredModelRow = modelRegistry.getRow('Fraud detection model');
registeredModelRow.findName().contains('Fraud detection model').click();
verifyRelativeURL(`/modelRegistry/modelregistry-sample/registeredModels/1/versions`);
verifyRelativeURL(`/model-registry/modelregistry-sample/registeredModels/1/versions`);
cy.go('back');
verifyRelativeURL(`/modelRegistry/modelregistry-sample`);
verifyRelativeURL(`/model-registry/modelregistry-sample`);
registeredModelRow.findName().contains('Fraud detection model').should('exist');
});

Expand All @@ -143,7 +143,7 @@ describe('Model Versions', () => {
//cy.reload();
const registeredModelRow = modelRegistry.getRow('Fraud detection model');
registeredModelRow.findName().contains('Fraud detection model').click();
verifyRelativeURL(`/modelRegistry/modelregistry-sample/registeredModels/1/versions`);
verifyRelativeURL(`/model-registry/modelregistry-sample/registeredModels/1/versions`);
modelRegistry.findModelBreadcrumbItem().contains('test');
//modelRegistry.findModelVersionsTableKebab().findDropdownItem('View archived versions');
//modelRegistry.findModelVersionsHeaderAction().findDropdownItem('Archive model');
Expand Down Expand Up @@ -209,10 +209,10 @@ describe('Model Versions', () => {
registeredModelRow.findName().contains('Fraud detection model').click();
const modelVersionRow = modelRegistry.getModelVersionRow('model version');
modelVersionRow.findModelVersionName().contains('model version').click();
verifyRelativeURL('/modelRegistry/modelregistry-sample/registeredModels/1/versions/1/details');
verifyRelativeURL('/model-registry/modelregistry-sample/registeredModels/1/versions/1/details');
cy.findByTestId('app-page-title').should('have.text', 'model version');
cy.findByTestId('breadcrumb-version-name').should('have.text', 'model version');
cy.go('back');
verifyRelativeURL('/modelRegistry/modelregistry-sample/registeredModels/1/versions');
verifyRelativeURL('/model-registry/modelregistry-sample/registeredModels/1/versions');
});
});
20 changes: 10 additions & 10 deletions clients/ui/frontend/src/__tests__/cypress/cypress/tests/mocked/registeredModelArchive.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,28 +133,28 @@ describe('Model archive list', () => {
registeredModels: [],
});
registeredModelArchive.visit();
verifyRelativeURL('/modelRegistry/modelregistry-sample/registeredModels/archive');
verifyRelativeURL('/model-registry/modelregistry-sample/registeredModels/archive');
registeredModelArchive.shouldArchiveVersionsEmpty();
});

it('Archived model details browser back button should lead to archived models table', () => {
initIntercepts({});
registeredModelArchive.visit();
verifyRelativeURL('/modelRegistry/modelregistry-sample/registeredModels/archive');
verifyRelativeURL('/model-registry/modelregistry-sample/registeredModels/archive');
registeredModelArchive.findArchiveModelBreadcrumbItem().contains('Archived models');
const archiveModelRow = registeredModelArchive.getRow('model 2');
archiveModelRow.findName().contains('model 2').click();
verifyRelativeURL('/modelRegistry/modelregistry-sample/registeredModels/archive/2/versions');
verifyRelativeURL('/model-registry/modelregistry-sample/registeredModels/archive/2/versions');
cy.findByTestId('app-page-title').should('have.text', 'model 2Archived');
cy.go('back');
verifyRelativeURL('/modelRegistry/modelregistry-sample/registeredModels/archive');
verifyRelativeURL('/model-registry/modelregistry-sample/registeredModels/archive');
registeredModelArchive.findArchiveModelTable().should('be.visible');
});

it('Archived model with no versions', () => {
initIntercepts({ modelVersions: [] });
registeredModelArchive.visit();
verifyRelativeURL('/modelRegistry/modelregistry-sample/registeredModels/archive');
verifyRelativeURL('/model-registry/modelregistry-sample/registeredModels/archive');
registeredModelArchive.findArchiveModelBreadcrumbItem().contains('Archived models');
const archiveModelRow = registeredModelArchive.getRow('model 2');
archiveModelRow.findName().contains('model 2').click();
Expand All @@ -164,23 +164,23 @@ describe('Model archive list', () => {
it('Archived model flow', () => {
initIntercepts({});
registeredModelArchive.visitArchiveModelVersionList();
verifyRelativeURL('/modelRegistry/modelregistry-sample/registeredModels/archive/2/versions');
verifyRelativeURL('/model-registry/modelregistry-sample/registeredModels/archive/2/versions');

modelRegistry.findModelVersionsTable().should('be.visible');
modelRegistry.findModelVersionsTableRows().should('have.length', 2);
const version = modelRegistry.getModelVersionRow('model version');
version.findModelVersionName().contains('model version').click();
verifyRelativeURL(
'/modelRegistry/modelregistry-sample/registeredModels/archive/2/versions/1/details',
'/model-registry/modelregistry-sample/registeredModels/archive/2/versions/1/details',
);
cy.go('back');
verifyRelativeURL('/modelRegistry/modelregistry-sample/registeredModels/archive/2/versions');
verifyRelativeURL('/model-registry/modelregistry-sample/registeredModels/archive/2/versions');
});

it('Archive models list', () => {
initIntercepts({});
registeredModelArchive.visit();
verifyRelativeURL('/modelRegistry/modelregistry-sample/registeredModels/archive');
verifyRelativeURL('/model-registry/modelregistry-sample/registeredModels/archive');

//breadcrumb
registeredModelArchive.findArchiveModelBreadcrumbItem().contains('Archived models');
Expand Down Expand Up @@ -233,7 +233,7 @@ describe('Model archive list', () => {
archiveModelRow.findKebabAction('View details').click();
cy.location('pathname').should(
'be.equals',
'/modelRegistry/modelregistry-sample/registeredModels/archive/2/details',
'/model-registry/modelregistry-sample/registeredModels/archive/2/details',
);
});
});
Expand Down
Loading
Loading