update wording for ensureCompatiblePipelineServer page

opendatahub-io · Oct 30, 2024 · 1ab7f26 · 1ab7f26
1 parent 2e859cb
commit 1ab7f26
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 69 deletions.
diff --git a/frontend/src/__tests__/cypress/cypress/pages/pipelines/pipelinesGlobal.ts b/frontend/src/__tests__/cypress/cypress/pages/pipelines/pipelinesGlobal.ts
@@ -59,6 +59,14 @@ class PipelinesGlobal {
     return cy.findByTestId('incompatible-pipelines-server');
   }
 
+  shouldHaveIncompatibleTitleText() {
+    cy.findByTestId('incompatible-pipelines-server-title').should(
+      'contain.text',
+      'Unsupported pipeline and pipeline server version',
+    );
+    return this;
+  }
+
   findDeletePipelineServerButton() {
     return this.findIsServerIncompatible().findByTestId('delete-pipeline-server-button');
   }

diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/pipelines/pipelines.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/pipelines/pipelines.cy.ts
@@ -30,7 +30,6 @@ import {
   RouteModel,
   SecretModel,
 } from '~/__tests__/cypress/cypress/utils/models';
-import { asProductAdminUser } from '~/__tests__/cypress/cypress/utils/mockUsers';
 import type { PipelineKF, PipelineVersionKF } from '~/concepts/pipelines/kfTypes';
 import { tablePagination } from '~/__tests__/cypress/cypress/pages/components/Pagination';
 
@@ -502,7 +501,7 @@ describe('Pipelines', () => {
     });
   });
 
-  it('incompatible dpsa version shows error with delete option for regular user', () => {
+  it('incompatible dpsa version shows error', () => {
     initIntercepts({});
     pipelinesGlobal.visit(projectName);
     cy.interceptK8sList(
@@ -519,7 +518,7 @@ describe('Pipelines', () => {
     pipelinesGlobal.visit(projectName);
     pipelinesGlobal.isApiAvailable();
     pipelinesGlobal.findIsServerIncompatible().should('exist');
-    pipelinesGlobal.findDeletePipelineServerButton().should('exist');
+    pipelinesGlobal.shouldHaveIncompatibleTitleText();
   });
 
   it('error while creating a pipeline server', () => {
@@ -530,27 +529,6 @@ describe('Pipelines', () => {
       .should('have.text', 'Data connection unsuccessfully verified');
   });
 
-  it('incompatible dpsa version shows error with delete option for admin', () => {
-    asProductAdminUser();
-    initIntercepts({});
-    pipelinesGlobal.visit(projectName);
-    cy.interceptK8sList(
-      DataSciencePipelineApplicationModel,
-      mockK8sResourceList([
-        mockDataSciencePipelineApplicationK8sResource({ namespace: projectName, dspVersion: 'v1' }),
-      ]),
-    );
-    cy.interceptK8s(
-      DataSciencePipelineApplicationModel,
-      mockDataSciencePipelineApplicationK8sResource({ namespace: projectName, dspVersion: 'v1' }),
-    );
-
-    pipelinesGlobal.visit(projectName);
-    pipelinesGlobal.isApiAvailable();
-    pipelinesGlobal.findIsServerIncompatible().should('exist');
-    pipelinesGlobal.findDeletePipelineServerButton().should('exist');
-  });
-
   it('selects a different project', () => {
     initIntercepts({});
     pipelinesGlobal.visit(projectName);

diff --git a/frontend/src/concepts/pipelines/EnsureAPIAvailability.tsx b/frontend/src/concepts/pipelines/EnsureAPIAvailability.tsx
@@ -7,9 +7,8 @@ type EnsureAPIAvailabilityProps = {
 };
 
 const EnsureAPIAvailability: React.FC<EnsureAPIAvailabilityProps> = ({ children }) => {
-  const { apiAvailable } = usePipelinesAPI();
-
-  if (!apiAvailable) {
+  const { apiAvailable, pipelinesServer } = usePipelinesAPI();
+  if (!apiAvailable && pipelinesServer.compatible) {
     return (
       <Bullseye style={{ minHeight: 150 }} data-testid="pipelines-api-not-available">
         <Spinner />

diff --git a/frontend/src/concepts/pipelines/EnsureCompatiblePipelineServer.tsx b/frontend/src/concepts/pipelines/EnsureCompatiblePipelineServer.tsx
@@ -5,16 +5,14 @@ import {
   Bullseye,
   Spinner,
   EmptyStateHeader,
-  EmptyStateActions,
-  EmptyStateFooter,
   EmptyStateBody,
-  Button,
   EmptyStateIcon,
   ButtonVariant,
 } from '@patternfly/react-core';
 import { ExclamationTriangleIcon } from '@patternfly/react-icons';
 import ExternalLink from '~/components/ExternalLink';
 import NoPipelineServer from '~/concepts/pipelines/NoPipelineServer';
+import { ODH_PRODUCT_NAME } from '~/utilities/const';
 import { DeleteServerModal, usePipelinesAPI } from './context';
 
 const DOCS_LINK =
@@ -48,7 +46,8 @@ const EnsureCompatiblePipelineServer: React.FC<EnsureCompatiblePipelineServerPro
         <Bullseye data-testid="incompatible-pipelines-server">
           <EmptyState variant={EmptyStateVariant.lg}>
             <EmptyStateHeader
-              titleText="Pipeline version cannot be rendered"
+              data-testid="incompatible-pipelines-server-title"
+              titleText="Unsupported pipeline and pipeline server version"
               icon={
                 <EmptyStateIcon
                   color="var(--pf-v5-global--warning-color--100)"
@@ -58,27 +57,14 @@ const EnsureCompatiblePipelineServer: React.FC<EnsureCompatiblePipelineServerPro
             />
             <EmptyStateBody>
               <p>
-                Rendering of this pipeline version in the UI is no longer supported, but it can
-                still be accessed via the API or OpenShift Console. To remove unsupported versions,
-                delete this project&apos;s pipeline server and create a new one.
+                This project contains v1 pipeline resources, which are no longer supported or
+                managed by {ODH_PRODUCT_NAME}. To proceed, back up your pipelines data, delete the
+                pipeline server, then create a new one. Alternatively, create a new project and
+                pipeline server. <ExternalLink text="View the documentation" to={DOCS_LINK} /> to
+                learn more about the migration process, server deletion, supported versions, and
+                data recovery.
               </p>
-              <ExternalLink
-                text="Learn more about supported versions and data recovery"
-                to={DOCS_LINK}
-              />
             </EmptyStateBody>
-
-            <EmptyStateFooter>
-              <EmptyStateActions>
-                <Button
-                  data-testid="delete-pipeline-server-button"
-                  variant="primary"
-                  onClick={() => setIsDeleting(true)}
-                >
-                  Delete pipeline server
-                </Button>
-              </EmptyStateActions>
-            </EmptyStateFooter>
           </EmptyState>
         </Bullseye>
         {isDeleting ? <DeleteServerModal onClose={() => setIsDeleting(false)} /> : null}

diff --git a/frontend/src/concepts/pipelines/content/PipelineServerActions.tsx b/frontend/src/concepts/pipelines/content/PipelineServerActions.tsx
@@ -27,7 +27,7 @@ const PipelineServerActions: React.FC<PipelineServerActionsProps> = ({ variant,
     React.useContext(PipelineAndVersionContext);
   const { pipelines, versions } = getResourcesForDeletion();
   const [deletePipelinesOpen, setDeletePipelinesOpen] = React.useState(false);
-
+  const { pipelinesServer } = usePipelinesAPI();
   const DropdownComponent = (
     <Dropdown
       onOpenChange={(isOpened) => setOpen(isOpened)}
@@ -68,24 +68,28 @@ const PipelineServerActions: React.FC<PipelineServerActionsProps> = ({ variant,
           <DropdownItem key="view-server-details" onClick={() => setViewOpen(true)}>
             View pipeline server configuration
           </DropdownItem>,
-          <Divider key="separator" />,
-          <DropdownItem
-            onClick={() => {
-              setDeleteOpen(true);
-            }}
-            key="delete-server"
-          >
-            Delete pipeline server
-          </DropdownItem>,
-          ...(variant === 'kebab'
+          ...(pipelinesServer.compatible
             ? [
+                <Divider key="separator" />,
                 <DropdownItem
-                  key="delete"
-                  onClick={() => setDeletePipelinesOpen(true)}
-                  isDisabled={pipelines.length === 0 && versions.length === 0}
+                  onClick={() => {
+                    setDeleteOpen(true);
+                  }}
+                  key="delete-server"
                 >
-                  Delete
+                  Delete pipeline server
                 </DropdownItem>,
+                ...(variant === 'kebab'
+                  ? [
+                      <DropdownItem
+                        key="delete"
+                        onClick={() => setDeletePipelinesOpen(true)}
+                        isDisabled={pipelines.length === 0 && versions.length === 0}
+                      >
+                        Delete
+                      </DropdownItem>,
+                    ]
+                  : []),
               ]
             : []),
         ]}

diff --git a/frontend/src/pages/pipelines/global/PipelineCoreApplicationPage.tsx b/frontend/src/pages/pipelines/global/PipelineCoreApplicationPage.tsx
@@ -20,18 +20,22 @@ const PipelineCoreApplicationPage: React.FC<PipelineCoreApplicationPageProps> =
   overrideChildPadding,
   ...pageProps
 }) => {
-  const pipelinesAPi = usePipelinesAPI();
+  const { pipelinesServer } = usePipelinesAPI();
 
   return (
     <ApplicationsPage
       {...pageProps}
-      loaded={!pipelinesAPi.pipelinesServer.initializing}
-      empty={!pipelinesAPi.pipelinesServer.installed}
+      loaded={!pipelinesServer.initializing}
+      empty={!pipelinesServer.installed}
       emptyStatePage={<NoPipelineServer variant={ButtonVariant.primary} />}
       headerContent={<PipelineCoreProjectSelector getRedirectPath={getRedirectPath} />}
       provideChildrenPadding={!overrideChildPadding}
     >
-      {pipelinesAPi.pipelinesServer.timedOut ? <PipelineServerTimedOut /> : children}
+      {pipelinesServer.timedOut && pipelinesServer.compatible ? (
+        <PipelineServerTimedOut />
+      ) : (
+        children
+      )}
     </ApplicationsPage>
   );
 };