diff --git a/ui/package-lock.json b/ui/package-lock.json index 7ce0ec2575..947160a2f7 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -985,9 +985,9 @@ } }, "@influxdata/influx": { - "version": "0.2.26", - "resolved": "https://registry.npmjs.org/@influxdata/influx/-/influx-0.2.26.tgz", - "integrity": "sha512-Zmay0PLHHAATWbRu4uvit6pLDTwy54GlD/V6v1SzbfS1XswhbWZBNXMyALBSN/pWQ/6pafwdotKAK9MqH78Wrg==", + "version": "0.2.27", + "resolved": "https://registry.npmjs.org/@influxdata/influx/-/influx-0.2.27.tgz", + "integrity": "sha512-B00No54veQGtteUwEcc6/NSCL1bvgOhk3PeD8qPSkHiGHlPZjt3ae+F3sisVtJ4DDqqQTkZTKTyfuBjPX0LntA==", "requires": { "axios": "^0.18.0" } @@ -11029,7 +11029,7 @@ "dependencies": { "minimist": { "version": "0.0.10", - "resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", "dev": true }, diff --git a/ui/package.json b/ui/package.json index be5b95df43..837e0aaeff 100644 --- a/ui/package.json +++ b/ui/package.json @@ -137,7 +137,7 @@ }, "dependencies": { "@influxdata/clockface": "0.0.5", - "@influxdata/influx": "0.2.26", + "@influxdata/influx": "0.2.27", "@influxdata/react-custom-scrollbars": "4.3.8", "axios": "^0.18.0", "babel-polyfill": "^6.26.0", diff --git a/ui/src/protos/actions/index.ts b/ui/src/protos/actions/index.ts index dddaa96c47..95f16d5902 100644 --- a/ui/src/protos/actions/index.ts +++ b/ui/src/protos/actions/index.ts @@ -12,7 +12,7 @@ import {loadDashboard} from 'src/dashboards/actions/v2/' import {notify} from 'src/shared/actions/notifications' // Types -import {Proto, Dashboard} from '@influxdata/influx' +import {Proto, IDashboard} from '@influxdata/influx' import {GetState} from 'src/types/v2' import {ConfigurationState} from 'src/types/v2/dataLoaders' @@ -59,7 +59,7 @@ export const createDashFromProto = ( try { const dashboards = await client.dashboards.createFromProto(protoID, orgID) - dashboards.forEach((d: Dashboard) => { + dashboards.forEach((d: IDashboard) => { const updatedDashboard = { ...d, labels: d.labels.map(addLabelDefaults), diff --git a/ui/src/types/v2/dashboards.ts b/ui/src/types/v2/dashboards.ts index 0e3c6409a6..c86e32cfeb 100644 --- a/ui/src/types/v2/dashboards.ts +++ b/ui/src/types/v2/dashboards.ts @@ -1,9 +1,8 @@ import {HistogramPosition} from 'src/minard' import {Color} from 'src/types/colors' -import {Label} from 'src/types/v2/labels' import { - Dashboard as DashboardAPI, + IDashboard as DashboardAPI, View as ViewAPI, Cell as CellAPI, } from '@influxdata/influx' @@ -91,9 +90,8 @@ export interface Cell extends CellAPI { dashboardID: string } -export interface Dashboard extends Omit { +export interface Dashboard extends Omit { cells: Cell[] - labels: Label[] } type Omit = Pick>