fix(ui): update ui telegraf orgID

influxdata · Jun 3, 2019 · fe01f36 · fe01f36
1 parent 18a0f3f
commit fe01f36
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 19 deletions.
diff --git a/ui/cypress/support/commands.ts b/ui/cypress/support/commands.ts
@@ -246,7 +246,7 @@ export const createScraper = (
 export const createTelegraf = (
   name?: string,
   description?: string,
-  organizationID?: string
+  orgID?: string
 ): Cypress.Chainable<Cypress.Response> => {
   return cy.request({
     method: 'POST',
@@ -256,7 +256,7 @@ export const createTelegraf = (
       description,
       agent: {collectionInterval: 10000},
       plugins: [],
-      organizationID,
+      orgID,
     },
   })
 }

diff --git a/ui/mocks/dummyData.ts b/ui/mocks/dummyData.ts
@@ -410,7 +410,7 @@ export const influxDB2Plugin = {
 
 export const telegrafConfig = {
   id: telegrafConfigID,
-  organizationID: '1',
+  orgID: '1',
   name: 'in n out',
   created: '2018-11-28T18:56:48.854337-08:00',
   lastModified: '2018-11-28T18:56:48.854337-08:00',
@@ -500,8 +500,7 @@ export const bucket = {
     self: '/api/v2/buckets/034a10d6f7a6b000',
   },
   id: '034a10d6f7a6b000',
-  organizationID: '034a0adc49a6b000',
-  organization: 'default',
+  orgID: '034a0adc49a6b000',
   name: 'newbuck',
   retentionRules: [],
   labels: [],
@@ -516,8 +515,7 @@ export const buckets = [
       self: '/api/v2/buckets/034a10d6f7a6b000',
     },
     id: '034a10d6f7a6b000',
-    organizationID: '034a0adc49a6b000',
-    organization: 'default',
+    orgID: '034a0adc49a6b000',
     name: 'newbuck',
     retentionRules: [],
     labels: [],
@@ -530,8 +528,7 @@ export const buckets = [
       self: '/api/v2/buckets/034a10d6f7a6b000',
     },
     id: '034a10d6f7a6b001',
-    organizationID: '034a0adc49a6b000',
-    organization: 'default',
+    orgID: '034a0adc49a6b000',
     name: 'newbuck1',
     retentionRules: [],
     labels: [],
@@ -557,7 +554,6 @@ export const setSetupParamsResponse = {
       },
       id: '033bc62534fe3000',
       orgID: '033bc62534be3000',
-      organization: 'default',
       name: 'defbuck',
       retentionRules: [],
       labels: [],
@@ -652,12 +648,12 @@ export const telegraf = [
   {
     id: '03636a150fb51000',
     name: 'Name this Configuration',
-    organizationID: '03636a0aabb51000',
+    orgID: '03636a0aabb51000',
   },
   {
     id: '03636a150fb51001',
     name: 'Name this Configuration',
-    organizationID: '03636a0aabb51000',
+    orgID: '03636a0aabb51000',
   },
 ]
 

diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -140,7 +140,7 @@
   },
   "dependencies": {
     "@influxdata/clockface": "0.0.13",
-    "@influxdata/influx": "0.3.4",
+    "@influxdata/influx": "github:influxdata/influxdb2-js#telegraf_rename_orgID",
     "@influxdata/influxdb-templates": "influxdata/influxdb-templates",
     "@influxdata/react-custom-scrollbars": "4.3.8",
     "@influxdata/vis": "^0.9.0",

diff --git a/ui/src/dataLoaders/actions/dataLoaders.ts b/ui/src/dataLoaders/actions/dataLoaders.ts
@@ -402,7 +402,7 @@ const createTelegraf = async (dispatch, getState, plugins) => {
       name: telegrafConfigName,
       description: telegrafConfigDescription,
       agent: {collectionInterval: DEFAULT_COLLECTION_INTERVAL},
-      organizationID: org.id,
+      orgID: org.id,
       plugins,
     }
 

diff --git a/ui/src/telegrafs/components/__snapshots__/Collectors.test.tsx.snap b/ui/src/telegrafs/components/__snapshots__/Collectors.test.tsx.snap
@@ -24,7 +24,7 @@ exports[`CollectorList rendering renders 1`] = `
           Object {
             "id": "03636a150fb51000",
             "name": "Name this Configuration",
-            "organizationID": "03636a0aabb51000",
+            "orgID": "03636a0aabb51000",
           }
         }
         key="03636a150fb51000"
@@ -37,7 +37,7 @@ exports[`CollectorList rendering renders 1`] = `
           Object {
             "id": "03636a150fb51001",
             "name": "Name this Configuration",
-            "organizationID": "03636a0aabb51000",
+            "orgID": "03636a0aabb51000",
           }
         }
         key="03636a150fb51001"