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

fix(js): error if pageParams or its attributes are null 

- Add null check for pageParams
- Add optional chaining
- Use fallback empty strings in DEFAULT_STORAGE_URLS
- page-context.js: Add null check for products and provide fallback values
staging/influxdb3-beta
Jason Stirnaman 2025-03-16 20:26:04 -05:00
parent 39eb272262
commit 69311a6667
2 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,25 +84,31 @@ function getPreferences() {
const defaultUrls = {}; const defaultUrls = {};
Object.entries(pageParams.influxdb_urls).forEach(([product, {providers}]) => { // Guard against pageParams being null/undefined and safely access nested properties
defaultUrls[product] = providers.filter(provider => provider.name === 'Default')[0]?.regions[0]?.url; 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 || '';
});
}
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: '',
}; };

36
assets/js/page-context.js
View File

@ -3,31 +3,37 @@
*/ */
import { products, influxdb_urls } from '@params'; import { products, influxdb_urls } from '@params';
const safeProducts = products || {};
const safeUrls = influxdb_urls || {};
function getCurrentProductData() { function getCurrentProductData() {
const path = window.location.pathname; const path = window.location.pathname;
const mappings = [ const mappings = [
{ pattern: /\/influxdb\/cloud\//, product: products.cloud, urls: influxdb_urls.influxdb_cloud }, { pattern: /\/influxdb\/cloud\//, product: safeProducts.cloud, urls: safeUrls.influxdb_cloud },
{ pattern: /\/influxdb3\/core/, product: products.influxdb3_core, urls: influxdb_urls.core }, { pattern: /\/influxdb3\/core/, product: safeProducts.influxdb3_core, urls: safeUrls.core },
{ pattern: /\/influxdb3\/enterprise/, product: products.influxdb3_enterprise, urls: influxdb_urls.enterprise }, { pattern: /\/influxdb3\/enterprise/, product: safeProducts.influxdb3_enterprise, urls: safeUrls.enterprise },
{ pattern: /\/influxdb3\/cloud-serverless/, product: products.influxdb3_cloud_serverless, urls: influxdb_urls.cloud }, { pattern: /\/influxdb3\/cloud-serverless/, product: safeProducts.influxdb3_cloud_serverless, urls: safeUrls.cloud },
{ pattern: /\/influxdb3\/cloud-dedicated/, product: products.influxdb3_cloud_dedicated, urls: influxdb_urls.dedicated }, { pattern: /\/influxdb3\/cloud-dedicated/, product: safeProducts.influxdb3_cloud_dedicated, urls: safeUrls.dedicated },
{ pattern: /\/influxdb3\/clustered/, product: products.influxdb3_clustered, urls: influxdb_urls.clustered }, { pattern: /\/influxdb3\/clustered/, product: safeProducts.influxdb3_clustered, urls: safeUrls.clustered },
{ pattern: /\/enterprise_v1\//, product: products.enterprise_influxdb, urls: influxdb_urls.oss }, { pattern: /\/enterprise_v1\//, product: safeProducts.enterprise_influxdb, urls: safeUrls.oss },
{ pattern: /\/influxdb.*v1\//, product: products.influxdb, urls: influxdb_urls.oss }, { pattern: /\/influxdb.*v1\//, product: safeProducts.influxdb, urls: safeUrls.oss },
{ pattern: /\/influxdb.*v2\//, product: products.influxdb, urls: influxdb_urls.oss }, { pattern: /\/influxdb.*v2\//, product: safeProducts.influxdb, urls: safeUrls.oss },
{ pattern: /\/kapacitor\//, product: products.kapacitor, urls: influxdb_urls.oss }, { pattern: /\/kapacitor\//, product: safeProducts.kapacitor, urls: safeUrls.oss },
{ pattern: /\/telegraf\//, product: products.telegraf, urls: influxdb_urls.oss }, { pattern: /\/telegraf\//, product: safeProducts.telegraf, urls: safeUrls.oss },
{ pattern: /\/chronograf\//, product: products.chronograf, urls: influxdb_urls.oss }, { pattern: /\/chronograf\//, product: safeProducts.chronograf, urls: safeUrls.oss },
{ pattern: /\/flux\//, product: products.flux, urls: influxdb_urls.oss }, { pattern: /\/flux\//, product: safeProducts.flux, urls: safeUrls.oss },
]; ];
for (const { pattern, product, urls } of mappings) { for (const { pattern, product, urls } of mappings) {
if (pattern.test(path)) { if (pattern.test(path)) {
return { product, urls }; return {
product: product || 'unknown',
urls: urls || {}
};
} }
} }
return 'other'; return { product: 'other', urls: {} };
} }
// Return the page context (cloud, serverless, oss/enterprise, dedicated, clustered, other) // Return the page context (cloud, serverless, oss/enterprise, dedicated, clustered, other)