Skip to content

feat(sample-data): add new wind sample dataset #6440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 6, 2025
Merged

feat(sample-data): add new wind sample dataset #6440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f81cd91
feat(sample-data): add new wind sample dataset
sanderson Oct 2, 2025
a5f5999
Merge branch 'master' into wind-sample-data
sanderson Oct 2, 2025
a43a795
Merge branch 'master' into wind-sample-data
sanderson Oct 2, 2025
e06f426
Apply suggestions from code review
sanderson Oct 6, 2025
736e470
Merge branch 'master' into wind-sample-data
sanderson Oct 6, 2025
0e4d8b3
fix(js): fix syntax error and lint
sanderson Oct 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 51 additions & 31 deletions assets/js/influxdb-url.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ export function InfluxDBUrl() {
const elementSelector = '.article--content pre:not(.preserve)';

///////////////////// Stored preference management ///////////////////////
// Retrieve the user's InfluxDB preference (cloud or oss) from the influxdb_pref local storage key. Default is cloud.
// Retrieve the user's InfluxDB preference (cloud or oss) from the
// influxdb_pref local storage key. Default is cloud.
function getURLPreference() {
return getPreference('influxdb_url');
}
Expand Down Expand Up @@ -100,17 +101,18 @@ export function InfluxDBUrl() {
removeInfluxDBUrl(product);
}

////////////////////////////////////////////////////////////////////////////////
//////////////////////// InfluxDB URL utility functions ////////////////////////
////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
/////////////////////// InfluxDB URL utility functions ///////////////////////
//////////////////////////////////////////////////////////////////////////////

// Preserve URLs in codeblocks that come just after or are inside a div
// with the class, .keep-url
function addPreserve() {
$('.keep-url').each(function () {
// For code blocks with no syntax highlighting
$(this).next('pre').addClass('preserve');
// For code blocks with no syntax highlighting inside of a link (API endpoint blocks)
// For code blocks with no syntax highlighting inside of a link
// (API endpoint blocks)
$(this).next('a').find('pre').addClass('preserve');
// For code blocks with syntax highlighting
$(this).next('.highlight').find('pre').addClass('preserve');
Expand All @@ -127,8 +129,8 @@ export function InfluxDBUrl() {
return { oss, cloud, core, enterprise, serverless, dedicated, clustered };
}

// Retrieve the previously selected URLs from the from the urls local storage object.
// This is used to update URLs whenever you switch between browser tabs.
// Retrieve the previously selected URLs from the urls local storage
// object. This updates URLs when switching between browser tabs.
function getPrevUrls() {
const {
prev_cloud: cloud,
Expand Down Expand Up @@ -291,7 +293,7 @@ export function InfluxDBUrl() {
});
}

// Append the URL selector button to each codeblock containing a placeholder URL
// Append the URL selector button to codeblocks that contain a placeholder URL
function appendUrlSelector(
urls = {
cloud: '',
Expand Down Expand Up @@ -320,19 +322,29 @@ export function InfluxDBUrl() {
return contextText[context];
};

appendToUrls.forEach(function (url) {
$(elementSelector).each(function () {
var code = $(this).html();
if (code.includes(url)) {
$(this).after(
"<div class='select-url'><a class='url-trigger' href='#'>" +
getBtnText(PRODUCT_CONTEXT) +
'</a></div>'
);
$('.select-url').fadeIn(400);
}
// Process each code block only once
$(elementSelector).each(function () {
var code = $(this).html();
var $codeBlock = $(this);

// Check if this code block contains any of the URLs
var containsUrl = appendToUrls.some(function (url) {
return url && code.includes(url);
});

// If the code block contains at least one URL and doesn't already have a
// URL selector button
if (containsUrl && !$codeBlock.next('.select-url').length) {
$codeBlock.after(
"<div class='select-url'><a class='url-trigger' href='#'>" +
getBtnText(PRODUCT_CONTEXT) +
'</a></div>'
);
}
});

// Fade in all select-url elements after they've been added
$('.select-url').fadeIn(400);
}

////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -365,9 +377,9 @@ export function InfluxDBUrl() {
// Set active radio button on page load
setRadioButtons(getUrls());

////////////////////////////////////////////////////////////////////////////////
////////////////////////// Modal window interactions ///////////////////////////
////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
///////////////////////// Modal window interactions //////////////////////////
//////////////////////////////////////////////////////////////////////////////

// General modal window interactions are controlled in modals.js

Expand Down Expand Up @@ -513,12 +525,18 @@ export function InfluxDBUrl() {
// Toggled preferred service on load
showPreference();

////////////////////////////////////////////////////////////////////////////////
///////////////////////////////// Custom URLs //////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////// Custom URLs /////////////////////////////////
//////////////////////////////////////////////////////////////////////////////

// Validate custom URLs
function validateUrl(url) {
/** Match 3 possible types of hosts:
* Named host = (unreserved | pct-encoded | sub-delims)+
* IPv6 host = \[([a-f0-9:.]+)\]
* IPvFuture host = \[v[a-f0-9][a-z0-9\-._~%!$&'()*+,;=:]+\]
* Port = [0-9]+
*/
/** validDomain = (Named host | IPv6 host | IPvFuture host)(:Port)? **/
const validDomain = new RegExp(
`([a-z0-9\-._~%]+` +
Expand All @@ -536,7 +554,7 @@ export function InfluxDBUrl() {
const domain = url.replace(protocol, '');

// First use the regex to check for an HTTP protocol and valid domain
// --JS URL validation can't differentiate host:port string from a protocol.
// JS URL validation can't differentiate host:port string from a protocol.
if (validProtocol.test(protocol) == false) {
return { valid: false, error: 'Invalid protocol, use http[s]' };
} else if (validDomain.test(domain) == false) {
Expand Down Expand Up @@ -598,7 +616,9 @@ export function InfluxDBUrl() {
removeCustomUrl();
hideValidationMessage();
$(
`input[name="influxdb-${PRODUCT_CONTEXT}-url"][value="${DEFAULT_STORAGE_URLS[PRODUCT_CONTEXT]}"]`
`input[name="influxdb-${PRODUCT_CONTEXT}-url"][value="` +
DEFAULT_STORAGE_URLS[PRODUCT_CONTEXT] +
'"]'
).trigger('click');
}
}
Expand Down Expand Up @@ -659,7 +679,7 @@ export function InfluxDBUrl() {
'#clustered-url-field',
].join();

// Store the custom InfluxDB URL or product-specific URL when exiting the field
// Store the custom InfluxDB URL or product-specific URL when exiting fields
$(urlValueElements).blur(function () {
!['dedicated', 'clustered'].includes(PRODUCT_CONTEXT)
? applyCustomUrl()
Expand Down Expand Up @@ -694,9 +714,9 @@ export function InfluxDBUrl() {
$(`#${productEl}-url-field`).val(productUrlCookie);
});

////////////////////////////////////////////////////////////////////////////////
/////////////////////////// Dynamically update URLs ////////////////////////////
////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
////////////////////////// Dynamically update URLs ///////////////////////////
//////////////////////////////////////////////////////////////////////////////

// Check if the referrerHost is one of the cloud URLs
// cloudUrls is built dynamically in layouts/partials/footer/javascript.html
Expand Down
2 changes: 1 addition & 1 deletion assets/styles/layouts/article/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,5 +99,5 @@ a.btn {
li .url-trigger { padding: 0rem .5rem; }

.code-tab-content {
.select-url{margin-top: -3.25rem}
.select-url{margin-top: -3.15rem}
}
Loading