Connection type admin view feature flag

ashley-o0o · Feb 12, 2025 · 3ef9ee1 · 3ef9ee1
1 parent ba5a863
commit 3ef9ee1
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 7 deletions.
diff --git a/backend/src/types.ts b/backend/src/types.ts
@@ -47,6 +47,7 @@ export type DashboardConfig = K8sResourceCommon & {
       disableConnectionTypes: boolean;
       disableStorageClasses: boolean;
       disableNIMModelServing: boolean;
+      disableAdminConnectionTypes: boolean;
       disableFineTuning: boolean;
     };
     /** @deprecated -- replacing this with Platform Auth resource -- remove when this is no longer in the CRD */

diff --git a/backend/src/utils/constants.ts b/backend/src/utils/constants.ts
@@ -73,6 +73,7 @@ export const blankDashboardCR: DashboardConfig = {
       disableConnectionTypes: false,
       disableStorageClasses: false,
       disableNIMModelServing: true,
+      disableAdminConnectionTypes: false,
       disableFineTuning: true,
     },
     notebookController: {

diff --git a/frontend/src/__mocks__/mockDashboardConfig.ts b/frontend/src/__mocks__/mockDashboardConfig.ts
@@ -31,6 +31,7 @@ export type MockDashboardConfigType = {
   disableModelRegistrySecureDB?: boolean;
   disableServingRuntimeParams?: boolean;
   disableConnectionTypes?: boolean;
+  disableAdminConnectionTypes?: boolean;
   disableStorageClasses?: boolean;
   disableNotebookController?: boolean;
   notebookSizes?: NotebookSize[];
@@ -182,6 +183,7 @@ export const mockDashboardConfig = ({
       disableServingRuntimeParams,
       disableStorageClasses,
       disableNIMModelServing,
+      disableAdminConnectionTypes: false,
       disableFineTuning,
     },
     notebookController: {

diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/connectionTypes/connectionTypes.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/connectionTypes/connectionTypes.cy.ts
@@ -21,6 +21,23 @@ it('Connection types should not be available for non product admins', () => {
   connectionTypesPage.findNavItem().should('not.exist');
 });
 
+it('Connection types should be hidden by feature flag', () => {
+  asProductAdminUser();
+
+  cy.visitWithLogin('/connectionTypes');
+
+  cy.interceptOdh(
+    'GET /api/config',
+    mockDashboardConfig({
+      disableAdminConnectionTypes: false,
+    }),
+  );
+
+  cy.interceptOdh('GET /api/connection-types', []);
+  connectionTypesPage.visit();
+  connectionTypesPage.shouldBeEmpty();
+});
+
 describe('Connection types', () => {
   beforeEach(() => {
     asProductAdminUser();

diff --git a/frontend/src/concepts/areas/const.ts b/frontend/src/concepts/areas/const.ts
@@ -34,6 +34,7 @@ export const allFeatureFlags: string[] = Object.keys({
   disableServingRuntimeParams: false,
   disableStorageClasses: false,
   disableNIMModelServing: true,
+  disableAdminConnectionTypes: true,
   disableFineTuning: true,
 } satisfies DashboardCommonConfig);
 
@@ -145,6 +146,9 @@ export const SupportedAreasStateMap: SupportedAreasState = {
     featureFlags: ['disableNIMModelServing'],
     reliantAreas: [SupportedArea.K_SERVE],
   },
+  [SupportedArea.ADMIN_CONNECTION_TYPES]: {
+    featureFlags: ['disableAdminConnectionTypes'],
+  },
   [SupportedArea.FINE_TUNING]: {
     featureFlags: ['disableFineTuning'],
     reliantAreas: [SupportedArea.DS_PIPELINES],

diff --git a/frontend/src/concepts/areas/types.ts b/frontend/src/concepts/areas/types.ts
@@ -39,6 +39,7 @@ export enum SupportedArea {
   ACCELERATOR_PROFILES = 'accelerator-profiles',
   HARDWARE_PROFILES = 'hardware-profiles',
   STORAGE_CLASSES = 'storage-classes',
+  ADMIN_CONNECTION_TYPES = 'connection-types',
   FINE_TUNING = 'fine-tuning',
 
   /* DS Projects specific areas */

diff --git a/frontend/src/k8sTypes.ts b/frontend/src/k8sTypes.ts
@@ -1205,6 +1205,7 @@ export type DashboardCommonConfig = {
   disableServingRuntimeParams: boolean;
   disableStorageClasses: boolean;
   disableNIMModelServing: boolean;
+  disableAdminConnectionTypes: boolean;
   disableFineTuning: boolean;
 };
 

diff --git a/frontend/src/utilities/NavData.tsx b/frontend/src/utilities/NavData.tsx
@@ -157,13 +157,14 @@ const useCustomRuntimesNav = (): NavDataHref[] =>
     },
   ]);
 
-const useConnectionTypesNav = (): NavDataHref[] => [
-  {
-    id: 'settings-connection-types',
-    label: 'Connection types',
-    href: '/connectionTypes',
-  },
-];
+const useConnectionTypesNav = (): NavDataHref[] =>
+  useAreaCheck<NavDataHref>(SupportedArea.ADMIN_CONNECTION_TYPES, [
+    {
+      id: 'settings-connection-types',
+      label: 'Connection types',
+      href: '/connectionTypes',
+    },
+  ]);
 
 const useStorageClassesNav = (): NavDataHref[] =>
   useAreaCheck<NavDataHref>(SupportedArea.STORAGE_CLASSES, [

diff --git a/manifests/common/crd/odhdashboardconfigs.opendatahub.io.crd.yaml b/manifests/common/crd/odhdashboardconfigs.opendatahub.io.crd.yaml
@@ -85,6 +85,8 @@ spec:
                       type: boolean
                     disableNIMModelServing:
                       type: boolean
+                    disableAdminConnectionTypes:
+                      type: boolean
                     disableFineTuning:
                       type: boolean
                 groupsConfig: