add retryPipelineRunLogic, wip

add archived labels and additional dropdown items format, update tests
opendatahub-io · May 21, 2024 · 47bb48a · 47bb48a
1 parent cd93b29
commit 47bb48a
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 9 deletions.
diff --git a/frontend/src/__tests__/cypress/cypress/e2e/pipelines/PipelinesTopology.cy.ts b/frontend/src/__tests__/cypress/cypress/e2e/pipelines/PipelinesTopology.cy.ts
@@ -311,13 +311,13 @@ describe('Pipeline topology', () => {
 
       it('Test pipeline run duplicate navigation', () => {
         pipelineRunDetails.visit(projectId, mockRun.run_id);
-        pipelineRunDetails.selectActionDropdownItem('Duplicate');
+        pipelineRunDetails.selectActionDropdownItem('Clone');
         verifyRelativeURL(`/pipelineRuns/${projectId}/pipelineRun/clone/${mockRun.run_id}`);
       });
 
       it('Test pipeline job duplicate navigation', () => {
         pipelineRunJobDetails.visit(projectId, mockJob.recurring_run_id);
-        pipelineRunJobDetails.selectActionDropdownItem('Duplicate');
+        pipelineRunJobDetails.selectActionDropdownItem('Clone');
         verifyRelativeURL(
           `/pipelineRuns/${projectId}/pipelineRun/cloneJob/${mockJob.recurring_run_id}?runType=scheduled`,
         );

diff --git a/frontend/src/api/pipelines/custom.ts b/frontend/src/api/pipelines/custom.ts
@@ -235,6 +235,9 @@ export const stopPipelineRun: UpdatePipelineRunAPI = (hostPath) => (opts, runId)
     proxyENDPOINT(hostPath, `/apis/v2beta1/runs/${runId}:terminate`, {}, opts),
   );
 
+export const retryPipelineRun: UpdatePipelineRunAPI = (hostPath) => (opts, runId) =>
+  handlePipelineFailures(proxyENDPOINT(hostPath, `/apis/v2beta1/runs/${runId}:retry`, {}, opts));
+
 export const updatePipelineRunJob: UpdatePipelineRunJobAPI = (hostPath) => (opts, jobId, enabled) =>
   handlePipelineFailures(
     proxyENDPOINT(

diff --git a/frontend/src/concepts/pipelines/content/pipelinesDetails/PipelineDetailsTitle.tsx b/frontend/src/concepts/pipelines/content/pipelinesDetails/PipelineDetailsTitle.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Label, Split, SplitItem } from '@patternfly/react-core';
 import { PipelineRunKFv2 } from '~/concepts/pipelines/kfTypes';
-import { computeRunStatus } from '~/concepts/pipelines/content/utils';
+import { computeRunStatus, getStorageState } from '~/concepts/pipelines/content/utils';
 import PipelineRunTypeLabel from '~/concepts/pipelines/content/PipelineRunTypeLabel';
 
 type RunJobTitleProps = {
@@ -17,6 +17,8 @@ const PipelineDetailsTitle: React.FC<RunJobTitleProps> = ({
 }) => {
   const { icon, label } = computeRunStatus(run);
 
+  const isArchived = getStorageState(run) === 'ARCHIVED';
+
   return (
     <>
       <Split hasGutter>
@@ -31,6 +33,11 @@ const PipelineDetailsTitle: React.FC<RunJobTitleProps> = ({
             <Label icon={icon}>{label}</Label>
           </SplitItem>
         )}
+        {isArchived && (
+          <SplitItem>
+            <Label>Archived</Label>
+          </SplitItem>
+        )}
       </Split>
     </>
   );

diff --git a/...src/concepts/pipelines/content/pipelinesDetails/pipelineRun/PipelineRunDetailsActions.tsx b/...src/concepts/pipelines/content/pipelinesDetails/pipelineRun/PipelineRunDetailsActions.tsx
@@ -42,15 +42,15 @@ const PipelineRunDetailsActions: React.FC<PipelineRunDetailsActionsProps> = ({ o
           ? []
           : [
               <DropdownItem
-                key="stop-run"
-                isDisabled={run.state !== RuntimeStateKF.RUNNING}
+                key="retry-run"
+                isDisabled={run.state !== RuntimeStateKF.FAILED || !!run.error}
                 onClick={() =>
                   api
-                    .stopPipelineRun({}, run.run_id)
-                    .catch((e) => notification.error('Unable to stop pipeline run', e.message))
+                    .retryPipelineRun({}, run.run_id)
+                    .catch((e) => notification.error('Unable to retry pipeline run', e.message))
                 }
               >
-                Stop
+                Retry
               </DropdownItem>,
               <DropdownItem
                 key="clone-run"
@@ -64,7 +64,18 @@ const PipelineRunDetailsActions: React.FC<PipelineRunDetailsActionsProps> = ({ o
                   )
                 }
               >
-                Duplicate
+                Clone
+              </DropdownItem>,
+              <DropdownItem
+                key="stop-run"
+                isDisabled={run.state !== RuntimeStateKF.RUNNING}
+                onClick={() =>
+                  api
+                    .stopPipelineRun({}, run.run_id)
+                    .catch((e) => notification.error('Unable to stop pipeline run', e.message))
+                }
+              >
+                Stop
               </DropdownItem>,
               isExperimentsAvailable && experimentId && isRunActive ? (
                 <DropdownItem
@@ -78,6 +89,20 @@ const PipelineRunDetailsActions: React.FC<PipelineRunDetailsActionsProps> = ({ o
               ) : (
                 <React.Fragment key="compare-runs" />
               ),
+              !isRunActive ? (
+                <DropdownItem
+                  key="restore-run"
+                  onClick={() =>
+                    api
+                      .unarchivePipelineRun({}, run.run_id)
+                      .catch((e) => notification.error('Unable to restore pipeline run', e.message))
+                  }
+                >
+                  Restore
+                </DropdownItem>
+              ) : (
+                <React.Fragment key="restore-run" />
+              ),
               <DropdownSeparator key="separator" />,
               <DropdownItem key="delete-run" onClick={() => onDelete()}>
                 Delete

diff --git a/frontend/src/concepts/pipelines/content/utils.tsx b/frontend/src/concepts/pipelines/content/utils.tsx
@@ -15,6 +15,7 @@ import {
   PipelineRunKFv2,
   PipelineVersionKFv2,
   RuntimeStateKF,
+  StorageStateKF,
   runtimeStateLabels,
 } from '~/concepts/pipelines/kfTypes';
 import { relativeTime } from '~/utilities/time';
@@ -30,6 +31,9 @@ export type RunStatusDetails = {
 const UNKNOWN_ICON = <QuestionCircleIcon />;
 const UNKNOWN_STATUS = 'warning';
 
+export const getStorageState = (run?: PipelineRunKFv2 | null): StorageStateKF | undefined =>
+  run?.storage_state;
+
 export const computeRunStatus = (run?: PipelineRunKFv2 | null): RunStatusDetails => {
   if (!run) {
     return { icon: UNKNOWN_ICON, status: UNKNOWN_STATUS, label: '-' };

diff --git a/frontend/src/concepts/pipelines/context/usePipelineAPIState.ts b/frontend/src/concepts/pipelines/context/usePipelineAPIState.ts
@@ -30,6 +30,7 @@ import {
   archiveExperiment,
   unarchiveExperiment,
   deleteExperiment,
+  retryPipelineRun,
 } from '~/api';
 import { PipelineAPIs } from '~/concepts/pipelines/types';
 import { APIState } from '~/concepts/proxy/types';
@@ -66,6 +67,7 @@ const usePipelineAPIState = (
       listPipelineVersions: listPipelineVersions(path),
       archivePipelineRun: archivePipelineRun(path),
       unarchivePipelineRun: unarchivePipelineRun(path),
+      retryPipelineRun: retryPipelineRun(path),
       archiveExperiment: archiveExperiment(path),
       unarchiveExperiment: unarchiveExperiment(path),
       stopPipelineRun: stopPipelineRun(path),

diff --git a/frontend/src/concepts/pipelines/types.ts b/frontend/src/concepts/pipelines/types.ts
@@ -152,6 +152,7 @@ export type PipelineAPIs = {
   listPipelineRunJobs: ListPipelineRunJobs;
   listPipelineVersions: ListPipelineVersions;
   archivePipelineRun: UpdatePipelineRun;
+  retryPipelineRun: UpdatePipelineRun;
   unarchivePipelineRun: UpdatePipelineRun;
   archiveExperiment: UpdateExperiment;
   unarchiveExperiment: UpdateExperiment;