Merge pull request #12524 from influxdata/feat/org-import-dashboard

feat(ui/dash): Add import dashboard button to org view
influxdata · Mar 11, 2019 · da48330 · da48330
2 parents 9216528 + 5850dac
commit da48330
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,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
 
 ### Bug Fixes
 

diff --git a/ui/src/organizations/components/Dashboards.tsx b/ui/src/organizations/components/Dashboards.tsx
@@ -7,8 +7,9 @@ import _ from 'lodash'
 // Components
 import DashboardsIndexContents from 'src/dashboards/components/dashboard_index/DashboardsIndexContents'
 import {Input, Tabs} from 'src/clockface'
-import {Button, ComponentColor, IconFont} from '@influxdata/clockface'
+import {IconFont} from '@influxdata/clockface'
 import ImportDashboardOverlay from 'src/dashboards/components/ImportDashboardOverlay'
+import AddResourceDropdown from 'src/shared/components/AddResourceDropdown'
 
 // APIs
 import {createDashboard, cloneDashboard} from 'src/dashboards/apis/v2/'
@@ -112,12 +113,10 @@ class Dashboards extends PureComponent<Props, State> {
             testID={`dashboards--filter-field ${searchTerm}`}
             customClass="filter-dashboards"
           />
-          <Button
-            color={ComponentColor.Primary}
-            onClick={this.handleCreateDashboard}
-            icon={IconFont.Plus}
-            text="Create Dashboard"
-            titleText="Create a new dashboard"
+          <AddResourceDropdown
+            onSelectNew={this.handleCreateDashboard}
+            onSelectImport={this.handleToggleOverlay}
+            resourceName="Dashboard"
           />
         </Tabs.TabContentsHeader>
         <DashboardsIndexContents