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

Jump to bottom

Conditionally render model registry modals #3304

Merged
merged 1 commit into from
Oct 4, 2024
Merged

Conditionally render model registry modals #3304

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
78 changes: 40 additions & 38 deletions .../src/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsHeaderActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,45 +70,47 @@
</DropdownItem>
</DropdownList>
</Dropdown>
<DeployRegisteredModelModal
onSubmit={() => {
refresh();
navigate(
modelVersionDeploymentsUrl(
mv.id,
mv.registeredModelId,
preferredModelRegistry?.metadata.name,
),
);
}}
onCancel={() => setIsDeployModalOpen(false)}
isOpen={isDeployModalOpen}
modelVersion={mv}
/>
<ArchiveModelVersionModal
onCancel={() => setIsArchiveModalOpen(false)}
onSubmit={() =>
apiState.api
.patchModelVersion(
{},
{
state: ModelState.ARCHIVED,
},
mv.id,
)
.then(() =>
navigate(
modelVersionArchiveDetailsUrl(
mv.id,
mv.registeredModelId,
preferredModelRegistry?.metadata.name,
),
{isDeployModalOpen ? (
<DeployRegisteredModelModal
onSubmit={() => {
refresh();
navigate(

Check warning on line 77 in frontend/src/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsHeaderActions.tsx

View check run for this annotation

Codecov / codecov/patch

frontend/src/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsHeaderActions.tsx#L74-L77 

Added lines #L74 - L77 were not covered by tests
modelVersionDeploymentsUrl(
mv.id,
mv.registeredModelId,
preferredModelRegistry?.metadata.name,

Check warning on line 81 in frontend/src/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsHeaderActions.tsx

View check run for this annotation

Codecov / codecov/patch

frontend/src/pages/modelRegistry/screens/ModelVersionDetails/ModelVersionDetailsHeaderActions.tsx#L81 

Added line #L81 was not covered by tests
),
)
}
isOpen={isArchiveModalOpen}
modelVersionName={mv.name}
/>
);
}}
onCancel={() => setIsDeployModalOpen(false)}
modelVersion={mv}
/>
) : null}
{isArchiveModalOpen ? (
<ArchiveModelVersionModal
onCancel={() => setIsArchiveModalOpen(false)}
onSubmit={() =>
apiState.api
.patchModelVersion(
{},
{
state: ModelState.ARCHIVED,
},
mv.id,
)
.then(() =>
navigate(
modelVersionArchiveDetailsUrl(
mv.id,
mv.registeredModelId,
preferredModelRegistry?.metadata.name,
),
),
)
}
modelVersionName={mv.name}
/>
) : null}
</>
);
};
Expand Down
33 changes: 17 additions & 16 deletions frontend/src/pages/modelRegistry/screens/ModelVersions/ModelVersionsHeaderActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,22 +63,23 @@ const ModelVersionsHeaderActions: React.FC<ModelVersionsHeaderActionsProps> = ({
</Dropdown>
</FlexItem>
</Flex>
<ArchiveRegisteredModelModal
onCancel={() => setIsArchiveModalOpen(false)}
onSubmit={() =>
apiState.api
.patchRegisteredModel(
{},
{
state: ModelState.ARCHIVED,
},
rm.id,
)
.then(() => navigate(registeredModelsUrl(preferredModelRegistry?.metadata.name)))
}
isOpen={isArchiveModalOpen}
registeredModelName={rm.name}
/>
{isArchiveModalOpen ? (
<ArchiveRegisteredModelModal
onCancel={() => setIsArchiveModalOpen(false)}
onSubmit={() =>
apiState.api
.patchRegisteredModel(
{},
{
state: ModelState.ARCHIVED,
},
rm.id,
)
.then(() => navigate(registeredModelsUrl(preferredModelRegistry?.metadata.name)))
}
registeredModelName={rm.name}
/>
) : null}
</>
);
};
Expand Down
107 changes: 55 additions & 52 deletions frontend/src/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,60 +101,63 @@
{!isArchiveModel && (
<Td isActionCell>
<ActionsColumn items={actions} />
<ArchiveModelVersionModal
onCancel={() => setIsArchiveModalOpen(false)}
onSubmit={() =>
apiState.api
.patchModelVersion(
{},
{
state: ModelState.ARCHIVED,
},
mv.id,
)
.then(refresh)
}
isOpen={isArchiveModalOpen}
modelVersionName={mv.name}
/>
<DeployRegisteredModelModal
onSubmit={() =>
navigate(
modelVersionDeploymentsUrl(
mv.id,
mv.registeredModelId,
preferredModelRegistry?.metadata.name,
),
)
}
onCancel={() => setIsDeployModalOpen(false)}
isOpen={isDeployModalOpen}
modelVersion={mv}
/>
<RestoreModelVersionModal
onCancel={() => setIsRestoreModalOpen(false)}
onSubmit={() =>
apiState.api
.patchModelVersion(
{},
{
state: ModelState.LIVE,
},
mv.id,
)
.then(() =>
navigate(
modelVersionUrl(
mv.id,
mv.registeredModelId,
preferredModelRegistry?.metadata.name,
),
{isArchiveModalOpen ? (
<ArchiveModelVersionModal
onCancel={() => setIsArchiveModalOpen(false)}
onSubmit={() =>
apiState.api
.patchModelVersion(
{},
{
state: ModelState.ARCHIVED,
},
mv.id,
)
.then(refresh)
}
modelVersionName={mv.name}
/>
) : null}
{isDeployModalOpen ? (
<DeployRegisteredModelModal
onSubmit={() =>

Check warning on line 123 in frontend/src/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableRow.tsx

View check run for this annotation

Codecov / codecov/patch

frontend/src/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableRow.tsx#L123 

Added line #L123 was not covered by tests
navigate(
modelVersionDeploymentsUrl(
mv.id,
mv.registeredModelId,
preferredModelRegistry?.metadata.name,

Check warning on line 128 in frontend/src/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableRow.tsx

View check run for this annotation

Codecov / codecov/patch

frontend/src/pages/modelRegistry/screens/ModelVersions/ModelVersionsTableRow.tsx#L128 

Added line #L128 was not covered by tests
),
)
}
isOpen={isRestoreModalOpen}
modelVersionName={mv.name}
/>
}
onCancel={() => setIsDeployModalOpen(false)}
modelVersion={mv}
/>
) : null}
{isRestoreModalOpen ? (
<RestoreModelVersionModal
onCancel={() => setIsRestoreModalOpen(false)}
onSubmit={() =>
apiState.api
.patchModelVersion(
{},
{
state: ModelState.LIVE,
},
mv.id,
)
.then(() =>
navigate(
modelVersionUrl(
mv.id,
mv.registeredModelId,
preferredModelRegistry?.metadata.name,
),
),
)
}
modelVersionName={mv.name}
/>
) : null}
</Td>
)}
</Tr>
Expand Down
5 changes: 2 additions & 3 deletions frontend/src/pages/modelRegistry/screens/ModelVersionsArchive/ModelVersionArchiveDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const ModelVersionsArchiveDetails: React.FC<ModelVersionsArchiveDetailsProps> =
/>
)}
</ApplicationsPage>
{mv !== null && (
{mv !== null && isRestoreModalOpen ? (
<RestoreModelVersionModal
onCancel={() => setIsRestoreModalOpen(false)}
onSubmit={() =>
Expand All @@ -125,10 +125,9 @@ const ModelVersionsArchiveDetails: React.FC<ModelVersionsArchiveDetailsProps> =
navigate(modelVersionUrl(mv.id, rm?.id, preferredModelRegistry?.metadata.name)),
)
}
isOpen={isRestoreModalOpen}
modelVersionName={mv.name}
/>
)}
) : null}
</>
);
};
Expand Down
5 changes: 2 additions & 3 deletions frontend/src/pages/modelRegistry/screens/RegisterModel/ConnectionModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,15 @@ import { DataConnection } from '~/pages/projects/types';
import { ConnectionDropdown } from './ConnectionDropdown';

export const ConnectionModal: React.FC<{
isOpen: boolean;
onClose: () => void;
onSubmit: (connection: DataConnection) => void;
}> = ({ isOpen = false, onClose, onSubmit }) => {
}> = ({ onClose, onSubmit }) => {
const [project, setProject] = React.useState<string | undefined>(undefined);
const [connection, setConnection] = React.useState<DataConnection | undefined>(undefined);

return (
<Modal
isOpen={isOpen}
isOpen
data-testid="connection-autofill-modal"
variant="medium"
title="Autofill from data connection"
Expand Down
17 changes: 9 additions & 8 deletions frontend/src/pages/modelRegistry/screens/RegisterModel/RegistrationCommonFormSections.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,14 +235,15 @@ const RegistrationCommonFormSections: React.FC<RegistrationCommonFormSectionsPro
}
/>
</FormSection>
<ConnectionModal
isOpen={isAutofillModalOpen}
onClose={() => setAutofillModalOpen(false)}
onSubmit={(connection) => {
fillObjectStorageByConnection(connection);
setAutofillModalOpen(false);
}}
/>
{isAutofillModalOpen ? (
<ConnectionModal
onClose={() => setAutofillModalOpen(false)}
onSubmit={(connection) => {
fillObjectStorageByConnection(connection);
setAutofillModalOpen(false);
}}
/>
) : null}
</>
);
};
Expand Down
70 changes: 36 additions & 34 deletions frontend/src/pages/modelRegistry/screens/RegisteredModels/RegisteredModelTableRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,40 +93,42 @@ const RegisteredModelTableRow: React.FC<RegisteredModelTableRowProps> = ({
</Td>
<Td isActionCell>
<ActionsColumn items={actions} />
<ArchiveRegisteredModelModal
onCancel={() => setIsArchiveModalOpen(false)}
onSubmit={() =>
apiState.api
.patchRegisteredModel(
{},
{
state: ModelState.ARCHIVED,
},
rm.id,
)
.then(refresh)
}
isOpen={isArchiveModalOpen}
registeredModelName={rm.name}
/>
<RestoreRegisteredModelModal
onCancel={() => setIsRestoreModalOpen(false)}
onSubmit={() =>
apiState.api
.patchRegisteredModel(
{},
{
state: ModelState.LIVE,
},
rm.id,
)
.then(() =>
navigate(registeredModelUrl(rm.id, preferredModelRegistry?.metadata.name)),
)
}
isOpen={isRestoreModalOpen}
registeredModelName={rm.name}
/>
{isArchiveModalOpen ? (
<ArchiveRegisteredModelModal
onCancel={() => setIsArchiveModalOpen(false)}
onSubmit={() =>
apiState.api
.patchRegisteredModel(
{},
{
state: ModelState.ARCHIVED,
},
rm.id,
)
.then(refresh)
}
registeredModelName={rm.name}
/>
) : null}
{isRestoreModalOpen ? (
<RestoreRegisteredModelModal
onCancel={() => setIsRestoreModalOpen(false)}
onSubmit={() =>
apiState.api
.patchRegisteredModel(
{},
{
state: ModelState.LIVE,
},
rm.id,
)
.then(() =>
navigate(registeredModelUrl(rm.id, preferredModelRegistry?.metadata.name)),
)
}
registeredModelName={rm.name}
/>
) : null}
</Td>
</Tr>
);
Expand Down
Loading
Loading