Merge branch 'master'

Feature #14365

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

diff --cc src/views-components/context-menu/action-sets/collection-action-set.ts
index e3ccb2dd9139cbbce5981e81261019699ff1686c,f7dbf3a7b01c44ae19c9868b1b079a15f21a1c17..07e150245486d85442034849250a2a41acdb4d0d
--- 1/src/views-components/context-menu/action-sets/collection-action-set.ts
--- 2/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/collection-resource-action-set.ts
Simple merge

diff --cc src/views-components/context-menu/action-sets/process-action-set.ts
index edb444104de2f7c7a572381c3ecdb67e51ee1e33,d41b59d6f31b0547dff1d380091d4910d7038aa9..4ad68597098029c1e274688de9e67bfd07083e48
--- 1/src/views-components/context-menu/action-sets/process-action-set.ts
--- 2/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/process-resource-action-set.ts
Simple merge

diff --cc src/views-components/context-menu/action-sets/project-action-set.ts
index 63ea3b559a1919d7433526434230b6d47e86f017,7171c0af0285e9c201b699e6b3a24f6023e58fa1..aa82c7fa2864de5174a2f1779a8c00ba06b127d2
--- 1/src/views-components/context-menu/action-sets/project-action-set.ts
--- 2/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 2e8bc192155482141affad0bfe057903b34e5b2c,1e6538485ec8e538c975b5d2eeca84b4b607a8fc..41f9682f639c8e76faed175f8bc2511ce680c196
--- 1/src/views/workbench/workbench.tsx
--- 2/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';