@beinformed/ui 1.65.13 → 1.65.15

package/lib/hooks/useModularUI.js

@@ -16,45 +16,40 @@ var _Href = _interopRequireDefault(require("../models/href/Href"));
 /**
  * Core hook to retrieve information for a Be Informed modular ui resource
  */
-const useModularUI = (modelKey, url, options = {
-  method: _constants.HTTP_METHODS.GET,
-  removeOnUnmount: false
-}) => {
+const useModularUI = (modelKey, url, options = {}) => {
   const dispatch = (0, _reactRedux.useDispatch)();
   const href = (0, _react.useMemo)(() => url?.toString() || "", [url]);
   const key = (0, _useModularUIKey.useModularUIKey)(modelKey, href);
-  const modelSelector = (0, _react.useMemo)(() => state => state.modularui[key], [key]);
-  const model = (0, _reactRedux.useSelector)(modelSelector);
-  if (url instanceof _Href.default) {
-    options.origin = options.origin ?? url.origin;
-    options.contextPath = options.contextPath ?? url.contextPath;
-  }
+  const model = (0, _reactRedux.useSelector)(state => state.modularui[key]);
+  const requestOptions = (0, _react.useMemo)(() => {
+    const merged = {
+      method: _constants.HTTP_METHODS.GET,
+      removeOnUnmount: false,
+      ...options
+    };
+    if (url instanceof _Href.default) {
+      merged.origin = merged.origin ?? url.origin;
+      merged.contextPath = merged.contextPath ?? url.contextPath;
+    }
+    return merged;
+  }, [options, url]);
   const location = (0, _reactRouter.useLocation)();
   const redirectLocation = location.state?.redirectLocation;
-  const forceLoad = model == null || (redirectLocation instanceof _Href.default ? redirectLocation?.equals(href) : false);
-  const prevOptions = (0, _react.useRef)(options);
-  const prevHref = (0, _react.useRef)(href);
-  const prevForceLoad = (0, _react.useRef)(forceLoad);
+  const shouldLoad = model == null || (redirectLocation instanceof _Href.default ? redirectLocation?.equals(href) : false) || requestOptions.isReload === true;
 
   // dispatch loadModularUI
   (0, _useDeepCompareEffect.default)(() => {
-    // prevent reloads when previous option had the isReload, but the new options not
-    const isOldReload = prevHref.current === href && prevOptions.current.isReload && !options.isReload;
-    const doForceLoad = forceLoad && !prevForceLoad.current;
-    if (href !== "" && (doForceLoad || !isOldReload)) {
-      dispatch((0, _ModularUIActions.loadModularUI)(key, href, options));
+    if (href !== "" && shouldLoad) {
+      dispatch((0, _ModularUIActions.loadModularUI)(key, href, requestOptions));
     }
-    prevOptions.current = options;
-    prevHref.current = href;
-    prevForceLoad.current = forceLoad;
-  }, [key, href, options, forceLoad]);
+  }, [key, href, requestOptions, shouldLoad]);
   (0, _react.useEffect)(() => {
-    if (options.removeOnUnmount) {
+    if (requestOptions.removeOnUnmount) {
       return () => {
         dispatch((0, _ModularUIActions.removeModelByKey)(key));
       };
     }
-  }, [dispatch, key, options.removeOnUnmount]);
+  }, [dispatch, key, requestOptions.removeOnUnmount]);
   return model;
 };
 exports.useModularUI = useModularUI;

package/lib/hooks/useModularUI.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModularUI.js","names":["_react","require","_reactRedux","_reactRouter","_constants","_ModularUIActions","_useDeepCompareEffect","_interopRequireDefault","_useModularUIKey","_Href","useModularUI","modelKey","url","options","method","HTTP_METHODS","GET","removeOnUnmount","dispatch","useDispatch","href","useMemo","toString","key","useModularUIKey","modelSelector","state","modularui","model","useSelector","Href","origin","contextPath","location","useLocation","redirectLocation","forceLoad","equals","prevOptions","useRef","prevHref","prevForceLoad","useDeepCompareEffect","isOldReload","current","isReload","doForceLoad","loadModularUI","useEffect","removeModelByKey","exports"],"sources":["../../src/hooks/useModularUI.js"],"sourcesContent":["// @flow\nimport { useEffect, useRef, useMemo } from \"react\";\nimport { useDispatch, useSelector } from \"react-redux\";\nimport { useLocation } from \"react-router\";\n\nimport { HTTP_METHODS } from \"../constants\";\nimport {\n  loadModularUI,\n  removeModelByKey,\n} from \"../redux/_modularui/ModularUIActions\";\n\nimport useDeepCompareEffect from \"./useDeepCompareEffect\";\nimport { useModularUIKey } from \"./useModularUIKey\";\n\nimport Href from \"../models/href/Href\";\nimport type { RequestModularUIOptions } from \"../utils\";\n\n/**\n * Core hook to retrieve information for a Be Informed modular ui resource\n */\nexport const useModularUI = (\n  modelKey: string,\n  url: string | Href,\n  options: RequestModularUIOptions = {\n    method: HTTP_METHODS.GET,\n    removeOnUnmount: false,\n  },\n): any => {\n  const dispatch = useDispatch();\n  const href = useMemo(() => url?.toString() || \"\", [url]);\n  const key = useModularUIKey(modelKey, href);\n\n  const modelSelector = useMemo(() => (state) => state.modularui[key], [key]);\n  const model = useSelector(modelSelector);\n\n  if (url instanceof Href) {\n    options.origin = options.origin ?? url.origin;\n    options.contextPath = options.contextPath ?? url.contextPath;\n  }\n\n  const location = useLocation();\n  const redirectLocation = location.state?.redirectLocation;\n  const forceLoad =\n    model == null ||\n    (redirectLocation instanceof Href ? redirectLocation?.equals(href) : false);\n\n  const prevOptions = useRef(options);\n  const prevHref = useRef(href);\n  const prevForceLoad = useRef(forceLoad);\n\n  // dispatch loadModularUI\n  useDeepCompareEffect(() => {\n    // prevent reloads when previous option had the isReload, but the new options not\n    const isOldReload =\n      prevHref.current === href &&\n      prevOptions.current.isReload &&\n      !options.isReload;\n\n    const doForceLoad = forceLoad && !prevForceLoad.current;\n\n    if (href !== \"\" && (doForceLoad || !isOldReload)) {\n      dispatch(loadModularUI(key, href, options));\n    }\n\n    prevOptions.current = options;\n    prevHref.current = href;\n    prevForceLoad.current = forceLoad;\n  }, [key, href, options, forceLoad]);\n\n  useEffect(() => {\n    if (options.removeOnUnmount) {\n      return () => {\n        dispatch(removeModelByKey(key));\n      };\n    }\n  }, [dispatch, key, options.removeOnUnmount]);\n\n  return model;\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"useModularUI.js","names":["_react","require","_reactRedux","_reactRouter","_constants","_ModularUIActions","_useDeepCompareEffect","_interopRequireDefault","_useModularUIKey","_Href","useModularUI","modelKey","url","options","dispatch","useDispatch","href","useMemo","toString","key","useModularUIKey","model","useSelector","state","modularui","requestOptions","merged","method","HTTP_METHODS","GET","removeOnUnmount","Href","origin","contextPath","location","useLocation","redirectLocation","shouldLoad","equals","isReload","useDeepCompareEffect","loadModularUI","useEffect","removeModelByKey","exports"],"sources":["../../src/hooks/useModularUI.js"],"sourcesContent":["// @flow\nimport { useEffect, useMemo } from \"react\";\nimport { useDispatch, useSelector } from \"react-redux\";\nimport { useLocation } from \"react-router\";\n\nimport { HTTP_METHODS } from \"../constants\";\nimport {\n  loadModularUI,\n  removeModelByKey,\n} from \"../redux/_modularui/ModularUIActions\";\n\nimport useDeepCompareEffect from \"./useDeepCompareEffect\";\nimport { useModularUIKey } from \"./useModularUIKey\";\n\nimport Href from \"../models/href/Href\";\nimport type { RequestModularUIOptions } from \"../utils\";\n\n/**\n * Core hook to retrieve information for a Be Informed modular ui resource\n */\nexport const useModularUI = (\n  modelKey: string,\n  url: string | Href,\n  options: RequestModularUIOptions = {},\n): any => {\n  const dispatch = useDispatch();\n\n  const href = useMemo(() => url?.toString() || \"\", [url]);\n  const key = useModularUIKey(modelKey, href);\n\n  const model = useSelector((state) => state.modularui[key]);\n\n  const requestOptions = useMemo(() => {\n    const merged = {\n      method: HTTP_METHODS.GET,\n      removeOnUnmount: false,\n      ...options,\n    };\n\n    if (url instanceof Href) {\n      merged.origin = merged.origin ?? url.origin;\n      merged.contextPath = merged.contextPath ?? url.contextPath;\n    }\n    return merged;\n  }, [options, url]);\n\n  const location = useLocation();\n  const redirectLocation = location.state?.redirectLocation;\n\n  const shouldLoad =\n    model == null ||\n    (redirectLocation instanceof Href\n      ? redirectLocation?.equals(href)\n      : false) ||\n    requestOptions.isReload === true;\n\n  // dispatch loadModularUI\n  useDeepCompareEffect(() => {\n    if (href !== \"\" && shouldLoad) {\n      dispatch(loadModularUI(key, href, requestOptions));\n    }\n  }, [key, href, requestOptions, shouldLoad]);\n\n  useEffect(() => {\n    if (requestOptions.removeOnUnmount) {\n      return () => {\n        dispatch(removeModelByKey(key));\n      };\n    }\n  }, [dispatch, key, requestOptions.removeOnUnmount]);\n\n  return model;\n};\n"],"mappings":";;;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AACA,IAAAE,YAAA,GAAAF,OAAA;AAEA,IAAAG,UAAA,GAAAH,OAAA;AACA,IAAAI,iBAAA,GAAAJ,OAAA;AAKA,IAAAK,qBAAA,GAAAC,sBAAA,CAAAN,OAAA;AACA,IAAAO,gBAAA,GAAAP,OAAA;AAEA,IAAAQ,KAAA,GAAAF,sBAAA,CAAAN,OAAA;AAGA;AACA;AACA;AACO,MAAMS,YAAY,GAAGA,CAC1BC,QAAgB,EAChBC,GAAkB,EAClBC,OAAgC,GAAG,CAAC,CAAC,KAC7B;EACR,MAAMC,QAAQ,GAAG,IAAAC,uBAAW,EAAC,CAAC;EAE9B,MAAMC,IAAI,GAAG,IAAAC,cAAO,EAAC,MAAML,GAAG,EAAEM,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE,CAACN,GAAG,CAAC,CAAC;EACxD,MAAMO,GAAG,GAAG,IAAAC,gCAAe,EAACT,QAAQ,EAAEK,IAAI,CAAC;EAE3C,MAAMK,KAAK,GAAG,IAAAC,uBAAW,EAAEC,KAAK,IAAKA,KAAK,CAACC,SAAS,CAACL,GAAG,CAAC,CAAC;EAE1D,MAAMM,cAAc,GAAG,IAAAR,cAAO,EAAC,MAAM;IACnC,MAAMS,MAAM,GAAG;MACbC,MAAM,EAAEC,uBAAY,CAACC,GAAG;MACxBC,eAAe,EAAE,KAAK;MACtB,GAAGjB;IACL,CAAC;IAED,IAAID,GAAG,YAAYmB,aAAI,EAAE;MACvBL,MAAM,CAACM,MAAM,GAAGN,MAAM,CAACM,MAAM,IAAIpB,GAAG,CAACoB,MAAM;MAC3CN,MAAM,CAACO,WAAW,GAAGP,MAAM,CAACO,WAAW,IAAIrB,GAAG,CAACqB,WAAW;IAC5D;IACA,OAAOP,MAAM;EACf,CAAC,EAAE,CAACb,OAAO,EAAED,GAAG,CAAC,CAAC;EAElB,MAAMsB,QAAQ,GAAG,IAAAC,wBAAW,EAAC,CAAC;EAC9B,MAAMC,gBAAgB,GAAGF,QAAQ,CAACX,KAAK,EAAEa,gBAAgB;EAEzD,MAAMC,UAAU,GACdhB,KAAK,IAAI,IAAI,KACZe,gBAAgB,YAAYL,aAAI,GAC7BK,gBAAgB,EAAEE,MAAM,CAACtB,IAAI,CAAC,GAC9B,KAAK,CAAC,IACVS,cAAc,CAACc,QAAQ,KAAK,IAAI;;EAElC;EACA,IAAAC,6BAAoB,EAAC,MAAM;IACzB,IAAIxB,IAAI,KAAK,EAAE,IAAIqB,UAAU,EAAE;MAC7BvB,QAAQ,CAAC,IAAA2B,+BAAa,EAACtB,GAAG,EAAEH,IAAI,EAAES,cAAc,CAAC,CAAC;IACpD;EACF,CAAC,EAAE,CAACN,GAAG,EAAEH,IAAI,EAAES,cAAc,EAAEY,UAAU,CAAC,CAAC;EAE3C,IAAAK,gBAAS,EAAC,MAAM;IACd,IAAIjB,cAAc,CAACK,eAAe,EAAE;MAClC,OAAO,MAAM;QACXhB,QAAQ,CAAC,IAAA6B,kCAAgB,EAACxB,GAAG,CAAC,CAAC;MACjC,CAAC;IACH;EACF,CAAC,EAAE,CAACL,QAAQ,EAAEK,GAAG,EAAEM,cAAc,CAACK,eAAe,CAAC,CAAC;EAEnD,OAAOT,KAAK;AACd,CAAC;AAACuB,OAAA,CAAAlC,YAAA,GAAAA,YAAA","ignoreList":[]}

package/lib/hooks/useModularUIBasic.js

@@ -1,9 +1,11 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useReload = exports.useModularUIBasic = void 0;
+var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 var _reactRouter = require("react-router");
 var _reactRedux = require("react-redux");
 var _react = require("react");
@@ -13,48 +15,24 @@ var _useModularUIKey = require("./useModularUIKey");
 // Helper to create useModularUI options
 const createUseModularUIOptions = (options, href, mustReload) => {
   const baseOptions = {
-    targetModel: undefined,
-    forceTargetModel: undefined,
-    isReload: false,
-    origin: undefined,
-    contextPath: undefined,
-    cache: false,
-    removeOnUnmount: false,
+    expectedModels: [],
     method: _constants.HTTP_METHODS.GET,
-    data: undefined
+    data: undefined,
+    removeOnUnmount: false,
+    ...options,
+    isReload: mustReload || options.isReload
   };
-
-  // Handle targetModel and forceTargetModel
-  if (options.targetModel) {
-    baseOptions.targetModel = options.targetModel;
-    baseOptions.forceTargetModel = options.forceTargetModel;
-  }
-
-  // Handle cache option
-  if (options.cache) {
-    baseOptions.cache = options.cache;
-  }
-  if (mustReload) {
-    baseOptions.isReload = true;
-  }
-  if (options.removeOnUnmount) {
-    baseOptions.removeOnUnmount = true;
-  }
   if (options.formdata != null) {
     baseOptions.method = _constants.HTTP_METHODS.POST;
     baseOptions.data = options.formdata;
   }
-
-  // Handle origin and contextPath options
-  baseOptions.origin = options.origin ?? baseOptions.origin;
-  baseOptions.contextPath = options.contextPath ?? baseOptions.contextPath;
   return baseOptions;
 };
 
 // Helper to validate the model against expectedModels
 const validateModel = (model, expectedModels) => {
   if (expectedModels.length > 0) {
-    const isCorrectModel = expectedModels.some(expectedModel => model.type === expectedModel);
+    const isCorrectModel = (0, _includes.default)(expectedModels).call(expectedModels, model.type);
     if (!isCorrectModel) {
       console.warn(model, "is not of instance", expectedModels);
     }
@@ -64,15 +42,7 @@ const validateModel = (model, expectedModels) => {
 /**
  * useModularUIBasic Hook
  */
-const useModularUIBasic = (defaultKey, href, options = {
-  expectedModels: [],
-  targetModel: undefined,
-  forceTargetModel: false,
-  origin: undefined,
-  contextPath: undefined,
-  key: undefined,
-  formdata: undefined
-}) => {
+const useModularUIBasic = (defaultKey, href, options = {}) => {
   const memoizedHref = (0, _react.useMemo)(() => href.toString(), [href]);
   const key = options.key ?? defaultKey;
   const mustReload = useReload(key, memoizedHref);

package/lib/hooks/useModularUIBasic.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModularUIBasic.js","names":["_reactRouter","require","_reactRedux","_react","_useModularUI","_constants","_useModularUIKey","createUseModularUIOptions","options","href","mustReload","baseOptions","targetModel","undefined","forceTargetModel","isReload","origin","contextPath","cache","removeOnUnmount","method","HTTP_METHODS","GET","data","formdata","POST","validateModel","model","expectedModels","length","isCorrectModel","some","expectedModel","type","console","warn","useModularUIBasic","defaultKey","key","memoizedHref","useMemo","toString","useReload","modularUIOptions","modularUI","useModularUI","exports","modelKey","url","location","useLocation","useModularUIKey","modelEntry","useSelector","state","modularui","reload","isFullyLoaded","status","MODULARUI_STATUS","FINISHED","lastModification"],"sources":["../../src/hooks/useModularUIBasic.js"],"sourcesContent":["// @flow\nimport { useLocation } from \"react-router\";\nimport { useSelector } from \"react-redux\";\nimport { useMemo } from \"react\";\nimport { useModularUI } from \"./useModularUI\";\n\nimport { HTTP_METHODS, MODULARUI_STATUS } from \"../constants\";\nimport { useModularUIKey } from \"./useModularUIKey\";\n\nimport type { ModularUIModel, Href } from \"../models\";\nexport type HookOptions = {\n  key?: string,\n  origin?: string,\n  contextPath?: string,\n  removeOnUnmount?: boolean,\n  formdata?: any,\n};\n\nexport type UseModularUIBasicOptions<T: ModularUIModel> = {\n  expectedModels?: Array<string>,\n  targetModel?: Class<T> | Array<Class<T>>,\n  forceTargetModel?: boolean,\n  origin?: string,\n  contextPath?: string,\n  cache?: boolean,\n  key?: string,\n  isReload?: boolean,\n  removeOnUnmount?: boolean,\n  formdata?: any,\n};\n\n// Helper to create useModularUI options\nconst createUseModularUIOptions = <T: ModularUIModel>(\n  options: UseModularUIBasicOptions<T>,\n  href: string,\n  mustReload: boolean,\n): Object => {\n  const baseOptions = {\n    targetModel: undefined,\n    forceTargetModel: undefined,\n    isReload: false,\n    origin: undefined,\n    contextPath: undefined,\n    cache: false,\n    removeOnUnmount: false,\n    method: HTTP_METHODS.GET,\n    data: undefined,\n  };\n\n  // Handle targetModel and forceTargetModel\n  if (options.targetModel) {\n    baseOptions.targetModel = options.targetModel;\n    baseOptions.forceTargetModel = options.forceTargetModel;\n  }\n\n  // Handle cache option\n  if (options.cache) {\n    baseOptions.cache = options.cache;\n  }\n\n  if (mustReload) {\n    baseOptions.isReload = true;\n  }\n\n  if (options.removeOnUnmount) {\n    baseOptions.removeOnUnmount = true;\n  }\n\n  if (options.formdata != null) {\n    baseOptions.method = HTTP_METHODS.POST;\n    baseOptions.data = options.formdata;\n  }\n\n  // Handle origin and contextPath options\n  baseOptions.origin = options.origin ?? baseOptions.origin;\n  baseOptions.contextPath = options.contextPath ?? baseOptions.contextPath;\n\n  return baseOptions;\n};\n\n// Helper to validate the model against expectedModels\nconst validateModel = (model: any, expectedModels: Array<string>) => {\n  if (expectedModels.length > 0) {\n    const isCorrectModel = expectedModels.some(\n      (expectedModel) => model.type === expectedModel,\n    );\n    if (!isCorrectModel) {\n      console.warn(model, \"is not of instance\", expectedModels);\n    }\n  }\n};\n\n/**\n * useModularUIBasic Hook\n */\nexport const useModularUIBasic = <T: ModularUIModel>(\n  defaultKey: string,\n  href: string | Href,\n  options: UseModularUIBasicOptions<T> = {\n    expectedModels: [],\n    targetModel: undefined,\n    forceTargetModel: false,\n    origin: undefined,\n    contextPath: undefined,\n    key: undefined,\n    formdata: undefined,\n  },\n): T | null => {\n  const memoizedHref = useMemo(() => href.toString(), [href]);\n  const key = options.key ?? defaultKey;\n\n  const mustReload = useReload(key, memoizedHref);\n  const modularUIOptions = useMemo(\n    () => createUseModularUIOptions(options, memoizedHref, mustReload),\n    [options, memoizedHref, mustReload],\n  );\n\n  const modularUI = useModularUI(key, href, modularUIOptions);\n  const expectedModels = useMemo(\n    () => options.expectedModels ?? [],\n    [options.expectedModels],\n  );\n\n  return useMemo((): T | null => {\n    if (modularUI?.model) {\n      validateModel(modularUI.model, expectedModels);\n      return modularUI.model;\n    }\n    return null;\n  }, [expectedModels, modularUI]);\n};\n\n/**\n * Check if the model corresponding to a modular ui service should be reloaded\n */\nexport const useReload = (modelKey: string, url: string): boolean => {\n  const location = useLocation();\n  const key = useModularUIKey(modelKey, url);\n  const modelEntry = useSelector((state) => state.modularui[key]);\n\n  if (modelEntry) {\n    const reload = location.state?.reload || 0;\n    if (reload > 0) {\n      const isFullyLoaded = modelEntry?.status === MODULARUI_STATUS.FINISHED;\n      const lastModification = modelEntry?.lastModification ?? 0;\n      if (isFullyLoaded && lastModification < reload) {\n        return true;\n      }\n    }\n  }\n  return false;\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"useModularUIBasic.js","names":["_reactRouter","require","_reactRedux","_react","_useModularUI","_constants","_useModularUIKey","createUseModularUIOptions","options","href","mustReload","baseOptions","expectedModels","method","HTTP_METHODS","GET","data","undefined","removeOnUnmount","isReload","formdata","POST","validateModel","model","length","isCorrectModel","_includes","default","call","type","console","warn","useModularUIBasic","defaultKey","memoizedHref","useMemo","toString","key","useReload","modularUIOptions","modularUI","useModularUI","exports","modelKey","url","location","useLocation","useModularUIKey","modelEntry","useSelector","state","modularui","reload","isFullyLoaded","status","MODULARUI_STATUS","FINISHED","lastModification"],"sources":["../../src/hooks/useModularUIBasic.js"],"sourcesContent":["// @flow\nimport { useLocation } from \"react-router\";\nimport { useSelector } from \"react-redux\";\nimport { useMemo } from \"react\";\nimport { useModularUI } from \"./useModularUI\";\n\nimport { HTTP_METHODS, MODULARUI_STATUS } from \"../constants\";\nimport { useModularUIKey } from \"./useModularUIKey\";\n\nimport type { ModularUIModel, Href } from \"../models\";\nexport type HookOptions = {\n  key?: string,\n  origin?: string,\n  contextPath?: string,\n  removeOnUnmount?: boolean,\n  formdata?: any,\n};\n\nexport type UseModularUIBasicOptions<T: ModularUIModel> = {\n  expectedModels?: Array<string>,\n  targetModel?: Class<T> | Array<Class<T>>,\n  forceTargetModel?: boolean,\n  origin?: string,\n  contextPath?: string,\n  cache?: boolean,\n  key?: string,\n  isReload?: boolean,\n  removeOnUnmount?: boolean,\n  formdata?: any,\n};\n\n// Helper to create useModularUI options\nconst createUseModularUIOptions = <T: ModularUIModel>(\n  options: UseModularUIBasicOptions<T>,\n  href: string,\n  mustReload: boolean,\n): Object => {\n  const baseOptions = {\n    expectedModels: [],\n    method: HTTP_METHODS.GET,\n    data: undefined,\n    removeOnUnmount: false,\n    ...options,\n    isReload: mustReload || options.isReload,\n  };\n\n  if (options.formdata != null) {\n    baseOptions.method = HTTP_METHODS.POST;\n    baseOptions.data = options.formdata;\n  }\n\n  return baseOptions;\n};\n\n// Helper to validate the model against expectedModels\nconst validateModel = (model: any, expectedModels: Array<string>) => {\n  if (expectedModels.length > 0) {\n    const isCorrectModel = expectedModels.includes(model.type);\n    if (!isCorrectModel) {\n      console.warn(model, \"is not of instance\", expectedModels);\n    }\n  }\n};\n\n/**\n * useModularUIBasic Hook\n */\nexport const useModularUIBasic = <T: ModularUIModel>(\n  defaultKey: string,\n  href: string | Href,\n  options: UseModularUIBasicOptions<T> = {},\n): T | null => {\n  const memoizedHref = useMemo(() => href.toString(), [href]);\n  const key = options.key ?? defaultKey;\n\n  const mustReload = useReload(key, memoizedHref);\n  const modularUIOptions = useMemo(\n    () => createUseModularUIOptions(options, memoizedHref, mustReload),\n    [options, memoizedHref, mustReload],\n  );\n\n  const modularUI = useModularUI(key, href, modularUIOptions);\n  const expectedModels = useMemo(\n    () => options.expectedModels ?? [],\n    [options.expectedModels],\n  );\n\n  return useMemo((): T | null => {\n    if (modularUI?.model) {\n      validateModel(modularUI.model, expectedModels);\n      return modularUI.model;\n    }\n    return null;\n  }, [expectedModels, modularUI]);\n};\n\n/**\n * Check if the model corresponding to a modular ui service should be reloaded\n */\nexport const useReload = (modelKey: string, url: string): boolean => {\n  const location = useLocation();\n  const key = useModularUIKey(modelKey, url);\n  const modelEntry = useSelector((state) => state.modularui[key]);\n\n  if (modelEntry) {\n    const reload = location.state?.reload || 0;\n    if (reload > 0) {\n      const isFullyLoaded = modelEntry?.status === MODULARUI_STATUS.FINISHED;\n      const lastModification = modelEntry?.lastModification ?? 0;\n      if (isFullyLoaded && lastModification < reload) {\n        return true;\n      }\n    }\n  }\n  return false;\n};\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.65.13",
+  "version": "1.65.15",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "https://support.beinformed.com",
@@ -51,7 +51,6 @@
     "README.md",
     "CHANGELOG.md",
     "LICENSE.md",
-    "src",
     "esm",
     "lib",
     "codemods"
@@ -132,7 +131,7 @@
     "jscodeshift": "^17.3.0",
     "lint-staged": "^16.2.7",
     "polished": "^4.3.1",
-    "prettier": "^3.7.4",
+    "prettier": "^3.8.0",
     "react": "^19.2.3",
     "react-dom": "^19.2.3",
     "react-helmet-async": "^2.0.5",

package/src/builder/__tests__/LayoutHintConfig.json

@@ -1,20 +0,0 @@
-{
-  "MOCK": {
-    "hint": "mock",
-    "description": {
-      "NL": "mock dutch description",
-      "EN": "mock english description"
-    },
-    "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,71 +0,0 @@
-import { mergeLayoutHintConfigurations } from "../mergeLayoutHintConfigurations";
-import { LayoutHintConfiguration } from "../../constants/LayoutHintConfig";
-const fs = require("fs");
-
-//
-const projectJson1 = {
-  MOCK: {
-    hint: "mock",
-    description: {
-      NL: "mock dutch description",
-      EN: "mock english description",
-    },
-    link: "",
-    component: ["attribute"],
-  },
-};
-
-const projectJson2 = {
-  MOCK2: {
-    hint: "mock2",
-    description: {
-      NL: "mock2 dutch description",
-      EN: "mock2 english description",
-    },
-    link: "",
-    component: ["attribute"],
-  },
-};
-
-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(),
-}));
-
-describe("mergeLayoutHintConfigurations", () => {
-  it("generates layouthint.json", async () => {
-    expect.assertions(2);
-
-    const expectedJson = {
-      ...LayoutHintConfiguration,
-      ...projectJson1,
-      ...projectJson2,
-      ...projectMerge,
-    };
-
-    await mergeLayoutHintConfigurations("./src", "/output");
-
-    expect(fs.writeFileSync).toHaveBeenCalledWith(
-      expect.stringContaining("LayoutHintConfig.json"),
-      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

@@ -1,20 +0,0 @@
-{
-  "MOCK2": {
-    "hint": "mock2",
-    "description": {
-      "NL": "mock2 dutch description",
-      "EN": "mock2 english description"
-    },
-    "link": "",
-    "component": ["attribute"]
-  },
-  "MERGE": {
-    "hint": "merge",
-    "description": {
-      "NL": "merge with extra component",
-      "EN": "merge with extra component"
-    },
-    "link": "",
-    "component": ["component1", "component3"]
-  }
-}

package/src/builder/index.js

@@ -1,2 +0,0 @@
-// @flow
-export * from "./mergeLayoutHintConfigurations";

package/src/builder/mergeLayoutHintConfigurations.js

@@ -1,62 +0,0 @@
-// @flow
-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> => {
-  const matchedFiles = [];
-
-  const files = readdirSync(dir);
-
-  for (const file of files) {
-    const absolute = path.join(dir, file);
-    if (statSync(absolute).isDirectory()) {
-      const foundFiles = findFiles(absolute);
-      matchedFiles.push(...foundFiles);
-    } else {
-      const filename = path.basename(file);
-      if (filename === "LayoutHintConfig.json") {
-        matchedFiles.push(absolute);
-      }
-    }
-  }
-
-  return matchedFiles;
-};
-
-/**
- * Merge all LayoutHintConfig.json files from this library and in the srcFolder
- * together into one config file, and copies it to the outputFolder.<br/>
- * This file is consumed by Be Informed studio to give layout hint information
- */
-exports.mergeLayoutHintConfigurations = async (
-  srcFolder: string,
-  outputFolder: string,
-): Promise<void> => {
-  const escapedSrcFolder = srcFolder.replace(/\\/g, "/");
-
-  const files = findFiles(escapedSrcFolder);
-
-  const jsons = files.map((file) => {
-    const content = readFileSync(file, "utf-8");
-    return JSON.parse(content);
-  });
-
-  // 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"),
-    JSON.stringify(newConfig),
-  );
-
-  return Promise.resolve();
-};

package/src/constants/Constants.js

@@ -1,196 +0,0 @@
-// @flow
-/**
- * path to content service
- */
-export const CONTENT_PATH = `/content`;
-
-/**
- * Upload Path
- */
-export const UPLOAD_PATH = `/uploadFile`;
-
-/**
- * Captcha Path
- */
-export const CAPTCHA_PATH = `/captchaServices`;
-
-/**
- * Path to change avatar page / component
- */
-export const CHANGEAVATAR_PATH = "/change-avatar";
-
-/**
- * Path to change password page / component
- */
-export const CHANGEPASSWORD_PATH = "/change-password";
-
-/**
- * Path to user profile page / component
- */
-export const USERPROFILE_PATH = "/user";
-
-/**
- * Path to resources in the Be Informed repository
- */
-export const RESOURCE_PATH = "/resource";
-
-/**
- * Separator for parameters of a list, makes it possible to render multiple lists on a page in a non-js environment
- */
-export const PARAMETER_SEPARATOR = "~";
-
-/**
- * Timeversion filter name
- */
-export const TIMEVERSION_FILTER_NAME = "entryDate";
-
-const PARAMETER_OVERVIEW_VIEWTYPE = "viewType";
-/**
- * Parameter name for the viewtype toggle
- */
-export const DEFAULT_UI_PARAMETERS: Array<string> = [
-  PARAMETER_OVERVIEW_VIEWTYPE,
-];
-
-/**
- */
-export const ISO_DATE_FORMAT = "yyyy-MM-dd";
-/**
- */
-export const ISO_DATETIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss";
-/**
- */
-export const ISO_TIME_FORMAT = "HH:mm:ss";
-/**
- */
-export const ISO_TIMESTAMP_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSS";
-/**
- * Offset format is appended to iso datetime and timestamp when isIncludeTimeOffsetInDateTimes = true
- */
-export const DATETIME_OFFSET_FORMAT = "xxx";
-/**
- * week starts on monday by default
- */
-export const DEFAULT_WEEK_STARTS_ON = 1;
-
-/**
- * first week indicated by the 1st of january
- */
-export const DEFAULT_FIRST_WEEK_CONTAINS_DATE = 1;
-
-/**
- * Key codes
- * @type {{SPACE: number, PAGE_DOWN: number, TAB: number, ARROW_RIGHT: number, ARROW_DOWN: number, ENTER: number, ARROW_UP: number, ARROW_LEFT: number, PAGE_UP: number, ESCAPE: number}}
- */
-export const KEYCODES = {
-  TAB: 9,
-  ENTER: 13,
-  ESCAPE: 27,
-  SPACE: 32,
-  PAGE_UP: 33,
-  PAGE_DOWN: 34,
-  ARROW_LEFT: 37,
-  ARROW_UP: 38,
-  ARROW_RIGHT: 39,
-  ARROW_DOWN: 40,
-};
-
-/**
- * @type {boolean}
- */
-export const IS_SYNC = typeof dataFetcher !== "undefined";
-/**
- * @type {boolean}
- */
-export const IS_SERVER = IS_SYNC;
-/**
- * @type {boolean}
- */
-// $FlowExpectedError[cannot-resolve-name]
-export const IS_GRAALJS = typeof Graal !== "undefined";
-
-/**
- * @type {{SUCCESS: string, ERROR: string, INFO: string, WARNING: string}}
- */
-export const NOTIFICATION_TYPES = {
-  SUCCESS: "SUCCESS",
-  INFO: "INFO",
-  WARNING: "WARNING",
-  ERROR: "ERROR",
-};
-
-/**
- * SUPPORTED HTTP METHODS
- * @type {{POST: string, GET: string}}
- */
-export const HTTP_METHODS = {
-  GET: "GET",
-  POST: "POST",
-};
-
-export const PARAMETER_TYPES = {
-  BODY: "bodyParameter",
-  QUERY: "queryParameter",
-};
-
-/**
- * POSSIBLE MODULARUI STATUSSES
- * @type {{LOADING: string, ERROR: string, FINISHED: string}}
- */
-export const MODULARUI_STATUS = {
-  LOADING: "LOADING",
-  FINISHED: "FINISHED",
-  ERROR: "ERROR",
-};
-
-/**
- * POSSIBLE AUTOSAVE STATUSSES
- * @type {{START: string, FINISHED: string}}
- */
-export const AUTOSAVE_STATUS = {
-  START: "START",
-  FINISHED: "FINISHED",
-};
-
-/**
- * DEBOUNCE INPUT TIMEOUT
- */
-export const INPUT_DEBOUNCE_TIMEOUT = 100;
-
-/**
- * DEBOUNCE VALIDATION TIMEOUT
- */
-export const VALIDATE_DEBOUNCE_TIMEOUT = 500;
-
-/**
- * ATTRIBUTE WIDTH
- */
-export const ATTRIBUTE_WIDTH = {
-  EXTRA_SMALL: "EXTRA_SMALL",
-  SMALL: "SMALL",
-  MEDIUM: "MEDIUM",
-  LARGE: "LARGE",
-  EXTRA_LARGE: "EXTRA_LARGE",
-};
-
-export const ALL_CONTENT_IN_DATA_SETTING = "hasAllContentInData";
-
-export const INCLUDE_TIME_OFFSET = "isIncludeTimeOffsetInDateTimes";
-
-export const INTERNAL_LOGIN_TYPE = {
-  JAAS: "JAAS",
-  PAC4J_FORM: "PAC4J_FORM",
-  PAC4J_BASIC: "PAC4J_BASIC",
-  PAC4J_INDIRECT: "PAC4J_INDIRECT",
-};
-export const LOGIN_TYPE = "security.clients";
-export const LOGIN_PATH_SETTING = "FormClient.login_url";
-export const LOGIN_USERNAME_SETTING = "FormClient.username_field_name";
-export const LOGIN_PASSWORD_SETTING = "FormClient.password_field_name";
-export const LOGOUT_PATH_SETTING = "FormClient.logout_url";
-
-export const DEFAULT_AUTHENTICATION_TYPE = {
-  name: "Form based authentication",
-  authentication: "DefaultFormClient",
-  isPrimary: true,
-};