Remove step status icon on pipeline run log containers

opendatahub-io · May 3, 2024 · 77b2e89 · 77b2e89
1 parent 521f401
commit 77b2e89
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 95 deletions.
diff --git a/frontend/src/concepts/k8s/pods/utils.ts b/frontend/src/concepts/k8s/pods/utils.ts
@@ -1,5 +1,5 @@
 import { PodKind } from '~/k8sTypes';
-import { PodContainer, PodContainerStatuses, PodStepState, PodStepStateType } from '~/types';
+import { PodContainer, PodContainerStatuses } from '~/types';
 import { getPodContainerLogText } from '~/api';
 import { downloadString } from '~/utilities/string';
 
@@ -54,40 +54,3 @@ ${logsIndividualStep}`,
   const combinedLogs = allStepLogs.join('\n');
   downloadString(`${pod.metadata.name}-${completed ? 'full' : currentTimeStamp}.log`, combinedLogs);
 };
-
-export const getPodStepsStates = async (
-  podContainerStatuses: PodContainerStatuses,
-  namespace: string,
-  podName: string | undefined,
-): Promise<PodStepState[]> => {
-  const stepsStatesPromises = podContainerStatuses.reduce<Promise<PodStepState>[]>(
-    (accumulator, podContainerStatus) => {
-      if (podContainerStatus && podName) {
-        const stepsStatePromise = getPodContainerLogText(
-          namespace,
-          podName,
-          podContainerStatus.name,
-        )
-          .then((logsIndividualStep) => ({
-            stepName: podContainerStatus.name || '',
-            state:
-              podContainerStatus.state?.running || podContainerStatus.state?.waiting
-                ? PodStepStateType.loading
-                : logsIndividualStep.toLowerCase().includes('error')
-                ? PodStepStateType.error
-                : podContainerStatus.state?.terminated
-                ? PodStepStateType.success
-                : PodStepStateType.loading,
-          }))
-          .catch(() => ({
-            stepName: podContainerStatus.name || '',
-            state: PodStepStateType.error,
-          }));
-        accumulator.push(stepsStatePromise);
-      }
-      return accumulator;
-    },
-    [],
-  );
-  return Promise.all(stepsStatesPromises);
-};
diff --git a/frontend/src/concepts/pipelines/content/pipelinesDetails/pipelineRun/runLogs/LogsTab.tsx b/frontend/src/concepts/pipelines/content/pipelinesDetails/pipelineRun/runLogs/LogsTab.tsx
@@ -3,7 +3,6 @@ import {
   Button,
   Checkbox,
   DropdownList,
-  Icon,
   Spinner,
   Stack,
   StackItem,
@@ -20,10 +19,8 @@ import { PlayIcon } from '@patternfly/react-icons/dist/esm/icons/play-icon';
 import { DownloadIcon } from '@patternfly/react-icons/dist/esm/icons/download-icon';
 import { LogViewer, LogViewerSearch } from '@patternfly/react-log-viewer';
 import {
-  CheckCircleIcon,
   CompressIcon,
   EllipsisVIcon,
-  ExclamationCircleIcon,
   ExpandIcon,
   OutlinedWindowRestoreIcon,
 } from '@patternfly/react-icons';
@@ -34,10 +31,8 @@ import usePodContainerLogState from '~/concepts/pipelines/content/pipelinesDetai
 import LogsTabStatus from '~/concepts/pipelines/content/pipelinesDetails/pipelineRun/runLogs/LogsTabStatus';
 import { LOG_TAIL_LINES } from '~/concepts/pipelines/content/pipelinesDetails/pipelineRun/runLogs/const';
 import { downloadAllStepLogs, downloadCurrentStepLog } from '~/concepts/k8s/pods/utils';
-import usePodStepsStates from '~/concepts/pipelines/content/pipelinesDetails/pipelineRun/runLogs/usePodStepsStates';
 import { usePipelinesAPI } from '~/concepts/pipelines/context';
 import DownloadDropdown from '~/concepts/pipelines/content/pipelinesDetails/pipelineRun/runLogs/DownloadDropdown';
-import { PodStepStateType } from '~/types';
 import useDebounceCallback from '~/utilities/useDebounceCallback';
 import { PipelineTask } from '~/concepts/pipelines/topology';
 import { ExecutionStateKF } from '~/concepts/pipelines/kfTypes';
@@ -83,7 +78,6 @@ const LogsTabForPodName: React.FC<{ podName: string; isFailedPod: boolean }> = (
       (podContainerStatus) => podContainerStatus?.name === podContainer.name,
     ),
   );
-  const podStepStates = usePodStepsStates(sortedContainerStatuses, podName);
   const [downloading, setDownloading] = React.useState(false);
   const [downloadError, setDownloadError] = React.useState<Error | undefined>();
   const logViewerRef = React.useRef<{ scrollToBottom: () => void }>();
@@ -244,26 +238,10 @@ const LogsTabForPodName: React.FC<{ podName: string; isFailedPod: boolean }> = (
                         <ToolbarItem spacer={{ default: 'spacerSm' }} style={{ maxWidth: '200px' }}>
                           <SimpleDropdownSelect
                             dataTestId="logs-step-select"
-                            isDisabled={podStepStates.length <= 1}
-                            options={podStepStates.map((podStepState) => ({
-                              key: podStepState.stepName,
-                              label: podStepState.stepName,
-                              dropdownLabel: (
-                                <>
-                                  <span className="pf-v5-u-mr-sm">{podStepState.stepName}</span>
-                                  {podStepState.state === PodStepStateType.loading ? (
-                                    <Spinner size="sm" />
-                                  ) : podStepState.state === PodStepStateType.error ? (
-                                    <Icon status="danger">
-                                      <ExclamationCircleIcon />
-                                    </Icon>
-                                  ) : (
-                                    <Icon status="success">
-                                      <CheckCircleIcon />
-                                    </Icon>
-                                  )}
-                                </>
-                              ),
+                            isDisabled={sortedContainerStatuses.length <= 1}
+                            options={sortedContainerStatuses.map((containerStatus) => ({
+                              key: containerStatus?.name || '',
+                              label: containerStatus?.name || '',
                             }))}
                             value={containerName}
                             placeholder="Select container..."

diff --git a/.../src/concepts/pipelines/content/pipelinesDetails/pipelineRun/runLogs/usePodStepsStates.ts b/.../src/concepts/pipelines/content/pipelinesDetails/pipelineRun/runLogs/usePodStepsStates.ts
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
@@ -331,14 +331,6 @@ export type PodContainer = {
   securityContext?: unknown;
 };
 
-export type PodStepState = { stepName: string; state: PodStepStateType };
-
-export enum PodStepStateType {
-  success = 'Success',
-  error = 'Error',
-  loading = 'Loading',
-}
-
 export type PodContainerStatus = {
   name?: string;
   ready: boolean;