Merge remote-tracking branch 'upstream/main'

red-hat-data-services · Nov 9, 2024 · 15234bf · 15234bf
2 parents 44e60e6 + e85d7a1
commit 15234bf
Show file tree

Hide file tree

Showing 9 changed files with 119 additions and 152 deletions.
diff --git a/backend/src/routes/api/modelRegistries/index.ts b/backend/src/routes/api/modelRegistries/index.ts
@@ -1,6 +1,7 @@
 import { FastifyReply, FastifyRequest } from 'fastify';
 import { secureAdminRoute } from '../../../utils/route-security';
 import { KubeFastifyInstance, ModelRegistryKind, RecursivePartial } from '../../../types';
+import createError from 'http-errors';
 import {
   createModelRegistryAndSecret,
   deleteModelRegistryAndSecret,
@@ -61,7 +62,9 @@ export default async (fastify: KubeFastifyInstance): Promise<void> => {
             modelRegistryNamespace,
             databasePassword,
             !!dryRun,
-          );
+          ).catch((e) => {
+            throw createError(e.statusCode, e?.body?.message);
+          });
         } catch (e) {
           fastify.log.error(
             `ModelRegistry ${modelRegistry.metadata.name} could not be created, ${

diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/projects/dataConnection.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/projects/dataConnection.cy.ts
@@ -171,12 +171,6 @@ describe('Data connections', () => {
       .findSelectOption('Test Notebook')
       .click();
     editDataConnectionModal.findNotebookRestartAlert().should('exist');
-    cy.interceptK8sList(
-      NotebookModel,
-      mockK8sResourceList([
-        mockNotebookK8sResource({ envFrom: [{ secretRef: { name: 'test-secret' } }] }),
-      ]),
-    ).as('addConnectedWorkbench');
     cy.interceptK8s('PUT', SecretModel, mockSecretK8sResource({})).as('editDataConnection');
 
     editDataConnectionModal.findSubmitButton().click();
@@ -212,13 +206,6 @@ describe('Data connections', () => {
     cy.get('@editDataConnection.all').then((interceptions) => {
       expect(interceptions).to.have.length(2); //1 dry run request and 1 actual request
     });
-
-    cy.wait('@addConnectedWorkbench').then(() => {
-      projectDetails
-        .getDataConnectionRow('Test Secret')
-        .findWorkbenchConnection()
-        .should('have.text', 'Test Notebook');
-    });
   });
   it('Delete connection', () => {
     initIntercepts({});

diff --git a/...ges/modelServing/screens/projects/ModelMeshSection/ServingRuntimeTableExpandedSection.tsx b/...ges/modelServing/screens/projects/ModelMeshSection/ServingRuntimeTableExpandedSection.tsx
@@ -28,8 +28,7 @@ const ServingRuntimeTableExpandedSection: React.FC<ServingRuntimeTableExpandedSe
   obj,
 }) => {
   const {
-    inferenceServices: { data: inferenceServices },
-    refreshAllProjectData,
+    inferenceServices: { data: inferenceServices, refresh: refreshInferenceServices },
   } = React.useContext(ProjectDetailsContext);
 
   const modelInferenceServices = getInferenceServiceFromServingRuntime(inferenceServices, obj);
@@ -55,7 +54,7 @@ const ServingRuntimeTableExpandedSection: React.FC<ServingRuntimeTableExpandedSe
               inferenceServices={modelInferenceServices}
               servingRuntimes={[obj]}
               refresh={() => {
-                refreshAllProjectData();
+                refreshInferenceServices();
                 onClose();
               }}
             />

diff --git a/frontend/src/pages/projects/ProjectDetailsContext.tsx b/frontend/src/pages/projects/ProjectDetailsContext.tsx
@@ -37,7 +37,6 @@ import useConnections from './screens/detail/connections/useConnections';
 
 type ProjectDetailsContextType = {
   currentProject: ProjectKind;
-  refreshAllProjectData: () => void;
   filterTokens: (servingRuntime?: string) => SecretKind[];
   notebooks: ContextResourceData<NotebookState>;
   pvcs: ContextResourceData<PersistentVolumeClaimKind>;
@@ -54,10 +53,7 @@ type ProjectDetailsContextType = {
 };
 
 export const ProjectDetailsContext = React.createContext<ProjectDetailsContextType>({
-  // We never will get into a case without a project, so fudge the default value
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  currentProject: null as unknown as ProjectKind,
-  refreshAllProjectData: () => undefined,
+  currentProject: { apiVersion: '', kind: '', metadata: { name: '' } },
   filterTokens: () => [],
   notebooks: DEFAULT_CONTEXT_DATA,
   pvcs: DEFAULT_CONTEXT_DATA,
@@ -99,39 +95,6 @@ const ProjectDetailsContextProvider: React.FC = () => {
   const projectSharingRB = useContextResourceData<RoleBindingKind>(useProjectSharing(namespace));
   const groups = useGroups();
 
-  const notebookRefresh = notebooks.refresh;
-  const pvcRefresh = pvcs.refresh;
-  const dataConnectionRefresh = dataConnections.refresh;
-  const connectionRefresh = connections.refresh;
-  const servingRuntimeRefresh = servingRuntimes.refresh;
-  const servingRuntimeTemplateOrderRefresh = servingRuntimeTemplateOrder.refresh;
-  const servingRuntimeTemplateDisablementRefresh = servingRuntimeTemplateDisablement.refresh;
-  const inferenceServiceRefresh = inferenceServices.refresh;
-  const projectSharingRefresh = projectSharingRB.refresh;
-  const refreshAllProjectData = React.useCallback(() => {
-    notebookRefresh();
-    setTimeout(notebookRefresh, 2000);
-    pvcRefresh();
-    dataConnectionRefresh();
-    connectionRefresh();
-    servingRuntimeRefresh();
-    inferenceServiceRefresh();
-    projectSharingRefresh();
-
-    servingRuntimeTemplateOrderRefresh();
-    servingRuntimeTemplateDisablementRefresh();
-  }, [
-    notebookRefresh,
-    pvcRefresh,
-    dataConnectionRefresh,
-    connectionRefresh,
-    servingRuntimeRefresh,
-    servingRuntimeTemplateOrderRefresh,
-    servingRuntimeTemplateDisablementRefresh,
-    inferenceServiceRefresh,
-    projectSharingRefresh,
-  ]);
-
   const filterTokens = React.useCallback(
     (servingRuntimeName?: string): SecretKind[] => {
       if (!namespace || !servingRuntimeName) {
@@ -167,7 +130,6 @@ const ProjectDetailsContextProvider: React.FC = () => {
             servingRuntimeTemplateOrder,
             servingRuntimeTemplateDisablement,
             inferenceServices,
-            refreshAllProjectData,
             filterTokens,
             serverSecrets,
             projectSharingRB,
@@ -185,7 +147,6 @@ const ProjectDetailsContextProvider: React.FC = () => {
       servingRuntimeTemplateOrder,
       servingRuntimeTemplateDisablement,
       inferenceServices,
-      refreshAllProjectData,
       filterTokens,
       serverSecrets,
       projectSharingRB,

diff --git a/frontend/src/pages/projects/screens/detail/ProjectDetails.tsx b/frontend/src/pages/projects/screens/detail/ProjectDetails.tsx
@@ -53,72 +53,6 @@ const ProjectDetails: React.FC = () => {
 
   useCheckLogoutParams();
 
-  const content = () => (
-    <GenericHorizontalBar
-      activeKey={state}
-      sections={[
-        { id: ProjectSectionID.OVERVIEW, title: 'Overview', component: <ProjectOverview /> },
-        { id: ProjectSectionID.WORKBENCHES, title: 'Workbenches', component: <NotebookList /> },
-        ...(pipelinesEnabled
-          ? [
-              {
-                id: ProjectSectionID.PIPELINES,
-                title: 'Pipelines',
-                component: <PipelinesSection />,
-              },
-            ]
-          : []),
-        ...(modelServingEnabled
-          ? [
-              {
-                id: ProjectSectionID.MODEL_SERVER,
-                title: 'Models',
-                component: <ModelServingPlatform />,
-              },
-            ]
-          : []),
-        {
-          id: ProjectSectionID.CLUSTER_STORAGES,
-          title: 'Cluster storage',
-          component: <StorageList />,
-        },
-        ...(connectionTypesEnabled
-          ? [
-              {
-                id: ProjectSectionID.CONNECTIONS,
-                title: 'Connections',
-                component: <ConnectionsList />,
-              },
-            ]
-          : [
-              {
-                id: ProjectSectionID.DATA_CONNECTIONS,
-                title: 'Data connections',
-                component: <DataConnectionsList />,
-              },
-            ]),
-        ...(projectSharingEnabled && allowCreate
-          ? [
-              {
-                id: ProjectSectionID.PERMISSIONS,
-                title: 'Permissions',
-                component: <ProjectSharing />,
-              },
-            ]
-          : []),
-        ...(biasMetricsAreaAvailable && allowCreate
-          ? [
-              {
-                id: ProjectSectionID.SETTINGS,
-                title: 'Settings',
-                component: <ProjectSettingsPage />,
-              },
-            ]
-          : []),
-      ]}
-    />
-  );
-
   return (
     <ApplicationsPage
       title={
@@ -142,7 +76,69 @@ const ProjectDetails: React.FC = () => {
       empty={false}
       headerAction={<ProjectActions project={currentProject} />}
     >
-      {content()}
+      <GenericHorizontalBar
+        activeKey={state}
+        sections={[
+          { id: ProjectSectionID.OVERVIEW, title: 'Overview', component: <ProjectOverview /> },
+          { id: ProjectSectionID.WORKBENCHES, title: 'Workbenches', component: <NotebookList /> },
+          ...(pipelinesEnabled
+            ? [
+                {
+                  id: ProjectSectionID.PIPELINES,
+                  title: 'Pipelines',
+                  component: <PipelinesSection />,
+                },
+              ]
+            : []),
+          ...(modelServingEnabled
+            ? [
+                {
+                  id: ProjectSectionID.MODEL_SERVER,
+                  title: 'Models',
+                  component: <ModelServingPlatform />,
+                },
+              ]
+            : []),
+          {
+            id: ProjectSectionID.CLUSTER_STORAGES,
+            title: 'Cluster storage',
+            component: <StorageList />,
+          },
+          ...(connectionTypesEnabled
+            ? [
+                {
+                  id: ProjectSectionID.CONNECTIONS,
+                  title: 'Connections',
+                  component: <ConnectionsList />,
+                },
+              ]
+            : [
+                {
+                  id: ProjectSectionID.DATA_CONNECTIONS,
+                  title: 'Data connections',
+                  component: <DataConnectionsList />,
+                },
+              ]),
+          ...(projectSharingEnabled && allowCreate
+            ? [
+                {
+                  id: ProjectSectionID.PERMISSIONS,
+                  title: 'Permissions',
+                  component: <ProjectSharing />,
+                },
+              ]
+            : []),
+          ...(biasMetricsAreaAvailable && allowCreate
+            ? [
+                {
+                  id: ProjectSectionID.SETTINGS,
+                  title: 'Settings',
+                  component: <ProjectSettingsPage />,
+                },
+              ]
+            : []),
+        ]}
+      />
     </ApplicationsPage>
   );
 };

diff --git a/frontend/src/pages/projects/screens/detail/data-connections/DataConnectionsList.tsx b/frontend/src/pages/projects/screens/detail/data-connections/DataConnectionsList.tsx
@@ -13,12 +13,21 @@ import DataConnectionsTable from './DataConnectionsTable';
 
 const DataConnectionsList: React.FC = () => {
   const {
-    dataConnections: { data: connections, loaded, error },
-    refreshAllProjectData,
+    notebooks: { refresh: refreshNotebooks },
+    dataConnections: {
+      data: dataConnections,
+      loaded: dataConnectionsLoaded,
+      error: dataConnectionsError,
+      refresh: refreshDataConnections,
+    },
   } = React.useContext(ProjectDetailsContext);
   const [open, setOpen] = React.useState(false);
+  const isDataConnectionsEmpty = dataConnections.length === 0;
 
-  const isDataConnectionsEmpty = connections.length === 0;
+  const refresh = () => {
+    refreshDataConnections();
+    refreshNotebooks();
+  };
 
   return (
     <>
@@ -55,9 +64,9 @@ const DataConnectionsList: React.FC = () => {
               ]
             : undefined
         }
-        isLoading={!loaded}
+        isLoading={!dataConnectionsLoaded}
         isEmpty={isDataConnectionsEmpty}
-        loadError={error}
+        loadError={dataConnectionsError}
         emptyState={
           <EmptyDetailsView
             title="Start by adding a data connection"
@@ -77,15 +86,15 @@ const DataConnectionsList: React.FC = () => {
           />
         }
       >
-        {!isDataConnectionsEmpty ? (
-          <DataConnectionsTable connections={connections} refreshData={refreshAllProjectData} />
-        ) : null}
+        {!isDataConnectionsEmpty && (
+          <DataConnectionsTable connections={dataConnections} refreshData={refresh} />
+        )}
       </DetailsSection>
       {open ? (
         <ManageDataConnectionModal
           onClose={(submitted) => {
             if (submitted) {
-              refreshAllProjectData();
+              refresh();
             }
             setOpen(false);
           }}

diff --git a/frontend/src/pages/projects/screens/detail/notebooks/NotebookList.tsx b/frontend/src/pages/projects/screens/detail/notebooks/NotebookList.tsx
@@ -16,21 +16,25 @@ import NotebookTable from './NotebookTable';
 const NotebookList: React.FC = () => {
   const {
     currentProject,
-    notebooks: { data: notebookStates, loaded, error: loadError },
-    refreshAllProjectData: refresh,
+    notebooks: {
+      data: notebooks,
+      loaded: notebooksLoaded,
+      error: notebooksError,
+      refresh: refreshNotebooks,
+    },
   } = React.useContext(ProjectDetailsContext);
   const navigate = useNavigate();
   const projectName = currentProject.metadata.name;
-  const isNotebooksEmpty = notebookStates.length === 0;
+  const isNotebooksEmpty = notebooks.length === 0;
 
   useRefreshInterval(FAST_POLL_INTERVAL, () =>
-    notebookStates
+    notebooks
       .filter((notebookState) => notebookState.isStarting || notebookState.isStopping)
       .forEach((notebookState) => notebookState.refresh()),
   );
 
   useRefreshInterval(POLL_INTERVAL, () =>
-    notebookStates
+    notebooks
       .filter((notebookState) => !notebookState.isStarting && !notebookState.isStopping)
       .forEach((notebookState) => notebookState.refresh()),
   );
@@ -63,8 +67,8 @@ const NotebookList: React.FC = () => {
           Create workbench
         </Button>,
       ]}
-      isLoading={!loaded}
-      loadError={loadError}
+      isLoading={!notebooksLoaded}
+      loadError={notebooksError}
       isEmpty={isNotebooksEmpty}
       emptyState={
         <EmptyDetailsView
@@ -86,7 +90,7 @@ const NotebookList: React.FC = () => {
       }
     >
       {!isNotebooksEmpty ? (
-        <NotebookTable notebookStates={notebookStates} refresh={refresh} />
+        <NotebookTable notebookStates={notebooks} refresh={refreshNotebooks} />
       ) : null}
     </DetailsSection>
   );