15768: standardized types between identitical functions Arvados-DCO-1.1-Signed-off...

diff --git a/src/components/multiselectToolbar/MultiselectToolbar.tsx b/src/components/multiselectToolbar/MultiselectToolbar.tsx
index faf65db3d82af61cee31d561b69b0fa38343846a..47fd380e07fb560a32a4c6426709a3df57d839e0 100644 (file)
--- a/src/components/multiselectToolbar/MultiselectToolbar.tsx
+++ b/src/components/multiselectToolbar/MultiselectToolbar.tsx
@@ -176,11 +176,20 @@ function mapDispatchToProps(dispatch: Dispatch) {
     return {
         executeMulti: (selectedAction: ContextMenuAction, checkedList: TCheckedList, resources: ResourcesState): void => {
             const kindGroups = groupByKind(checkedList, resources);
-            for (const kind in kindGroups) {
-                const actionSet = kindToActionSet[kind];
+            if (selectedAction.name === "Move to") {
+                const firstResource = getResource(selectedToArray(checkedList)[0])(resources) as Resource;
+
+                const actionSet = kindToActionSet[firstResource.kind];
                 const action = findActionByName(selectedAction.name as string, actionSet);
 
-                if (action) action.execute(dispatch, kindGroups[kind]);
+                if (action) action.execute(dispatch, kindGroups[firstResource.kind]);
+            } else {
+                for (const kind in kindGroups) {
+                    const actionSet = kindToActionSet[kind];
+                    const action = findActionByName(selectedAction.name as string, actionSet);
+
+                    if (action) action.execute(dispatch, kindGroups[kind]);
+                }
             }
         },
     };

diff --git a/src/store/projects/project-move-actions.ts b/src/store/projects/project-move-actions.ts
index 618ce21e2d46f717fc5a06d26330cf75b92c905a..0684fc9c744515a704b9e6a5ac282794549377aa 100644 (file)
--- a/src/store/projects/project-move-actions.ts
+++ b/src/store/projects/project-move-actions.ts
@@ -17,11 +17,11 @@ import { loadSidePanelTreeProjects } from "../side-panel-tree/side-panel-tree-ac
 
 export const PROJECT_MOVE_FORM_NAME = "projectMoveFormName";
 
-export const openMoveProjectDialog = (resources: Array<any>) => {
+export const openMoveProjectDialog = (resource: any) => {
     return (dispatch: Dispatch) => {
         dispatch<any>(resetPickerProjectTree());
         dispatch<any>(initProjectsTreePicker(PROJECT_MOVE_FORM_NAME));
-        dispatch(initialize(PROJECT_MOVE_FORM_NAME, resources[0]));
+        dispatch(initialize(PROJECT_MOVE_FORM_NAME, resource));
         dispatch(dialogActions.OPEN_DIALOG({ id: PROJECT_MOVE_FORM_NAME, data: {} }));
     };
 };

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 fec407941610a650d3b11530c99a23bb2ea2582f..d40cffb66ef0ca8d362eea249437b0769c107d86 100644 (file)
--- a/src/views-components/context-menu/action-sets/collection-action-set.ts
+++ b/src/views-components/context-menu/action-sets/collection-action-set.ts
@@ -2,9 +2,9 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { ContextMenuAction, ContextMenuActionSet } from '../context-menu-action-set';
-import { ToggleFavoriteAction } from '../actions/favorite-action';
-import { toggleFavorite } from 'store/favorites/favorites-actions';
+import { ContextMenuAction, ContextMenuActionSet } from "../context-menu-action-set";
+import { ToggleFavoriteAction } from "../actions/favorite-action";
+import { toggleFavorite } from "store/favorites/favorites-actions";
 import {
     RenameIcon,
     ShareIcon,
@@ -16,29 +16,29 @@ import {
     Link,
     RestoreVersionIcon,
     FolderSharedIcon,
-} 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 { openWebDavS3InfoDialog } from 'store/collections/collection-info-actions';
-import { ToggleTrashAction } from 'views-components/context-menu/actions/trash-action';
-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';
-import { copyToClipboardAction, openInNewTabAction } from 'store/open-in-new-tab/open-in-new-tab.actions';
-import { openRestoreCollectionVersionDialog } from 'store/collections/collection-version-actions';
-import { TogglePublicFavoriteAction } from '../actions/public-favorite-action';
-import { togglePublicFavorite } from 'store/public-favorites/public-favorites-actions';
-import { publicFavoritePanelActions } from 'store/public-favorites-panel/public-favorites-action';
-import { ContextMenuResource } from 'store/context-menu/context-menu-actions';
+} 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 { openWebDavS3InfoDialog } from "store/collections/collection-info-actions";
+import { ToggleTrashAction } from "views-components/context-menu/actions/trash-action";
+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";
+import { copyToClipboardAction, openInNewTabAction } from "store/open-in-new-tab/open-in-new-tab.actions";
+import { openRestoreCollectionVersionDialog } from "store/collections/collection-version-actions";
+import { TogglePublicFavoriteAction } from "../actions/public-favorite-action";
+import { togglePublicFavorite } from "store/public-favorites/public-favorites-actions";
+import { publicFavoritePanelActions } from "store/public-favorites-panel/public-favorites-action";
+import { ContextMenuResource } from "store/context-menu/context-menu-actions";
 
 const toggleFavoriteAction: ContextMenuAction = {
     component: ToggleFavoriteAction,
-    name: 'ToggleFavoriteAction',
+    name: "ToggleFavoriteAction",
     execute: (dispatch, resources) => {
-        resources.forEach((resource) =>
+        resources.forEach(resource =>
             dispatch<any>(toggleFavorite(resource)).then(() => {
                 dispatch<any>(favoritePanelActions.REQUEST_ITEMS());
             })
@@ -50,37 +50,37 @@ const commonActionSet: ContextMenuActionSet = [
     [
         {
             icon: OpenIcon,
-            name: 'Open in new tab',
+            name: "Open in new tab",
             execute: (dispatch, resource) => {
                 dispatch<any>(openInNewTabAction(resource));
             },
         },
         {
             icon: Link,
-            name: 'Copy to clipboard',
+            name: "Copy to clipboard",
             execute: (dispatch, resource) => {
                 dispatch<any>(copyToClipboardAction(resource));
             },
         },
         {
             icon: CopyIcon,
-            name: 'Make a copy',
+            name: "Make a copy",
             execute: (dispatch, resources) => {
-                resources.forEach((resource) => dispatch<any>(openCollectionCopyDialog(resource)));
+                resources.forEach(resource => dispatch<any>(openCollectionCopyDialog(resource)));
             },
         },
         {
             icon: DetailsIcon,
-            name: 'View details',
-            execute: (dispatch) => {
+            name: "View details",
+            execute: dispatch => {
                 dispatch<any>(toggleDetailsPanel());
             },
         },
         {
             icon: AdvancedIcon,
-            name: 'API Details',
+            name: "API Details",
             execute: (dispatch, resources) => {
-                resources.forEach((resource) => dispatch<any>(openAdvancedTabDialog(resource.uuid)));
+                resources.forEach(resource => dispatch<any>(openAdvancedTabDialog(resource.uuid)));
             },
         },
     ],
@@ -92,9 +92,9 @@ export const readOnlyCollectionActionSet: ContextMenuActionSet = [
         toggleFavoriteAction,
         {
             icon: FolderSharedIcon,
-            name: 'Open with 3rd party client',
+            name: "Open with 3rd party client",
             execute: (dispatch, resources) => {
-                resources.forEach((resource) => dispatch<any>(openWebDavS3InfoDialog(resource.uuid)));
+                resources.forEach(resource => dispatch<any>(openWebDavS3InfoDialog(resource.uuid)));
             },
         },
     ],
@@ -105,29 +105,28 @@ export const collectionActionSet: ContextMenuActionSet = [
         ...readOnlyCollectionActionSet.reduce((prev, next) => prev.concat(next), []),
         {
             icon: RenameIcon,
-            name: 'Edit collection',
+            name: "Edit collection",
             execute: (dispatch, resources) => {
-                resources.forEach((resource) => dispatch<any>(openCollectionUpdateDialog(resource)));
+                resources.forEach(resource => dispatch<any>(openCollectionUpdateDialog(resource)));
             },
         },
         {
             icon: ShareIcon,
-            name: 'Share',
+            name: "Share",
             execute: (dispatch, resources) => {
                 resources.forEach(({ uuid }) => dispatch<any>(openSharingDialog(uuid)));
             },
         },
         {
             icon: MoveToIcon,
-            name: 'Move to',
-            execute: (dispatch, resources) => resources.forEach((resource) => dispatch<any>(openMoveCollectionDialog(resource))),
+            name: "Move to",
+            execute: (dispatch, resources) => dispatch<any>(openMoveCollectionDialog(resources[0])),
         },
         {
             component: ToggleTrashAction,
-            name: 'ToggleTrashAction',
-            // execute: (dispatch, resource) => {
+            name: "ToggleTrashAction",
             execute: (dispatch, resources: ContextMenuResource[]) => {
-                resources.forEach((resource) => dispatch<any>(toggleCollectionTrashed(resource.uuid, resource.isTrashed!!)));
+                resources.forEach(resource => dispatch<any>(toggleCollectionTrashed(resource.uuid, resource.isTrashed!!)));
             },
         },
     ],
@@ -138,9 +137,9 @@ export const collectionAdminActionSet: ContextMenuActionSet = [
         ...collectionActionSet.reduce((prev, next) => prev.concat(next), []),
         {
             component: TogglePublicFavoriteAction,
-            name: 'TogglePublicFavoriteAction',
+            name: "TogglePublicFavoriteAction",
             execute: (dispatch, resources) => {
-                resources.forEach((resource) =>
+                resources.forEach(resource =>
                     dispatch<any>(togglePublicFavorite(resource)).then(() => {
                         dispatch<any>(publicFavoritePanelActions.REQUEST_ITEMS());
                     })
@@ -155,7 +154,7 @@ export const oldCollectionVersionActionSet: ContextMenuActionSet = [
         ...commonActionSet.reduce((prev, next) => prev.concat(next), []),
         {
             icon: RestoreVersionIcon,
-            name: 'Restore version',
+            name: "Restore version",
             execute: (dispatch, resources) => {
                 resources.forEach(({ uuid }) => dispatch<any>(openRestoreCollectionVersionDialog(uuid)));
             },

diff --git a/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
index 9ea1dc62a75f8a4e18a1f9efcbf4f87b22c9e659..d9ad424e3d34a09209ee88f8a66af5394891deae 100644 (file)
--- a/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
@@ -2,9 +2,9 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { ContextMenuActionSet } from '../context-menu-action-set';
-import { ToggleFavoriteAction } from '../actions/favorite-action';
-import { toggleFavorite } from 'store/favorites/favorites-actions';
+import { ContextMenuActionSet } from "../context-menu-action-set";
+import { ToggleFavoriteAction } from "../actions/favorite-action";
+import { toggleFavorite } from "store/favorites/favorites-actions";
 import {
     RenameIcon,
     ShareIcon,
@@ -15,27 +15,27 @@ import {
     OutputIcon,
     AdvancedIcon,
     OpenIcon,
-} from 'components/icon/icon';
-import { favoritePanelActions } from 'store/favorite-panel/favorite-panel-action';
-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 { openSharingDialog } from 'store/sharing-dialog/sharing-dialog-actions';
-import { openRemoveProcessDialog } from 'store/processes/processes-actions';
-import { toggleDetailsPanel } from 'store/details-panel/details-panel-action';
-import { navigateToOutput } from 'store/process-panel/process-panel-actions';
-import { openAdvancedTabDialog } from 'store/advanced-tab/advanced-tab';
-import { TogglePublicFavoriteAction } from '../actions/public-favorite-action';
-import { togglePublicFavorite } from 'store/public-favorites/public-favorites-actions';
-import { publicFavoritePanelActions } from 'store/public-favorites-panel/public-favorites-action';
-import { openInNewTabAction } from 'store/open-in-new-tab/open-in-new-tab.actions';
+} from "components/icon/icon";
+import { favoritePanelActions } from "store/favorite-panel/favorite-panel-action";
+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 { openSharingDialog } from "store/sharing-dialog/sharing-dialog-actions";
+import { openRemoveProcessDialog } from "store/processes/processes-actions";
+import { toggleDetailsPanel } from "store/details-panel/details-panel-action";
+import { navigateToOutput } from "store/process-panel/process-panel-actions";
+import { openAdvancedTabDialog } from "store/advanced-tab/advanced-tab";
+import { TogglePublicFavoriteAction } from "../actions/public-favorite-action";
+import { togglePublicFavorite } from "store/public-favorites/public-favorites-actions";
+import { publicFavoritePanelActions } from "store/public-favorites-panel/public-favorites-action";
+import { openInNewTabAction } from "store/open-in-new-tab/open-in-new-tab.actions";
 
 export const readOnlyProcessResourceActionSet: ContextMenuActionSet = [
     [
         {
             component: ToggleFavoriteAction,
             execute: (dispatch, resources) => {
-                resources.forEach((resource) =>
+                resources.forEach(resource =>
                     dispatch<any>(toggleFavorite(resource)).then(() => {
                         dispatch<any>(favoritePanelActions.REQUEST_ITEMS());
                     })
@@ -44,23 +44,23 @@ export const readOnlyProcessResourceActionSet: ContextMenuActionSet = [
         },
         {
             icon: OpenIcon,
-            name: 'Open in new tab',
+            name: "Open in new tab",
             execute: (dispatch, resources) => {
-                resources.forEach((resource) => dispatch<any>(openInNewTabAction(resource)));
+                resources.forEach(resource => dispatch<any>(openInNewTabAction(resource)));
             },
         },
         {
             icon: ReRunProcessIcon,
-            name: 'Copy and re-run process',
+            name: "Copy and re-run process",
             execute: (dispatch, resources) => {
-                resources.forEach((resource) => dispatch<any>(openCopyProcessDialog(resource)));
+                resources.forEach(resource => dispatch<any>(openCopyProcessDialog(resource)));
             },
         },
         {
             icon: OutputIcon,
-            name: 'Outputs',
+            name: "Outputs",
             execute: (dispatch, resources) => {
-                resources.forEach((resource) => {
+                resources.forEach(resource => {
                     if (resource.outputUuid) {
                         dispatch<any>(navigateToOutput(resource.outputUuid));
                     }
@@ -69,16 +69,16 @@ export const readOnlyProcessResourceActionSet: ContextMenuActionSet = [
         },
         {
             icon: DetailsIcon,
-            name: 'View details',
-            execute: (dispatch) => {
+            name: "View details",
+            execute: dispatch => {
                 dispatch<any>(toggleDetailsPanel());
             },
         },
         {
             icon: AdvancedIcon,
-            name: 'API Details',
+            name: "API Details",
             execute: (dispatch, resources) => {
-                resources.forEach((resource) => dispatch<any>(openAdvancedTabDialog(resource.uuid)));
+                resources.forEach(resource => dispatch<any>(openAdvancedTabDialog(resource.uuid)));
             },
         },
     ],
@@ -89,30 +89,30 @@ export const processResourceActionSet: ContextMenuActionSet = [
         ...readOnlyProcessResourceActionSet.reduce((prev, next) => prev.concat(next), []),
         {
             icon: RenameIcon,
-            name: 'Edit process',
+            name: "Edit process",
             execute: (dispatch, resources) => {
-                resources.forEach((resource) => dispatch<any>(openProcessUpdateDialog(resource)));
+                resources.forEach(resource => dispatch<any>(openProcessUpdateDialog(resource)));
             },
         },
         {
             icon: ShareIcon,
-            name: 'Share',
+            name: "Share",
             execute: (dispatch, resources) => {
                 resources.forEach(({ uuid }) => dispatch<any>(openSharingDialog(uuid)));
             },
         },
         {
             icon: MoveToIcon,
-            name: 'Move to',
+            name: "Move to",
             execute: (dispatch, resources) => {
-                resources.forEach((resource) => dispatch<any>(openMoveProcessDialog(resource)));
+                dispatch<any>(openMoveProcessDialog(resources[0]));
             },
         },
         {
-            name: 'Remove',
+            name: "Remove",
             icon: RemoveIcon,
             execute: (dispatch, resources) => {
-                resources.forEach((resource) => dispatch<any>(openRemoveProcessDialog(resource.uuid)));
+                resources.forEach(resource => dispatch<any>(openRemoveProcessDialog(resource.uuid)));
             },
         },
     ],
@@ -123,9 +123,9 @@ export const processResourceAdminActionSet: ContextMenuActionSet = [
         ...processResourceActionSet.reduce((prev, next) => prev.concat(next), []),
         {
             component: TogglePublicFavoriteAction,
-            name: 'Add to public favorites',
+            name: "Add to public favorites",
             execute: (dispatch, resources) => {
-                resources.forEach((resource) =>
+                resources.forEach(resource =>
                     dispatch<any>(togglePublicFavorite(resource)).then(() => {
                         dispatch<any>(publicFavoritePanelActions.REQUEST_ITEMS());
                     })

diff --git a/src/views-components/context-menu/action-sets/project-action-set.ts b/src/views-components/context-menu/action-sets/project-action-set.ts
index 877c34b9357b200ad37b9d9fafe61e73a90463e3..9a4d924db8de3b193f9128090df2685e091fddd2 100644 (file)
--- a/src/views-components/context-menu/action-sets/project-action-set.ts
+++ b/src/views-components/context-menu/action-sets/project-action-set.ts
@@ -92,8 +92,8 @@ export const shareAction = {
 export const moveToAction = {
     icon: MoveToIcon,
     name: "Move to",
-    execute: (dispatch, resources) => {
-        dispatch(openMoveProjectDialog(resources));
+    execute: (dispatch, resource) => {
+        dispatch(openMoveProjectDialog(resource[0]));
     },
 };