Merge branch 'master' into 14103-improve-dialogs

refs #14103

Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki@contractors.roche.com>

diff --cc src/views-components/context-menu/action-sets/collection-action-set.ts
index fab4a8055a53ed8d435257f7364d9bc18f5ae67d,2d3cd55935e386f65fd3d134fd9f278b88187ef3..e3c39f2bc428b049835a6dd62f54e23244a35be6
--- 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
@@@ -6,10 -6,10 +6,10 @@@ import { ContextMenuActionSet } from ".
  import { ToggleFavoriteAction } from "../actions/favorite-action";
  import { toggleFavorite } from "~/store/favorites/favorites-actions";
  import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, ProvenanceGraphIcon, AdvancedIcon, RemoveIcon } from "~/components/icon/icon";
 -import { openUpdater } from "~/store/collections/updater/collection-updater-action";
 +import { openCollectionUpdateDialog } from "~/store/collections/collection-update-actions";
  import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
  import { openMoveCollectionDialog } from '~/store/move-collection-dialog/move-collection-dialog';
- import { openProjectCopyDialog } from "~/store/project-copy-project-dialog/project-copy-project-dialog";
+ import { openCollectionCopyDialog } from "~/store/collections/collection-copy-actions";
  
  export const collectionActionSet: ContextMenuActionSet = [[
      {

diff --cc src/views-components/context-menu/action-sets/collection-resource-action-set.ts
index 66838a96fd48787f268a6567da7ac7d482841591,fbabeee312931939b50e1d2111b8e78c30f00252..de39521b36046c7bfa97d0658adfecccc0c7c94c
--- 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
@@@ -6,10 -6,10 +6,10 @@@ import { ContextMenuActionSet } from ".
  import { ToggleFavoriteAction } from "../actions/favorite-action";
  import { toggleFavorite } from "~/store/favorites/favorites-actions";
  import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, RemoveIcon } from "~/components/icon/icon";
 -import { openUpdater } from "~/store/collections/updater/collection-updater-action";
 +import { openCollectionUpdateDialog } from "~/store/collections/collection-update-actions";
  import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action";
  import { openMoveCollectionDialog } from '~/store/move-collection-dialog/move-collection-dialog';
- import { openProjectCopyDialog } from '~/store/project-copy-project-dialog/project-copy-project-dialog';
+ import { openCollectionCopyDialog } from '~/store/collections/collection-copy-actions';
  
  export const collectionResourceActionSet: ContextMenuActionSet = [[
      {

diff --cc src/views/workbench/workbench.tsx
Simple merge