Merge pull request #635 from noi-techpark/development

latest fixes
noi-techpark · Oct 18, 2024 · f9ba1b0 · f9ba1b0
2 parents e648e22 + 1bd5914
commit f9ba1b0
Showing 1 changed file with 63 additions and 9 deletions.
diff --git a/databrowser/src/domain/datasets/view/modifiers/dynamicParams/dynamicParamsReplacement.ts b/databrowser/src/domain/datasets/view/modifiers/dynamicParams/dynamicParamsReplacement.ts
@@ -5,8 +5,11 @@
 import { MaybeRef, computed, toValue } from 'vue';
 import {
   DatasetDomain,
+  DetailElements,
+  EditElements,
   ListElements,
   PropertyConfig,
+  SubCategoryElement,
 } from '../../../config/types';
 import {
   DetailViewConfigWithType,
@@ -100,17 +103,68 @@ const applyReplacementsToSingleRecordView = <
   objectValueReplacer: ObjectValueReplacer
 ): T | undefined => ({
   ...view,
-  elements: view.elements.map((element) => ({
-    ...element,
-    subcategories: element.subcategories.map((subcategory) => ({
-      ...subcategory,
-      properties: subcategory.properties.map((property) =>
-        replaceMappings(property, stringReplacer, objectValueReplacer)
-      ),
-    })),
-  })),
+  elements: applyReplacementsToElements(
+    view.elements,
+    stringReplacer,
+    objectValueReplacer
+  ),
 });
 
+const applyReplacementsToElements = (
+  elements: DetailElements[] | EditElements[],
+  stringReplacer: StringReplacer,
+  objectValueReplacer: ObjectValueReplacer
+) => {
+  return elements.map((element) => ({
+    ...applyReplacementsToSubElements(
+      element,
+      stringReplacer,
+      objectValueReplacer
+    ),
+    subcategories: applyReplacementsToSubCategories(
+      element.subcategories,
+      stringReplacer,
+      objectValueReplacer
+    ),
+  }));
+};
+
+const applyReplacementsToSubCategories = (
+  subcategories: SubCategoryElement[],
+  stringReplacer: StringReplacer,
+  objectValueReplacer: ObjectValueReplacer
+) => {
+  return subcategories.map((subcategory) => ({
+    ...subcategory,
+    properties: subcategory.properties.map((property) =>
+      replaceMappings(property, stringReplacer, objectValueReplacer)
+    ),
+  }));
+};
+
+const applyReplacementsToSubElements = (
+  element: DetailElements,
+  stringReplacer: StringReplacer,
+  objectValueReplacer: ObjectValueReplacer
+) => {
+  return element.subElements
+    ? {
+        ...element,
+        subElements: [...element.subElements].map((subElement) => ({
+          ...subElement,
+          elements: {
+            ...subElement.elements,
+            subcategories: applyReplacementsToSubCategories(
+              subElement.elements.subcategories,
+              stringReplacer,
+              objectValueReplacer
+            ),
+          },
+        })),
+      }
+    : element;
+};
+
 const replaceMappings = (
   property: PropertyConfig,
   stringReplacer: StringReplacer,