From: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
Date: Tue, 30 Oct 2018 13:56:35 +0000 (+0100)
Subject: Merge branch 'master'
X-Git-Tag: 1.3.0~39^2~1
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/c038a5258d5790773ccca89a192c8c2b7dcd86cb

Merge branch 'master'

Feature #14365

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
---

c038a5258d5790773ccca89a192c8c2b7dcd86cb
diff --cc src/views-components/context-menu/action-sets/collection-action-set.ts
index e3ccb2dd,f7dbf3a7..07e15024
--- a/src/views-components/context-menu/action-sets/collection-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-action-set.ts
@@@ -13,7 -13,7 +13,8 @@@ import { openCollectionCopyDialog } fro
  import { ToggleTrashAction } from "~/views-components/context-menu/actions/trash-action";
  import { toggleCollectionTrashed } from "~/store/trash/trash-actions";
  import { detailsPanelActions } from '~/store/details-panel/details-panel-action';
- import { openSharingDialog } from '../../../store/sharing-dialog/sharing-dialog-actions';
++import { openSharingDialog } from '~/store/sharing-dialog/sharing-dialog-actions';
+ import { openAdvancedTabDialog } from "~/store/advanced-tab/advanced-tab";
  
  export const collectionActionSet: ContextMenuActionSet = [[
      {
diff --cc src/views-components/context-menu/action-sets/process-action-set.ts
index edb44410,d41b59d6..4ad68597
--- a/src/views-components/context-menu/action-sets/process-action-set.ts
+++ b/src/views-components/context-menu/action-sets/process-action-set.ts
@@@ -14,9 -14,9 +14,10 @@@ import { navigateToProcessLogs } from '
  import { openMoveProcessDialog } from '~/store/processes/process-move-actions';
  import { openProcessUpdateDialog } from "~/store/processes/process-update-actions";
  import { openCopyProcessDialog } from '~/store/processes/process-copy-actions';
- import { openProcessCommandDialog } from '../../../store/processes/process-command-actions';
+ import { openProcessCommandDialog } from '~/store/processes/process-command-actions';
  import { detailsPanelActions } from '~/store/details-panel/details-panel-action';
 +import { openSharingDialog } from "~/store/sharing-dialog/sharing-dialog-actions";
+ import { openAdvancedTabDialog } from "~/store/advanced-tab/advanced-tab";
  
  export const processActionSet: ContextMenuActionSet = [[
      {
diff --cc src/views-components/context-menu/action-sets/project-action-set.ts
index 63ea3b55,7171c0af..aa82c7fa
--- a/src/views-components/context-menu/action-sets/project-action-set.ts
+++ b/src/views-components/context-menu/action-sets/project-action-set.ts
@@@ -13,8 -13,7 +13,9 @@@ import { openProjectUpdateDialog } fro
  import { ToggleTrashAction } from "~/views-components/context-menu/actions/trash-action";
  import { toggleProjectTrashed } from "~/store/trash/trash-actions";
  import { detailsPanelActions } from '~/store/details-panel/details-panel-action';
 +import { ShareIcon } from '~/components/icon/icon';
 +import { openSharingDialog } from "~/store/sharing-dialog/sharing-dialog-actions";
+ import { openAdvancedTabDialog } from "~/store/advanced-tab/advanced-tab";
  
  export const projectActionSet: ContextMenuActionSet = [[
      {
diff --cc src/views/workbench/workbench.tsx
index 2e8bc192,1e653848..41f9682f
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -42,13 -42,7 +42,8 @@@ import { RunProcessPanel } from '~/view
  import SplitterLayout from 'react-splitter-layout';
  import { WorkflowPanel } from '~/views/workflow-panel/workflow-panel';
  import { SearchResultsPanel } from '~/views/search-results-panel/search-results-panel';
- import { HomeTreePicker } from '~/views-components/projects-tree-picker/home-tree-picker';
- import { SharedTreePicker } from '~/views-components/projects-tree-picker/shared-tree-picker';
- import { FavoritesTreePicker } from '../../views-components/projects-tree-picker/favorites-tree-picker';
- import { ProjectsTreePicker } from '~/views-components/projects-tree-picker/projects-tree-picker';
- import { Chips } from '~/components/chips/chips';
- import { ChipsInput } from '../../components/chips-input/chips-input';
 +import { SharingDialog } from '~/views-components/sharing-dialog/sharing-dialog';
+ import { AdvancedTabDialog } from '~/views-components/advanced-tab-dialog/advanced-tab-dialog';
  
  type CssRules = 'root' | 'container' | 'splitter' | 'asidePanel' | 'contentWrapper' | 'content';