feat: update maps to use the new proxy service endpoints (flagged) (#4397)

Author: Palakp41

.gitignore

@@ -28,14 +28,15 @@ yarn-error.log
 /public/test.*
 
 # oats generated routes
-src/client/generatedRoutes.ts
+src/client/annotationdRoutes.ts
 src/client/cloudPrivRoutes.ts
-src/client/unityRoutes.ts
 src/client/flowsRoutes.ts
-src/client/notebooksRoutes.ts
-src/client/annotationdRoutes.ts
-src/client/mapsdRoutes.ts
+src/client/fluxdocsdRoutes.ts
+src/client/generatedRoutes.ts
 src/client/managedFunctionsRoutes.ts
+src/client/mapsdRoutes.ts
+src/client/notebooksRoutes.ts
 src/client/pinnedItemRoutes.ts
-src/client/fluxdocsdRoutes.ts
-src/client/subscriptionsRoutes.ts
+src/client/subscriptionsRoutes.ts
+src/client/uiproxydRoutes.ts
+src/client/unityRoutes.ts

package.json

@@ -55,8 +55,8 @@
     "generate": "export SHA=b983e6ecc75f9b9852401e5585f2706890b10bb3 && export REMOTE=https://raw.githubusercontent.com/influxdata/openapi/${SHA}/ && yarn generate-meta",
     "generate-local": "export REMOTE=../openapi/ && yarn generate-meta",
     "generate-meta": "if [ -z \"${CLOUD_URL}\" ]; then yarn generate-meta-oss; else yarn generate-meta-cloud; fi",
-    "generate-meta-oss": "yarn oss-api && yarn notebooks && yarn unity && yarn annotations-oss && yarn pinned && yarn mapsd-oss && yarn cloudPriv && yarn fluxdocs && yarn subscriptions-oss",
-    "generate-meta-cloud": "yarn cloud-api && yarn notebooks && yarn unity && yarn annotations && yarn cloudPriv && yarn pinned && yarn mapsd && yarn fluxdocs && yarn subscriptions",
+    "generate-meta-oss": "yarn oss-api && yarn notebooks && yarn unity && yarn annotations-oss && yarn pinned && yarn mapsd-oss && yarn uiproxyd-oss && yarn cloudPriv && yarn fluxdocs && yarn subscriptions-oss",
+    "generate-meta-cloud": "yarn cloud-api && yarn notebooks && yarn unity && yarn annotations && yarn cloudPriv && yarn pinned && yarn mapsd && yarn uiproxyd && yarn fluxdocs && yarn subscriptions",
     "oss": "oats ${REMOTE}contracts/oss-diff.yml > ./src/client/ossRoutes.ts",
     "cloud": "oats ${REMOTE}contracts/cloud-diff.yml > ./src/client/cloudRoutes.ts",
     "common": "oats ${REMOTE}contracts/common.yml > ./src/client/commonRoutes.ts",
@@ -69,6 +69,8 @@
     "annotations-oss": "oats ${REMOTE}contracts/priv/annotationd-oss.yml > ./src/client/annotationdRoutes.ts",
     "mapsd-oss": "touch ./src/client/mapsdRoutes.ts",
     "mapsd": "oats ${REMOTE}contracts/mapsd.yml > ./src/client/mapsdRoutes.ts",
+    "uiproxyd-oss": "touch ./src/client/uiproxydRoutes.ts",
+    "uiproxyd": "oats ${REMOTE}contracts/uiproxyd.yml > ./src/client/uiproxydRoutes.ts",
     "subscriptions": "oats ${REMOTE}contracts/priv/nifid.yml > ./src/client/subscriptionsRoutes.ts",
     "subscriptions-oss": "touch ./src/client/subscriptionsRoutes.ts",
     "pinned": "oats ${REMOTE}contracts/priv/pinneditemsd.yml > ./src/client/pinnedItemRoutes.ts",

src/visualization/types/Map/view.test.tsx

@@ -1,3 +1,15 @@
+jest.mock(
+  'src/client/uiproxydRoutes',
+  () => {
+    return {
+      getMapToken: () => ({
+        token: 'token',
+      }),
+    }
+  },
+  {virtual: true}
+)
+
 jest.mock(
   'src/client/mapsdRoutes',
   () => {
@@ -48,7 +60,7 @@ jest.mock('src/shared/constants/index', () => ({
 describe('Map component renders', () => {
   it('returns with helpful error message when map service is down', () => {
     jest.mock(
-      'src/client/mapsdRoutes',
+      'src/client/uiproxydRoutes',
       () => {
         throw new Error('Service Unavailable')
       },

src/visualization/types/Map/view.tsx

@@ -11,10 +11,15 @@ import {VisualizationProps} from 'src/visualization'
 import {getGeoCoordinates} from 'src/shared/utils/vis'
 import {event} from 'src/cloud/utils/reporting'
 import {CLOUD} from 'src/shared/constants'
+import {isFlagEnabled} from 'src/shared/utils/featureFlag'
+
 let getMapToken = null
 
 if (CLOUD) {
   getMapToken = require('src/client/mapsdRoutes').getMapToken
+  if (isFlagEnabled('uiproxyd')) {
+    getMapToken = require('src/client/uiproxydRoutes').getMapToken
+  }
 }
 
 interface Props extends VisualizationProps {