Merge pull request #12843 from influxdata/feat/export-copy-button

Add copy button to export overlays
influxdata · Mar 22, 2019 · 9277a76 · 9277a76
2 parents 8196a00 + 95b005e
commit 9277a76
Show file tree

Hide file tree

Showing 14 changed files with 162 additions and 562 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 1. [12706](https://github.com/influxdata/influxdb/pull/12706): Add ability to add variable to script from the side menu.
 1. [12791](https://github.com/influxdata/influxdb/pull/12791): Use time range for metaqueries in Data Explorer and Cell Editor Overlay
 1. [12827](https://github.com/influxdata/influxdb/pull/12827): Fix screen tearing bug in Raw Data View
+1. [12843](https://github.com/influxdata/influxdb/pull/12843): Add copy to clipboard button to export overlays
 
 ### Bug Fixes
 

diff --git a/ui/src/dataLoaders/components/collectorsWizard/verify/VerifyCollectorsStep.tsx b/ui/src/dataLoaders/components/collectorsWizard/verify/VerifyCollectorsStep.tsx
@@ -32,7 +32,6 @@ export class VerifyCollectorStep extends PureComponent<Props> {
     const {
       telegrafConfigID,
       bucket,
-      notify,
       org,
       onDecrementCurrentStepIndex,
       onExit,
@@ -53,7 +52,6 @@ export class VerifyCollectorStep extends PureComponent<Props> {
           </div>
           <DataStreaming
             org={org}
-            notify={notify}
             bucket={bucket}
             token={token}
             configID={telegrafConfigID}

diff --git a/ui/src/dataLoaders/components/verifyStep/DataStreaming.tsx b/ui/src/dataLoaders/components/verifyStep/DataStreaming.tsx
@@ -9,11 +9,7 @@ import DataListening from 'src/dataLoaders/components/verifyStep/DataListening'
 // Decorator
 import {ErrorHandling} from 'src/shared/decorators/errors'
 
-// Types
-import {NotificationAction} from 'src/types'
-
 interface Props {
-  notify: NotificationAction
   bucket: string
   org: string
   configID: string
@@ -23,15 +19,11 @@ interface Props {
 @ErrorHandling
 class DataStreaming extends PureComponent<Props> {
   public render() {
-    const {token, configID, bucket, notify} = this.props
+    const {token, configID, bucket} = this.props
 
     return (
       <div className="streaming">
-        <TelegrafInstructions
-          notify={notify}
-          token={token}
-          configID={configID}
-        />
+        <TelegrafInstructions token={token} configID={configID} />
 
         <DataListening bucket={bucket} />
       </div>

diff --git a/ui/src/dataLoaders/components/verifyStep/TelegrafInstructions.test.tsx b/ui/src/dataLoaders/components/verifyStep/TelegrafInstructions.test.tsx
@@ -7,7 +7,6 @@ let wrapper
 
 const setup = (override = {}) => {
   const props = {
-    notify: jest.fn(),
     token: '',
     configID: '',
     ...override,

diff --git a/ui/src/dataLoaders/components/verifyStep/TelegrafInstructions.tsx b/ui/src/dataLoaders/components/verifyStep/TelegrafInstructions.tsx
@@ -8,19 +8,15 @@ import {ErrorHandling} from 'src/shared/decorators/errors'
 // Components
 import CodeSnippet from 'src/shared/components/CodeSnippet'
 
-// Types
-import {NotificationAction} from 'src/types'
-
 export interface Props {
-  notify: NotificationAction
   token: string
   configID: string
 }
 
 @ErrorHandling
 class TelegrafInstructions extends PureComponent<Props> {
   public render() {
-    const {notify, token, configID} = this.props
+    const {token, configID} = this.props
     const exportToken = `export INFLUX_TOKEN=${token || ''}`
     const configScript = `telegraf --config ${
       this.origin
@@ -46,13 +42,13 @@ class TelegrafInstructions extends PureComponent<Props> {
           copy the following command to your terminal window to set an
           environment variable with your token.
         </p>
-        <CodeSnippet copyText={exportToken} notify={notify} label="CLI" />
+        <CodeSnippet copyText={exportToken} label="CLI" />
         <h6>3. Start Telegraf</h6>
         <p>
           Finally, you can run the following command to start the Telegraf agent
           running on your machine.
         </p>
-        <CodeSnippet copyText={configScript} notify={notify} label="CLI" />
+        <CodeSnippet copyText={configScript} label="CLI" />
       </div>
     )
   }

diff --git a/ui/src/dataLoaders/components/verifyStep/__snapshots__/TelegrafInstructions.test.tsx.snap b/ui/src/dataLoaders/components/verifyStep/__snapshots__/TelegrafInstructions.test.tsx.snap
@@ -28,7 +28,6 @@ exports[`TelegrafInstructions matches snapshot 1`] = `
   <CodeSnippet
     copyText="export INFLUX_TOKEN="
     label="CLI"
-    notify={[MockFunction]}
   />
   <h6>
     3. Start Telegraf
@@ -39,7 +38,6 @@ exports[`TelegrafInstructions matches snapshot 1`] = `
   <CodeSnippet
     copyText="telegraf --config http://localhost/api/v2/telegrafs/"
     label="CLI"
-    notify={[MockFunction]}
   />
 </div>
 `;
diff --git a/ui/src/me/components/account/ViewTokenOverlay.test.tsx b/ui/src/me/components/account/ViewTokenOverlay.test.tsx
@@ -1,6 +1,6 @@
 // Libraries
 import React from 'react'
-import {mount} from 'enzyme'
+import {shallow} from 'enzyme'
 
 // Components
 import ViewTokenOverlay from 'src/me/components/account/ViewTokenOverlay'
@@ -14,7 +14,7 @@ const setup = (override?) => {
     ...override,
   }
 
-  const wrapper = mount(<ViewTokenOverlay {...props} />)
+  const wrapper = shallow(<ViewTokenOverlay {...props} />)
 
   return {wrapper}
 }

diff --git a/ui/src/me/components/account/ViewTokenOverlay.tsx b/ui/src/me/components/account/ViewTokenOverlay.tsx
@@ -25,15 +25,14 @@ interface Props {
 export default class ViewTokenOverlay extends PureComponent<Props> {
   public render() {
     const {description} = this.props.auth
-    const {onNotify} = this.props
 
     const permissions = this.permissions
 
     return (
       <Overlay.Container>
         <Overlay.Heading title={description} onDismiss={this.handleDismiss} />
         <Overlay.Body>
-          <CodeSnippet copyText={this.props.auth.token} notify={onNotify} />
+          <CodeSnippet copyText={this.props.auth.token} />
           <PermissionsWidget
             mode={PermissionsWidgetMode.Read}
             heightPixels={500}