Fix bug with one liner, release 1.0.4 (#70)

bcgov · Mar 26, 2024 · 0e6e5b5 · 0e6e5b5
1 parent 24837f3
commit 0e6e5b5
Show file tree

Hide file tree

Showing 8 changed files with 495 additions and 9 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-0.9.9.min.js';
+    'https://cdn.jsdelivr.net/gh/bcgov/nr-af-pods@dev/powerpod/releases/powerpod-1.0.4.min.js';
   const script = document.createElement('script');
   script.setAttribute('async', '');
   script.src = src;

diff --git a/assets/claim/js/claim.js b/assets/claim/js/claim.js
@@ -1,6 +1,6 @@
 (function () {
   const src =
-    'https://cdn.jsdelivr.net/gh/bcgov/nr-af-pods@dev/powerpod/releases/powerpod-0.9.9.min.js';
+    'https://cdn.jsdelivr.net/gh/bcgov/nr-af-pods@dev/powerpod/releases/powerpod-1.0.4.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": "0.9.9",
+  "version": "1.0.4",
   "description": "Powerpod is a jQuery plugin that enhances functionality of Power Pages components.",
   "main": "dist/powerpod",
   "scripts": {

diff --git a/powerpod/releases/powerpod-1.0.4.min.js b/powerpod/releases/powerpod-1.0.4.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 0.9.9
+* powerpod 1.0.4
 * https://github.com/bcgov/nr-af-pods/powerpod
 *
 * @license GPLv3 for open source use only

diff --git a/powerpod/src/js/common/fieldConfiguration.js b/powerpod/src/js/common/fieldConfiguration.js
@@ -5,10 +5,8 @@ import {
   getFieldsBySectionApplication,
 } from './fields.js';
 import {
-  combineElementsIntoOneRowNew,
   hideFieldByFieldName,
   observeChanges,
-  showFieldRow,
 } from './html.js';
 import { Logger } from './logger.js';
 import { FieldMaskType, maskInput } from './masking.js';

diff --git a/powerpod/src/js/common/fields.js b/powerpod/src/js/common/fields.js
@@ -11,7 +11,7 @@ import {
 } from './html.js';
 import { Logger } from './logger.js';
 import { getProgramAbbreviation } from './program.ts';
-import { POWERPOD } from './constants.js';
+import { POWERPOD, FormStep } from './constants.js';
 import { mergeFieldArrays } from './utils.js';
 import { configureSections } from './sections.js';
 import { hideTabs } from './tabs.js';
@@ -114,7 +114,16 @@ export function getFieldsBySectionApplication(stepName, forceRefresh = false) {
   }
 
   fields.forEach((s) => {
-    combineElementsIntoOneRowNew(s.name);
+    if (
+      ![
+        FormStep.Documents,
+        FormStep.DeclarationAndConsent,
+        FormStep.Unknown,
+        FormStep.DemographicInfo,
+      ].includes(stepName)
+    ) {
+      combineElementsIntoOneRowNew(s.name);
+    }
     if (s.visibleIf) {
       logger.warn({
         fn: getFieldsBySectionClaim,

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