TASK 3980: Fix multi draft, rel 1.4.7

bcgov · Jun 11, 2024 · 23a4afe · 23a4afe
1 parent 37b5581
commit 23a4afe
Show file tree

Hide file tree

Showing 8 changed files with 2,119 additions and 8 deletions.
diff --git a/assets/application/js/application.js b/assets/application/js/application.js
@@ -1,6 +1,6 @@
 (function () {
   const src =
-    'https://cdn.jsdelivr.net/gh/bcgov/nr-af-pods@dev/powerpod/releases/powerpod-1.4.6.min.js';
+    'https://cdn.jsdelivr.net/gh/bcgov/nr-af-pods@dev/powerpod/releases/powerpod-1.4.7.min.js';
   const script = document.createElement('script');
   script.setAttribute('async', '');
   script.src = src;

diff --git a/powerpod/package.json b/powerpod/package.json
@@ -1,7 +1,7 @@
 {
   "name": "powerpod",
   "type": "module",
-  "version": "1.4.6",
+  "version": "1.4.7",
   "description": "Powerpod is a jQuery plugin that enhances functionality of Power Pages components.",
   "main": "dist/powerpod",
   "scripts": {

diff --git a/powerpod/releases/powerpod-1.4.6.min.js b/powerpod/releases/powerpod-1.4.6.min.js
diff --git a/powerpod/releases/powerpod-1.4.7.min.js b/powerpod/releases/powerpod-1.4.7.min.js
diff --git a/powerpod/rollup.config.js b/powerpod/rollup.config.js
@@ -5,7 +5,7 @@ import typescript from '@rollup/plugin-typescript';
 import css from 'rollup-plugin-import-css';
 
 const licenseContent = `/*!
-* powerpod 1.4.6
+* powerpod 1.4.7
 * https://github.com/bcgov/nr-af-pods/powerpod
 *
 * @license GPLv3 for open source use only

diff --git a/powerpod/src/js/common/html.js b/powerpod/src/js/common/html.js
@@ -13,7 +13,8 @@ export function redirectToFormId(id) {
   let currentUrl = new URL(window.location.href);
 
   // Append the new parameter to the URL
-  currentUrl.searchParams.append('id', id);
+  currentUrl.search = '';
+  currentUrl.searchParams.set('id', id);
 
   logger.info({
     fn: redirectToFormId,

diff --git a/powerpod/src/js/common/program.ts b/powerpod/src/js/common/program.ts
@@ -101,9 +101,10 @@ export async function getProgramId() {
     });
   }
   if (
-    programIdHiddenValue &&
-    programIdParam &&
-    programIdHiddenValue != programIdParam
+    (programIdHiddenValue &&
+      programIdParam &&
+      programIdHiddenValue != programIdParam) ||
+    (programIdHiddenValue == undefined && programIdParam)
   ) {
     logger.warn({
       fn: getProgramId,
@@ -178,6 +179,12 @@ export async function getProgramId() {
         'Check that HTML content is present in Portal Management.',
     });
   }
+
+  logger.info({
+    fn: getProgramId,
+    message: `No mismatch or drafts to look up, succesfully found programid: ${programId}`,
+  });
+
   // @ts-ignore
   POWERPOD.program.programId = programId;
   return { programId };

diff --git a/powerpod/src/js/powerpod.js b/powerpod/src/js/powerpod.js
@@ -68,7 +68,7 @@ function setAPI() {
     };
   };
   // @ts-ignore
-  POWERPOD.version = '1.4.6';
+  POWERPOD.version = '1.4.7';
   // @ts-ignore
   win.powerpod = POWERPOD;
 }