@beinformed/ui 1.54.1 → 1.54.3

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.54.3](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.54.2...v1.54.3) (2024-09-18)
+
+
+### Bug Fixes
+
+* **layouthint-config:** merge duplicate hint entries ([6dfefa3](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/6dfefa36c7c00c4d7f139eff313c3a4c24853968))
+* **modularui-connector:** make it possible to set removeOnUnmount with a property ([959ce04](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/959ce0447fce2d725c7bd8316a2c1cc4477cc1d1))
+
+## [1.54.2](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.54.1...v1.54.2) (2024-09-17)
+
+
+### Bug Fixes
+
+* **layouthint-config:** merge duplicate hint entries ([29b837c](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/29b837c83d991d6f5dada5f6cd0eb165abdbd2eb))
+
 ## [1.54.1](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.54.0...v1.54.1) (2024-09-17)
 
 

package/esm/builder/mergeLayoutHintConfigurations.js

@@ -1,5 +1,5 @@
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
-import _Object$assign from "@babel/runtime-corejs3/core-js-stable/object/assign";
+import _Set from "@babel/runtime-corejs3/core-js-stable/set";
 import _JSON$stringify from "@babel/runtime-corejs3/core-js-stable/json/stringify";
 import _Promise from "@babel/runtime-corejs3/core-js-stable/promise";
 const path = require("path");
@@ -9,6 +9,7 @@ const {
   readFileSync,
   writeFileSync
 } = require("fs");
+const mergeWith = require("lodash/mergeWith");
 const {
   LayoutHintConfiguration
 } = require("../constants/LayoutHintConfig");
@@ -42,7 +43,14 @@ exports.mergeLayoutHintConfigurations = async (srcFolder, outputFolder) => {
     const content = readFileSync(file, "utf-8");
     return JSON.parse(content);
   });
-  const newConfig = _Object$assign(LayoutHintConfiguration, ...jsons);
+
+  // Function to merge arrays during merging
+  const customizer = (objValue, srcValue) => {
+    if (Array.isArray(objValue)) {
+      return [...new _Set([...objValue, ...srcValue])];
+    }
+  };
+  const newConfig = mergeWith(LayoutHintConfiguration, ...jsons, customizer);
   writeFileSync(path.join(outputFolder, "LayoutHintConfig.json"), _JSON$stringify(newConfig));
   return _Promise.resolve();
 };

package/esm/builder/mergeLayoutHintConfigurations.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergeLayoutHintConfigurations.js","names":["path","require","readdirSync","statSync","readFileSync","writeFileSync","LayoutHintConfiguration","findFiles","dir","matchedFiles","files","file","absolute","join","isDirectory","foundFiles","push","filename","basename","exports","mergeLayoutHintConfigurations","srcFolder","outputFolder","escapedSrcFolder","replace","jsons","_mapInstanceProperty","call","content","JSON","parse","newConfig","_Object$assign","_JSON$stringify","_Promise","resolve"],"sources":["../../src/builder/mergeLayoutHintConfigurations.js"],"sourcesContent":["// @flow\nconst path = require(\"path\");\nconst { readdirSync, statSync, readFileSync, writeFileSync } = require(\"fs\");\n\nconst { LayoutHintConfiguration } = require(\"../constants/LayoutHintConfig\");\n\nconst findFiles = (dir: string): Array<string> => {\n  const matchedFiles = [];\n\n  const files = readdirSync(dir);\n\n  for (const file of files) {\n    const absolute = path.join(dir, file);\n    if (statSync(absolute).isDirectory()) {\n      const foundFiles = findFiles(absolute);\n      matchedFiles.push(...foundFiles);\n    } else {\n      const filename = path.basename(file);\n      if (filename === \"LayoutHintConfig.json\") {\n        matchedFiles.push(absolute);\n      }\n    }\n  }\n\n  return matchedFiles;\n};\n\n/**\n * Merge all LayoutHintConfig.json files from this library and in the srcFolder\n * together into one config file, and copies it to the outputFolder.<br/>\n * This file is consumed by Be Informed studio to give layout hint information\n */\nexports.mergeLayoutHintConfigurations = async (\n  srcFolder: string,\n  outputFolder: string,\n): Promise<void> => {\n  const escapedSrcFolder = srcFolder.replace(/\\\\/g, \"/\");\n\n  const files = findFiles(escapedSrcFolder);\n\n  const jsons = files.map((file) => {\n    const content = readFileSync(file, \"utf-8\");\n    return JSON.parse(content);\n  });\n\n  const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);\n\n  writeFileSync(\n    path.join(outputFolder, \"LayoutHintConfig.json\"),\n    JSON.stringify(newConfig),\n  );\n\n  return Promise.resolve();\n};\n"],"mappings":";;;;AACA,MAAMA,IAAI,GAAGC,OAAO,CAAC,MAAM,CAAC;AAC5B,MAAM;EAAEC,WAAW;EAAEC,QAAQ;EAAEC,YAAY;EAAEC;AAAc,CAAC,GAAGJ,OAAO,CAAC,IAAI,CAAC;AAE5E,MAAM;EAAEK;AAAwB,CAAC,GAAGL,OAAO,CAAC,+BAA+B,CAAC;AAE5E,MAAMM,SAAS,GAAIC,GAAW,IAAoB;EAChD,MAAMC,YAAY,GAAG,EAAE;EAEvB,MAAMC,KAAK,GAAGR,WAAW,CAACM,GAAG,CAAC;EAE9B,KAAK,MAAMG,IAAI,IAAID,KAAK,EAAE;IACxB,MAAME,QAAQ,GAAGZ,IAAI,CAACa,IAAI,CAACL,GAAG,EAAEG,IAAI,CAAC;IACrC,IAAIR,QAAQ,CAACS,QAAQ,CAAC,CAACE,WAAW,CAAC,CAAC,EAAE;MACpC,MAAMC,UAAU,GAAGR,SAAS,CAACK,QAAQ,CAAC;MACtCH,YAAY,CAACO,IAAI,CAAC,GAAGD,UAAU,CAAC;IAClC,CAAC,MAAM;MACL,MAAME,QAAQ,GAAGjB,IAAI,CAACkB,QAAQ,CAACP,IAAI,CAAC;MACpC,IAAIM,QAAQ,KAAK,uBAAuB,EAAE;QACxCR,YAAY,CAACO,IAAI,CAACJ,QAAQ,CAAC;MAC7B;IACF;EACF;EAEA,OAAOH,YAAY;AACrB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAU,OAAO,CAACC,6BAA6B,GAAG,OACtCC,SAAiB,EACjBC,YAAoB,KACF;EAClB,MAAMC,gBAAgB,GAAGF,SAAS,CAACG,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;EAEtD,MAAMd,KAAK,GAAGH,SAAS,CAACgB,gBAAgB,CAAC;EAEzC,MAAME,KAAK,GAAGC,oBAAA,CAAAhB,KAAK,EAAAiB,IAAA,CAALjB,KAAK,EAAMC,IAAI,IAAK;IAChC,MAAMiB,OAAO,GAAGxB,YAAY,CAACO,IAAI,EAAE,OAAO,CAAC;IAC3C,OAAOkB,IAAI,CAACC,KAAK,CAACF,OAAO,CAAC;EAC5B,CAAC,CAAC;EAEF,MAAMG,SAAS,GAAGC,cAAA,CAAc1B,uBAAuB,EAAE,GAAGmB,KAAK,CAAC;EAElEpB,aAAa,CACXL,IAAI,CAACa,IAAI,CAACS,YAAY,EAAE,uBAAuB,CAAC,EAChDW,eAAA,CAAeF,SAAS,CAC1B,CAAC;EAED,OAAOG,QAAA,CAAQC,OAAO,CAAC,CAAC;AAC1B,CAAC","ignoreList":[]}
+{"version":3,"file":"mergeLayoutHintConfigurations.js","names":["path","require","readdirSync","statSync","readFileSync","writeFileSync","mergeWith","LayoutHintConfiguration","findFiles","dir","matchedFiles","files","file","absolute","join","isDirectory","foundFiles","push","filename","basename","exports","mergeLayoutHintConfigurations","srcFolder","outputFolder","escapedSrcFolder","replace","jsons","_mapInstanceProperty","call","content","JSON","parse","customizer","objValue","srcValue","Array","isArray","_Set","newConfig","_JSON$stringify","_Promise","resolve"],"sources":["../../src/builder/mergeLayoutHintConfigurations.js"],"sourcesContent":["// @flow\nconst path = require(\"path\");\nconst { readdirSync, statSync, readFileSync, writeFileSync } = require(\"fs\");\n\nconst mergeWith = require(\"lodash/mergeWith\");\nconst { LayoutHintConfiguration } = require(\"../constants/LayoutHintConfig\");\n\nconst findFiles = (dir: string): Array<string> => {\n  const matchedFiles = [];\n\n  const files = readdirSync(dir);\n\n  for (const file of files) {\n    const absolute = path.join(dir, file);\n    if (statSync(absolute).isDirectory()) {\n      const foundFiles = findFiles(absolute);\n      matchedFiles.push(...foundFiles);\n    } else {\n      const filename = path.basename(file);\n      if (filename === \"LayoutHintConfig.json\") {\n        matchedFiles.push(absolute);\n      }\n    }\n  }\n\n  return matchedFiles;\n};\n\n/**\n * Merge all LayoutHintConfig.json files from this library and in the srcFolder\n * together into one config file, and copies it to the outputFolder.<br/>\n * This file is consumed by Be Informed studio to give layout hint information\n */\nexports.mergeLayoutHintConfigurations = async (\n  srcFolder: string,\n  outputFolder: string,\n): Promise<void> => {\n  const escapedSrcFolder = srcFolder.replace(/\\\\/g, \"/\");\n\n  const files = findFiles(escapedSrcFolder);\n\n  const jsons = files.map((file) => {\n    const content = readFileSync(file, \"utf-8\");\n    return JSON.parse(content);\n  });\n\n  // Function to merge arrays during merging\n  const customizer = (objValue: Object, srcValue: Object): Object => {\n    if (Array.isArray(objValue)) {\n      return [...new Set([...objValue, ...srcValue])];\n    }\n  };\n\n  const newConfig = mergeWith(LayoutHintConfiguration, ...jsons, customizer);\n\n  writeFileSync(\n    path.join(outputFolder, \"LayoutHintConfig.json\"),\n    JSON.stringify(newConfig),\n  );\n\n  return Promise.resolve();\n};\n"],"mappings":";;;;AACA,MAAMA,IAAI,GAAGC,OAAO,CAAC,MAAM,CAAC;AAC5B,MAAM;EAAEC,WAAW;EAAEC,QAAQ;EAAEC,YAAY;EAAEC;AAAc,CAAC,GAAGJ,OAAO,CAAC,IAAI,CAAC;AAE5E,MAAMK,SAAS,GAAGL,OAAO,CAAC,kBAAkB,CAAC;AAC7C,MAAM;EAAEM;AAAwB,CAAC,GAAGN,OAAO,CAAC,+BAA+B,CAAC;AAE5E,MAAMO,SAAS,GAAIC,GAAW,IAAoB;EAChD,MAAMC,YAAY,GAAG,EAAE;EAEvB,MAAMC,KAAK,GAAGT,WAAW,CAACO,GAAG,CAAC;EAE9B,KAAK,MAAMG,IAAI,IAAID,KAAK,EAAE;IACxB,MAAME,QAAQ,GAAGb,IAAI,CAACc,IAAI,CAACL,GAAG,EAAEG,IAAI,CAAC;IACrC,IAAIT,QAAQ,CAACU,QAAQ,CAAC,CAACE,WAAW,CAAC,CAAC,EAAE;MACpC,MAAMC,UAAU,GAAGR,SAAS,CAACK,QAAQ,CAAC;MACtCH,YAAY,CAACO,IAAI,CAAC,GAAGD,UAAU,CAAC;IAClC,CAAC,MAAM;MACL,MAAME,QAAQ,GAAGlB,IAAI,CAACmB,QAAQ,CAACP,IAAI,CAAC;MACpC,IAAIM,QAAQ,KAAK,uBAAuB,EAAE;QACxCR,YAAY,CAACO,IAAI,CAACJ,QAAQ,CAAC;MAC7B;IACF;EACF;EAEA,OAAOH,YAAY;AACrB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAU,OAAO,CAACC,6BAA6B,GAAG,OACtCC,SAAiB,EACjBC,YAAoB,KACF;EAClB,MAAMC,gBAAgB,GAAGF,SAAS,CAACG,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;EAEtD,MAAMd,KAAK,GAAGH,SAAS,CAACgB,gBAAgB,CAAC;EAEzC,MAAME,KAAK,GAAGC,oBAAA,CAAAhB,KAAK,EAAAiB,IAAA,CAALjB,KAAK,EAAMC,IAAI,IAAK;IAChC,MAAMiB,OAAO,GAAGzB,YAAY,CAACQ,IAAI,EAAE,OAAO,CAAC;IAC3C,OAAOkB,IAAI,CAACC,KAAK,CAACF,OAAO,CAAC;EAC5B,CAAC,CAAC;;EAEF;EACA,MAAMG,UAAU,GAAGA,CAACC,QAAgB,EAAEC,QAAgB,KAAa;IACjE,IAAIC,KAAK,CAACC,OAAO,CAACH,QAAQ,CAAC,EAAE;MAC3B,OAAO,CAAC,GAAG,IAAAI,IAAA,CAAQ,CAAC,GAAGJ,QAAQ,EAAE,GAAGC,QAAQ,CAAC,CAAC,CAAC;IACjD;EACF,CAAC;EAED,MAAMI,SAAS,GAAGhC,SAAS,CAACC,uBAAuB,EAAE,GAAGmB,KAAK,EAAEM,UAAU,CAAC;EAE1E3B,aAAa,CACXL,IAAI,CAACc,IAAI,CAACS,YAAY,EAAE,uBAAuB,CAAC,EAChDgB,eAAA,CAAeD,SAAS,CAC1B,CAAC;EAED,OAAOE,QAAA,CAAQC,OAAO,CAAC,CAAC;AAC1B,CAAC","ignoreList":[]}

package/esm/redux/_modularui/ModularUIConnector.js

@@ -41,6 +41,8 @@ const modularUIConnector = function (name, resource) {
   } = options;
   return Component => {
     const WrappedComponent = props => {
+      // explicit property for removeOnMount overwrite the setting
+      const finalRemoveOnUnmount = props.removeOnUnmount === true ? true : removeOnUnmount;
       const dispatch = useDispatch();
       const location = useLocation();
       const url = useUrl(resource, {
@@ -50,7 +52,10 @@ const modularUIConnector = function (name, resource) {
       const displayName = getDisplayName(Component, name, props.contextId);
 
       // Load the model through the useModUI hook
-      const modelEntry = useModularUI(displayName, url, otherOptions);
+      const modelEntry = useModularUI(displayName, url, {
+        ...otherOptions,
+        removeOnUnmount: finalRemoveOnUnmount
+      });
       const modelKey = modelEntry?.model?.connectKey;
 
       // handle manual reload of model
@@ -79,11 +84,11 @@ const modularUIConnector = function (name, resource) {
       // Remove model when hoc unloads
       useEffect(() => {
         return () => {
-          if (removeOnUnmount) {
+          if (finalRemoveOnUnmount) {
             dispatch(removeModelByKey(modelKey));
           }
         };
-      }, [dispatch, modelKey]);
+      }, [dispatch, modelKey, finalRemoveOnUnmount]);
 
       // Create new properties object to inject modularui properties to own props
       const locale = useLocale();

package/esm/redux/_modularui/ModularUIConnector.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModularUIConnector.js","names":["useEffect","useDispatch","useLocation","loadModularUI","reloadModel","removeModelByKey","Href","getDisplayName","useUrl","useReload","useModularUI","useLocale","FormModel","jsx","_jsx","patchUpdateModelOption","oldOptions","updateModel","updateHandler","newModel","clonedModel","clone","update","modularUIConnector","name","resource","options","arguments","length","undefined","propName","removeOnUnmount","otherOptions","Component","WrappedComponent","props","dispatch","location","url","displayName","contextId","modelEntry","modelKey","model","connectKey","handleManualReload","reloadOptions","handleFetch","href","fetchOptions","reload","state","doReload","isReload","locale","newProps","status","lastModification","hasModel","Boolean","fetchModularUI"],"sources":["../../../src/redux/_modularui/ModularUIConnector.js"],"sourcesContent":["// @flow\nimport { useEffect } from \"react\";\nimport { useDispatch } from \"react-redux\";\nimport { useLocation } from \"react-router\";\n\nimport {\n  loadModularUI,\n  reloadModel,\n  removeModelByKey,\n} from \"./ModularUIActions\";\n\nimport Href from \"../../models/href/Href\";\nimport { getDisplayName } from \"../../react/utils\";\n\nimport { useUrl, useReload } from \"./ModularUIUtils\";\nimport { useModularUI } from \"../../hooks/useModularUI\";\nimport { useLocale } from \"../../hooks/useI18n\";\n\nimport type { ComponentType, Node } from \"react\";\nimport type { Location } from \"react-router\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { ModularUIOptions } from \"./types\";\nimport FormModel from \"../../models/form/FormModel\";\n\nexport type InjectedProps = {\n  +modelKey: string,\n  +location: Location,\n  +status: string | null,\n  +lastModification: number | null,\n  +hasModel: boolean,\n  +locale: string,\n  +fetchModularUI: (href: string | Href, fetchOptions: Object) => void,\n  +reloadModel: (model: ModularUIModel, options: Object) => void,\n  +data?: ?ModularUIModel,\n};\n\nconst patchUpdateModelOption = (oldOptions: Object) => {\n  if (\n    \"updateModel\" in oldOptions &&\n    oldOptions.updateModel instanceof FormModel\n  ) {\n    return {\n      ...oldOptions,\n      updateHandler: (newModel: ModularUIModel): ModularUIModel => {\n        if (newModel instanceof FormModel) {\n          // $FLowFixMe\n          const clonedModel: FormModel = oldOptions.updateModel.clone();\n          clonedModel.update(newModel);\n          return clonedModel;\n        }\n        return newModel;\n      },\n    };\n  }\n\n  return oldOptions;\n};\n\n/**\n */\nconst modularUIConnector = (\n  name: string,\n  resource: string | Function,\n  options: ModularUIOptions = { propName: \"data\", removeOnUnmount: false },\n): ((Component: ComponentType<any>) => (props: any) => Node) => {\n  const {\n    propName = \"data\",\n    removeOnUnmount = false,\n    ...otherOptions\n  } = options;\n\n  return (Component: ComponentType<any>) => {\n    const WrappedComponent = (props: any) => {\n      const dispatch = useDispatch();\n      const location = useLocation();\n\n      const url = useUrl(resource, { location, ...props });\n      const displayName = getDisplayName(Component, name, props.contextId);\n\n      // Load the model through the useModUI hook\n      const modelEntry = useModularUI(displayName, url, otherOptions);\n      const modelKey = modelEntry?.model?.connectKey;\n\n      // handle manual reload of model\n      const handleManualReload = (\n        model: ModularUIModel,\n        reloadOptions?: Object,\n      ) => {\n        dispatch(reloadModel(model, reloadOptions));\n      };\n\n      // Provide connected models with a fetchModularUI method to be able\n      // to run the loadModularUI action from a handler / callback in the component\n      const handleFetch = (href: string | Href, fetchOptions: Object) => {\n        dispatch(\n          loadModularUI(modelKey, href, patchUpdateModelOption(fetchOptions)),\n        );\n      };\n\n      // Check if current model needs a reload\n      const reload = location?.state?.reload ?? 0;\n      const doReload = useReload(modelEntry, reload);\n      useEffect(() => {\n        if (doReload) {\n          dispatch(\n            loadModularUI(modelKey, url, {\n              ...patchUpdateModelOption(otherOptions),\n              isReload: true,\n            }),\n          );\n        }\n      }, [dispatch, doReload, url, modelKey]);\n\n      // Remove model when hoc unloads\n      useEffect(() => {\n        return () => {\n          if (removeOnUnmount) {\n            dispatch(removeModelByKey(modelKey));\n          }\n        };\n      }, [dispatch, modelKey]);\n\n      // Create new properties object to inject modularui properties to own props\n      const locale = useLocale();\n      const newProps: InjectedProps = {\n        modelKey,\n        [propName]: modelEntry ? modelEntry.model : null,\n        location,\n        status: modelEntry ? modelEntry.status : null,\n        lastModification: modelEntry ? modelEntry.lastModification : null,\n        hasModel: Boolean(modelEntry),\n        locale,\n        fetchModularUI: handleFetch,\n        reloadModel: handleManualReload,\n      };\n\n      return <Component {...props} {...newProps} />;\n    };\n\n    WrappedComponent.displayName = `BI.modularui(${getDisplayName(\n      WrappedComponent,\n      name,\n    )}`;\n\n    return WrappedComponent;\n  };\n};\n\nexport default modularUIConnector;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ModularUIConnector.js","names":["useEffect","useDispatch","useLocation","loadModularUI","reloadModel","removeModelByKey","Href","getDisplayName","useUrl","useReload","useModularUI","useLocale","FormModel","jsx","_jsx","patchUpdateModelOption","oldOptions","updateModel","updateHandler","newModel","clonedModel","clone","update","modularUIConnector","name","resource","options","arguments","length","undefined","propName","removeOnUnmount","otherOptions","Component","WrappedComponent","props","finalRemoveOnUnmount","dispatch","location","url","displayName","contextId","modelEntry","modelKey","model","connectKey","handleManualReload","reloadOptions","handleFetch","href","fetchOptions","reload","state","doReload","isReload","locale","newProps","status","lastModification","hasModel","Boolean","fetchModularUI"],"sources":["../../../src/redux/_modularui/ModularUIConnector.js"],"sourcesContent":["// @flow\nimport { useEffect } from \"react\";\nimport { useDispatch } from \"react-redux\";\nimport { useLocation } from \"react-router\";\n\nimport {\n  loadModularUI,\n  reloadModel,\n  removeModelByKey,\n} from \"./ModularUIActions\";\n\nimport Href from \"../../models/href/Href\";\nimport { getDisplayName } from \"../../react/utils\";\n\nimport { useUrl, useReload } from \"./ModularUIUtils\";\nimport { useModularUI } from \"../../hooks/useModularUI\";\nimport { useLocale } from \"../../hooks/useI18n\";\n\nimport type { ComponentType, Node } from \"react\";\nimport type { Location } from \"react-router\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { ModularUIOptions } from \"./types\";\nimport FormModel from \"../../models/form/FormModel\";\n\nexport type InjectedProps = {\n  +modelKey: string,\n  +location: Location,\n  +status: string | null,\n  +lastModification: number | null,\n  +hasModel: boolean,\n  +locale: string,\n  +fetchModularUI: (href: string | Href, fetchOptions: Object) => void,\n  +reloadModel: (model: ModularUIModel, options: Object) => void,\n  +data?: ?ModularUIModel,\n};\n\nconst patchUpdateModelOption = (oldOptions: Object) => {\n  if (\n    \"updateModel\" in oldOptions &&\n    oldOptions.updateModel instanceof FormModel\n  ) {\n    return {\n      ...oldOptions,\n      updateHandler: (newModel: ModularUIModel): ModularUIModel => {\n        if (newModel instanceof FormModel) {\n          // $FLowFixMe\n          const clonedModel: FormModel = oldOptions.updateModel.clone();\n          clonedModel.update(newModel);\n          return clonedModel;\n        }\n        return newModel;\n      },\n    };\n  }\n\n  return oldOptions;\n};\n\n/**\n */\nconst modularUIConnector = (\n  name: string,\n  resource: string | Function,\n  options: ModularUIOptions = { propName: \"data\", removeOnUnmount: false },\n): ((Component: ComponentType<any>) => (props: any) => Node) => {\n  const {\n    propName = \"data\",\n    removeOnUnmount = false,\n    ...otherOptions\n  } = options;\n\n  return (Component: ComponentType<any>) => {\n    const WrappedComponent = (props: any) => {\n      // explicit property for removeOnMount overwrite the setting\n      const finalRemoveOnUnmount =\n        props.removeOnUnmount === true ? true : removeOnUnmount;\n\n      const dispatch = useDispatch();\n      const location = useLocation();\n\n      const url = useUrl(resource, { location, ...props });\n      const displayName = getDisplayName(Component, name, props.contextId);\n\n      // Load the model through the useModUI hook\n      const modelEntry = useModularUI(displayName, url, {\n        ...otherOptions,\n        removeOnUnmount: finalRemoveOnUnmount,\n      });\n      const modelKey = modelEntry?.model?.connectKey;\n\n      // handle manual reload of model\n      const handleManualReload = (\n        model: ModularUIModel,\n        reloadOptions?: Object,\n      ) => {\n        dispatch(reloadModel(model, reloadOptions));\n      };\n\n      // Provide connected models with a fetchModularUI method to be able\n      // to run the loadModularUI action from a handler / callback in the component\n      const handleFetch = (href: string | Href, fetchOptions: Object) => {\n        dispatch(\n          loadModularUI(modelKey, href, patchUpdateModelOption(fetchOptions)),\n        );\n      };\n\n      // Check if current model needs a reload\n      const reload = location?.state?.reload ?? 0;\n      const doReload = useReload(modelEntry, reload);\n      useEffect(() => {\n        if (doReload) {\n          dispatch(\n            loadModularUI(modelKey, url, {\n              ...patchUpdateModelOption(otherOptions),\n              isReload: true,\n            }),\n          );\n        }\n      }, [dispatch, doReload, url, modelKey]);\n\n      // Remove model when hoc unloads\n      useEffect(() => {\n        return () => {\n          if (finalRemoveOnUnmount) {\n            dispatch(removeModelByKey(modelKey));\n          }\n        };\n      }, [dispatch, modelKey, finalRemoveOnUnmount]);\n\n      // Create new properties object to inject modularui properties to own props\n      const locale = useLocale();\n      const newProps: InjectedProps = {\n        modelKey,\n        [propName]: modelEntry ? modelEntry.model : null,\n        location,\n        status: modelEntry ? modelEntry.status : null,\n        lastModification: modelEntry ? modelEntry.lastModification : null,\n        hasModel: Boolean(modelEntry),\n        locale,\n        fetchModularUI: handleFetch,\n        reloadModel: handleManualReload,\n      };\n\n      return <Component {...props} {...newProps} />;\n    };\n\n    WrappedComponent.displayName = `BI.modularui(${getDisplayName(\n      WrappedComponent,\n      name,\n    )}`;\n\n    return WrappedComponent;\n  };\n};\n\nexport default modularUIConnector;\n"],"mappings":"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","ignoreList":[]}

package/lib/builder/__tests__/mergeLayoutHintConfigurations.spec.js.flow

@@ -1,6 +1,7 @@
 import { mergeLayoutHintConfigurations } from "../mergeLayoutHintConfigurations";
 import { LayoutHintConfiguration } from "../../constants/LayoutHintConfig";
 const fs = require("fs");
+
 //
 const projectJson1 = {
   MOCK: {
@@ -26,6 +27,18 @@ const projectJson2 = {
   },
 };
 
+const projectMerge = {
+  MERGE: {
+    hint: "merge",
+    description: {
+      NL: "merge with extra component",
+      EN: "merge with extra component",
+    },
+    link: "",
+    component: ["component1", "component2", "component3"],
+  },
+};
+
 jest.mock("fs", () => ({
   ...jest.requireActual("fs"),
   writeFileSync: jest.fn(),
@@ -33,19 +46,26 @@ jest.mock("fs", () => ({
 
 describe("mergeLayoutHintConfigurations", () => {
   it("generates layouthint.json", async () => {
-    expect.assertions(1);
+    expect.assertions(2);
 
     const expectedJson = {
       ...LayoutHintConfiguration,
       ...projectJson1,
       ...projectJson2,
+      ...projectMerge,
     };
 
     await mergeLayoutHintConfigurations("./src", "/output");
 
     expect(fs.writeFileSync).toHaveBeenCalledWith(
       expect.stringContaining("LayoutHintConfig.json"),
-      JSON.stringify(expectedJson),
+      expect.any(String),
     );
+
+    // Check that the JSON written matches the expected JSON
+    const actualJson = JSON.parse(fs.writeFileSync.mock.calls[0][1]);
+
+    // Compare objects using deep comparison to ensure they are equal
+    expect(actualJson).toEqual(expectedJson);
   });
 });

package/lib/builder/mergeLayoutHintConfigurations.js

@@ -2,7 +2,7 @@
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/assign"));
+var _set = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set"));
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/json/stringify"));
 var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
 const path = require("path");
@@ -12,6 +12,7 @@ const {
   readFileSync,
   writeFileSync
 } = require("fs");
+const mergeWith = require("lodash/mergeWith");
 const {
   LayoutHintConfiguration
 } = require("../constants/LayoutHintConfig");
@@ -45,7 +46,14 @@ exports.mergeLayoutHintConfigurations = async (srcFolder, outputFolder) => {
     const content = readFileSync(file, "utf-8");
     return JSON.parse(content);
   });
-  const newConfig = (0, _assign.default)(LayoutHintConfiguration, ...jsons);
+
+  // Function to merge arrays during merging
+  const customizer = (objValue, srcValue) => {
+    if (Array.isArray(objValue)) {
+      return [...new _set.default([...objValue, ...srcValue])];
+    }
+  };
+  const newConfig = mergeWith(LayoutHintConfiguration, ...jsons, customizer);
   writeFileSync(path.join(outputFolder, "LayoutHintConfig.json"), (0, _stringify.default)(newConfig));
   return _promise.default.resolve();
 };

package/lib/builder/mergeLayoutHintConfigurations.js.flow

@@ -2,6 +2,7 @@
 const path = require("path");
 const { readdirSync, statSync, readFileSync, writeFileSync } = require("fs");
 
+const mergeWith = require("lodash/mergeWith");
 const { LayoutHintConfiguration } = require("../constants/LayoutHintConfig");
 
 const findFiles = (dir: string): Array<string> => {
@@ -43,7 +44,14 @@ exports.mergeLayoutHintConfigurations = async (
     return JSON.parse(content);
   });
 
-  const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);
+  // Function to merge arrays during merging
+  const customizer = (objValue: Object, srcValue: Object): Object => {
+    if (Array.isArray(objValue)) {
+      return [...new Set([...objValue, ...srcValue])];
+    }
+  };
+
+  const newConfig = mergeWith(LayoutHintConfiguration, ...jsons, customizer);
 
   writeFileSync(
     path.join(outputFolder, "LayoutHintConfig.json"),

package/lib/builder/mergeLayoutHintConfigurations.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergeLayoutHintConfigurations.js","names":["path","require","readdirSync","statSync","readFileSync","writeFileSync","LayoutHintConfiguration","findFiles","dir","matchedFiles","files","file","absolute","join","isDirectory","foundFiles","push","filename","basename","exports","mergeLayoutHintConfigurations","srcFolder","outputFolder","escapedSrcFolder","replace","jsons","_map","default","call","content","JSON","parse","newConfig","_assign","_stringify","_promise","resolve"],"sources":["../../src/builder/mergeLayoutHintConfigurations.js"],"sourcesContent":["// @flow\nconst path = require(\"path\");\nconst { readdirSync, statSync, readFileSync, writeFileSync } = require(\"fs\");\n\nconst { LayoutHintConfiguration } = require(\"../constants/LayoutHintConfig\");\n\nconst findFiles = (dir: string): Array<string> => {\n  const matchedFiles = [];\n\n  const files = readdirSync(dir);\n\n  for (const file of files) {\n    const absolute = path.join(dir, file);\n    if (statSync(absolute).isDirectory()) {\n      const foundFiles = findFiles(absolute);\n      matchedFiles.push(...foundFiles);\n    } else {\n      const filename = path.basename(file);\n      if (filename === \"LayoutHintConfig.json\") {\n        matchedFiles.push(absolute);\n      }\n    }\n  }\n\n  return matchedFiles;\n};\n\n/**\n * Merge all LayoutHintConfig.json files from this library and in the srcFolder\n * together into one config file, and copies it to the outputFolder.<br/>\n * This file is consumed by Be Informed studio to give layout hint information\n */\nexports.mergeLayoutHintConfigurations = async (\n  srcFolder: string,\n  outputFolder: string,\n): Promise<void> => {\n  const escapedSrcFolder = srcFolder.replace(/\\\\/g, \"/\");\n\n  const files = findFiles(escapedSrcFolder);\n\n  const jsons = files.map((file) => {\n    const content = readFileSync(file, \"utf-8\");\n    return JSON.parse(content);\n  });\n\n  const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);\n\n  writeFileSync(\n    path.join(outputFolder, \"LayoutHintConfig.json\"),\n    JSON.stringify(newConfig),\n  );\n\n  return Promise.resolve();\n};\n"],"mappings":";;;;;;;AACA,MAAMA,IAAI,GAAGC,OAAO,CAAC,MAAM,CAAC;AAC5B,MAAM;EAAEC,WAAW;EAAEC,QAAQ;EAAEC,YAAY;EAAEC;AAAc,CAAC,GAAGJ,OAAO,CAAC,IAAI,CAAC;AAE5E,MAAM;EAAEK;AAAwB,CAAC,GAAGL,OAAO,CAAC,+BAA+B,CAAC;AAE5E,MAAMM,SAAS,GAAIC,GAAW,IAAoB;EAChD,MAAMC,YAAY,GAAG,EAAE;EAEvB,MAAMC,KAAK,GAAGR,WAAW,CAACM,GAAG,CAAC;EAE9B,KAAK,MAAMG,IAAI,IAAID,KAAK,EAAE;IACxB,MAAME,QAAQ,GAAGZ,IAAI,CAACa,IAAI,CAACL,GAAG,EAAEG,IAAI,CAAC;IACrC,IAAIR,QAAQ,CAACS,QAAQ,CAAC,CAACE,WAAW,CAAC,CAAC,EAAE;MACpC,MAAMC,UAAU,GAAGR,SAAS,CAACK,QAAQ,CAAC;MACtCH,YAAY,CAACO,IAAI,CAAC,GAAGD,UAAU,CAAC;IAClC,CAAC,MAAM;MACL,MAAME,QAAQ,GAAGjB,IAAI,CAACkB,QAAQ,CAACP,IAAI,CAAC;MACpC,IAAIM,QAAQ,KAAK,uBAAuB,EAAE;QACxCR,YAAY,CAACO,IAAI,CAACJ,QAAQ,CAAC;MAC7B;IACF;EACF;EAEA,OAAOH,YAAY;AACrB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAU,OAAO,CAACC,6BAA6B,GAAG,OACtCC,SAAiB,EACjBC,YAAoB,KACF;EAClB,MAAMC,gBAAgB,GAAGF,SAAS,CAACG,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;EAEtD,MAAMd,KAAK,GAAGH,SAAS,CAACgB,gBAAgB,CAAC;EAEzC,MAAME,KAAK,GAAG,IAAAC,IAAA,CAAAC,OAAA,EAAAjB,KAAK,EAAAkB,IAAA,CAALlB,KAAK,EAAMC,IAAI,IAAK;IAChC,MAAMkB,OAAO,GAAGzB,YAAY,CAACO,IAAI,EAAE,OAAO,CAAC;IAC3C,OAAOmB,IAAI,CAACC,KAAK,CAACF,OAAO,CAAC;EAC5B,CAAC,CAAC;EAEF,MAAMG,SAAS,GAAG,IAAAC,OAAA,CAAAN,OAAA,EAAcrB,uBAAuB,EAAE,GAAGmB,KAAK,CAAC;EAElEpB,aAAa,CACXL,IAAI,CAACa,IAAI,CAACS,YAAY,EAAE,uBAAuB,CAAC,EAChD,IAAAY,UAAA,CAAAP,OAAA,EAAeK,SAAS,CAC1B,CAAC;EAED,OAAOG,QAAA,CAAAR,OAAA,CAAQS,OAAO,CAAC,CAAC;AAC1B,CAAC","ignoreList":[]}
+{"version":3,"file":"mergeLayoutHintConfigurations.js","names":["path","require","readdirSync","statSync","readFileSync","writeFileSync","mergeWith","LayoutHintConfiguration","findFiles","dir","matchedFiles","files","file","absolute","join","isDirectory","foundFiles","push","filename","basename","exports","mergeLayoutHintConfigurations","srcFolder","outputFolder","escapedSrcFolder","replace","jsons","_map","default","call","content","JSON","parse","customizer","objValue","srcValue","Array","isArray","_set","newConfig","_stringify","_promise","resolve"],"sources":["../../src/builder/mergeLayoutHintConfigurations.js"],"sourcesContent":["// @flow\nconst path = require(\"path\");\nconst { readdirSync, statSync, readFileSync, writeFileSync } = require(\"fs\");\n\nconst mergeWith = require(\"lodash/mergeWith\");\nconst { LayoutHintConfiguration } = require(\"../constants/LayoutHintConfig\");\n\nconst findFiles = (dir: string): Array<string> => {\n  const matchedFiles = [];\n\n  const files = readdirSync(dir);\n\n  for (const file of files) {\n    const absolute = path.join(dir, file);\n    if (statSync(absolute).isDirectory()) {\n      const foundFiles = findFiles(absolute);\n      matchedFiles.push(...foundFiles);\n    } else {\n      const filename = path.basename(file);\n      if (filename === \"LayoutHintConfig.json\") {\n        matchedFiles.push(absolute);\n      }\n    }\n  }\n\n  return matchedFiles;\n};\n\n/**\n * Merge all LayoutHintConfig.json files from this library and in the srcFolder\n * together into one config file, and copies it to the outputFolder.<br/>\n * This file is consumed by Be Informed studio to give layout hint information\n */\nexports.mergeLayoutHintConfigurations = async (\n  srcFolder: string,\n  outputFolder: string,\n): Promise<void> => {\n  const escapedSrcFolder = srcFolder.replace(/\\\\/g, \"/\");\n\n  const files = findFiles(escapedSrcFolder);\n\n  const jsons = files.map((file) => {\n    const content = readFileSync(file, \"utf-8\");\n    return JSON.parse(content);\n  });\n\n  // Function to merge arrays during merging\n  const customizer = (objValue: Object, srcValue: Object): Object => {\n    if (Array.isArray(objValue)) {\n      return [...new Set([...objValue, ...srcValue])];\n    }\n  };\n\n  const newConfig = mergeWith(LayoutHintConfiguration, ...jsons, customizer);\n\n  writeFileSync(\n    path.join(outputFolder, \"LayoutHintConfig.json\"),\n    JSON.stringify(newConfig),\n  );\n\n  return Promise.resolve();\n};\n"],"mappings":";;;;;;;AACA,MAAMA,IAAI,GAAGC,OAAO,CAAC,MAAM,CAAC;AAC5B,MAAM;EAAEC,WAAW;EAAEC,QAAQ;EAAEC,YAAY;EAAEC;AAAc,CAAC,GAAGJ,OAAO,CAAC,IAAI,CAAC;AAE5E,MAAMK,SAAS,GAAGL,OAAO,CAAC,kBAAkB,CAAC;AAC7C,MAAM;EAAEM;AAAwB,CAAC,GAAGN,OAAO,CAAC,+BAA+B,CAAC;AAE5E,MAAMO,SAAS,GAAIC,GAAW,IAAoB;EAChD,MAAMC,YAAY,GAAG,EAAE;EAEvB,MAAMC,KAAK,GAAGT,WAAW,CAACO,GAAG,CAAC;EAE9B,KAAK,MAAMG,IAAI,IAAID,KAAK,EAAE;IACxB,MAAME,QAAQ,GAAGb,IAAI,CAACc,IAAI,CAACL,GAAG,EAAEG,IAAI,CAAC;IACrC,IAAIT,QAAQ,CAACU,QAAQ,CAAC,CAACE,WAAW,CAAC,CAAC,EAAE;MACpC,MAAMC,UAAU,GAAGR,SAAS,CAACK,QAAQ,CAAC;MACtCH,YAAY,CAACO,IAAI,CAAC,GAAGD,UAAU,CAAC;IAClC,CAAC,MAAM;MACL,MAAME,QAAQ,GAAGlB,IAAI,CAACmB,QAAQ,CAACP,IAAI,CAAC;MACpC,IAAIM,QAAQ,KAAK,uBAAuB,EAAE;QACxCR,YAAY,CAACO,IAAI,CAACJ,QAAQ,CAAC;MAC7B;IACF;EACF;EAEA,OAAOH,YAAY;AACrB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAU,OAAO,CAACC,6BAA6B,GAAG,OACtCC,SAAiB,EACjBC,YAAoB,KACF;EAClB,MAAMC,gBAAgB,GAAGF,SAAS,CAACG,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;EAEtD,MAAMd,KAAK,GAAGH,SAAS,CAACgB,gBAAgB,CAAC;EAEzC,MAAME,KAAK,GAAG,IAAAC,IAAA,CAAAC,OAAA,EAAAjB,KAAK,EAAAkB,IAAA,CAALlB,KAAK,EAAMC,IAAI,IAAK;IAChC,MAAMkB,OAAO,GAAG1B,YAAY,CAACQ,IAAI,EAAE,OAAO,CAAC;IAC3C,OAAOmB,IAAI,CAACC,KAAK,CAACF,OAAO,CAAC;EAC5B,CAAC,CAAC;;EAEF;EACA,MAAMG,UAAU,GAAGA,CAACC,QAAgB,EAAEC,QAAgB,KAAa;IACjE,IAAIC,KAAK,CAACC,OAAO,CAACH,QAAQ,CAAC,EAAE;MAC3B,OAAO,CAAC,GAAG,IAAAI,IAAA,CAAAV,OAAA,CAAQ,CAAC,GAAGM,QAAQ,EAAE,GAAGC,QAAQ,CAAC,CAAC,CAAC;IACjD;EACF,CAAC;EAED,MAAMI,SAAS,GAAGjC,SAAS,CAACC,uBAAuB,EAAE,GAAGmB,KAAK,EAAEO,UAAU,CAAC;EAE1E5B,aAAa,CACXL,IAAI,CAACc,IAAI,CAACS,YAAY,EAAE,uBAAuB,CAAC,EAChD,IAAAiB,UAAA,CAAAZ,OAAA,EAAeW,SAAS,CAC1B,CAAC;EAED,OAAOE,QAAA,CAAAb,OAAA,CAAQc,OAAO,CAAC,CAAC;AAC1B,CAAC","ignoreList":[]}

package/lib/redux/_modularui/ModularUIConnector.js

@@ -48,6 +48,8 @@ const modularUIConnector = function (name, resource) {
   } = options;
   return Component => {
     const WrappedComponent = props => {
+      // explicit property for removeOnMount overwrite the setting
+      const finalRemoveOnUnmount = props.removeOnUnmount === true ? true : removeOnUnmount;
       const dispatch = (0, _reactRedux.useDispatch)();
       const location = (0, _reactRouter.useLocation)();
       const url = (0, _ModularUIUtils.useUrl)(resource, {
@@ -57,7 +59,10 @@ const modularUIConnector = function (name, resource) {
       const displayName = (0, _utils.getDisplayName)(Component, name, props.contextId);
 
       // Load the model through the useModUI hook
-      const modelEntry = (0, _useModularUI.useModularUI)(displayName, url, otherOptions);
+      const modelEntry = (0, _useModularUI.useModularUI)(displayName, url, {
+        ...otherOptions,
+        removeOnUnmount: finalRemoveOnUnmount
+      });
       const modelKey = modelEntry?.model?.connectKey;
 
       // handle manual reload of model
@@ -86,11 +91,11 @@ const modularUIConnector = function (name, resource) {
       // Remove model when hoc unloads
       (0, _react.useEffect)(() => {
         return () => {
-          if (removeOnUnmount) {
+          if (finalRemoveOnUnmount) {
             dispatch((0, _ModularUIActions.removeModelByKey)(modelKey));
           }
         };
-      }, [dispatch, modelKey]);
+      }, [dispatch, modelKey, finalRemoveOnUnmount]);
 
       // Create new properties object to inject modularui properties to own props
       const locale = (0, _useI18n.useLocale)();

package/lib/redux/_modularui/ModularUIConnector.js.flow

@@ -71,6 +71,10 @@ const modularUIConnector = (
 
   return (Component: ComponentType<any>) => {
     const WrappedComponent = (props: any) => {
+      // explicit property for removeOnMount overwrite the setting
+      const finalRemoveOnUnmount =
+        props.removeOnUnmount === true ? true : removeOnUnmount;
+
       const dispatch = useDispatch();
       const location = useLocation();
 
@@ -78,7 +82,10 @@ const modularUIConnector = (
       const displayName = getDisplayName(Component, name, props.contextId);
 
       // Load the model through the useModUI hook
-      const modelEntry = useModularUI(displayName, url, otherOptions);
+      const modelEntry = useModularUI(displayName, url, {
+        ...otherOptions,
+        removeOnUnmount: finalRemoveOnUnmount,
+      });
       const modelKey = modelEntry?.model?.connectKey;
 
       // handle manual reload of model
@@ -114,11 +121,11 @@ const modularUIConnector = (
       // Remove model when hoc unloads
       useEffect(() => {
         return () => {
-          if (removeOnUnmount) {
+          if (finalRemoveOnUnmount) {
             dispatch(removeModelByKey(modelKey));
           }
         };
-      }, [dispatch, modelKey]);
+      }, [dispatch, modelKey, finalRemoveOnUnmount]);
 
       // Create new properties object to inject modularui properties to own props
       const locale = useLocale();

package/lib/redux/_modularui/ModularUIConnector.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModularUIConnector.js","names":["_react","require","_reactRedux","_reactRouter","_ModularUIActions","_Href","_interopRequireDefault","_utils","_ModularUIUtils","_useModularUI","_useI18n","_FormModel","_jsxRuntime","patchUpdateModelOption","oldOptions","updateModel","FormModel","updateHandler","newModel","clonedModel","clone","update","modularUIConnector","name","resource","options","arguments","length","undefined","propName","removeOnUnmount","otherOptions","Component","WrappedComponent","props","dispatch","useDispatch","location","useLocation","url","useUrl","displayName","getDisplayName","contextId","modelEntry","useModularUI","modelKey","model","connectKey","handleManualReload","reloadOptions","reloadModel","handleFetch","href","fetchOptions","loadModularUI","reload","state","doReload","useReload","useEffect","isReload","removeModelByKey","locale","useLocale","newProps","status","lastModification","hasModel","Boolean","fetchModularUI","jsx","_default","exports","default"],"sources":["../../../src/redux/_modularui/ModularUIConnector.js"],"sourcesContent":["// @flow\nimport { useEffect } from \"react\";\nimport { useDispatch } from \"react-redux\";\nimport { useLocation } from \"react-router\";\n\nimport {\n  loadModularUI,\n  reloadModel,\n  removeModelByKey,\n} from \"./ModularUIActions\";\n\nimport Href from \"../../models/href/Href\";\nimport { getDisplayName } from \"../../react/utils\";\n\nimport { useUrl, useReload } from \"./ModularUIUtils\";\nimport { useModularUI } from \"../../hooks/useModularUI\";\nimport { useLocale } from \"../../hooks/useI18n\";\n\nimport type { ComponentType, Node } from \"react\";\nimport type { Location } from \"react-router\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { ModularUIOptions } from \"./types\";\nimport FormModel from \"../../models/form/FormModel\";\n\nexport type InjectedProps = {\n  +modelKey: string,\n  +location: Location,\n  +status: string | null,\n  +lastModification: number | null,\n  +hasModel: boolean,\n  +locale: string,\n  +fetchModularUI: (href: string | Href, fetchOptions: Object) => void,\n  +reloadModel: (model: ModularUIModel, options: Object) => void,\n  +data?: ?ModularUIModel,\n};\n\nconst patchUpdateModelOption = (oldOptions: Object) => {\n  if (\n    \"updateModel\" in oldOptions &&\n    oldOptions.updateModel instanceof FormModel\n  ) {\n    return {\n      ...oldOptions,\n      updateHandler: (newModel: ModularUIModel): ModularUIModel => {\n        if (newModel instanceof FormModel) {\n          // $FLowFixMe\n          const clonedModel: FormModel = oldOptions.updateModel.clone();\n          clonedModel.update(newModel);\n          return clonedModel;\n        }\n        return newModel;\n      },\n    };\n  }\n\n  return oldOptions;\n};\n\n/**\n */\nconst modularUIConnector = (\n  name: string,\n  resource: string | Function,\n  options: ModularUIOptions = { propName: \"data\", removeOnUnmount: false },\n): ((Component: ComponentType<any>) => (props: any) => Node) => {\n  const {\n    propName = \"data\",\n    removeOnUnmount = false,\n    ...otherOptions\n  } = options;\n\n  return (Component: ComponentType<any>) => {\n    const WrappedComponent = (props: any) => {\n      const dispatch = useDispatch();\n      const location = useLocation();\n\n      const url = useUrl(resource, { location, ...props });\n      const displayName = getDisplayName(Component, name, props.contextId);\n\n      // Load the model through the useModUI hook\n      const modelEntry = useModularUI(displayName, url, otherOptions);\n      const modelKey = modelEntry?.model?.connectKey;\n\n      // handle manual reload of model\n      const handleManualReload = (\n        model: ModularUIModel,\n        reloadOptions?: Object,\n      ) => {\n        dispatch(reloadModel(model, reloadOptions));\n      };\n\n      // Provide connected models with a fetchModularUI method to be able\n      // to run the loadModularUI action from a handler / callback in the component\n      const handleFetch = (href: string | Href, fetchOptions: Object) => {\n        dispatch(\n          loadModularUI(modelKey, href, patchUpdateModelOption(fetchOptions)),\n        );\n      };\n\n      // Check if current model needs a reload\n      const reload = location?.state?.reload ?? 0;\n      const doReload = useReload(modelEntry, reload);\n      useEffect(() => {\n        if (doReload) {\n          dispatch(\n            loadModularUI(modelKey, url, {\n              ...patchUpdateModelOption(otherOptions),\n              isReload: true,\n            }),\n          );\n        }\n      }, [dispatch, doReload, url, modelKey]);\n\n      // Remove model when hoc unloads\n      useEffect(() => {\n        return () => {\n          if (removeOnUnmount) {\n            dispatch(removeModelByKey(modelKey));\n          }\n        };\n      }, [dispatch, modelKey]);\n\n      // Create new properties object to inject modularui properties to own props\n      const locale = useLocale();\n      const newProps: InjectedProps = {\n        modelKey,\n        [propName]: modelEntry ? modelEntry.model : null,\n        location,\n        status: modelEntry ? modelEntry.status : null,\n        lastModification: modelEntry ? modelEntry.lastModification : null,\n        hasModel: Boolean(modelEntry),\n        locale,\n        fetchModularUI: handleFetch,\n        reloadModel: handleManualReload,\n      };\n\n      return <Component {...props} {...newProps} />;\n    };\n\n    WrappedComponent.displayName = `BI.modularui(${getDisplayName(\n      WrappedComponent,\n      name,\n    )}`;\n\n    return WrappedComponent;\n  };\n};\n\nexport default modularUIConnector;\n"],"mappings":";;;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,YAAA,GAAAF,OAAA;AAEA,IAAAG,iBAAA,GAAAH,OAAA;AAMA,IAAAI,KAAA,GAAAC,sBAAA,CAAAL,OAAA;AACA,IAAAM,MAAA,GAAAN,OAAA;AAEA,IAAAO,eAAA,GAAAP,OAAA;AACA,IAAAQ,aAAA,GAAAR,OAAA;AACA,IAAAS,QAAA,GAAAT,OAAA;AAMA,IAAAU,UAAA,GAAAL,sBAAA,CAAAL,OAAA;AAAoD,IAAAW,WAAA,GAAAX,OAAA;AAcpD,MAAMY,sBAAsB,GAAIC,UAAkB,IAAK;EACrD,IACE,aAAa,IAAIA,UAAU,IAC3BA,UAAU,CAACC,WAAW,YAAYC,kBAAS,EAC3C;IACA,OAAO;MACL,GAAGF,UAAU;MACbG,aAAa,EAAGC,QAAwB,IAAqB;QAC3D,IAAIA,QAAQ,YAAYF,kBAAS,EAAE;UACjC;UACA,MAAMG,WAAsB,GAAGL,UAAU,CAACC,WAAW,CAACK,KAAK,CAAC,CAAC;UAC7DD,WAAW,CAACE,MAAM,CAACH,QAAQ,CAAC;UAC5B,OAAOC,WAAW;QACpB;QACA,OAAOD,QAAQ;MACjB;IACF,CAAC;EACH;EAEA,OAAOJ,UAAU;AACnB,CAAC;;AAED;AACA;AACA,MAAMQ,kBAAkB,GAAG,SAAAA,CACzBC,IAAY,EACZC,QAA2B,EAEmC;EAAA,IAD9DC,OAAyB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG;IAAEG,QAAQ,EAAE,MAAM;IAAEC,eAAe,EAAE;EAAM,CAAC;EAExE,MAAM;IACJD,QAAQ,GAAG,MAAM;IACjBC,eAAe,GAAG,KAAK;IACvB,GAAGC;EACL,CAAC,GAAGN,OAAO;EAEX,OAAQO,SAA6B,IAAK;IACxC,MAAMC,gBAAgB,GAAIC,KAAU,IAAK;MACvC,MAAMC,QAAQ,GAAG,IAAAC,uBAAW,EAAC,CAAC;MAC9B,MAAMC,QAAQ,GAAG,IAAAC,wBAAW,EAAC,CAAC;MAE9B,MAAMC,GAAG,GAAG,IAAAC,sBAAM,EAAChB,QAAQ,EAAE;QAAEa,QAAQ;QAAE,GAAGH;MAAM,CAAC,CAAC;MACpD,MAAMO,WAAW,GAAG,IAAAC,qBAAc,EAACV,SAAS,EAAET,IAAI,EAAEW,KAAK,CAACS,SAAS,CAAC;;MAEpE;MACA,MAAMC,UAAU,GAAG,IAAAC,0BAAY,EAACJ,WAAW,EAAEF,GAAG,EAAER,YAAY,CAAC;MAC/D,MAAMe,QAAQ,GAAGF,UAAU,EAAEG,KAAK,EAAEC,UAAU;;MAE9C;MACA,MAAMC,kBAAkB,GAAGA,CACzBF,KAAqB,EACrBG,aAAsB,KACnB;QACHf,QAAQ,CAAC,IAAAgB,6BAAW,EAACJ,KAAK,EAAEG,aAAa,CAAC,CAAC;MAC7C,CAAC;;MAED;MACA;MACA,MAAME,WAAW,GAAGA,CAACC,IAAmB,EAAEC,YAAoB,KAAK;QACjEnB,QAAQ,CACN,IAAAoB,+BAAa,EAACT,QAAQ,EAAEO,IAAI,EAAExC,sBAAsB,CAACyC,YAAY,CAAC,CACpE,CAAC;MACH,CAAC;;MAED;MACA,MAAME,MAAM,GAAGnB,QAAQ,EAAEoB,KAAK,EAAED,MAAM,IAAI,CAAC;MAC3C,MAAME,QAAQ,GAAG,IAAAC,yBAAS,EAACf,UAAU,EAAEY,MAAM,CAAC;MAC9C,IAAAI,gBAAS,EAAC,MAAM;QACd,IAAIF,QAAQ,EAAE;UACZvB,QAAQ,CACN,IAAAoB,+BAAa,EAACT,QAAQ,EAAEP,GAAG,EAAE;YAC3B,GAAG1B,sBAAsB,CAACkB,YAAY,CAAC;YACvC8B,QAAQ,EAAE;UACZ,CAAC,CACH,CAAC;QACH;MACF,CAAC,EAAE,CAAC1B,QAAQ,EAAEuB,QAAQ,EAAEnB,GAAG,EAAEO,QAAQ,CAAC,CAAC;;MAEvC;MACA,IAAAc,gBAAS,EAAC,MAAM;QACd,OAAO,MAAM;UACX,IAAI9B,eAAe,EAAE;YACnBK,QAAQ,CAAC,IAAA2B,kCAAgB,EAAChB,QAAQ,CAAC,CAAC;UACtC;QACF,CAAC;MACH,CAAC,EAAE,CAACX,QAAQ,EAAEW,QAAQ,CAAC,CAAC;;MAExB;MACA,MAAMiB,MAAM,GAAG,IAAAC,kBAAS,EAAC,CAAC;MAC1B,MAAMC,QAAuB,GAAG;QAC9BnB,QAAQ;QACR,CAACjB,QAAQ,GAAGe,UAAU,GAAGA,UAAU,CAACG,KAAK,GAAG,IAAI;QAChDV,QAAQ;QACR6B,MAAM,EAAEtB,UAAU,GAAGA,UAAU,CAACsB,MAAM,GAAG,IAAI;QAC7CC,gBAAgB,EAAEvB,UAAU,GAAGA,UAAU,CAACuB,gBAAgB,GAAG,IAAI;QACjEC,QAAQ,EAAEC,OAAO,CAACzB,UAAU,CAAC;QAC7BmB,MAAM;QACNO,cAAc,EAAElB,WAAW;QAC3BD,WAAW,EAAEF;MACf,CAAC;MAED,oBAAO,IAAArC,WAAA,CAAA2D,GAAA,EAACvC,SAAS;QAAA,GAAKE,KAAK;QAAA,GAAM+B;MAAQ,CAAG,CAAC;IAC/C,CAAC;IAEDhC,gBAAgB,CAACQ,WAAW,GAAG,gBAAgB,IAAAC,qBAAc,EAC3DT,gBAAgB,EAChBV,IACF,CAAC,EAAE;IAEH,OAAOU,gBAAgB;EACzB,CAAC;AACH,CAAC;AAAC,IAAAuC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEapD,kBAAkB","ignoreList":[]}
+{"version":3,"file":"ModularUIConnector.js","names":["_react","require","_reactRedux","_reactRouter","_ModularUIActions","_Href","_interopRequireDefault","_utils","_ModularUIUtils","_useModularUI","_useI18n","_FormModel","_jsxRuntime","patchUpdateModelOption","oldOptions","updateModel","FormModel","updateHandler","newModel","clonedModel","clone","update","modularUIConnector","name","resource","options","arguments","length","undefined","propName","removeOnUnmount","otherOptions","Component","WrappedComponent","props","finalRemoveOnUnmount","dispatch","useDispatch","location","useLocation","url","useUrl","displayName","getDisplayName","contextId","modelEntry","useModularUI","modelKey","model","connectKey","handleManualReload","reloadOptions","reloadModel","handleFetch","href","fetchOptions","loadModularUI","reload","state","doReload","useReload","useEffect","isReload","removeModelByKey","locale","useLocale","newProps","status","lastModification","hasModel","Boolean","fetchModularUI","jsx","_default","exports","default"],"sources":["../../../src/redux/_modularui/ModularUIConnector.js"],"sourcesContent":["// @flow\nimport { useEffect } from \"react\";\nimport { useDispatch } from \"react-redux\";\nimport { useLocation } from \"react-router\";\n\nimport {\n  loadModularUI,\n  reloadModel,\n  removeModelByKey,\n} from \"./ModularUIActions\";\n\nimport Href from \"../../models/href/Href\";\nimport { getDisplayName } from \"../../react/utils\";\n\nimport { useUrl, useReload } from \"./ModularUIUtils\";\nimport { useModularUI } from \"../../hooks/useModularUI\";\nimport { useLocale } from \"../../hooks/useI18n\";\n\nimport type { ComponentType, Node } from \"react\";\nimport type { Location } from \"react-router\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { ModularUIOptions } from \"./types\";\nimport FormModel from \"../../models/form/FormModel\";\n\nexport type InjectedProps = {\n  +modelKey: string,\n  +location: Location,\n  +status: string | null,\n  +lastModification: number | null,\n  +hasModel: boolean,\n  +locale: string,\n  +fetchModularUI: (href: string | Href, fetchOptions: Object) => void,\n  +reloadModel: (model: ModularUIModel, options: Object) => void,\n  +data?: ?ModularUIModel,\n};\n\nconst patchUpdateModelOption = (oldOptions: Object) => {\n  if (\n    \"updateModel\" in oldOptions &&\n    oldOptions.updateModel instanceof FormModel\n  ) {\n    return {\n      ...oldOptions,\n      updateHandler: (newModel: ModularUIModel): ModularUIModel => {\n        if (newModel instanceof FormModel) {\n          // $FLowFixMe\n          const clonedModel: FormModel = oldOptions.updateModel.clone();\n          clonedModel.update(newModel);\n          return clonedModel;\n        }\n        return newModel;\n      },\n    };\n  }\n\n  return oldOptions;\n};\n\n/**\n */\nconst modularUIConnector = (\n  name: string,\n  resource: string | Function,\n  options: ModularUIOptions = { propName: \"data\", removeOnUnmount: false },\n): ((Component: ComponentType<any>) => (props: any) => Node) => {\n  const {\n    propName = \"data\",\n    removeOnUnmount = false,\n    ...otherOptions\n  } = options;\n\n  return (Component: ComponentType<any>) => {\n    const WrappedComponent = (props: any) => {\n      // explicit property for removeOnMount overwrite the setting\n      const finalRemoveOnUnmount =\n        props.removeOnUnmount === true ? true : removeOnUnmount;\n\n      const dispatch = useDispatch();\n      const location = useLocation();\n\n      const url = useUrl(resource, { location, ...props });\n      const displayName = getDisplayName(Component, name, props.contextId);\n\n      // Load the model through the useModUI hook\n      const modelEntry = useModularUI(displayName, url, {\n        ...otherOptions,\n        removeOnUnmount: finalRemoveOnUnmount,\n      });\n      const modelKey = modelEntry?.model?.connectKey;\n\n      // handle manual reload of model\n      const handleManualReload = (\n        model: ModularUIModel,\n        reloadOptions?: Object,\n      ) => {\n        dispatch(reloadModel(model, reloadOptions));\n      };\n\n      // Provide connected models with a fetchModularUI method to be able\n      // to run the loadModularUI action from a handler / callback in the component\n      const handleFetch = (href: string | Href, fetchOptions: Object) => {\n        dispatch(\n          loadModularUI(modelKey, href, patchUpdateModelOption(fetchOptions)),\n        );\n      };\n\n      // Check if current model needs a reload\n      const reload = location?.state?.reload ?? 0;\n      const doReload = useReload(modelEntry, reload);\n      useEffect(() => {\n        if (doReload) {\n          dispatch(\n            loadModularUI(modelKey, url, {\n              ...patchUpdateModelOption(otherOptions),\n              isReload: true,\n            }),\n          );\n        }\n      }, [dispatch, doReload, url, modelKey]);\n\n      // Remove model when hoc unloads\n      useEffect(() => {\n        return () => {\n          if (finalRemoveOnUnmount) {\n            dispatch(removeModelByKey(modelKey));\n          }\n        };\n      }, [dispatch, modelKey, finalRemoveOnUnmount]);\n\n      // Create new properties object to inject modularui properties to own props\n      const locale = useLocale();\n      const newProps: InjectedProps = {\n        modelKey,\n        [propName]: modelEntry ? modelEntry.model : null,\n        location,\n        status: modelEntry ? modelEntry.status : null,\n        lastModification: modelEntry ? modelEntry.lastModification : null,\n        hasModel: Boolean(modelEntry),\n        locale,\n        fetchModularUI: handleFetch,\n        reloadModel: handleManualReload,\n      };\n\n      return <Component {...props} {...newProps} />;\n    };\n\n    WrappedComponent.displayName = `BI.modularui(${getDisplayName(\n      WrappedComponent,\n      name,\n    )}`;\n\n    return WrappedComponent;\n  };\n};\n\nexport default modularUIConnector;\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.54.1",
+  "version": "1.54.3",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",

package/src/builder/__tests__/LayoutHintConfig.json

@@ -7,5 +7,14 @@
     },
     "link": "",
     "component": ["attribute"]
+  },
+  "MERGE": {
+    "hint": "merge",
+    "description": {
+      "NL": "merge with extra component",
+      "EN": "merge with extra component"
+    },
+    "link": "",
+    "component": ["component1", "component2"]
   }
 }

package/src/builder/__tests__/mergeLayoutHintConfigurations.spec.js

@@ -1,6 +1,7 @@
 import { mergeLayoutHintConfigurations } from "../mergeLayoutHintConfigurations";
 import { LayoutHintConfiguration } from "../../constants/LayoutHintConfig";
 const fs = require("fs");
+
 //
 const projectJson1 = {
   MOCK: {
@@ -26,6 +27,18 @@ const projectJson2 = {
   },
 };
 
+const projectMerge = {
+  MERGE: {
+    hint: "merge",
+    description: {
+      NL: "merge with extra component",
+      EN: "merge with extra component",
+    },
+    link: "",
+    component: ["component1", "component2", "component3"],
+  },
+};
+
 jest.mock("fs", () => ({
   ...jest.requireActual("fs"),
   writeFileSync: jest.fn(),
@@ -33,19 +46,26 @@ jest.mock("fs", () => ({
 
 describe("mergeLayoutHintConfigurations", () => {
   it("generates layouthint.json", async () => {
-    expect.assertions(1);
+    expect.assertions(2);
 
     const expectedJson = {
       ...LayoutHintConfiguration,
       ...projectJson1,
       ...projectJson2,
+      ...projectMerge,
     };
 
     await mergeLayoutHintConfigurations("./src", "/output");
 
     expect(fs.writeFileSync).toHaveBeenCalledWith(
       expect.stringContaining("LayoutHintConfig.json"),
-      JSON.stringify(expectedJson),
+      expect.any(String),
     );
+
+    // Check that the JSON written matches the expected JSON
+    const actualJson = JSON.parse(fs.writeFileSync.mock.calls[0][1]);
+
+    // Compare objects using deep comparison to ensure they are equal
+    expect(actualJson).toEqual(expectedJson);
   });
 });

package/src/builder/__tests__/subdir/LayoutHintConfig.json

@@ -7,5 +7,14 @@
     },
     "link": "",
     "component": ["attribute"]
+  },
+  "MERGE": {
+    "hint": "merge",
+    "description": {
+      "NL": "merge with extra component",
+      "EN": "merge with extra component"
+    },
+    "link": "",
+    "component": ["component1", "component3"]
   }
 }

package/src/builder/mergeLayoutHintConfigurations.js

@@ -2,6 +2,7 @@
 const path = require("path");
 const { readdirSync, statSync, readFileSync, writeFileSync } = require("fs");
 
+const mergeWith = require("lodash/mergeWith");
 const { LayoutHintConfiguration } = require("../constants/LayoutHintConfig");
 
 const findFiles = (dir: string): Array<string> => {
@@ -43,7 +44,14 @@ exports.mergeLayoutHintConfigurations = async (
     return JSON.parse(content);
   });
 
-  const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);
+  // Function to merge arrays during merging
+  const customizer = (objValue: Object, srcValue: Object): Object => {
+    if (Array.isArray(objValue)) {
+      return [...new Set([...objValue, ...srcValue])];
+    }
+  };
+
+  const newConfig = mergeWith(LayoutHintConfiguration, ...jsons, customizer);
 
   writeFileSync(
     path.join(outputFolder, "LayoutHintConfig.json"),

package/src/redux/_modularui/ModularUIConnector.js

@@ -71,6 +71,10 @@ const modularUIConnector = (
 
   return (Component: ComponentType<any>) => {
     const WrappedComponent = (props: any) => {
+      // explicit property for removeOnMount overwrite the setting
+      const finalRemoveOnUnmount =
+        props.removeOnUnmount === true ? true : removeOnUnmount;
+
       const dispatch = useDispatch();
       const location = useLocation();
 
@@ -78,7 +82,10 @@ const modularUIConnector = (
       const displayName = getDisplayName(Component, name, props.contextId);
 
       // Load the model through the useModUI hook
-      const modelEntry = useModularUI(displayName, url, otherOptions);
+      const modelEntry = useModularUI(displayName, url, {
+        ...otherOptions,
+        removeOnUnmount: finalRemoveOnUnmount,
+      });
       const modelKey = modelEntry?.model?.connectKey;
 
       // handle manual reload of model
@@ -114,11 +121,11 @@ const modularUIConnector = (
       // Remove model when hoc unloads
       useEffect(() => {
         return () => {
-          if (removeOnUnmount) {
+          if (finalRemoveOnUnmount) {
             dispatch(removeModelByKey(modelKey));
           }
         };
-      }, [dispatch, modelKey]);
+      }, [dispatch, modelKey, finalRemoveOnUnmount]);
 
       // Create new properties object to inject modularui properties to own props
       const locale = useLocale();