From: Daniel Kutyła <daniel.kutyla@contractors.roche.com>
Date: Mon, 12 Oct 2020 19:31:44 +0000 (+0200)
Subject: Merge branch 'master' into 16812-token-appears-in-the-download-URL
X-Git-Tag: 2.1.1~9^2~6
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/42ec7892e74f6d9d19f2f0155830565f447a861f

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>
---

42ec7892e74f6d9d19f2f0155830565f447a861f
diff --cc src/views-components/context-menu/action-sets/collection-files-item-action-set.ts
index f6899435,b900d186..6ce62ca9
--- a/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 = [[
      {