Merge branch 'master'

Feature #14365

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

diff --combined 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 = [[
      {
@@@ -26,8 -26,8 +27,8 @@@
      {
          icon: ShareIcon,
          name: "Share",
 -        execute: (dispatch, resource) => {
 -            // add code
 +        execute: (dispatch, { uuid }) => {
 +            dispatch<any>(openSharingDialog(uuid));
          }
      },
      {
@@@ -55,11 -55,14 +56,14 @@@
          execute: (dispatch, resource) => {
              dispatch<any>(openCollectionCopyDialog(resource));
          }
+ 
      },
      {
          icon: DetailsIcon,
          name: "View details",
-         execute: dispatch => dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL())
+         execute: dispatch => {
+             dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL());
+         }
      },
      {
          icon: ProvenanceGraphIcon,
@@@ -72,7 -75,7 +76,7 @@@
          icon: AdvancedIcon,
          name: "Advanced",
          execute: (dispatch, resource) => {
-             // add code
+             dispatch<any>(openAdvancedTabDialog(resource.uuid));
          }
      },
      {

diff --combined src/views-components/context-menu/action-sets/collection-resource-action-set.ts
index 99bd1567cd74cf207c3f1e8aa2389fafac246b4c,565a7d090c930cbc2ea93f678c3e58a730927cbe..30ef4e795c74c20cec8aabd4351607c61080dadd
--- 1/src/views-components/context-menu/action-sets/collection-resource-action-set.ts
--- 2/src/views-components/context-menu/action-sets/collection-resource-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-resource-action-set.ts
@@@ -13,7 -13,6 +13,7 @@@ import { openMoveCollectionDialog } fro
  import { openCollectionCopyDialog } from '~/store/collections/collection-copy-actions';
  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";
  
  export const collectionResourceActionSet: ContextMenuActionSet = [[
      {
@@@ -26,14 -25,16 +26,16 @@@
      {
          icon: ShareIcon,
          name: "Share",
 -        execute: (dispatch, resource) => {
 -            // add code
 +        execute: (dispatch, { uuid }) => {
 +            dispatch<any>(openSharingDialog(uuid));
          }
      },
      {
          icon: MoveToIcon,
          name: "Move to",
-         execute: (dispatch, resource) => dispatch<any>(openMoveCollectionDialog(resource))
+         execute: (dispatch, resource) => {
+             dispatch<any>(openMoveCollectionDialog(resource));
+         }
      },
      {
          component: ToggleFavoriteAction,
@@@ -54,12 -55,14 +56,14 @@@
          name: "Copy to project",
          execute: (dispatch, resource) => {
              dispatch<any>(openCollectionCopyDialog(resource));
-         },
+         }
      },
      {
          icon: DetailsIcon,
          name: "View details",
-         execute: dispatch => dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL())
+         execute: dispatch => {
+             dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL());
+         }
      },
      {
          icon: RemoveIcon,

diff --combined 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
@@@ -2,8 -2,8 +2,8 @@@
  //
  // SPDX-License-Identifier: AGPL-3.0
  
- import { ContextMenuActionSet } from "../context-menu-action-set";
- import { ToggleFavoriteAction } from "../actions/favorite-action";
+ import { ContextMenuActionSet } from "~/views-components/context-menu/context-menu-action-set";
+ import { ToggleFavoriteAction } from "~/views-components/context-menu/actions/favorite-action";
  import { toggleFavorite } from "~/store/favorites/favorites-actions";
  import {
      RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, ProvenanceGraphIcon,
@@@ -14,27 -14,31 +14,32 @@@ 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 = [[
      {
          icon: RenameIcon,
          name: "Edit process",
-         execute: (dispatch, resource) => dispatch<any>(openProcessUpdateDialog(resource))
+         execute: (dispatch, resource) => {
+             dispatch<any>(openProcessUpdateDialog(resource));
+         }
      },
      {
          icon: ShareIcon,
          name: "Share",
 -        execute: (dispatch, resource) => {
 -            // add code
 +        execute: (dispatch, { uuid }) => {
 +            dispatch<any>(openSharingDialog(uuid));
          }
      },
      {
          icon: MoveToIcon,
          name: "Move to",
-         execute: (dispatch, resource) => dispatch<any>(openMoveProcessDialog(resource))
+         execute: (dispatch, resource) => {
+             dispatch<any>(openMoveProcessDialog(resource));
+         }
      },
      {
          component: ToggleFavoriteAction,
@@@ -47,7 -51,9 +52,9 @@@
      {
          icon: CopyIcon,
          name: "Copy to project",
-         execute: (dispatch, resource) => dispatch<any>(openCopyProcessDialog(resource))
+         execute: (dispatch, resource) => {
+             dispatch<any>(openCopyProcessDialog(resource));
+         }
      },
      {
          icon: ReRunProcessIcon,
@@@ -80,7 -86,9 +87,9 @@@
      {
          icon: DetailsIcon,
          name: "View details",
-         execute: dispatch => dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL())
+         execute: dispatch => {
+             dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL());
+         }
      },
      {
          icon: LogIcon,
@@@ -100,7 -108,7 +109,7 @@@
          icon: AdvancedIcon,
          name: "Advanced",
          execute: (dispatch, resource) => {
-             // add code
+             dispatch<any>(openAdvancedTabDialog(resource.uuid));
          }
      },
      {

diff --combined src/views-components/context-menu/action-sets/process-resource-action-set.ts
index a433ff8ddce085b473fcc6d154963e7087f594cd,6f3efc31a4c31d2b356eafb481f4e116ab5f6cc9..cf8aba5975b834c0ccccceb9347359a231006429
--- 1/src/views-components/context-menu/action-sets/process-resource-action-set.ts
--- 2/src/views-components/context-menu/action-sets/process-resource-action-set.ts
+++ b/src/views-components/context-menu/action-sets/process-resource-action-set.ts
@@@ -11,25 -11,28 +11,29 @@@ import { openMoveProcessDialog } from '
  import { openProcessUpdateDialog } from "~/store/processes/process-update-actions";
  import { openCopyProcessDialog } from '~/store/processes/process-copy-actions';
  import { detailsPanelActions } from '~/store/details-panel/details-panel-action';
 +import { openSharingDialog } from "~/store/sharing-dialog/sharing-dialog-actions";
  
  export const processResourceActionSet: ContextMenuActionSet = [[
      {
          icon: RenameIcon,
          name: "Edit process",
-         execute: (dispatch, resource) => dispatch<any>(openProcessUpdateDialog(resource))
+         execute: (dispatch, resource) => {
+             dispatch<any>(openProcessUpdateDialog(resource));
+         }
      },
      {
          icon: ShareIcon,
          name: "Share",
 -        execute: (dispatch, resource) => {
 -            // add code
 +        execute: (dispatch, { uuid }) => {
 +            dispatch<any>(openSharingDialog(uuid));
          }
      },
      {
          icon: MoveToIcon,
          name: "Move to",
-         execute: (dispatch, resource) => dispatch<any>(openMoveProcessDialog(resource))
+         execute: (dispatch, resource) => {
+             dispatch<any>(openMoveProcessDialog(resource));
+         }
      },
      {
          component: ToggleFavoriteAction,
@@@ -42,12 -45,16 +46,16 @@@
      {
          icon: CopyIcon,
          name: "Copy to project",
-         execute: (dispatch, resource) => dispatch<any>(openCopyProcessDialog(resource))
+         execute: (dispatch, resource) => {
+             dispatch<any>(openCopyProcessDialog(resource));
+         }
      },
      {
          icon: DetailsIcon,
          name: "View details",
-         execute: dispatch => dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL())
+         execute: dispatch => {
+             dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL());
+         }
      },
      {
          icon: RemoveIcon,

diff --combined 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
@@@ -3,7 -3,7 +3,7 @@@
  // SPDX-License-Identifier: AGPL-3.0
  
  import { ContextMenuActionSet } from "../context-menu-action-set";
- import { NewProjectIcon, RenameIcon, CopyIcon, MoveToIcon, DetailsIcon } from '~/components/icon/icon';
+ import { NewProjectIcon, RenameIcon, CopyIcon, MoveToIcon, DetailsIcon, AdvancedIcon } from '~/components/icon/icon';
  import { ToggleFavoriteAction } from "../actions/favorite-action";
  import { toggleFavorite } from "~/store/favorites/favorites-actions";
  import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
@@@ -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 = [[
      {
@@@ -31,13 -30,6 +32,13 @@@
              dispatch<any>(openProjectUpdateDialog(resource));
          }
      },
 +    {
 +        icon: ShareIcon,
 +        name: "Share",
 +        execute: (dispatch, { uuid }) => {
 +            dispatch<any>(openSharingDialog(uuid));
 +        }
 +    },
      {
          component: ToggleFavoriteAction,
          execute: (dispatch, resource) => {
@@@ -55,7 -47,9 +56,9 @@@
      {
          icon: MoveToIcon,
          name: "Move to",
-         execute: (dispatch, resource) => dispatch<any>(openMoveProjectDialog(resource))
+         execute: (dispatch, resource) => {
+             dispatch<any>(openMoveProjectDialog(resource));
+         }
      },
      {
          icon: CopyIcon,
@@@ -67,6 -61,15 +70,15 @@@
      {
          icon: DetailsIcon,
          name: "View details",
-         execute: dispatch => dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL())
-     }
+         execute: dispatch => {
+             dispatch(detailsPanelActions.TOGGLE_DETAILS_PANEL());
+         }
+     },
+     {
+         icon: AdvancedIcon,
+         name: "Advanced",
+         execute: (dispatch, resource) => {
+             dispatch<any>(openAdvancedTabDialog(resource.uuid));
+         }
+     },
  ]];

diff --combined 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';
  
@@@ -115,6 -109,7 +110,7 @@@ export const WorkbenchPanel 
              <Grid item>
                  <DetailsPanel />
              </Grid>
+             <AdvancedTabDialog />
              <ContextMenu />
              <CopyCollectionDialog />
              <CopyProcessDialog />
@@@ -131,7 -126,6 +127,7 @@@
              <ProcessCommandDialog />
              <RenameFileDialog />
              <RichTextEditorDialog />
 +            <SharingDialog />
              <Snackbar />
              <UpdateCollectionDialog />
              <UpdateProcessDialog />