Merge pull request #12531 from influxdata/feat/remove-dash-export-fea…

…ture-flag feat(ui): Show dashboard and template export buttons
influxdata · Mar 12, 2019 · b9808ed · b9808ed
2 parents 947aade + d0a76dd
commit b9808ed
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### Features
 1. [12496](https://github.com/influxdata/influxdb/pull/12496): Add ability to import a dashboard
 1. [12524](https://github.com/influxdata/influxdb/pull/12524): Add ability to import a dashboard from org view
+1. [12531](https://github.com/influxdata/influxdb/pull/12531): Add ability to export a dashboard and a task
 
 ### Bug Fixes
 

diff --git a/ui/src/dashboards/components/dashboard_index/DashboardCard.tsx b/ui/src/dashboards/components/dashboard_index/DashboardCard.tsx
@@ -6,7 +6,6 @@ import {withRouter, WithRouterProps} from 'react-router'
 // Components
 import {IconFont, ComponentColor} from '@influxdata/clockface'
 import {ResourceList, Context} from 'src/clockface'
-import FeatureFlag from 'src/shared/components/FeatureFlag'
 import InlineLabels from 'src/shared/components/inlineLabels/InlineLabels'
 
 // Actions
@@ -98,15 +97,13 @@ class DashboardCard extends PureComponent<Props> {
 
     return (
       <Context>
-        <FeatureFlag>
-          <Context.Menu icon={IconFont.CogThick}>
-            <Context.Item
-              label="Export"
-              action={this.handleExport}
-              value={dashboard}
-            />
-          </Context.Menu>
-        </FeatureFlag>
+        <Context.Menu icon={IconFont.CogThick}>
+          <Context.Item
+            label="Export"
+            action={this.handleExport}
+            value={dashboard}
+          />
+        </Context.Menu>
         <Context.Menu
           icon={IconFont.Duplicate}
           color={ComponentColor.Secondary}
@@ -166,7 +163,7 @@ class DashboardCard extends PureComponent<Props> {
       // notify success
       return newLabel
     } catch (err) {
-      console.log(err)
+      console.error(err)
       // notify of fail
       throw err
     }

diff --git a/ui/src/tasks/components/TaskCard.tsx b/ui/src/tasks/components/TaskCard.tsx
@@ -6,7 +6,6 @@ import {withRouter, WithRouterProps} from 'react-router'
 // Components
 import {SlideToggle, ComponentSize} from '@influxdata/clockface'
 import {ResourceList, Context} from 'src/clockface'
-import FeatureFlag from 'src/shared/components/FeatureFlag'
 import InlineLabels from 'src/shared/components/inlineLabels/InlineLabels'
 
 // API
@@ -90,9 +89,7 @@ export class TaskCard extends PureComponent<Props & WithRouterProps> {
     return (
       <Context>
         <Context.Menu icon={IconFont.CogThick}>
-          <FeatureFlag>
-            <Context.Item label="Export" action={this.handleExport} />
-          </FeatureFlag>
+          <Context.Item label="Export" action={this.handleExport} />
           <Context.Item label="View Task Runs" action={this.handleViewRuns} />
           <Context.Item label="Run Task" action={onRunTask} value={task.id} />
         </Context.Menu>