21448: expanded copy to oclipboard change Arvados-DCO-1.1-Signed-off-by: Lisa Knox...

diff --git a/services/workbench2/cypress/e2e/collection.cy.js b/services/workbench2/cypress/e2e/collection.cy.js
index 9c25f48f58eb87d67b5878f50cd7c316ac13761e..3a5cc27ec548fd335f60c599504ea3e15c8706f8 100644 (file)
--- a/services/workbench2/cypress/e2e/collection.cy.js
+++ b/services/workbench2/cypress/e2e/collection.cy.js
@@ -32,7 +32,7 @@ describe("Collection panel tests", function () {
         const msButtonTooltips = [
             'API Details',
             'Add to favorites',
-            'Copy to clipboard',
+            'Copy link to clipboard',
             'Edit collection',
             'Make a copy',
             'Move to',
@@ -351,7 +351,7 @@ describe("Collection panel tests", function () {
                             cy.get("[data-cy=context-menu]")
                                 .should("contain", "Download")
                                 .and("contain", "Open in new tab")
-                                .and("contain", "Copy to clipboard")
+                                .and("contain", "Copy link to clipboard")
                                 .and(`${isWritable ? "" : "not."}contain`, "Rename")
                                 .and(`${isWritable ? "" : "not."}contain`, "Remove");
                             cy.get("body").click(); // Collapse the menu
@@ -359,7 +359,7 @@ describe("Collection panel tests", function () {
                             cy.get("[data-cy=context-menu]")
                                 .should("not.contain", "Download")
                                 .and("contain", "Open in new tab")
-                                .and("contain", "Copy to clipboard")
+                                .and("contain", "Copy link to clipboard")
                                 .and(`${isWritable ? "" : "not."}contain`, "Rename")
                                 .and(`${isWritable ? "" : "not."}contain`, "Remove");
                             cy.get("body").click(); // Collapse the menu

diff --git a/services/workbench2/cypress/e2e/project.cy.js b/services/workbench2/cypress/e2e/project.cy.js
index 4b38fe6d929e6624c9897149e767675d1de2a561..912e765a88b2558de9cd1cfd27a5fa9d1e5251be 100644 (file)
--- a/services/workbench2/cypress/e2e/project.cy.js
+++ b/services/workbench2/cypress/e2e/project.cy.js
@@ -221,7 +221,7 @@ describe("Project tests", function () {
         const msButtonTooltips = [
             'API Details',
             'Add to favorites',
-            'Copy to clipboard',
+            'Copy link to clipboard',
             'Edit project',
             'Freeze project',
             'Move to',
@@ -636,7 +636,7 @@ describe("Project tests", function () {
         cy.get("[data-cy=side-panel-tree]").contains("Projects").click();
         cy.waitForDom();
         cy.get("[data-cy=project-panel]").contains(projectName).should("be.visible").rightclick();
-        cy.get("[data-cy=context-menu]").contains("Copy to clipboard").click();
+        cy.get("[data-cy=context-menu]").contains("Copy link to clipboard").click();
         cy.window().then(win =>
             win.navigator.clipboard.readText().then(text => {
                 expect(text).to.match(/https\:\/\/127\.0\.0\.1\:[0-9]+\/projects\/[a-z0-9]{5}-[a-z0-9]{5}-[a-z0-9]{15}/);

diff --git a/services/workbench2/cypress/e2e/search.cy.js b/services/workbench2/cypress/e2e/search.cy.js
index ba9077ac2065a78c9a37ecf2a0ed73007112fde9..094a3f618c64c1502b66f2227eef6ca7c192c65e 100644 (file)
--- a/services/workbench2/cypress/e2e/search.cy.js
+++ b/services/workbench2/cypress/e2e/search.cy.js
@@ -271,17 +271,17 @@ describe("Search tests", function () {
                 cy.stub(win, "open").as("Open");
             });
 
-            // Check copy to clipboard
+            // Check Copy link to clipboard
             cy.get("[data-cy=search-results]").contains(colName).rightclick();
             cy.get("[data-cy=context-menu]").within(ctx => {
                 // Check that there are 4 items in the menu
                 cy.get(ctx).children().should("have.length", 4);
                 cy.contains("API Details");
-                cy.contains("Copy to clipboard");
+                cy.contains("Copy link to clipboard");
                 cy.contains("Open in new tab");
                 cy.contains("View details");
 
-                cy.contains("Copy to clipboard").click();
+                cy.contains("Copy link to clipboard").click();
                 cy.waitForDom();
                 cy.window().then(win =>
                     win.navigator.clipboard.readText().then(text => {
@@ -298,10 +298,10 @@ describe("Search tests", function () {
                 cy.get("@Open").should("have.been.calledOnceWith", `${window.location.origin}/collections/${testCollection.uuid}`);
             });
 
-            // Check federated result copy to clipboard
+            // Check federated result Copy link to clipboard
             cy.get("[data-cy=search-results]").contains(federatedColName).rightclick();
             cy.get("[data-cy=context-menu]").within(() => {
-                cy.contains("Copy to clipboard").click();
+                cy.contains("Copy link to clipboard").click();
                 cy.waitForDom();
                 cy.window().then(win =>
                     win.navigator.clipboard.readText().then(text => {

diff --git a/services/workbench2/cypress/e2e/workflow.cy.js b/services/workbench2/cypress/e2e/workflow.cy.js
index c6c49ee34325b294b2f0e17bcfe09058cf562401..f0c91a772220481c662fbd4c4aae4852f1299813 100644 (file)
--- a/services/workbench2/cypress/e2e/workflow.cy.js
+++ b/services/workbench2/cypress/e2e/workflow.cy.js
@@ -270,7 +270,7 @@ describe('Registered workflow panel tests', function() {
 
         const msButtonTooltips = [
             'API Details',
-            'Copy to clipboard',
+            'Copy link to clipboard',
             'Delete Workflow',
             'Open in new tab',
             'Run Workflow',

diff --git a/services/workbench2/src/components/copy-to-clipboard-snackbar/copy-to-clipboard-snackbar.tsx b/services/workbench2/src/components/copy-to-clipboard-snackbar/copy-to-clipboard-snackbar.tsx
index 3ef483dfe03faf63edd24fa3f02ff322e16110c4..13e653176607bc0b133575bd7aa791bc1a329d8f 100644 (file)
--- a/services/workbench2/src/components/copy-to-clipboard-snackbar/copy-to-clipboard-snackbar.tsx
+++ b/services/workbench2/src/components/copy-to-clipboard-snackbar/copy-to-clipboard-snackbar.tsx
@@ -48,7 +48,7 @@ export const CopyToClipboardSnackbar = connect()(
             render() {
                 const { children, value, classes } = this.props;
                 return (
-                    <Tooltip title='Copy to clipboard' onClick={(ev) => ev.stopPropagation()}>
+                    <Tooltip title='Copy link to clipboard' onClick={(ev) => ev.stopPropagation()}>
                         <span className={classes.copyIcon}>
                             <CopyToClipboard text={value} onCopy={this.onCopy}>
                                 {children || <CopyIcon />}

diff --git a/services/workbench2/src/components/details-attribute/details-attribute.tsx b/services/workbench2/src/components/details-attribute/details-attribute.tsx
index 5130db56d1f96314b1e9be12d17cb7aa7c883c55..1f1996424c760377653ca64ee0fff99d153264ef 100644 (file)
--- a/services/workbench2/src/components/details-attribute/details-attribute.tsx
+++ b/services/workbench2/src/components/details-attribute/details-attribute.tsx
@@ -124,7 +124,7 @@ export const DetailsAttributeComponent = withStyles(styles)(
                 className={classnames([props.classes.value, props.classValue, { [props.classes.lowercaseValue]: props.lowercaseValue }])}>
                 {props.value}
                 {props.children}
-                {(props.linkToUuid || props.copyValue) && props.onCopy && <Tooltip title="Copy to clipboard">
+                {(props.linkToUuid || props.copyValue) && props.onCopy && <Tooltip title="Copy link to clipboard">
                     <span className={props.classes.copyIcon}>
                         <CopyToClipboard text={props.linkToUuid || props.copyValue || ""} onCopy={() => props.onCopy!("Copied")}>
                             <CopyIcon />

diff --git a/services/workbench2/src/store/open-in-new-tab/open-in-new-tab.actions.ts b/services/workbench2/src/store/open-in-new-tab/open-in-new-tab.actions.ts
index 28da3cf95ab968c62e6d6dd06f956f31e231b97f..2d1ab2e40d450eb49788eb7f79ec0bb3b995cfbc 100644 (file)
--- a/services/workbench2/src/store/open-in-new-tab/open-in-new-tab.actions.ts
+++ b/services/workbench2/src/store/open-in-new-tab/open-in-new-tab.actions.ts
@@ -19,7 +19,7 @@ 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
+    // Copy link to clipboard omits token to avoid accidental sharing
 
     let url = getNavUrl(resources[0].uuid, getState().auth, false);
     let wasCopied;

diff --git a/services/workbench2/src/views-components/context-menu/actions/copy-to-clipboard-action.tsx b/services/workbench2/src/views-components/context-menu/actions/copy-to-clipboard-action.tsx
index 50ed20fd7fb01d2dc0f0cacb8850bbc5bfcec71d..7b6501dc2ec015c69b98bde83d2ef0dcaa980047 100644 (file)
--- a/services/workbench2/src/views-components/context-menu/actions/copy-to-clipboard-action.tsx
+++ b/services/workbench2/src/views-components/context-menu/actions/copy-to-clipboard-action.tsx
@@ -26,7 +26,7 @@ export const CopyToClipboardAction = (props: { href?: any, download?: any, onCli
                 <Link />
             </ListItemIcon>
             <ListItemText>
-                Copy to clipboard
+                Copy link to clipboard
             </ListItemText>
         </ListItem>
         : null;

diff --git a/services/workbench2/src/views-components/sharing-dialog/sharing-urls-component.tsx b/services/workbench2/src/views-components/sharing-dialog/sharing-urls-component.tsx
index c17fadd5f09a88c16f183642fbc656752162454f..7bb05fa0dcea0887e7fc8a19794d5c580e445455 100644 (file)
--- a/services/workbench2/src/views-components/sharing-dialog/sharing-urls-component.tsx
+++ b/services/workbench2/src/views-components/sharing-dialog/sharing-urls-component.tsx
@@ -78,7 +78,7 @@ export const SharingURLsComponent = withStyles(styles)((props: SharingURLsCompon
                     </Grid>
                     <Grid item xs />
                     <Grid item>
-                        <span className={props.classes.sharingUrlButton}><Tooltip title='Copy to clipboard'>
+                        <span className={props.classes.sharingUrlButton}><Tooltip title='Copy link to clipboard'>
                             <CopyToClipboard text={url} onCopy={() => props.onCopy('Sharing URL copied')}>
                                 <CopyIcon />
                             </CopyToClipboard>

diff --git a/services/workbench2/src/views-components/token-dialog/token-dialog.test.tsx b/services/workbench2/src/views-components/token-dialog/token-dialog.test.tsx
index 400bb1e68724d88d58b0f42819d930755432dc1f..ec68beab9da81f3a63de20a07ca8a53d8603cb5c 100644 (file)
--- a/services/workbench2/src/views-components/token-dialog/token-dialog.test.tsx
+++ b/services/workbench2/src/views-components/token-dialog/token-dialog.test.tsx
@@ -88,7 +88,7 @@ describe('<CurrentTokenDialog />', () => {
     });
   });
 
-  describe('copy to clipboard button', () => {
+  describe('Copy link to clipboard button', () => {
     beforeEach(() => {
       wrapper = mount(
         <Provider store={store}>

diff --git a/services/workbench2/src/views-components/token-dialog/token-dialog.tsx b/services/workbench2/src/views-components/token-dialog/token-dialog.tsx
index e6f3ed582ccd537ef40ba6ed74f548ae3312dc82..ad1093d7e58ecf881eca34c5c7c75097840732a9 100644 (file)
--- a/services/workbench2/src/views-components/token-dialog/token-dialog.tsx
+++ b/services/workbench2/src/views-components/token-dialog/token-dialog.tsx
@@ -140,7 +140,7 @@ unset ARVADOS_API_HOST_INSECURE`
                         variant="contained"
                         className={classes.actionButton}
                     >
-                        COPY TO CLIPBOARD
+                        Copy link to clipBOARD
                     </Button>
                 </CopyToClipboard>
                 <Typography>

diff --git a/services/workbench2/src/views/process-panel/process-cmd-card.tsx b/services/workbench2/src/views/process-panel/process-cmd-card.tsx
index d8368449cbad9902f818d379c0270d781b19070d..478b0bc56fb76cc15169516d061f8094a90804ff 100644 (file)
--- a/services/workbench2/src/views/process-panel/process-cmd-card.tsx
+++ b/services/workbench2/src/views/process-panel/process-cmd-card.tsx
@@ -100,7 +100,7 @@ export const ProcessCmdCard = withStyles(styles)(
           action={
             <Grid container direction="row" alignItems="center">
               <Grid item>
-                <Tooltip title="Copy to clipboard" disableFocusListener>
+                <Tooltip title="Copy link to clipboard" disableFocusListener>
                   <IconButton>
                     <CopyToClipboard
                       text={command.join(" ")}

diff --git a/services/workbench2/src/views/process-panel/process-log-card.tsx b/services/workbench2/src/views/process-panel/process-log-card.tsx
index 4fd8f2343d88b5a8b3356c4b0f53987da3f10cb4..b141abf24c5bf0d4b16359933a1a8a0d38ea460e 100644 (file)
--- a/services/workbench2/src/views/process-panel/process-log-card.tsx
+++ b/services/workbench2/src/views/process-panel/process-log-card.tsx
@@ -131,7 +131,7 @@ export const ProcessLogsCard = withStyles(styles)(
                             </Tooltip>
                         </Grid>
                         <Grid item>
-                            <Tooltip title="Copy to clipboard" disableFocusListener>
+                            <Tooltip title="Copy link to clipboard" disableFocusListener>
                                 <IconButton>
                                     <CopyToClipboard text={lines.join()} onCopy={() => onCopy("Log copied to clipboard")}>
                                         <CopyIcon />

diff --git a/services/workbench2/src/views/virtual-machine-panel/virtual-machine-user-panel.tsx b/services/workbench2/src/views/virtual-machine-panel/virtual-machine-user-panel.tsx
index 36d432f95a98ed7a2222be97a5f9e445c09ac347..ae365ce0a91bc0cd05db6b8c4f5e82592096926b 100644 (file)
--- a/services/workbench2/src/views/virtual-machine-panel/virtual-machine-user-panel.tsx
+++ b/services/workbench2/src/views/virtual-machine-panel/virtual-machine-user-panel.tsx
@@ -238,7 +238,7 @@ const virtualMachinesTable = (props: VirtualMachineProps) =>
                             </TableCell>
                             <TableCell>
                                 {command}
-                                <Tooltip title="Copy to clipboard">
+                                <Tooltip title="Copy link to clipboard">
                                     <span className={props.classes.copyIcon}>
                                         <CopyToClipboard text={command || ""} onCopy={() => props.onCopy!("Copied")}>
                                             <CopyIcon />