fix: conform UI tests and mock data to new quartzOrgs data shape (#6132)

Author: wdoconnell

cypress/e2e/cloud/userProfile.test.ts

@@ -28,6 +28,9 @@ export const singleOrg = [
     name: 'single org',
     isDefault: true,
     isActive: true,
+    provider: 'AWS',
+    regionCode: 'us-east-1',
+    regionName: 'US East (N. Virginia)',
   },
 ]
 
@@ -37,12 +40,18 @@ export const multipleOrgs = [
     name: 'org 1 of 2',
     isDefault: true,
     isActive: true,
+    provider: 'Azure',
+    regionCode: 'westeurope',
+    regionName: 'Amsterdam',
   },
   {
     id: '2',
     name: 'org 2 of 2',
     isDefault: false,
     isActive: false,
+    provider: 'AWS', // Azure, AWS, GCP
+    regionCode: 'us-east-1',
+    regionName: 'US East (N. Virginia)',
   },
 ]
 

cypress/fixtures/multiOrgOrgs1.json

@@ -3,60 +3,90 @@
     "id": "9296169091c64567",
     "name": "Test Org 0",
     "isDefault": true,
-    "isActive": true
+    "isActive": true,
+    "provider": "AWS",
+    "regionCode": "us-east-1",
+    "regionName": "US East (N. Virginia)"
   },
   {
     "id": "a71ced2b8238902b",
     "name": "Test Org 1",
     "isDefault": false,
-    "isActive": false
+    "isActive": false,
+    "provider": "AWS",
+    "regionCode": "eu-central-1",
+    "regionName": "EU Frankfurt"
   },
   {
     "id": "ac3d3c04b8f1a545",
     "name": "Test Org 2",
     "isDefault": false,
-    "isActive": false
+    "isActive": false,
+    "provider": "AWS",
+    "regionCode": "us-east-1-2",
+    "regionName": "US East (N. Virginia) 2"
   },
   {
     "id": "fc734484afa0fcac",
     "name": "Test Org 3",
     "isDefault": false,
-    "isActive": false
+    "isActive": false,
+    "provider": "Azure",
+    "regionCode": "us-west-2-2",
+    "regionName": "US West (Oregon)"
   },
   {
     "id": "62cba0af4760ce02",
     "name": "Test Org 4",
     "isDefault": false,
-    "isActive": false
+    "isActive": false,
+    "provider": "Azure",
+    "regionCode": "westeurope",
+    "regionName": "Amsterdam"
   },
   {
     "id": "58fafbb4f68e05e5",
     "name": "Test Org 5",
     "isDefault": false,
-    "isActive": false
+    "isActive": false,
+    "provider": "Azure",
+    "regionCode": "eastus",
+    "regionName": "Virginia"
   },
   {
     "id": "3f3fd71611a4a0fe",
     "name": "Test Org 6",
     "isDefault": false,
-    "isActive": false
+    "isActive": false,
+    "provider": "GCP",
+    "regionCode": "eu-west1",
+    "regionName": "Belgium"
   },
   {
     "id": "1232a0085d2af2dd",
     "name": "Test Org 7",
     "isDefault": false,
-    "isActive": false
+    "isActive": false,
+    "provider": "GCP",
+    "regionCode": "us-central1",
+    "regionName": "Iowa"
   },
   {
     "id": "e337e5c5ee6439a2",
     "name": "Test Org 8",
     "isDefault": false,
-    "isActive": false
+    "isActive": false,
+    "provider": "GCP",
+    "regionCode": "us-central1-2",
+    "regionName": "Iowa"
   },
   {
     "id": "3b3ca09032853015",
     "name": "Test Org 9",
     "isDefault": false,
-    "isActive": false
+    "isActive": false,
+    "provider": "GCP",
+    "regionCode": "us-west1",
+    "regionName": "Oregon"
   }
 ]

package.json

@@ -52,7 +52,7 @@
     "cy": "CYPRESS_dexUrl=https://$INGRESS_HOST:$PORT_HTTPS CYPRESS_baseUrl=http://localhost:9999 cypress open",
     "cy:dev": "source ../monitor-ci/.env && CYPRESS_dexUrl=CLOUD CYPRESS_baseUrl=https://$INGRESS_HOST:$PORT_HTTPS cypress open --config testFiles='{cloud,shared}/**/*.*'",
     "cy:dev-oss": "source ../monitor-ci/.env && CYPRESS_dexUrl=OSS CYPRESS_baseUrl=https://$INGRESS_HOST:$PORT_HTTPS cypress open --config testFiles='{oss,shared}/**/*.*'",
-    "generate": "export SHA=4b8c02d04b82958996096a965b2e1c078f031763 && export REMOTE=https://raw.githubusercontent.com/influxdata/openapi/${SHA}/ && yarn generate-meta",
+    "generate": "export SHA=a570a0fa2a9fea8698250f5436f6eccb89c9061c && export REMOTE=https://raw.githubusercontent.com/influxdata/openapi/${SHA}/ && yarn generate-meta",
     "generate-local": "export REMOTE=../openapi/ && yarn generate-meta",
     "generate-local-cloud": "export REMOTE=../openapi/ && yarn generate-meta-cloud",
     "generate-meta": "if [ -z \"${CLOUD_URL}\" ]; then yarn generate-meta-oss; else yarn generate-meta-cloud; fi",

src/identity/components/GlobalHeader/DefaultEntities.tsx

@@ -14,4 +14,7 @@ export const emptyOrg: OrganizationSummaries[number] = {
   name: '',
   isActive: false,
   isDefault: false,
+  provider: '',
+  regionCode: '',
+  regionName: '',
 }

src/identity/quartzOrganizations/mockOrgData.ts

@@ -4,29 +4,44 @@ export const mockOrgData = [
     name: 'Test Co. 1',
     isDefault: true,
     isActive: true,
+    provider: 'AWS',
+    regionCode: 'us-east-1',
+    regionName: 'US East (N. Virginia)',
   },
   {
     id: 'a71ced2b8238902b',
     name: 'Test Corp. 2',
     isDefault: false,
     isActive: false,
+    provider: 'AWS',
+    regionCode: 'eu-central-1',
+    regionName: 'EU Frankfurt',
   },
   {
     id: 'ac3d3c04b8f1a545',
     name: 'Test GmbH 3',
     isDefault: false,
     isActive: false,
+    provider: 'AWS',
+    regionCode: 'us-east-1-2',
+    regionName: 'US East (N. Virginia) 2',
   },
   {
     id: 'fc734484afa0fcac',
     name: 'Test Inc. 4',
     isDefault: false,
     isActive: false,
+    provider: 'Azure',
+    regionCode: 'us-west-2-2',
+    regionName: 'US West (Oregon)',
   },
   {
     id: '62cba0af4760ce02',
     name: 'Test SA 5',
     isDefault: false,
     isActive: false,
+    provider: 'Azure',
+    regionCode: 'westeurope',
+    regionName: 'Amsterdam',
   },
 ]

src/identity/quartzOrganizations/reducers/index.ts

@@ -9,7 +9,6 @@ import {emptyOrg} from 'src/identity/components/GlobalHeader/DefaultEntities'
 import produce from 'immer'
 
 // Types
-
 import {OrganizationSummaries} from 'src/client/unityRoutes'
 import {RemoteDataState} from 'src/types'