merge master
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 2 Oct 2018 12:00:19 +0000 (14:00 +0200)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Tue, 2 Oct 2018 12:00:19 +0000 (14:00 +0200)
Feature #14231

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

1  2 
src/store/workbench/workbench-actions.ts

index 8d8eb953223cc306a777438bd2f32ec9319cc04c,56e3401d5ae0e56af72463992689e9bd17323bd5..bc2a9ed688a5100f3695c0c141e1ca7917d45104
@@@ -48,7 -48,8 +48,9 @@@ import { GroupContentsResource } from '
  import { unionize, ofType, UnionOf, MatchCases } from '~/common/unionize';
  import { loadRunProcessPanel } from '~/store/run-process-panel/run-process-panel-actions';
  import { loadCollectionFiles } from '~/store/collection-panel/collection-panel-files/collection-panel-files-actions';
 +import { SnackbarKind } from '~/store/snackbar/snackbar-actions';
+ import { collectionPanelActions } from "~/store/collection-panel/collection-panel-action";
+ import { CollectionResource } from "~/models/collection";
  
  export const WORKBENCH_LOADING_SCREEN = 'workbenchLoadingScreen';