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.

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

Update links to Registered models #3076

Merged
merged 1 commit into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions frontend/src/__tests__/cypress/cypress/pages/modelRegistry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,10 @@ class ModelRegistry {
return this.findTable().find('thead').findByRole('button', { name });
}

findModelRegistry() {
return cy.get('#model-registry-selector-dropdown');
}

findModelVersionsTableHeaderButton(name: string) {
return this.findModelVersionsTable().find('thead').findByRole('button', { name });
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,24 @@ import { mockRegisteredModel } from '~/__mocks__/mockRegisteredModel';
import type { ModelVersion } from '~/concepts/modelRegistry/types';
import { mockModelVersion } from '~/__mocks__/mockModelVersion';
import { mockModelRegistryService } from '~/__mocks__/mockModelRegistryService';
import type { ServiceKind } from '~/k8sTypes';

const MODEL_REGISTRY_API_VERSION = 'v1alpha3';

type HandlersProps = {
disableModelRegistryFeature?: boolean;
registeredModelsSize?: number;
modelVersions?: ModelVersion[];
modelRegistries?: ServiceKind[];
};

const initIntercepts = ({
disableModelRegistryFeature = false,
registeredModelsSize = 4,
modelRegistries = [
mockModelRegistryService({ name: 'modelregistry-sample' }),
mockModelRegistryService({ name: 'modelregistry-sample-2' }),
],
modelVersions = [
mockModelVersion({
author: 'Author 1',
Expand All @@ -48,13 +54,7 @@ const initIntercepts = ({
}),
);

cy.interceptK8sList(
ServiceModel,
mockK8sResourceList([
mockModelRegistryService({ name: 'modelregistry-sample' }),
mockModelRegistryService({ name: 'modelregistry-sample-2' }),
]),
);
cy.interceptK8sList(ServiceModel, mockK8sResourceList(modelRegistries));

cy.interceptOdh(
`GET /api/service/modelregistry/:serviceName/api/model_registry/:apiVersion/registered_models`,
Expand Down Expand Up @@ -103,9 +103,15 @@ describe('Model Versions', () => {
it('Model versions table', () => {
initIntercepts({
disableModelRegistryFeature: false,
modelRegistries: [
mockModelRegistryService({ name: 'modelRegistry-1' }),
mockModelRegistryService({}),
],
});

modelRegistry.visit();
modelRegistry.findModelRegistry().findSelectOption('modelregistry-sample').click();
cy.reload();
const registeredModelRow = modelRegistry.getRow('Fraud detection model');
registeredModelRow.findName().contains('Fraud detection model').click();
verifyRelativeURL(`/modelRegistry/modelregistry-sample/registeredModels/1/versions`);
Expand Down
18 changes: 18 additions & 0 deletions frontend/src/pages/modelRegistry/ModelRegistryCoreLoader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,26 @@ const ModelRegistryCoreLoader: React.FC<ModelRegistryCoreLoaderProps> =
modelRegistryServicesLoadError,
modelRegistryServices,
preferredModelRegistry,
updatePreferredModelRegistry,
} = React.useContext(ModelRegistrySelectorContext);

const modelRegistryFromRoute = modelRegistryServices.find(
(mr) => mr.metadata.name === modelRegistry,
);

React.useEffect(() => {
if (
modelRegistryFromRoute &&
preferredModelRegistry?.metadata.name !== modelRegistryFromRoute.metadata.name
) {
updatePreferredModelRegistry(modelRegistryFromRoute);
}
}, [
modelRegistryFromRoute,
updatePreferredModelRegistry,
preferredModelRegistry?.metadata.name,
]);

if (modelRegistryServicesLoadError) {
return (
<Bullseye>
Expand Down
Loading