Merge remote-tracking branch 'origin/main' into 19051-handle-quotes-in-search

[arvados-workbench2.git] / src / store / open-in-new-tab / open-in-new-tab.actions.ts

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 42bdc4ccfe5c25de8a33e277b0d34a4c81f24b98..c465aae8695a51291918aa0fd630e57fe8b327c6 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
@@ -2,27 +2,26 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
+import copy from 'copy-to-clipboard';
 import { Dispatch } from 'redux';
-import { ResourceKind } from '~/models/resource';
-import { unionize, ofType } from '~/common/unionize';
+import { getNavUrl } from 'routes/routes';
+import { RootState } from 'store/store';
 
-export const openInNewTabActions = unionize({
-    COPY_STORE: ofType<{}>(),
-    OPEN_COLLECTION_IN_NEW_TAB: ofType<string>(),
-    OPEN_PROJECT_IN_NEW_TAB: ofType<string>()
-});
+export const openInNewTabAction = (resource: any) => (dispatch: Dispatch, getState: () => RootState) => {
+    const url = getNavUrl(resource.uuid, getState().auth);
 
-export const openInNewTabAction = (resource: any) => (dispatch: Dispatch) => {
-    const { uuid, kind } = resource;
+    if (url[0] === '/') {
+        window.open(`${window.location.origin}${url}`, '_blank');
+    } else if (url.length) {
+        window.open(url, '_blank');
+    }
+};
 
-    dispatch(openInNewTabActions.COPY_STORE());
+export const copyToClipboardAction = (resource: any) => (dispatch: Dispatch, getState: () => RootState) => {
+    // Copy to clipboard omits token to avoid accidental sharing
+    const url = getNavUrl(resource.uuid, getState().auth, false);
 
-    if (kind === ResourceKind.COLLECTION) {
-        dispatch(openInNewTabActions.OPEN_COLLECTION_IN_NEW_TAB(uuid));
-    }
-    if (kind === ResourceKind.PROJECT) {
-        dispatch(openInNewTabActions.OPEN_PROJECT_IN_NEW_TAB(uuid));
+    if (url) {
+        copy(url);
     }
-
-    console.log(uuid);
-};
\ No newline at end of file
+};