15768: fixed copytoclipboard from search results Arvados-DCO-1.1-Signed-off-by: Lisa...

diff --git a/src/components/multiselect-toolbar/ms-toolbar-action-filters.ts b/src/components/multiselect-toolbar/ms-toolbar-action-filters.ts
index 7b786e5928aa02d62e9dfa4b60eddd35a3788607..9145a820694c7196c2676209e47cff43e327ae2d 100644 (file)
--- a/src/components/multiselect-toolbar/ms-toolbar-action-filters.ts
+++ b/src/components/multiselect-toolbar/ms-toolbar-action-filters.ts
@@ -19,10 +19,10 @@ export const contextMenuActionConsts = {
     REMOVE: "Remove",
 };
 
-const { MOVE_TO, TOGGLE_TRASH_ACTION, COPY_TO_CLIPBOARD, REMOVE, MAKE_A_COPY } = contextMenuActionConsts;
+const { MOVE_TO, TOGGLE_TRASH_ACTION, REMOVE, MAKE_A_COPY } = contextMenuActionConsts;
 
 //these sets govern what actions are on the ms toolbar for each resource kind
-const projectMSActionsFilter = new Set([COPY_TO_CLIPBOARD, MOVE_TO, TOGGLE_TRASH_ACTION]);
+const projectMSActionsFilter = new Set([MOVE_TO, TOGGLE_TRASH_ACTION]);
 const processResourceMSActionsFilter = new Set([MOVE_TO, REMOVE]);
 const collectionMSActionsFilter = new Set([MAKE_A_COPY, MOVE_TO, TOGGLE_TRASH_ACTION]);
 

diff --git a/src/store/open-in-new-tab/open-in-new-tab.actions.ts b/src/store/open-in-new-tab/open-in-new-tab.actions.ts
index 7c6c2bb3a964c78192a06896e79885a825bf82de..83055e32fcbd3750e50b648c4166f6d618b469de 100644 (file)
--- a/src/store/open-in-new-tab/open-in-new-tab.actions.ts
+++ b/src/store/open-in-new-tab/open-in-new-tab.actions.ts
@@ -21,23 +21,20 @@ export const openInNewTabAction = (resource: any) => (dispatch: Dispatch, getSta
 export const copyToClipboardAction = (resources: Array<any>) => (dispatch: Dispatch, getState: () => RootState) => {
     // Copy to clipboard omits token to avoid accidental sharing
 
-    let output = "";
+    let url = getNavUrl(resources[0].uuid, getState().auth, false);
+    let wasCopied;
 
-    for (const resource of [...resources]) {
-        let url = getNavUrl(resource.uuid, getState().auth, false);
-        if (url[0] === "/") url = `${window.location.origin}${url}`;
-        output += output.length ? `,${url}` : url;
+    if (url[0] === "/") wasCopied = copy(`${window.location.origin}${url}`);
+    else if (url.length) {
+        wasCopied = copy(url);
     }
 
-    if (output.length) {
-        const wasCopied = copy(output);
-        if (wasCopied)
-            dispatch(
-                snackbarActions.OPEN_SNACKBAR({
-                    message: "Copied",
-                    hideDuration: 2000,
-                    kind: SnackbarKind.SUCCESS,
-                })
-            );
-    }
+    if (wasCopied)
+        dispatch(
+            snackbarActions.OPEN_SNACKBAR({
+                message: "Copied",
+                hideDuration: 2000,
+                kind: SnackbarKind.SUCCESS,
+            })
+        );
 };