Influxdata
/
docs-v2
mirror of https://github.com/influxdata/docs-v2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

hotfix(urls): Partially reverts the previous change for setting URLs …
pull/5904/head
Jason Stirnaman 2025-03-17 11:01:07 -05:00 committed by GitHub
parent 96ddfbafe2 19bd48269f
commit fded3ebf5e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/js/influxdb-url.js
View File

@ -18,7 +18,11 @@ import { context as PRODUCT_CONTEXT, referrerHost } from './page-context.js';
import { delay } from './helpers.js'; import { delay } from './helpers.js';
import { toggleModal } from './modals.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() { export function InfluxDBUrl() {
const UNIQUE_URL_PRODUCTS = ['dedicated', 'clustered']; const UNIQUE_URL_PRODUCTS = ['dedicated', 'clustered'];
@ -577,7 +581,7 @@ export function InfluxDBUrl() {
removeCustomUrl(); removeCustomUrl();
hideValidationMessage(); 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'); ).trigger('click');
} }
} }

33
assets/js/local-storage.js
View File

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