fix(ui): Fix container-set log viewing in UI (#5348)

argoproj · Mar 10, 2021 · 80b5ab9 · 80b5ab9
1 parent bde9f21
commit 80b5ab9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx b/ui/src/app/workflows/components/workflow-logs-viewer/workflow-logs-viewer.tsx
@@ -53,7 +53,7 @@ export const WorkflowLogsViewer = ({workflow, nodeId, container, archived}: Work
 
     const containers = ['init', 'wait'].concat(
         templates
-            .map(t => (t.containerSet.graph || t.containerSet.sequence || [{name: 'main'}]).concat(t.sidecars || []))
+            .map(t => ((t.containerSet && t.containerSet.containers) || [{name: 'main'}]).concat(t.sidecars || []))
             .reduce((a, v) => a.concat(v), [])
             .map(c => c.name)
     );

diff --git a/ui/src/app/workflows/components/workflow-node-info/workflow-node-info.tsx b/ui/src/app/workflows/components/workflow-node-info/workflow-node-info.tsx
@@ -332,7 +332,7 @@ class WorkflowNodeContainers extends React.Component<Props, {selectedSidecar: st
                 </div>
             );
         }
-        const containers = (template.containerSet ? template.containerSet.graph || template.containerSet.sequence : []).concat(template.sidecars || []);
+        const containers = (template.containerSet ? template.containerSet.containers : []).concat(template.sidecars || []);
 
         const container = (this.state.selectedSidecar && containers.find(item => item.name === this.state.selectedSidecar)) || template.container || template.script;
 

diff --git a/ui/src/models/workflows.ts b/ui/src/models/workflows.ts
@@ -316,8 +316,7 @@ export interface Template {
     container?: kubernetes.Container;
 
     containerSet?: {
-        sequence: kubernetes.Container[];
-        graph: ContainerNode[];
+        containers: ContainerNode[];
     };
     /**
      * Deamon will allow a workflow to proceed to the next step so long as the container reaches readiness