Merge pull request #5903 from influxdata/jts-hotfix-influxdburls

hotfix(urls): Partially reverts the previous change for setting URLs …

Author: jstirnaman

assets/js/influxdb-url.js

@@ -18,7 +18,11 @@ import { context as PRODUCT_CONTEXT, referrerHost } from './page-context.js';
 import { delay } from './helpers.js';
 import { toggleModal } from './modals.js';
 
-export const CLOUD_URLS = Object.values(pageParams.influxdb_urls.cloud.providers).flatMap((provider) => provider.regions?.map((region) => region.url));
+let CLOUD_URLS = [];
+if (pageParams && pageParams.influxdb_urls) {
+  CLOUD_URLS = Object.values(pageParams.influxdb_urls.cloud.providers).flatMap((provider) => provider.regions?.map((region) => region.url));
+}
+export { CLOUD_URLS };
 
 export function InfluxDBUrl() {
   const UNIQUE_URL_PRODUCTS = ['dedicated', 'clustered'];
@@ -577,7 +581,7 @@ export function InfluxDBUrl() {
       removeCustomUrl();
       hideValidationMessage();
       $(
-        `input[name="influxdb-${PRODUCT_CONTEXT}-url"][value="${DEFAULT_URLS[PRODUCT_CONTEXT]}"]`
+        `input[name="influxdb-${PRODUCT_CONTEXT}-url"][value="${DEFAULT_STORAGE_URLS[PRODUCT_CONTEXT]}"]`
       ).trigger('click');
     }
   }

assets/js/local-storage.js

@@ -87,28 +87,25 @@ const defaultUrls = {};
 // Guard against pageParams being null/undefined and safely access nested properties
 if (pageParams && pageParams.influxdb_urls) {
   Object.entries(pageParams.influxdb_urls).forEach(([product, {providers}]) => {
-    // Use optional chaining and nullish coalescing to safely access properties
-    const defaultProvider = providers?.filter(provider => provider?.name === 'Default')[0];
-    const defaultRegion = defaultProvider?.regions?.[0];
-    defaultUrls[product] = defaultRegion?.url || '';
+  defaultUrls[product] = providers.filter(provider => provider.name === 'Default')[0]?.regions[0]?.url;
   });
 }
 
 export const DEFAULT_STORAGE_URLS = {
-  oss: defaultUrls.oss || '',
-  cloud: defaultUrls.cloud || '',
-  serverless: defaultUrls.serverless || '',
-  core: defaultUrls.core || '',
-  enterprise: defaultUrls.enterprise || '',
-  dedicated: defaultUrls.cloud_dedicated || '',
-  clustered: defaultUrls.clustered || '',
-  prev_oss: defaultUrls.oss || '',
-  prev_cloud: defaultUrls.cloud || '',
-  prev_core: defaultUrls.core || '',
-  prev_enterprise: defaultUrls.enterprise || '',
-  prev_serverless: defaultUrls.serverless || '',
-  prev_dedicated: defaultUrls.cloud_dedicated || '',
-  prev_clustered: defaultUrls.clustered || '',
+  oss: defaultUrls.oss,
+  cloud: defaultUrls.cloud,
+  serverless: defaultUrls.serverless,
+  core: defaultUrls.core,
+  enterprise: defaultUrls.enterprise,
+  dedicated: defaultUrls.cloud_dedicated,
+  clustered: defaultUrls.clustered,
+  prev_oss: defaultUrls.oss,
+  prev_cloud: defaultUrls.cloud,
+  prev_core: defaultUrls.core,
+  prev_enterprise: defaultUrls.enterprise,
+  prev_serverless: defaultUrls.serverless,
+  prev_dedicated: defaultUrls.cloud_dedicated,
+  prev_clustered: defaultUrls.clustered,
   custom: '',
 };