Merge branch 'master' into 16812-token-appears-in-the-download-URL

Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla@contractors.roche.com>

diff --combined src/views-components/context-menu/action-sets/collection-files-item-action-set.ts
index f68994358e5e72bcc60a392642bc920b10903a0d,b900d1864dd3490710cb39a061caff1b548417cb..6ce62ca942c55e738f79b2b47a295bd7cc220d1a
--- 1/src/views-components/context-menu/action-sets/collection-files-item-action-set.ts
--- 2/src/views-components/context-menu/action-sets/collection-files-item-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-files-item-action-set.ts
@@@ -3,11 -3,11 +3,11 @@@
  // SPDX-License-Identifier: AGPL-3.0
  
  import { ContextMenuActionSet } from "../context-menu-action-set";
- import { RemoveIcon } from "~/components/icon/icon";
+ import { RemoveIcon, RenameIcon } from "~/components/icon/icon";
  import { DownloadCollectionFileAction } from "../actions/download-collection-file-action";
- import { openFileRemoveDialog } from '~/store/collection-panel/collection-panel-files/collection-panel-files-actions';
+ import { openFileRemoveDialog, openRenameFileDialog } from '~/store/collection-panel/collection-panel-files/collection-panel-files-actions';
  import { CollectionFileViewerAction } from '~/views-components/context-menu/actions/collection-file-viewer-action';
 -
 +import { CollectionCopyToClipboardAction } from "../actions/collection-copy-to-clipboard-action";
  
  export const readOnlyCollectionFilesItemActionSet: ContextMenuActionSet = [[
      {
@@@ -17,22 -17,17 +17,21 @@@
      {
          component: CollectionFileViewerAction,
          execute: () => { return; },
 +    },
 +    {
 +        component: CollectionCopyToClipboardAction,
 +        execute: () => { return; },
      }
  ]];
  
  export const collectionFilesItemActionSet: ContextMenuActionSet = readOnlyCollectionFilesItemActionSet.concat([[
-     // FIXME: This isn't working. Maybe something related to WebDAV?
-     // {
-     //     name: "Rename",
-     //     icon: RenameIcon,
-     //     execute: (dispatch, resource) => {
-     //         dispatch<any>(openRenameFileDialog({ name: resource.name, id: resource.uuid }));
-     //     }
-     // },
+     {
+         name: "Rename",
+         icon: RenameIcon,
+         execute: (dispatch, resource) => {
+             dispatch<any>(openRenameFileDialog({ name: resource.name, id: resource.uuid }));
+         }
+     },
      {
          name: "Remove",
          icon: RemoveIcon,