From: Peter Amstutz <peter.amstutz@curii.com>
Date: Mon, 23 May 2022 15:15:44 +0000 (-0400)
Subject: Merge branch '19069-workflow-launching' into 19143-project-list-workflows
X-Git-Tag: 2.4.1~1^2~1^2~7
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/8c5147b7367e994e897357766a85e9b7b8e28f24

Merge branch '19069-workflow-launching' into 19143-project-list-workflows

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

8c5147b7367e994e897357766a85e9b7b8e28f24
diff --cc src/store/resource-type-filters/resource-type-filters.ts
index b1c52e4f,0539cefe..64a391ca
--- a/src/store/resource-type-filters/resource-type-filters.ts
+++ b/src/store/resource-type-filters/resource-type-filters.ts
@@@ -84,10 -83,9 +85,11 @@@ export const getInitialResourceTypeFilt
          initFilter(ObjectTypeFilter.COLLECTION),
          initFilter(CollectionTypeFilter.GENERAL_COLLECTION, ObjectTypeFilter.COLLECTION),
          initFilter(CollectionTypeFilter.OUTPUT_COLLECTION, ObjectTypeFilter.COLLECTION),
+         initFilter(CollectionTypeFilter.INTERMEDIATE_COLLECTION, ObjectTypeFilter.COLLECTION),
          initFilter(CollectionTypeFilter.LOG_COLLECTION, ObjectTypeFilter.COLLECTION),
      ),
 +    initFilter(ObjectTypeFilter.WORKFLOW)
 +
  );
  
  export const getInitialProcessTypeFilters = pipe(
diff --cc src/views/workflow-panel/workflow-description-card.tsx
index e93caea4,d03f46e4..f25a8e64
--- a/src/views/workflow-panel/workflow-description-card.tsx
+++ b/src/views/workflow-panel/workflow-description-card.tsx
@@@ -19,10 -20,10 +19,12 @@@ import 
  import { ArvadosTheme } from 'common/custom-theme';
  import { WorkflowIcon } from 'components/icon/icon';
  import { DataTableDefaultView } from 'components/data-table-default-view/data-table-default-view';
 +import { parseWorkflowDefinition, getWorkflowInputs, getInputLabel, stringifyInputType } from 'models/workflow';
- // import { WorkflowGraph } from "views/workflow-panel/workflow-graph";
- 
 +import { WorkflowDetailsCardDataProps, WorkflowDetailsAttributes } from 'views-components/details-panel/workflow-details';
+ import { WorkflowResource, parseWorkflowDefinition, getWorkflowInputs, getInputLabel, stringifyInputType } from 'models/workflow';
+ import { DetailsAttribute } from 'components/details-attribute/details-attribute';
+ import { ResourceOwnerWithName } from 'views-components/data-explorer/renderers';
+ import { formatDate } from "common/formatters";
  
  export type CssRules = 'root' | 'tab' | 'inputTab' | 'graphTab' | 'graphTabWithChosenWorkflow' | 'descriptionTab' | 'inputsTable';