Merge pull request #1889 from 4dn-dcic/copy_wrapper_updates

Add CopyWrapper for Access Key Id and Secret in Modal
4dn-dcic · May 24, 2024 · 2a17541 · 2a17541
2 parents b0ad8c9 + a686c72
commit 2a17541
Show file tree

Hide file tree

Showing 9 changed files with 129 additions and 248 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,12 @@ fourfront
 Change Log
 ----------
 
+7.5.2
+=====
+
+* adds two new props to object.CopyWrapper to allow/prevent sending analytics data into GA4
+
+
 7.5.1
 =====
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -107,7 +107,7 @@
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.4",
     "@hms-dbmi-bgm/react-workflow-viz": "0.1.7",
-    "@hms-dbmi-bgm/shared-portal-components": "git+https://github.com/4dn-dcic/shared-portal-components#0.1.83",
+    "@hms-dbmi-bgm/shared-portal-components": "git+https://github.com/4dn-dcic/shared-portal-components#0.1.84",
     "auth0-lock": "^11.33.1",
     "d3": "^7.5.0",
     "date-fns": "^2.28.0",

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.poetry]
 # Note: Various modules refer to this system as "encoded", not "fourfront".
 name = "encoded"
-version = "7.5.1"
+version = "7.5.2"
 description = "4DN-DCIC Fourfront"
 authors = ["4DN-DCIC Team <[email protected]>"]
 license = "MIT"

diff --git a/...d/static/components/browse/components/above-table-controls/SelectedFilesDownloadButton.js b/...d/static/components/browse/components/above-table-controls/SelectedFilesDownloadButton.js
@@ -292,7 +292,7 @@ const ModalCodeSnippet = React.memo(function ModalCodeSnippet(props){
     const plainValue = `cut -f 1 ${filename} | tail -n +3 | grep -v ^# | xargs -n 1 curl -O -L` + (session ? " --user <access_key_id>:<access_key_secret>" : '');
     return (
         <object.CopyWrapper value={plainValue} className="curl-command-wrapper" data-tip={'Click to copy'}
-            wrapperElement="div" iconProps={{ }}>
+            wrapperElement="div" iconProps={{ }} analyticsOnCopy maskAnalyticsValue={false}>
             {htmlValue}
         </object.CopyWrapper>
     );

diff --git a/src/encoded/static/components/item-pages/HiGlassViewConfigView.js b/src/encoded/static/components/item-pages/HiGlassViewConfigView.js
@@ -825,7 +825,8 @@ export class HiGlassViewConfigTabView extends React.PureComponent {
         const gridState = layout.responsiveGridState(windowWidth);
         const isMobile = gridState !== 'lg' && gridState !== 'xl';
         return (
-            <object.CopyWrapper data-tip="Copy view URL to clipboard to share with others." includeIcon={false} wrapperElement="button" value={href}>
+            <object.CopyWrapper data-tip="Copy view URL to clipboard to share with others." includeIcon={false} wrapperElement="button"
+                value={href} analyticsOnCopy maskAnalyticsValue={false}>
                 <i className="icon icon-fw icon-copy far"/>
                 {isMobile ?
                     <React.Fragment>

diff --git a/src/encoded/static/components/item-pages/UserView.js b/src/encoded/static/components/item-pages/UserView.js
@@ -148,15 +148,19 @@ class SyncedAccessKeyTable extends React.PureComponent {
                             Access Key ID
                         </div>
                         <div className="col-8">
-                            <code>{ access_key_id }</code>
+                            <object.CopyWrapper value={access_key_id} data-tip={'Click to copy'} className="d-inline-block"
+                                wrapperElement="div" iconProps={{}} analyticsOnCopy={false}><code>{access_key_id}</code>
+                            </object.CopyWrapper>
                         </div>
                     </div>
                     <div className="row mt-05">
                         <div className="col-4 text-600 text-right no-user-select">
                             Secret Access Key
                         </div>
                         <div className="col-8">
-                            <code>{ secret_access_key }</code>
+                            <object.CopyWrapper value={secret_access_key} data-tip={'Click to copy'} className="d-inline-block"
+                                wrapperElement="div" iconProps={{}} analyticsOnCopy={false}><code>{secret_access_key}</code>
+                            </object.CopyWrapper>
                         </div>
                     </div>
                 </Modal.Body>

diff --git a/src/encoded/static/components/item-pages/components/ItemHeader.js b/src/encoded/static/components/item-pages/components/ItemHeader.js
@@ -214,7 +214,8 @@ export class TopRow extends React.Component {
                         {typeInfoVisible ? this.typeInfoLabel() : null}
                         { typeInfoVisible && context.accession ?
                             <object.CopyWrapper value={context.accession} className="accession inline-block" data-tip={accessionTooltip}
-                                wrapperElement="span" iconProps={{ 'style': { 'fontSize': '0.875rem', 'marginLeft': -3 } }}>
+                                wrapperElement="span" iconProps={{ 'style': { 'fontSize': '0.875rem', 'marginLeft': -3 } }}
+                                analyticsOnCopy maskAnalyticsValue={true}>
                                 {context.accession}
                             </object.CopyWrapper>
                             : null}

diff --git a/src/encoded/static/components/static-pages/StaticPage.js b/src/encoded/static/components/static-pages/StaticPage.js
@@ -68,7 +68,7 @@ export const parseSectionsContent = memoize(function(context){
                             value={children}
                             className={(className || '') + " mt-2"}
                             wrapperElement="pre"
-                            whitespace={false}>
+                            whitespace={false} analyticsOnCopy maskAnalyticsValue={true}>
                             {children}
                         </object.CopyWrapper>
                     </div>