Merge pull request #2947 from Gkrumbach07/bug/RHOAIENG-8635-upgrade-f…

…rom-2-8-delete-pipeline-server-button remove isAdmin logic for EnsureCompatiblePipelineServer empty state
opendatahub-io · Jun 26, 2024 · 077bcd4 · 077bcd4
2 parents f3e6a95 + 3e4c833
commit 077bcd4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 23 deletions.
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
@@ -479,7 +479,7 @@ describe('Pipelines', () => {
     });
   });
 
-  it('incompatible dpsa version shows error', () => {
+  it('incompatible dpsa version shows error with delete option for regular user', () => {
     initIntercepts({});
     pipelinesGlobal.visit(projectName);
     cy.interceptK8sList(
@@ -496,10 +496,10 @@ describe('Pipelines', () => {
     pipelinesGlobal.visit(projectName);
     pipelinesGlobal.isApiAvailable();
     pipelinesGlobal.findIsServerIncompatible().should('exist');
-    pipelinesGlobal.findDeletePipelineServerButton().should('not.exist');
+    pipelinesGlobal.findDeletePipelineServerButton().should('exist');
   });
 
-  it('incompatible dpsa version shows error with delete option for admins', () => {
+  it('incompatible dpsa version shows error with delete option for admin', () => {
     asProductAdminUser();
     initIntercepts({});
     pipelinesGlobal.visit(projectName);

diff --git a/frontend/src/concepts/pipelines/EnsureCompatiblePipelineServer.tsx b/frontend/src/concepts/pipelines/EnsureCompatiblePipelineServer.tsx
@@ -14,7 +14,6 @@ import {
 import { ExclamationTriangleIcon } from '@patternfly/react-icons';
 import ExternalLink from '~/components/ExternalLink';
 import NoPipelineServer from '~/concepts/pipelines/NoPipelineServer';
-import { useUser } from '~/redux/selectors';
 import { DeleteServerModal, usePipelinesAPI } from './context';
 
 // TODO: Fix doc link to go to more docs on v2
@@ -29,13 +28,8 @@ const EnsureCompatiblePipelineServer: React.FC<EnsureCompatiblePipelineServerPro
   children,
 }) => {
   const { pipelinesServer } = usePipelinesAPI();
-  const { isAdmin } = useUser();
   const [isDeleting, setIsDeleting] = React.useState(false);
 
-  const bodyText = isAdmin
-    ? "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's pipeline server and create a new one."
-    : 'Rendering of this pipeline version in the UI is no longer supported. To access this pipeline, contact your administrator.';
-
   if (pipelinesServer.initializing) {
     return (
       <Bullseye>
@@ -63,25 +57,28 @@ const EnsureCompatiblePipelineServer: React.FC<EnsureCompatiblePipelineServerPro
               }
             />
             <EmptyStateBody>
-              <p>{bodyText}</p>
+              <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.
+              </p>
               <ExternalLink
                 text="Learn more about supported versions and data recovery"
                 to={DOCS_LINK}
               />
             </EmptyStateBody>
-            {isAdmin && (
-              <EmptyStateFooter>
-                <EmptyStateActions>
-                  <Button
-                    data-testid="delete-pipeline-server-button"
-                    variant="primary"
-                    onClick={() => setIsDeleting(true)}
-                  >
-                    Delete pipeline server
-                  </Button>
-                </EmptyStateActions>
-              </EmptyStateFooter>
-            )}
+
+            <EmptyStateFooter>
+              <EmptyStateActions>
+                <Button
+                  data-testid="delete-pipeline-server-button"
+                  variant="primary"
+                  onClick={() => setIsDeleting(true)}
+                >
+                  Delete pipeline server
+                </Button>
+              </EmptyStateActions>
+            </EmptyStateFooter>
           </EmptyState>
         </Bullseye>
         <DeleteServerModal isOpen={isDeleting} onClose={() => setIsDeleting(false)} />