Merge pull request #885 from IDEMSInternational/fix/hidden-overrides

fix hidden overrides
IDEMSInternational · Jul 2, 2021 · 41c56ec · 41c56ec
2 parents f66a377 + 12695e5
commit 41c56ec
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/app/shared/components/template/services/template-row.service.ts b/src/app/shared/components/template/services/template-row.service.ts
@@ -1,4 +1,5 @@
 import { FlowTypes } from "src/app/shared/model";
+import { booleanStringToBoolean } from "src/app/shared/utils";
 import { TemplateContainerComponent } from "../template-container.component";
 import { mergeTemplateRows } from "../utils/template-utils";
 
@@ -223,10 +224,12 @@ export class TemplateRowService {
     const translatedRow = this.container.templateTranslateService.translateRow(parsedRow);
 
     const row = translatedRow;
-    const { name, value, hidden, type, _dynamicFields } = row;
+    const { name, value, type, _dynamicFields } = row;
 
     // Make type assigned to hidden consistent
-    row.hidden = ["true", true, "TRUE"].includes(hidden) ? true : false;
+    if (row.hasOwnProperty("hidden")) {
+      row.hidden = booleanStringToBoolean(row.hidden);
+    }
 
     if (type === "template") isNestedTemplate = true;
 

diff --git a/src/app/shared/utils/utils.ts b/src/app/shared/utils/utils.ts
@@ -196,12 +196,12 @@ export type IFunctionHashmap = { [function_name: string]: (...args: any) => any
  * convert strings containing "TRUE", "true", "FALSE" or "false" to booleans
  * TODO - combine with script util
  */
-export function booleanStringToBoolean(str: string) {
-  if (typeof str === "string") {
-    if (str.match(/^true$/gi)) return true;
-    if (str.match(/^false$/gi)) return false;
+export function booleanStringToBoolean(val: any) {
+  if (typeof val === "string") {
+    if (val.match(/^true$/gi)) return true;
+    if (val.match(/^false$/gi)) return false;
   }
-  return str;
+  return val;
 }
 
 /**