Merge remote-tracking branch 'upstream/main'

red-hat-data-services · Oct 30, 2024 · 027a0ef · 027a0ef
2 parents 1ee31c6 + 5d82663
commit 027a0ef
Show file tree

Hide file tree

Showing 16 changed files with 149 additions and 97 deletions.
diff --git a/frontend/src/components/WhosMyAdministrator.tsx b/frontend/src/components/WhosMyAdministrator.tsx
@@ -0,0 +1,50 @@
+import * as React from 'react';
+import { Button, Popover } from '@patternfly/react-core';
+import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
+import PopoverListContent from '~/components/PopoverListContent';
+import { FindAdministratorOptions } from '~/pages/projects/screens/projects/const';
+
+type Props = {
+  buttonLabel?: string;
+  headerContent?: string;
+  leadText?: string;
+  isInline?: boolean;
+  contentTestId?: string;
+  linkTestId?: string;
+};
+
+const WhosMyAdministrator: React.FC<Props> = ({
+  buttonLabel = "Who's my administrator?",
+  headerContent,
+  leadText,
+  isInline,
+  contentTestId,
+  linkTestId,
+}) => (
+  <Popover
+    showClose
+    position="bottom"
+    headerContent={headerContent || 'Your administrator might be:'}
+    hasAutoWidth
+    maxWidth="370px"
+    bodyContent={
+      <PopoverListContent
+        data-testid={contentTestId}
+        leadText={leadText}
+        listHeading={headerContent ? 'Your administrator might be:' : undefined}
+        listItems={FindAdministratorOptions}
+      />
+    }
+  >
+    <Button
+      isInline={isInline}
+      variant="link"
+      icon={<OutlinedQuestionCircleIcon />}
+      data-testid={linkTestId}
+    >
+      {buttonLabel}
+    </Button>
+  </Popover>
+);
+
+export default WhosMyAdministrator;
diff --git a/frontend/src/pages/connectionTypes/ConnectionTypesTableRow.tsx b/frontend/src/pages/connectionTypes/ConnectionTypesTableRow.tsx
@@ -151,6 +151,7 @@ const ConnectionTypesTableRow: React.FC<ConnectionTypesTableRowProps> = ({
             {
               title: 'Edit',
               onClick: () => navigate(`/connectionTypes/edit/${obj.metadata.name}`),
+              isDisabled: ownedByDSC(obj),
             },
             {
               title: 'Duplicate',
@@ -160,6 +161,7 @@ const ConnectionTypesTableRow: React.FC<ConnectionTypesTableRowProps> = ({
             {
               title: 'Delete',
               onClick: () => handleDelete(obj),
+              isDisabled: ownedByDSC(obj),
             },
           ]}
         />

diff --git a/frontend/src/pages/connectionTypes/manage/EditConnectionTypePage.tsx b/frontend/src/pages/connectionTypes/manage/EditConnectionTypePage.tsx
@@ -1,14 +1,22 @@
 import * as React from 'react';
 import { useParams } from 'react-router';
+import { useNavigate } from 'react-router-dom';
 import ApplicationsPage from '~/pages/ApplicationsPage';
 import { useConnectionType } from '~/concepts/connectionTypes/useConnectionType';
 import { updateConnectionType } from '~/services/connectionTypesService';
+import { ownedByDSC } from '~/concepts/k8s/utils';
 import ManageConnectionTypePage from './ManageConnectionTypePage';
 
 const EditConnectionTypePage: React.FC = () => {
+  const navigate = useNavigate();
   const { name } = useParams();
   const [existingConnectionType, isLoaded, error] = useConnectionType(name);
 
+  if (existingConnectionType && ownedByDSC(existingConnectionType)) {
+    navigate('/connectionTypes');
+    return null;
+  }
+
   if (!isLoaded || error) {
     return <ApplicationsPage loaded={isLoaded} loadError={error} empty />;
   }

diff --git a/frontend/src/pages/distributedWorkloads/global/GlobalDistributedWorkloadsTabs.tsx b/frontend/src/pages/distributedWorkloads/global/GlobalDistributedWorkloadsTabs.tsx
@@ -11,12 +11,14 @@ import {
   EmptyStateBody,
   EmptyStateHeader,
   EmptyStateIcon,
+  EmptyStateFooter,
 } from '@patternfly/react-core';
 import { WrenchIcon } from '@patternfly/react-icons';
 import MetricsPageToolbar from '~/concepts/metrics/MetricsPageToolbar';
 import { DistributedWorkloadsContext } from '~/concepts/distributedWorkloads/DistributedWorkloadsContext';
 import EmptyStateErrorMessage from '~/components/EmptyStateErrorMessage';
 import { LoadingState } from '~/pages/distributedWorkloads/components/LoadingState';
+import WhosMyAdministrator from '~/components/WhosMyAdministrator';
 import {
   DistributedWorkloadsTabId,
   useDistributedWorkloadsTabs,
@@ -52,8 +54,9 @@ const GlobalDistributedWorkloadsTabs: React.FC<GlobalDistributedWorkloadsTabsPro
   }
 
   if (!clusterQueue.data || localQueues.data.length === 0) {
+    const nonAdmin = !clusterQueue.data;
     const title = `Configure the ${!clusterQueue.data ? 'cluster queue' : 'project queue'}`;
-    const message = !clusterQueue.data
+    const message = nonAdmin
       ? 'Ask your cluster admin to configure the cluster queue.'
       : 'Configure the queue for this project, or select a different project.';
 
@@ -65,6 +68,11 @@ const GlobalDistributedWorkloadsTabs: React.FC<GlobalDistributedWorkloadsTabsPro
           icon={<EmptyStateIcon icon={WrenchIcon} />}
         />
         <EmptyStateBody>{message}</EmptyStateBody>
+        {nonAdmin ? (
+          <EmptyStateFooter>
+            <WhosMyAdministrator />
+          </EmptyStateFooter>
+        ) : null}
       </EmptyState>
     );
   }

diff --git a/frontend/src/pages/home/projects/EmptyProjectsCard.tsx b/frontend/src/pages/home/projects/EmptyProjectsCard.tsx
@@ -12,6 +12,7 @@ import {
 } from '@patternfly/react-core';
 import { ArrowRightIcon } from '@patternfly/react-icons';
 import getStartedImage from '~/images/AI_ML-illustration-Blog-thumbnail.svg';
+import WhosMyAdministrator from '~/components/WhosMyAdministrator';
 
 type EmptyProjectsCardProps = {
   allowCreate: boolean;
@@ -53,7 +54,11 @@ const EmptyProjectsCard: React.FC<EmptyProjectsCardProps> = ({ allowCreate, onCr
                   Create a project
                 </Button>
               </StackItem>
-            ) : null}
+            ) : (
+              <StackItem>
+                <WhosMyAdministrator isInline />
+              </StackItem>
+            )}
           </Stack>
         </FlexItem>
       </Flex>

diff --git a/frontend/src/pages/modelRegistry/ModelRegistryCoreLoader.tsx b/frontend/src/pages/modelRegistry/ModelRegistryCoreLoader.tsx
@@ -1,15 +1,13 @@
 import * as React from 'react';
 import { Navigate, Outlet, useParams } from 'react-router';
-
-import { Bullseye, Alert, Popover, List, ListItem, Button } from '@patternfly/react-core';
-import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
-
+import { Bullseye, Alert } from '@patternfly/react-core';
 import { conditionalArea, SupportedArea } from '~/concepts/areas';
 import { ModelRegistryContextProvider } from '~/concepts/modelRegistry/context/ModelRegistryContext';
 import ApplicationsPage from '~/pages/ApplicationsPage';
 import TitleWithIcon from '~/concepts/design/TitleWithIcon';
 import { ProjectObjectType, typedEmptyImage } from '~/concepts/design/utils';
 import { ModelRegistrySelectorContext } from '~/concepts/modelRegistry/context/ModelRegistrySelectorContext';
+import WhosMyAdministrator from '~/components/WhosMyAdministrator';
 import InvalidModelRegistry from './screens/InvalidModelRegistry';
 import EmptyModelRegistryState from './screens/components/EmptyModelRegistryState';
 import ModelRegistrySelectorNavigator from './screens/ModelRegistrySelectorNavigator';
@@ -82,27 +80,7 @@ const ModelRegistryCoreLoader: React.FC<ModelRegistryCoreLoaderProps> =
             headerIcon={() => (
               <img src={typedEmptyImage(ProjectObjectType.registeredModels)} alt="" />
             )}
-            customAction={
-              <Popover
-                showClose
-                position="bottom"
-                headerContent="Your administrator might be:"
-                bodyContent={
-                  <List>
-                    <ListItem>
-                      The person who gave you your username, or who helped you to log in for the
-                      first time
-                    </ListItem>
-                    <ListItem>Someone in your IT department or help desk</ListItem>
-                    <ListItem>A project manager or developer</ListItem>
-                  </List>
-                }
-              >
-                <Button variant="link" icon={<OutlinedQuestionCircleIcon />}>
-                  Who&apos;s my administrator?
-                </Button>
-              </Popover>
-            }
+            customAction={<WhosMyAdministrator />}
           />
         ),
         headerContent: null,

diff --git a/frontend/src/pages/modelServing/screens/projects/EmptyModelServingPlatform.tsx b/frontend/src/pages/modelServing/screens/projects/EmptyModelServingPlatform.tsx
@@ -2,11 +2,12 @@ import * as React from 'react';
 import {
   EmptyState,
   EmptyStateBody,
+  EmptyStateFooter,
   EmptyStateHeader,
   EmptyStateIcon,
 } from '@patternfly/react-core';
-import EmptyDetailsList from '~/pages/projects/screens/detail/EmptyDetailsList';
 import gearsImg from '~/images/gears.svg';
+import WhosMyAdministrator from '~/components/WhosMyAdministrator';
 
 const EmptyModelServingPlatform: React.FC = () => (
   <EmptyState variant="xs">
@@ -20,13 +21,10 @@ const EmptyModelServingPlatform: React.FC = () => (
       To enable model serving, an administrator must first select a model serving platform in the
       cluster settings.
     </EmptyStateBody>
+    <EmptyStateFooter>
+      <WhosMyAdministrator />
+    </EmptyStateFooter>
   </EmptyState>
 );
 
-<EmptyDetailsList
-  title="No model serving platform selected"
-  description="To enable model serving, an administrator must first select a model serving platform in the cluster settings."
-  icon={() => <img src={gearsImg} alt="settings" />}
-/>;
-
 export default EmptyModelServingPlatform;
diff --git a/frontend/src/pages/projects/screens/projects/EmptyProjects.tsx b/frontend/src/pages/projects/screens/projects/EmptyProjects.tsx
@@ -5,15 +5,10 @@ import {
   EmptyStateIcon,
   EmptyStateHeader,
   EmptyStateFooter,
-  Popover,
-  Button,
-  Icon,
 } from '@patternfly/react-core';
 import { useNavigate } from 'react-router-dom';
-import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
-import PopoverListContent from '~/components/PopoverListContent';
 import projectsEmptyStateImg from '~/images/empty-state-projects-color.svg';
-import { FindAdministratorOptions } from '~/pages/projects/screens/projects/const';
+import WhosMyAdministrator from '~/components/WhosMyAdministrator';
 import NewProjectButton from './NewProjectButton';
 
 type EmptyProjectsProps = {
@@ -49,29 +44,10 @@ const EmptyProjects: React.FC<EmptyProjectsProps> = ({ allowCreate }) => {
             />
           </>
         ) : (
-          <Popover
-            minWidth="400px"
-            headerContent="Your administrator might be:"
-            bodyContent={
-              <PopoverListContent
-                data-testid="projects-empty-admin-help-content"
-                listItems={FindAdministratorOptions}
-              />
-            }
-          >
-            <Button
-              data-testid="projects-empty-admin-help"
-              isInline
-              variant="link"
-              icon={
-                <Icon isInline aria-label="More info">
-                  <OutlinedQuestionCircleIcon />
-                </Icon>
-              }
-            >
-              {`Who's my administrator?`}
-            </Button>
-          </Popover>
+          <WhosMyAdministrator
+            contentTestId="projects-empty-admin-help-content"
+            linkTestId="projects-empty-admin-help"
+          />
         )}
       </EmptyStateFooter>
     </EmptyState>

diff --git a/frontend/src/pages/projects/screens/projects/ProjectsToolbar.tsx b/frontend/src/pages/projects/screens/projects/ProjectsToolbar.tsx
@@ -1,22 +1,13 @@
 import * as React from 'react';
-import {
-  Button,
-  Icon,
-  Popover,
-  SearchInput,
-  ToolbarGroup,
-  ToolbarItem,
-} from '@patternfly/react-core';
+import { SearchInput, ToolbarGroup, ToolbarItem } from '@patternfly/react-core';
 import { useNavigate } from 'react-router-dom';
-import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
-import PopoverListContent from '~/components/PopoverListContent';
 import FilterToolbar from '~/components/FilterToolbar';
 import {
-  FindAdministratorOptions,
   ProjectsFilterDataType,
   projectsFilterOptions,
   ProjectsFilterOptions,
 } from '~/pages/projects/screens/projects/const';
+import WhosMyAdministrator from '~/components/WhosMyAdministrator';
 import NewProjectButton from './NewProjectButton';
 
 type ProjectsToolbarProps = {
@@ -64,25 +55,12 @@ const ProjectsToolbar: React.FC<ProjectsToolbarProps> = ({
               onProjectCreated={(projectName) => navigate(`/projects/${projectName}`)}
             />
           ) : (
-            <Popover
-              minWidth="400px"
+            <WhosMyAdministrator
+              buttonLabel="Need another project?"
               headerContent="Need another project?"
-              bodyContent={
-                <PopoverListContent
-                  data-testid="projects-admin-help-content"
-                  leadText="To request a new project, contact your administrator."
-                  listHeading="Your administrator might be:"
-                  listItems={FindAdministratorOptions}
-                />
-              }
-            >
-              <Button data-testid="projects-empty-admin-help" variant="link">
-                <Icon isInline aria-label="More info">
-                  <OutlinedQuestionCircleIcon />
-                </Icon>
-                <span className="pf-v5-u-ml-xs">Need another project?</span>
-              </Button>
-            </Popover>
+              leadText="To request a new project, contact your administrator."
+              contentTestId="projects-admin-help-content"
+            />
           )}
         </ToolbarItem>
       </ToolbarGroup>

diff --git a/frontend/src/pages/projects/screens/projects/const.ts b/frontend/src/pages/projects/screens/projects/const.ts
@@ -16,7 +16,7 @@ export const initialProjectsFilterData: ProjectsFilterDataType = {
 };
 
 export const FindAdministratorOptions = [
-  'The person who gave you your username',
-  'Someone in your IT department or Help desk (at a company or school)',
-  'The person who manages your email service or web site (in a small business or club)',
+  'The person who gave you your username, or who helped you to log in for the first time',
+  'Someone in your IT department or help desk',
+  'A project manager or developer',
 ];
diff --git a/frontend/src/pages/storageClasses/StorageClassesPage.tsx b/frontend/src/pages/storageClasses/StorageClassesPage.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-
 import {
   EmptyState,
   EmptyStateVariant,
@@ -8,11 +7,12 @@ import {
   Title,
   Alert,
   AlertActionCloseButton,
+  EmptyStateFooter,
 } from '@patternfly/react-core';
-
 import { ProjectObjectType, typedEmptyImage } from '~/concepts/design/utils';
 import ApplicationsPage from '~/pages/ApplicationsPage';
 import useStorageClasses from '~/concepts/k8s/useStorageClasses';
+import WhosMyAdministrator from '~/components/WhosMyAdministrator';
 import { StorageClassesTable } from './StorageClassesTable';
 import { StorageClassContextProvider, useStorageClassContext } from './StorageClassesContext';
 
@@ -55,6 +55,9 @@ const StorageClassesPageInternal: React.FC<StorageClassesPageInternalProps> = ({
               At least one OpenShift storage class is required to use OpenShift AI. Configure a
               storage class in OpenShift, or request that your admin configure one.
             </EmptyStateBody>
+            <EmptyStateFooter>
+              <WhosMyAdministrator />
+            </EmptyStateFooter>
           </EmptyState>
         </PageSection>
       }

diff --git a/manifests/common/connection-types/kustomization.yaml b/manifests/common/connection-types/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - ./oci-compliant-registry-v1.yaml
+  - ./s3.yaml
+  - ./uri-v1.yaml
diff --git a/manifests/common/connection-types/oci-compliant-registry-v1.yaml b/manifests/common/connection-types/oci-compliant-registry-v1.yaml
@@ -0,0 +1,13 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: oci-compliant-registry-v1
+  labels:
+    opendatahub.io/connection-type: 'true'
+    opendatahub.io/dashboard: 'true'
+  annotations:
+    openshift.io/description: 'Connect to an OCI-compliant container registry, enabling integration with containerized applications and services. Use this connection type to pull and manage container images and artifacts that adhere to the Open Container Initiative (OCI) standards, ensuring compatibility with OCI-compliant tools and workflows.'
+    openshift.io/display-name: OCI compliant registry - v1
+data:
+  category: '["URI"]'
+  fields: '[{"type":"uri","name":"URI","envVar":"URI","required":true,"properties":{}}]'