Merge remote-tracking branch 'upstream/main'

sunray1 · sunray1 · commit 0c987ba8cd42 · 2025-07-14T10:10:09.000-04:00
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -1,6 +1,9 @@
 variable "NODE_VERSION" {
   default = "22.5"
 }
+variable "PORTAL_WEB_SERVER_BUILDER_TAG" {
+  default = "v2.1.0"
+}
 
 # Populated from GitHub Action
 variable "REPO" {
@@ -28,7 +31,7 @@ target "portal-core-components" {
   tags = [for tag in target.docker-metadata-action.tags : tag]
   dockerfile = "bake.Dockerfile"
   contexts = {
-    "portal-web-server-builder:current" = "docker-image://${REPO}/portal-web-server-builder:v2.0.0"
+    "portal-web-server-builder:current" = "docker-image://${REPO}/portal-web-server-builder:${PORTAL_WEB_SERVER_BUILDER_TAG}"
     "portal-react-apps/node:current" = "docker-image://node:${NODE_VERSION}-alpine"
   }
 }
diff --git a/lib/remoteAssets/drupal-header.html.d.ts b/lib/remoteAssets/drupal-header.html.d.ts
diff --git a/lib/remoteAssets/drupal-header.html.js b/lib/remoteAssets/drupal-header.html.js
diff --git a/lib/staticJSON/timeSeriesDataProducts.json b/lib/staticJSON/timeSeriesDataProducts.json
@@ -14,6 +14,8 @@
     "DP1.00040.001",
     "DP1.00041.001",
     "DP1.00044.001",
+    "DP1.00045.001",
+    "DP1.00046.001",
     "DP1.00066.001",
     "DP1.00094.001",
     "DP1.00095.001",
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "portal-core-components",
-  "version": "2.13.0",
+  "version": "2.13.2",
   "main": "./lib/index.js",
   "private": true,
   "homepage": "./neon-react/",
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -0,0 +1,2 @@
+# Exclude generated library files
+sonar.exclusions=lib/**/*
diff --git a/src/lib_components/remoteAssets/drupal-header.html.js b/src/lib_components/remoteAssets/drupal-header.html.js
@@ -23,7 +23,7 @@ export default html = `<header class="header" role="banner">
   <div>
 
 <input data-drupal-selector="edit-openid-connect-client-auth0-login" type="submit" id="edit-openid-connect-client-auth0-login" name="auth0" value="Sign In" class="button js-form-submit form-submit button--search" />
-</div><input autocomplete="off" data-drupal-selector="form-4gzmcnouocnopmz7cebfjmethcpvshup-oyhfdswxri" type="hidden" name="form_build_id" value="form-4GZMCnouOCNopMZ7CebFjmEthcpVShuP_oyHfDswxRI" />
+</div><input autocomplete="off" data-drupal-selector="form-sq3lvwtkvsa17r14hulalskncowfnz-fwnrangydvho" type="hidden" name="form_build_id" value="form-Sq3lVWTkVsA17r14HuLaLSKnCoWfNZ_FWNRAnGydvho" />
 <input data-drupal-selector="edit-openid-connect-login-form" type="hidden" name="form_id" value="openid_connect_login_form" />
 
 </form>
diff --git a/src/lib_components/staticJSON/timeSeriesDataProducts.json b/src/lib_components/staticJSON/timeSeriesDataProducts.json
@@ -14,6 +14,8 @@
     "DP1.00040.001",
     "DP1.00041.001",
     "DP1.00044.001",
+    "DP1.00045.001",
+    "DP1.00046.001",
     "DP1.00066.001",
     "DP1.00094.001",
     "DP1.00095.001",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,9 @@`
`1`	`1`	`variable "NODE_VERSION" {`
`2`	`2`	`default = "22.5"`
`3`	`3`	`}`
	`4`	`+variable "PORTAL_WEB_SERVER_BUILDER_TAG" {`
	`5`	`+ default = "v2.1.0"`
	`6`	`+}`
`4`	`7`
`5`	`8`	`# Populated from GitHub Action`
`6`	`9`	`variable "REPO" {`
`@@ -28,7 +31,7 @@ target "portal-core-components" {`
`28`	`31`	`tags = [for tag in target.docker-metadata-action.tags : tag]`
`29`	`32`	`dockerfile = "bake.Dockerfile"`
`30`	`33`	`contexts = {`
`31`		`- "portal-web-server-builder:current" = "docker-image://${REPO}/portal-web-server-builder:v2.0.0"`
	`34`	`+ "portal-web-server-builder:current" = "docker-image://${REPO}/portal-web-server-builder:${PORTAL_WEB_SERVER_BUILDER_TAG}"`
`32`	`35`	`"portal-react-apps/node:current" = "docker-image://node:${NODE_VERSION}-alpine"`
`33`	`36`	`}`
`34`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "portal-core-components",`
`3`		`- "version": "2.13.0",`
	`3`	`+ "version": "2.13.2",`
`4`	`4`	`"main": "./lib/index.js",`
`5`	`5`	`"private": true,`
`6`	`6`	`"homepage": "./neon-react/",`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+# Exclude generated library files`
	`2`	`+sonar.exclusions=lib/*/`