Merge branch 'main' of git.arvados.org:arvados-workbench2 into 16073-process-io-panels
authorStephen Smith <stephen@curii.com>
Tue, 30 Aug 2022 22:04:05 +0000 (18:04 -0400)
committerStephen Smith <stephen@curii.com>
Tue, 30 Aug 2022 22:04:05 +0000 (18:04 -0400)
Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen@curii.com>

1  2 
package.json
src/store/processes/processes-actions.ts
src/views/process-panel/process-panel-root.tsx
src/views/process-panel/process-panel.tsx
yarn.lock

diff --cc package.json
Simple merge
index 22643e8588c279277295ecd537e29b0e31570ac4,f8ff84304dcb3fb4acc7554ef0f26882ef9cc6d6..1cf6030015426d87a9742790db6aa40bc30913bc
@@@ -17,10 -15,7 +17,11 @@@ import { getIOParamDisplayValue, Proces
  import { getProcessPanelLogs, ProcessLogsPanel } from 'store/process-logs-panel/process-logs-panel';
  import { ProcessLogsCard } from './process-log-card';
  import { FilterOption } from 'views/process-panel/process-log-form';
 +import { getInputs, getInputCollectionMounts, getOutputParameters } from 'store/processes/processes-actions';
 +import { CommandInputParameter, getIOParamId } from 'models/workflow';
 +import { CommandOutputParameter } from 'cwlts/mappings/v1.0/CommandOutputParameter';
 +import { AuthState } from 'store/auth/auth-reducer';
+ import { ProcessCmdCard } from './process-cmd-card';
  
  type CssRules = 'root';
  
@@@ -44,22 -38,15 +45,23 @@@ export interface ProcessPanelRootAction
      cancelProcess: (uuid: string) => void;
      onLogFilterChange: (filter: FilterOption) => void;
      navigateToLog: (uuid: string) => void;
-     onLogCopyToClipboard: (uuid: string) => void;
+     onCopyToClipboard: (uuid: string) => void;
 +    fetchOutputs: (uuid: string, fetchOutputs) => void;
  }
  
  export type ProcessPanelRootProps = ProcessPanelRootDataProps & ProcessPanelRootActionProps & WithStyles<CssRules>;
  
 +type OutputDetails = {
 +    rawOutputs?: any;
 +    pdh?: string;
 +}
 +
  const panelsData: MPVPanelState[] = [
      {name: "Details"},
+     {name: "Command"},
      {name: "Logs", visible: true},
 +    {name: "Inputs"},
 +    {name: "Outputs"},
      {name: "Subprocesses"},
  ];
  
diff --cc yarn.lock
Simple merge