From: Lucas Di Pentima Date: Tue, 20 Oct 2020 13:27:21 +0000 (-0300) Subject: 16719: Changes wording from 'Copy to project' to 'Make a copy' on collections. X-Git-Tag: 2.1.1~7^2~8 X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/8a5f805a21c44cd47b0b8b6d0b55e3f752f00a21 16719: Changes wording from 'Copy to project' to 'Make a copy' on collections. Also, removed duplicated code about context menus. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- diff --git a/src/index.tsx b/src/index.tsx index 0a51ed3c..a4353d4e 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -28,7 +28,6 @@ import { collectionFilesActionSet, readOnlyCollectionFilesActionSet } from '~/vi import { collectionFilesItemActionSet, readOnlyCollectionFilesItemActionSet } from '~/views-components/context-menu/action-sets/collection-files-item-action-set'; import { collectionFilesNotSelectedActionSet } from '~/views-components/context-menu/action-sets/collection-files-not-selected-action-set'; import { collectionActionSet, readOnlyCollectionActionSet } from '~/views-components/context-menu/action-sets/collection-action-set'; -import { collectionResourceActionSet } from '~/views-components/context-menu/action-sets/collection-resource-action-set'; import { processActionSet } from '~/views-components/context-menu/action-sets/process-action-set'; import { loadWorkbench } from '~/store/workbench/workbench-actions'; import { Routes } from '~/routes/routes'; @@ -77,7 +76,6 @@ addMenuActionSet(ContextMenuKind.COLLECTION_FILES_NOT_SELECTED, collectionFilesN addMenuActionSet(ContextMenuKind.COLLECTION_FILES_ITEM, collectionFilesItemActionSet); addMenuActionSet(ContextMenuKind.READONLY_COLLECTION_FILES_ITEM, readOnlyCollectionFilesItemActionSet); addMenuActionSet(ContextMenuKind.COLLECTION, collectionActionSet); -addMenuActionSet(ContextMenuKind.COLLECTION_RESOURCE, collectionResourceActionSet); addMenuActionSet(ContextMenuKind.READONLY_COLLECTION, readOnlyCollectionActionSet); addMenuActionSet(ContextMenuKind.TRASHED_COLLECTION, trashedCollectionActionSet); addMenuActionSet(ContextMenuKind.PROCESS, processActionSet); diff --git a/src/store/context-menu/context-menu-actions.test.ts b/src/store/context-menu/context-menu-actions.test.ts index 4bcbf9f2..c3e78679 100644 --- a/src/store/context-menu/context-menu-actions.test.ts +++ b/src/store/context-menu/context-menu-actions.test.ts @@ -71,7 +71,7 @@ describe('context-menu-actions', () => { expect(result).toEqual(ContextMenuKind.COLLECTION_ADMIN); }); - it('should return ContextMenuKind.COLLECTION_RESOURCE', () => { + it('should return ContextMenuKind.COLLECTION', () => { // given const isAdmin = false; const isEditable = true; @@ -80,7 +80,7 @@ describe('context-menu-actions', () => { const result = resourceKindToContextMenuKind(uuid, isAdmin, isEditable); // then - expect(result).toEqual(ContextMenuKind.COLLECTION_RESOURCE); + expect(result).toEqual(ContextMenuKind.COLLECTION); }); it('should return ContextMenuKind.READONLY_COLLECTION', () => { diff --git a/src/store/context-menu/context-menu-actions.ts b/src/store/context-menu/context-menu-actions.ts index 1f766bd3..308d5e88 100644 --- a/src/store/context-menu/context-menu-actions.ts +++ b/src/store/context-menu/context-menu-actions.ts @@ -204,15 +204,21 @@ export const resourceKindToContextMenuKind = (uuid: string, isAdmin?: boolean, i const kind = extractUuidKind(uuid); switch (kind) { case ResourceKind.PROJECT: - return !isAdmin ? - isEditable ? ContextMenuKind.PROJECT : ContextMenuKind.READONLY_PROJECT : - ContextMenuKind.PROJECT_ADMIN; + return !isAdmin + ? isEditable + ? ContextMenuKind.PROJECT + : ContextMenuKind.READONLY_PROJECT + : ContextMenuKind.PROJECT_ADMIN; case ResourceKind.COLLECTION: - return !isAdmin ? - isEditable ? ContextMenuKind.COLLECTION_RESOURCE : ContextMenuKind.READONLY_COLLECTION : - ContextMenuKind.COLLECTION_ADMIN; + return !isAdmin + ? isEditable + ? ContextMenuKind.COLLECTION + : ContextMenuKind.READONLY_COLLECTION + : ContextMenuKind.COLLECTION_ADMIN; case ResourceKind.PROCESS: - return !isAdmin ? ContextMenuKind.PROCESS_RESOURCE : ContextMenuKind.PROCESS_ADMIN; + return !isAdmin + ? ContextMenuKind.PROCESS_RESOURCE + : ContextMenuKind.PROCESS_ADMIN; case ResourceKind.USER: return ContextMenuKind.ROOT_PROJECT; case ResourceKind.LINK: diff --git a/src/views-components/context-menu/action-sets/collection-action-set.ts b/src/views-components/context-menu/action-sets/collection-action-set.ts index fba2a53a..7fa6f224 100644 --- a/src/views-components/context-menu/action-sets/collection-action-set.ts +++ b/src/views-components/context-menu/action-sets/collection-action-set.ts @@ -27,7 +27,7 @@ export const readOnlyCollectionActionSet: ContextMenuActionSet = [[ }, { icon: CopyIcon, - name: "Copy to project", + name: "Make a copy", execute: (dispatch, resource) => { dispatch(openCollectionCopyDialog(resource)); } diff --git a/src/views-components/context-menu/action-sets/collection-admin-action-set.ts b/src/views-components/context-menu/action-sets/collection-admin-action-set.ts index db849136..10a839d8 100644 --- a/src/views-components/context-menu/action-sets/collection-admin-action-set.ts +++ b/src/views-components/context-menu/action-sets/collection-admin-action-set.ts @@ -57,7 +57,7 @@ export const collectionAdminActionSet: ContextMenuActionSet = [[ }, { icon: CopyIcon, - name: "Copy to project", + name: "Make a copy", execute: (dispatch, resource) => { dispatch(openCollectionCopyDialog(resource)); } @@ -70,13 +70,6 @@ export const collectionAdminActionSet: ContextMenuActionSet = [[ dispatch(toggleDetailsPanel()); } }, - // { - // icon: ProvenanceGraphIcon, - // name: "Provenance graph", - // execute: (dispatch, resource) => { - // // add code - // } - // }, { icon: AdvancedIcon, name: "Advanced", @@ -90,11 +83,4 @@ export const collectionAdminActionSet: ContextMenuActionSet = [[ dispatch(toggleCollectionTrashed(resource.uuid, resource.isTrashed!!)); } }, - // { - // icon: RemoveIcon, - // name: "Remove", - // execute: (dispatch, resource) => { - // // add code - // } - // } ]]; diff --git a/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 deleted file mode 100644 index 5e367906..00000000 --- a/src/views-components/context-menu/action-sets/collection-resource-action-set.ts +++ /dev/null @@ -1,83 +0,0 @@ -// Copyright (C) The Arvados Authors. All rights reserved. -// -// SPDX-License-Identifier: AGPL-3.0 - -import { ContextMenuActionSet } from "../context-menu-action-set"; -import { ToggleFavoriteAction } from "../actions/favorite-action"; -import { ToggleTrashAction } from "~/views-components/context-menu/actions/trash-action"; -import { toggleFavorite } from "~/store/favorites/favorites-actions"; -import { RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon, AdvancedIcon } from '~/components/icon/icon'; -import { openCollectionUpdateDialog } from "~/store/collections/collection-update-actions"; -import { favoritePanelActions } from "~/store/favorite-panel/favorite-panel-action"; -import { openMoveCollectionDialog } from '~/store/collections/collection-move-actions'; -import { openCollectionCopyDialog } from '~/store/collections/collection-copy-actions'; -import { toggleCollectionTrashed } from "~/store/trash/trash-actions"; -import { openSharingDialog } from "~/store/sharing-dialog/sharing-dialog-actions"; -import { openAdvancedTabDialog } from '~/store/advanced-tab/advanced-tab'; -import { toggleDetailsPanel } from '~/store/details-panel/details-panel-action'; - -export const collectionResourceActionSet: ContextMenuActionSet = [[ - { - icon: RenameIcon, - name: "Edit collection", - execute: (dispatch, resource) => { - dispatch(openCollectionUpdateDialog(resource)); - } - }, - { - icon: ShareIcon, - name: "Share", - execute: (dispatch, { uuid }) => { - dispatch(openSharingDialog(uuid)); - } - }, - { - component: ToggleFavoriteAction, - execute: (dispatch, resource) => { - dispatch(toggleFavorite(resource)).then(() => { - dispatch(favoritePanelActions.REQUEST_ITEMS()); - }); - } - }, - { - icon: MoveToIcon, - name: "Move to", - execute: (dispatch, resource) => { - dispatch(openMoveCollectionDialog(resource)); - } - }, - { - icon: CopyIcon, - name: "Copy to project", - execute: (dispatch, resource) => { - dispatch(openCollectionCopyDialog(resource)); - } - }, - { - icon: DetailsIcon, - name: "View details", - execute: dispatch => { - dispatch(toggleDetailsPanel()); - } - }, - { - icon: AdvancedIcon, - name: "Advanced", - execute: (dispatch, resource) => { - dispatch(openAdvancedTabDialog(resource.uuid)); - } - }, - { - component: ToggleTrashAction, - execute: (dispatch, resource) => { - dispatch(toggleCollectionTrashed(resource.uuid, resource.isTrashed!!)); - } - }, - // { - // icon: RemoveIcon, - // name: "Remove", - // execute: (dispatch, resource) => { - // // add code - // } - // } -]]; diff --git a/src/views-components/context-menu/context-menu.tsx b/src/views-components/context-menu/context-menu.tsx index db5765ee..43474dd1 100644 --- a/src/views-components/context-menu/context-menu.tsx +++ b/src/views-components/context-menu/context-menu.tsx @@ -77,7 +77,6 @@ export enum ContextMenuKind { COLLECTION_FILES_NOT_SELECTED = "CollectionFilesNotSelected", COLLECTION = 'Collection', COLLECTION_ADMIN = 'CollectionAdmin', - COLLECTION_RESOURCE = 'CollectionResource', READONLY_COLLECTION = 'ReadOnlyCollection', TRASHED_COLLECTION = 'TrashedCollection', PROCESS = "Process",