diff --git a/frontend/src/app/AppRoutes.tsx b/frontend/src/app/AppRoutes.tsx index a20b057f1d..10b8ddb3dd 100644 --- a/frontend/src/app/AppRoutes.tsx +++ b/frontend/src/app/AppRoutes.tsx @@ -82,7 +82,6 @@ const AppRoutes: React.FC = () => { const { isAdmin, isAllowed } = useUser(); const isJupyterEnabled = useCheckJupyterEnabled(); const isHomeAvailable = useIsAreaAvailable(SupportedArea.HOME).status; - const isConnectionTypesAvailable = useIsAreaAvailable(SupportedArea.CONNECTION_TYPES).status; if (!isAllowed) { return ( @@ -140,9 +139,7 @@ const AppRoutes: React.FC = () => { } /> } /> } /> - {isConnectionTypesAvailable ? ( - } /> - ) : null} + } /> } /> } /> } /> diff --git a/frontend/src/concepts/areas/const.ts b/frontend/src/concepts/areas/const.ts index a2dcf665f4..dbb2c27add 100644 --- a/frontend/src/concepts/areas/const.ts +++ b/frontend/src/concepts/areas/const.ts @@ -51,9 +51,6 @@ export const SupportedAreasStateMap: SupportedAreasState = { featureFlags: ['disableCustomServingRuntimes'], reliantAreas: [SupportedArea.MODEL_SERVING], }, - [SupportedArea.CONNECTION_TYPES]: { - featureFlags: [], // TODO: We want to disable, no flag exists today, - }, [SupportedArea.STORAGE_CLASSES]: { featureFlags: ['disableStorageClasses'], }, diff --git a/frontend/src/concepts/areas/types.ts b/frontend/src/concepts/areas/types.ts index d8c2d2bf17..83ed788a2f 100644 --- a/frontend/src/concepts/areas/types.ts +++ b/frontend/src/concepts/areas/types.ts @@ -38,7 +38,6 @@ export enum SupportedArea { USER_MANAGEMENT = 'user-management', ACCELERATOR_PROFILES = 'accelerator-profiles', HARDWARE_PROFILES = 'hardware-profiles', - CONNECTION_TYPES = 'connections-types', STORAGE_CLASSES = 'storage-classes', /* DS Projects specific areas */ diff --git a/frontend/src/concepts/connectionTypes/useConnectionTypesEnabled.ts b/frontend/src/concepts/connectionTypes/useConnectionTypesEnabled.ts deleted file mode 100644 index 35d8aa15b1..0000000000 --- a/frontend/src/concepts/connectionTypes/useConnectionTypesEnabled.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { SupportedArea, useIsAreaAvailable } from '~/concepts/areas'; - -const useConnectionTypesEnabled = (): boolean => - useIsAreaAvailable(SupportedArea.CONNECTION_TYPES).status; - -export default useConnectionTypesEnabled; diff --git a/frontend/src/pages/home/aiFlows/ProjectsGallery.tsx b/frontend/src/pages/home/aiFlows/ProjectsGallery.tsx index 0d472e2e5e..18699ac6f2 100644 --- a/frontend/src/pages/home/aiFlows/ProjectsGallery.tsx +++ b/frontend/src/pages/home/aiFlows/ProjectsGallery.tsx @@ -5,7 +5,6 @@ import InfoGalleryItem from '~/concepts/design/InfoGalleryItem'; import { SupportedArea } from '~/concepts/areas'; import useIsAreaAvailable from '~/concepts/areas/useIsAreaAvailable'; import useServingPlatformStatuses from '~/pages/modelServing/useServingPlatformStatuses'; -import useConnectionTypesEnabled from '~/concepts/connectionTypes/useConnectionTypesEnabled'; import InfoGallery from './InfoGallery'; const ProjectsGallery: React.FC<{ onClose: () => void }> = ({ onClose }) => { @@ -13,7 +12,6 @@ const ProjectsGallery: React.FC<{ onClose: () => void }> = ({ onClose }) => { const { status: modelServingAvailable } = useIsAreaAvailable(SupportedArea.MODEL_SERVING); const servingPlatformStatuses = useServingPlatformStatuses(); const modelMeshEnabled = servingPlatformStatuses.modelMesh.enabled; - const connectionTypesEnabled = useConnectionTypesEnabled(); const getProjectDescriptionAdditionalText = () => { if (pipelinesAvailable && modelServingAvailable) { @@ -68,39 +66,22 @@ const ProjectsGallery: React.FC<{ onClose: () => void }> = ({ onClose }) => { } isOpen />, - connectionTypesEnabled ? ( - - Connections enable you to store and retrieve information that typically should not be - stored in code. For example, you can store details (including credentials) for object - storage, databases, and more. You can then attach the connections to artifacts in your - project, such as workbenches and model servers. - - } - isOpen - /> - ) : ( - - You can add data connections to link your project and its workbenches to data sources, - and to object storage buckets which save data and models that you want to deploy. - - } - isOpen - /> - ), + + Connections enable you to store and retrieve information that typically should not be + stored in code. For example, you can store details (including credentials) for object + storage, databases, and more. You can then attach the connections to artifacts in your + project, such as workbenches and model servers. + + } + isOpen + />, = ({ initialData: editInfo?.inferenceServiceEditInfo, }); - const isConnectionTypesEnabled = useConnectionTypesEnabled(); const [connection, setConnection] = React.useState(); const [isConnectionValid, setIsConnectionValid] = React.useState(false); @@ -171,23 +166,7 @@ const ManageKServeModal: React.FC = ({ if (createDataInferenceService.storage.type === InferenceServiceStorageType.EXISTING_URI) { return !!createDataInferenceService.storage.uri; } - if (createDataInferenceService.storage.type === InferenceServiceStorageType.EXISTING_STORAGE) { - if (isConnectionTypesEnabled) { - return isConnectionValid; - } - return ( - createDataInferenceService.storage.dataConnection !== '' && - isConnectionPathValid(createDataInferenceService.storage.path) - ); - } - // NEW_STORAGE - if (isConnectionTypesEnabled) { - return isConnectionValid; - } - return ( - isAWSValid(createDataInferenceService.storage.awsData, [AwsKeys.AWS_S3_BUCKET]) && - isConnectionPathValid(createDataInferenceService.storage.path) - ); + return isConnectionValid; }; const baseInputValueValid = diff --git a/frontend/src/pages/projects/screens/detail/ProjectDetails.tsx b/frontend/src/pages/projects/screens/detail/ProjectDetails.tsx index cebce5d843..742ca6011b 100644 --- a/frontend/src/pages/projects/screens/detail/ProjectDetails.tsx +++ b/frontend/src/pages/projects/screens/detail/ProjectDetails.tsx @@ -15,14 +15,12 @@ import { ProjectSectionID } from '~/pages/projects/screens/detail/types'; import { AccessReviewResourceAttributes } from '~/k8sTypes'; import { useAccessReview } from '~/api'; import { getDescriptionFromK8sResource, getDisplayNameFromK8sResource } from '~/concepts/k8s/utils'; -import useConnectionTypesEnabled from '~/concepts/connectionTypes/useConnectionTypesEnabled'; import ResourceNameTooltip from '~/components/ResourceNameTooltip'; import HeaderIcon from '~/concepts/design/HeaderIcon'; import useCheckLogoutParams from './useCheckLogoutParams'; import ProjectOverview from './overview/ProjectOverview'; import NotebookList from './notebooks/NotebookList'; import StorageList from './storage/StorageList'; -import DataConnectionsList from './data-connections/DataConnectionsList'; import ConnectionsList from './connections/ConnectionsList'; import PipelinesSection from './pipelines/PipelinesSection'; import ProjectActions from './ProjectActions'; @@ -43,7 +41,6 @@ const ProjectDetails: React.FC = () => { const projectSharingEnabled = useIsAreaAvailable(SupportedArea.DS_PROJECTS_PERMISSIONS).status; const pipelinesEnabled = useIsAreaAvailable(SupportedArea.DS_PIPELINES).status; const modelServingEnabled = useModelServingEnabled(); - const connectionTypesEnabled = useConnectionTypesEnabled(); const queryParams = useQueryParams(); const state = queryParams.get('section'); const [allowCreate, rbacLoaded] = useAccessReview({ @@ -113,21 +110,11 @@ const ProjectDetails: React.FC = () => { title: 'Cluster storage', component: , }, - ...(connectionTypesEnabled - ? [ - { - id: ProjectSectionID.CONNECTIONS, - title: 'Connections', - component: , - }, - ] - : [ - { - id: ProjectSectionID.DATA_CONNECTIONS, - title: 'Data connections', - component: , - }, - ]), + { + id: ProjectSectionID.CONNECTIONS, + title: 'Connections', + component: , + }, ...(projectSharingEnabled && allowCreate ? [ { diff --git a/frontend/src/utilities/NavData.tsx b/frontend/src/utilities/NavData.tsx index db3b324874..1efaf82413 100644 --- a/frontend/src/utilities/NavData.tsx +++ b/frontend/src/utilities/NavData.tsx @@ -152,14 +152,13 @@ const useCustomRuntimesNav = (): NavDataHref[] => }, ]); -const useConnectionTypesNav = (): NavDataHref[] => - useAreaCheck(SupportedArea.CONNECTION_TYPES, [ - { - id: 'settings-connection-types', - label: 'Connection types', - href: '/connectionTypes', - }, - ]); +const useConnectionTypesNav = (): NavDataHref[] => [ + { + id: 'settings-connection-types', + label: 'Connection types', + href: '/connectionTypes', + }, +]; const useStorageClassesNav = (): NavDataHref[] => useAreaCheck(SupportedArea.STORAGE_CLASSES, [