npm - @beinformed/ui - Versions diffs - 1.57.1 → 1.57.3 - Mend

@beinformed/ui 1.57.1 → 1.57.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (436) hide show

package/lib/hooks/useModelCatalog.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"useModelCatalog.js","names":["_useRouter","require","_createHref","_ModelCatalogModel","_interopRequireDefault","_ConceptIndexModel","_ConceptDetailModel","_BusinessScenarioModel","_ContentIndexModel","_ContentTOCModel","_ContentModel","_useModularUIBasic","_models","useModelCatalog","options","useModularUIBasic","expectedModels","targetModel","ModelCatalogModel","exports","useConceptIndex","href","key","arguments","length","undefined","url","filterParameters","ConceptIndexModel","useConceptDetail","concept","location","useLocation","createHref","useContentIndex","ContentIndexModel","useContentTOC","content","ContentTOCModel","useContent","contentSection","ContentModel","useContentType","contentType","ContentTypeModel","getSearchHref","uri","filters","filterString","_keys","default","filterValue","value","Array","isArray","join","replace","push","useConceptSearch","useContentSearch"],"sources":["../../src/hooks/useModelCatalog.js"],"sourcesContent":["// @flow\nimport { useLocation } from \"./useRouter\";\n\nimport { createHref, filterParameters } from \"../utils/helpers/createHref\";\n\nimport ModelCatalogModel from \"../models/modelcatalog/ModelCatalogModel\";\nimport ConceptIndexModel from \"../models/concepts/ConceptIndexModel\";\nimport ConceptDetailModel from \"../models/concepts/ConceptDetailModel\";\nimport { default as BusinessScenarioModel } from \"../models/concepts/BusinessScenarioModel\";\nimport ContentIndexModel from \"../models/content/ContentIndexModel\";\nimport ContentTOCModel from \"../models/content/ContentTOCModel\";\nimport ContentModel from \"../models/content/ContentModel\";\n\nimport { useModularUIBasic } from \"./useModularUIBasic\";\nimport { ContentTypeModel } from \"../models\";\n\nimport type { UseModularUIBasicOptions } from \"./useModularUIBasic\";\nexport type SearchFilter = {\n index?: string,\n label?: string,\n type?: string \| Array<string>,\n modelCategory?: string \| Array<string>,\n entryDate?: string,\n};\n\n/*\n /\nexport const useModelCatalog = (\n options?: UseModularUIBasicOptions<ModelCatalogModel>,\n): ?ModelCatalogModel =>\n useModularUIBasic(\"modelcatalog\", \"/modelcatalog\", {\n expectedModels: [\"ModelCatalog\"],\n targetModel: ModelCatalogModel,\n ...options,\n });\n\n/*\n /\nexport const useConceptIndex = (\n href: string,\n key?: string = \"conceptindex\",\n options?: UseModularUIBasicOptions<ConceptIndexModel>,\n): ?ConceptIndexModel => {\n const url = filterParameters(href, [\n \"entryDate\",\n \"index\",\n \"label\",\n \"modelcategory\",\n \"type\",\n ]);\n return useModularUIBasic(key, url, {\n expectedModels: [\"ConceptIndex\"],\n targetModel: ConceptIndexModel,\n ...options,\n });\n};\n\n/*\n /\nexport const useConceptDetail = (\n concept: string,\n key?: string = \"conceptdetail\",\n options?: UseModularUIBasicOptions<\n ConceptDetailModel \| BusinessScenarioModel,\n >,\n): ?ConceptDetailModel \| ?BusinessScenarioModel => {\n const location = useLocation();\n\n const href = createHref(\"concepts\", concept, location, [\"entryDate\"]);\n return useModularUIBasic(key, href, {\n expectedModels: [\"ConceptDetail\", \"BusinessScenario\"],\n ...options,\n });\n};\n\n/*\n /\nexport const useContentIndex = (\n href: string,\n key?: string = \"contentindex\",\n options?: UseModularUIBasicOptions<ContentIndexModel>,\n): ?ContentIndexModel => {\n const url = filterParameters(href, [\"index\", \"label\", \"type\"]);\n return useModularUIBasic(key, url, {\n expectedModels: [\"ContentIndex\"],\n targetModel: ContentIndexModel,\n ...options,\n });\n};\n\n/*\n /\nexport const useContentTOC = (\n content: string,\n key?: string = \"contenttoc\",\n options?: UseModularUIBasicOptions<ContentTOCModel>,\n): ?ContentTOCModel => {\n const location = useLocation();\n const href = createHref(\"content\", content, location, [\"entryDate\"]);\n return useModularUIBasic(key, href, {\n expectedModels: [\"ContentTOC\"],\n targetModel: ContentTOCModel,\n ...options,\n });\n};\n\n/*\n /\nexport const useContent = (\n contentSection: string,\n key?: string = \"content\",\n options?: UseModularUIBasicOptions<ContentModel>,\n): ?ContentModel => {\n const href = createHref(\"content\", contentSection, null, [\"entryDate\"]);\n return useModularUIBasic(key, href, {\n expectedModels: [\"Content\"],\n targetModel: ContentModel,\n ...options,\n });\n};\n\n/*\n /\nexport const useContentType = (\n contentType: string,\n key?: string = \"contenttypes\",\n options?: UseModularUIBasicOptions<ContentTypeModel>,\n): ?ContentTypeModel => {\n const href = createHref(\"contenttypes\", contentType, null, [\"entryDate\"]);\n return useModularUIBasic(key, href, {\n expectedModels: [\"ContentType\"],\n targetModel: ContentTypeModel,\n ...options,\n });\n};\n\n/*\n /\nconst getSearchHref = (uri: string, filters: SearchFilter): string => {\n const filterString = [];\n\n for (const key of Object.keys(filters)) {\n const filterValue = filters[key];\n if (filterValue) {\n let value: string = Array.isArray(filterValue)\n ? filterValue.join(\",\")\n : filterValue;\n if (key === \"type\") {\n value = value.replace(\"#\", \"%23\"); // handles un-encoded #\n }\n filterString.push(`${key}=${value}`);\n }\n }\n\n return filterString.length ? `${uri}?${filterString.join(\"&\")}` : uri;\n};\n\n/*\n /\nexport const useConceptSearch = (\n filters: SearchFilter,\n key?: string = \"conceptSearch\",\n options?: UseModularUIBasicOptions<ConceptIndexModel>,\n): ?ConceptIndexModel => {\n const href = getSearchHref(\"/concepts\", filters);\n return useConceptIndex(href, key, options);\n};\n\n/*\n /\nexport const useContentSearch = (\n filters: SearchFilter,\n key?: string = \"contentSearch\",\n options?: UseModularUIBasicOptions<ContentIndexModel>,\n): ?ContentIndexModel => {\n const href = getSearchHref(\"/content\", filters);\n return useContentIndex(href, key, options);\n};\n"],"mappings":"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","ignoreList":[]}
1	+ {"version":3,"file":"useModelCatalog.js","names":["_useRouter","require","_createHref","_ModelCatalogModel","_interopRequireDefault","_ConceptIndexModel","_ConceptDetailModel","_BusinessScenarioModel","_ContentIndexModel","_ContentTOCModel","_ContentModel","_useModularUIBasic","_models","useModelCatalog","options","useModularUIBasic","expectedModels","targetModel","ModelCatalogModel","exports","useConceptIndex","href","key","arguments","length","undefined","url","filterParameters","ConceptIndexModel","useConceptDetail","concept","location","useLocation","createHref","useContentIndex","ContentIndexModel","useContentTOC","content","ContentTOCModel","useContent","contentSection","ContentModel","useContentType","contentType","ContentTypeModel","getSearchHref","uri","filters","filterString","_keys","default","filterValue","value","Array","isArray","join","replace","push","useConceptSearch","useContentSearch"],"sources":["../../src/hooks/useModelCatalog.js"],"sourcesContent":["// @flow\nimport { useLocation } from \"./useRouter\";\n\nimport { createHref, filterParameters } from \"../utils/helpers/createHref\";\n\nimport ModelCatalogModel from \"../models/modelcatalog/ModelCatalogModel\";\nimport ConceptIndexModel from \"../models/concepts/ConceptIndexModel\";\nimport ConceptDetailModel from \"../models/concepts/ConceptDetailModel\";\nimport { default as BusinessScenarioModel } from \"../models/concepts/BusinessScenarioModel\";\nimport ContentIndexModel from \"../models/content/ContentIndexModel\";\nimport ContentTOCModel from \"../models/content/ContentTOCModel\";\nimport ContentModel from \"../models/content/ContentModel\";\n\nimport { useModularUIBasic } from \"./useModularUIBasic\";\nimport { ContentTypeModel } from \"../models\";\n\nimport type Href from \"../models/href/Href\";\nimport type { UseModularUIBasicOptions } from \"./useModularUIBasic\";\nexport type SearchFilter = {\n index?: string,\n label?: string,\n type?: string \| Array<string>,\n modelCategory?: string \| Array<string>,\n entryDate?: string,\n};\n\n/*\n /\nexport const useModelCatalog = (\n options?: UseModularUIBasicOptions<ModelCatalogModel>,\n): ?ModelCatalogModel =>\n useModularUIBasic(\"modelcatalog\", \"/modelcatalog\", {\n expectedModels: [\"ModelCatalog\"],\n targetModel: ModelCatalogModel,\n ...options,\n });\n\n/*\n /\nexport const useConceptIndex = (\n href: string \| Href,\n key?: string = \"conceptindex\",\n options?: UseModularUIBasicOptions<ConceptIndexModel>,\n): ?ConceptIndexModel => {\n const url = filterParameters(href, [\n \"entryDate\",\n \"index\",\n \"label\",\n \"modelcategory\",\n \"type\",\n ]);\n return useModularUIBasic(key, url, {\n expectedModels: [\"ConceptIndex\"],\n targetModel: ConceptIndexModel,\n ...options,\n });\n};\n\n/*\n /\nexport const useConceptDetail = (\n concept: string \| Href,\n key?: string = \"conceptdetail\",\n options?: UseModularUIBasicOptions<\n ConceptDetailModel \| BusinessScenarioModel,\n >,\n): ?ConceptDetailModel \| ?BusinessScenarioModel => {\n const location = useLocation();\n\n const href = createHref(\"concepts\", concept, location, [\"entryDate\"]);\n return useModularUIBasic(key, href, {\n expectedModels: [\"ConceptDetail\", \"BusinessScenario\"],\n ...options,\n });\n};\n\n/*\n /\nexport const useContentIndex = (\n href: string \| Href,\n key?: string = \"contentindex\",\n options?: UseModularUIBasicOptions<ContentIndexModel>,\n): ?ContentIndexModel => {\n const url = filterParameters(href, [\"index\", \"label\", \"type\"]);\n return useModularUIBasic(key, url, {\n expectedModels: [\"ContentIndex\"],\n targetModel: ContentIndexModel,\n ...options,\n });\n};\n\n/*\n /\nexport const useContentTOC = (\n content: string \| Href,\n key?: string = \"contenttoc\",\n options?: UseModularUIBasicOptions<ContentTOCModel>,\n): ?ContentTOCModel => {\n const location = useLocation();\n const href = createHref(\"content\", content, location, [\"entryDate\"]);\n return useModularUIBasic(key, href, {\n expectedModels: [\"ContentTOC\"],\n targetModel: ContentTOCModel,\n ...options,\n });\n};\n\n/*\n /\nexport const useContent = (\n contentSection: string \| Href,\n key?: string = \"content\",\n options?: UseModularUIBasicOptions<ContentModel>,\n): ?ContentModel => {\n const href = createHref(\"content\", contentSection, null, [\"entryDate\"]);\n return useModularUIBasic(key, href, {\n expectedModels: [\"Content\"],\n targetModel: ContentModel,\n ...options,\n });\n};\n\n/*\n /\nexport const useContentType = (\n contentType: string \| Href,\n key?: string = \"contenttypes\",\n options?: UseModularUIBasicOptions<ContentTypeModel>,\n): ?ContentTypeModel => {\n const href = createHref(\"contenttypes\", contentType, null, [\"entryDate\"]);\n return useModularUIBasic(key, href, {\n expectedModels: [\"ContentType\"],\n targetModel: ContentTypeModel,\n ...options,\n });\n};\n\n/*\n /\nconst getSearchHref = (uri: string, filters: SearchFilter): string => {\n const filterString = [];\n\n for (const key of Object.keys(filters)) {\n const filterValue = filters[key];\n if (filterValue) {\n let value: string = Array.isArray(filterValue)\n ? filterValue.join(\",\")\n : filterValue;\n if (key === \"type\") {\n value = value.replace(\"#\", \"%23\"); // handles un-encoded #\n }\n filterString.push(`${key}=${value}`);\n }\n }\n\n return filterString.length ? `${uri}?${filterString.join(\"&\")}` : uri;\n};\n\n/*\n /\nexport const useConceptSearch = (\n filters: SearchFilter,\n key?: string = \"conceptSearch\",\n options?: UseModularUIBasicOptions<ConceptIndexModel>,\n): ?ConceptIndexModel => {\n const href = getSearchHref(\"/concepts\", filters);\n return useConceptIndex(href, key, options);\n};\n\n/*\n /\nexport const useContentSearch = (\n filters: SearchFilter,\n key?: string = \"contentSearch\",\n options?: UseModularUIBasicOptions<ContentIndexModel>,\n): ?ContentIndexModel => {\n const href = getSearchHref(\"/content\", filters);\n return useContentIndex(href, key, options);\n};\n"],"mappings":"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","ignoreList":[]}

package/lib/hooks/useModularUI.js CHANGED Viewed

@@ -31,29 +31,31 @@ const useModularUI = function (modelKey, url) {
   const dispatch = (0, _reactRedux.useDispatch)();
   const href = (0, _react.useMemo)(() => url?.toString() || "", [url]);
   const key = useKeyForHook(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 location = (0, _reactRouter.useLocation)();
   const redirectLocation = location.state?.redirectLocation;
-  const forceReload = redirectLocation instanceof _Href.default ? redirectLocation?.equals(href) : false;
+  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 prevForceReload = (0, _react.useRef)(forceReload);
+  const prevForceLoad = (0, _react.useRef)(forceLoad);
   // 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 doForceReload = forceReload && !prevForceReload.current;
-    if (href !== "" && (doForceReload || !isOldReload)) {
+    const doForceLoad = forceLoad && !prevForceLoad.current;
+    if (href !== "" && (doForceLoad || !isOldReload)) {
       dispatch((0, _ModularUIActions.loadModularUI)(key, href, options));
     }
     prevOptions.current = options;
     prevHref.current = href;
-    prevForceReload.current = forceReload;
-  }, [key, href, options, forceReload]);
+    prevForceLoad.current = forceLoad;
+  }, [key, href, options, forceLoad]);
   (0, _react.useEffect)(() => {
     if (options.removeOnUnmount) {
       return () => {
@@ -61,8 +63,7 @@ const useModularUI = function (modelKey, url) {
       };
     }
   }, [dispatch, key, options.removeOnUnmount]);
-  const selector = (0, _react.useMemo)(() => state => state.modularui[key], [key]);
-  return (0, _reactRedux.useSelector)(selector);
+  return model;
 };
 exports.useModularUI = useModularUI;
 //# sourceMappingURL=useModularUI.js.map

package/lib/hooks/useModularUI.js.flow CHANGED Viewed

@@ -41,6 +41,9 @@ export const useModularUI = (
   const href = useMemo(() => url?.toString() || "", [url]);
   const key = useKeyForHook(modelKey, href);
+  const modelSelector = useMemo(() => (state) => state.modularui[key], [key]);
+  const model = useSelector(modelSelector);
   if (url instanceof Href) {
     options.origin = options.origin ?? url.origin;
     options.contextPath = options.contextPath ?? url.contextPath;
@@ -48,12 +51,13 @@ export const useModularUI = (
   const location = useLocation();
   const redirectLocation = location.state?.redirectLocation;
-  const forceReload =
-    redirectLocation instanceof Href ? redirectLocation?.equals(href) : false;
+  const forceLoad =
+    model == null ||
+    (redirectLocation instanceof Href ? redirectLocation?.equals(href) : false);
   const prevOptions = useRef(options);
   const prevHref = useRef(href);
-  const prevForceReload = useRef(forceReload);
+  const prevForceLoad = useRef(forceLoad);
   // dispatch loadModularUI
   useDeepCompareEffect(() => {
@@ -63,16 +67,16 @@ export const useModularUI = (
       prevOptions.current.isReload &&
       !options.isReload;
-    const doForceReload = forceReload && !prevForceReload.current;
+    const doForceLoad = forceLoad && !prevForceLoad.current;
-    if (href !== "" && (doForceReload || !isOldReload)) {
+    if (href !== "" && (doForceLoad || !isOldReload)) {
       dispatch(loadModularUI(key, href, options));
     }
     prevOptions.current = options;
     prevHref.current = href;
-    prevForceReload.current = forceReload;
-  }, [key, href, options, forceReload]);
+    prevForceLoad.current = forceLoad;
+  }, [key, href, options, forceLoad]);
   useEffect(() => {
     if (options.removeOnUnmount) {
@@ -82,6 +86,5 @@ export const useModularUI = (
     }
   }, [dispatch, key, options.removeOnUnmount]);
-  const selector = useMemo(() => (state) => state.modularui[key], [key]);
-  return useSelector(selector);
+  return model;
 };

package/lib/hooks/useModularUI.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"useModularUI.js","names":["_react","require","_reactRedux","_reactRouter","_constants","_ModularUIActions","_useDeepCompareEffect","_interopRequireDefault","_useI18n","_Href","useKeyForHook","modelKey","url","locale","useLocale","useMemo","split","useModularUI","options","arguments","length","undefined","method","HTTP_METHODS","GET","removeOnUnmount","dispatch","useDispatch","href","toString","key","Href","origin","contextPath","location","useLocation","redirectLocation","~~state~~","~~forceReload","~~equals","prevOptions","useRef","prevHref","~~prevForceReload~~","useDeepCompareEffect","isOldReload","current","isReload","~~doForceReload~~","loadModularUI","useEffect","removeModelByKey","~~selector","modularui","useSelector","~~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\";\n\nimport { useLocale } from \"./useI18n\";\nimport Href from \"../models/href/Href\";\n\nimport type { RequestModularUIOptions } from \"../utils\";\n\n/*\n /\nconst useKeyForHook = (modelKey: string, url: string) => {\n const locale = useLocale();\n return useMemo(\n () => `${modelKey}(${url.split(\"?\")[0]})(${locale})`,\n [modelKey, url, locale],\n );\n};\n\n/*\n Use redux action and selector to retrieve the correct modular ui service model\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 = useKeyForHook(modelKey, href);\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 ~~forceReload~~ =\n redirectLocation instanceof Href ? redirectLocation?.equals(href) : false;\n\n const prevOptions = useRef(options);\n const prevHref = useRef(href);\n const ~~prevForceReload~~ = useRef(~~forceReload~~);\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 ~~doForceReload~~ = ~~forceReload~~ && !~~prevForceReload~~.current;\n\n if (href !== \"\" && (~~doForceReload~~ \|\| !isOldReload)) {\n dispatch(loadModularUI(key, href, options));\n }\n\n prevOptions.current = options;\n prevHref.current = href;\n ~~prevForceReload~~.current = ~~forceReload~~;\n }, [key, href, options, ~~forceReload~~]);\n\n useEffect(() => {\n if (options.removeOnUnmount) {\n return () => {\n dispatch(removeModelByKey(key));\n };\n }\n }, [dispatch, key, options.removeOnUnmount]);\n\n ~~const selector = useMemo(() => (state) => state.modularui[key], [key]);\n~~ return ~~useSelector(selector)~~;\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;AAEA,IAAAO,QAAA,GAAAP,OAAA;AACA,IAAAQ,KAAA,GAAAF,sBAAA,CAAAN,OAAA;AAIA;AACA;AACA,MAAMS,aAAa,GAAGA,CAACC,QAAgB,EAAEC,GAAW,KAAK;EACvD,MAAMC,MAAM,GAAG,IAAAC,kBAAS,EAAC,CAAC;EAC1B,OAAO,IAAAC,cAAO,EACZ,MAAM,GAAGJ,QAAQ,IAAIC,GAAG,CAACI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAKH,MAAM,GAAG,EACpD,CAACF,QAAQ,EAAEC,GAAG,EAAEC,MAAM,CACxB,CAAC;AACH,CAAC;;AAED;AACA;AACA;AACO,MAAMI,YAAY,GAAG,SAAAA,CAC1BN,QAAgB,EAChBC,GAAkB,EAKV;EAAA,IAJRM,OAAgC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG;IACjCG,MAAM,EAAEC,uBAAY,CAACC,GAAG;IACxBC,eAAe,EAAE;EACnB,CAAC;EAED,MAAMC,QAAQ,GAAG,IAAAC,uBAAW,EAAC,CAAC;EAC9B,MAAMC,IAAI,GAAG,IAAAb,cAAO,EAAC,MAAMH,GAAG,EAAEiB,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE,CAACjB,GAAG,CAAC,CAAC;EACxD,MAAMkB,GAAG,GAAGpB,aAAa,CAACC,QAAQ,EAAEiB,IAAI,CAAC;EAEzC,~~IAAIhB~~,GAAG,~~YAAYmB~~,aAAI,EAAE;~~IACvBb~~,OAAO,~~CAACc~~,MAAM,~~GAAGd~~,OAAO,~~CAACc~~,MAAM,~~IAAIpB~~,GAAG,~~CAACoB~~,MAAM;~~IAC7Cd~~,OAAO,~~CAACe~~,WAAW,~~GAAGf~~,OAAO,~~CAACe~~,WAAW,~~IAAIrB~~,GAAG,~~CAACqB~~,WAAW;EAC9D;EAEA,MAAMC,QAAQ,GAAG,IAAAC,wBAAW,EAAC,CAAC;EAC9B,MAAMC,gBAAgB,GAAGF,QAAQ,~~CAACG~~,KAAK,~~EAAED~~,gBAAgB;EACzD,~~MAAME~~,~~WAAW~~,~~GACfF~~,gBAAgB,YAAYL,aAAI,GAAGK,gBAAgB,~~EAAEG~~,MAAM,~~CAACX~~,IAAI,CAAC,GAAG,KAAK;~~EAE3E~~,~~MAAMY~~,WAAW,GAAG,IAAAC,aAAM,~~EAACvB~~,OAAO,CAAC;EACnC,~~MAAMwB~~,QAAQ,GAAG,IAAAD,aAAM,~~EAACb~~,IAAI,CAAC;EAC7B,~~MAAMe~~,~~eAAe~~,GAAG,IAAAF,aAAM,EAACH,~~WAAW~~,CAAC;;~~EAE3C~~;EACA,IAAAM,6BAAoB,EAAC,MAAM;IACzB;IACA,MAAMC,WAAW,GACfH,QAAQ,CAACI,OAAO,~~KAAKlB~~,IAAI,~~IACzBY~~,WAAW,CAACM,OAAO,CAACC,QAAQ,IAC5B,~~CAAC7B~~,OAAO,~~CAAC6B~~,QAAQ;IAEnB,MAAMC,~~aAAa~~,GAAGV,~~WAAW~~,IAAI,CAACK,~~eAAe~~,CAACG,OAAO;~~IAE7D~~,~~IAAIlB~~,IAAI,KAAK,EAAE,~~KAAKoB~~,~~aAAa~~,IAAI,CAACH,WAAW,CAAC,EAAE;~~MAClDnB~~,QAAQ,CAAC,~~IAAAuB~~,+BAAa,~~EAACnB~~,GAAG,EAAEF,IAAI,EAAEV,OAAO,CAAC,CAAC;IAC7C;~~IAEAsB~~,WAAW,CAACM,OAAO,~~GAAG5B~~,OAAO;~~IAC7BwB~~,QAAQ,CAACI,OAAO,~~GAAGlB~~,IAAI;~~IACvBe~~,~~eAAe~~,CAACG,OAAO,GAAGR,~~WAAW~~;~~EACvC~~,CAAC,EAAE,~~CAACR~~,GAAG,EAAEF,IAAI,EAAEV,OAAO,~~EAAEoB~~,~~WAAW~~,CAAC,CAAC;~~EAErC~~,IAAAY,gBAAS,EAAC,MAAM;IACd,~~IAAIhC~~,OAAO,CAACO,eAAe,EAAE;MAC3B,OAAO,MAAM;QACXC,QAAQ,CAAC,~~IAAAyB~~,kCAAgB,~~EAACrB~~,GAAG,CAAC,CAAC;MACjC,CAAC;IACH;EACF,CAAC,EAAE,CAACJ,QAAQ,EAAEI,GAAG,EAAEZ,OAAO,CAACO,eAAe,CAAC,CAAC;EAE5C,~~MAAM2B~~,~~QAAQ,GAAG,IAAArC,cAAO,EAAC,MAAOsB,~~KAAK~~,IAAKA,KAAK,CAACgB,SAAS,CAACvB,GAAG,CAAC,EAAE,CAACA,GAAG,CAAC,CAAC~~;~~EACtE~~,~~OAAO,IAAAwB,uBAAW,EAACF,QAAQ,~~CAAC;~~AAC9B~~,~~CAAC;AAACG,~~OAAA,~~CAAAtC~~,YAAA,GAAAA,YAAA","ignoreList":[]}
1	+ {"version":3,"file":"useModularUI.js","names":["_react","require","_reactRedux","_reactRouter","_constants","_ModularUIActions","_useDeepCompareEffect","_interopRequireDefault","_useI18n","_Href","useKeyForHook","modelKey","url","locale","useLocale","useMemo","split","useModularUI","options","arguments","length","undefined","method","HTTP_METHODS","GET","removeOnUnmount","dispatch","useDispatch","href","toString","key","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\";\n\nimport { useLocale } from \"./useI18n\";\nimport Href from \"../models/href/Href\";\n\nimport type { RequestModularUIOptions } from \"../utils\";\n\n/*\n /\nconst useKeyForHook = (modelKey: string, url: string) => {\n const locale = useLocale();\n return useMemo(\n () => `${modelKey}(${url.split(\"?\")[0]})(${locale})`,\n [modelKey, url, locale],\n );\n};\n\n/*\n Use redux action and selector to retrieve the correct modular ui service model\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 = useKeyForHook(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":[]}

package/lib/hooks/useModularUIBasic.js CHANGED Viewed

@@ -9,7 +9,6 @@ var _startsWith = _interopRequireDefault(require("@babel/runtime-corejs3/core-js
 var _react = require("react");
 var _useModularUI = require("./useModularUI");
 var _useRouter = require("./useRouter");
-var _exceptions = require("../exceptions");
 // Helper to create useModularUI options
 const createUseModularUIOptions = (options, href, location) => {
   var _context;
@@ -49,8 +48,7 @@ const validateModel = (model, expectedModels) => {
   if (expectedModels.length > 0) {
     const isCorrectModel = expectedModels.some(expectedModel => model.type === expectedModel);
     if (!isCorrectModel) {
-      console.error(model, "is not of instance", expectedModels);
-      throw new _exceptions.IllegalStateException("Resolved model has incorrect type");
+      console.warn(model, "is not of instance", expectedModels);
     }
   }
 };
@@ -69,7 +67,7 @@ const useModularUIBasic = function (key, href) {
   const location = (0, _useRouter.useLocation)();
   const memoizedHref = (0, _react.useMemo)(() => href.toString(), [href]);
   const useModularUIOptions = (0, _react.useMemo)(() => createUseModularUIOptions(options, memoizedHref, location), [options, memoizedHref, location]);
-  const modularUI = (0, _useModularUI.useModularUI)(key, memoizedHref, useModularUIOptions);
+  const modularUI = (0, _useModularUI.useModularUI)(key, href, useModularUIOptions);
   const expectedModels = (0, _react.useMemo)(() => options.expectedModels ?? [], [options.expectedModels]);
   return (0, _react.useMemo)(() => {
     if (modularUI?.model) {

package/lib/hooks/useModularUIBasic.js.flow CHANGED Viewed

@@ -2,7 +2,7 @@
 import { useMemo } from "react";
 import { useModularUI } from "./useModularUI";
 import { useLocation } from "./useRouter";
-import { IllegalStateException } from "../exceptions";
 import type { ModularUIModel, Href } from "../models";
 export type UseModularUIBasicOptions<T: ModularUIModel> = {
@@ -59,8 +59,7 @@ const validateModel = (model: any, expectedModels: Array<string>) => {
       (expectedModel) => model.type === expectedModel,
     );
     if (!isCorrectModel) {
-      console.error(model, "is not of instance", expectedModels);
-      throw new IllegalStateException("Resolved model has incorrect type");
+      console.warn(model, "is not of instance", expectedModels);
     }
   }
 };
@@ -86,7 +85,7 @@ export const useModularUIBasic = <T: ModularUIModel>(
     [options, memoizedHref, location],
   );
-  const modularUI = useModularUI(key, memoizedHref, useModularUIOptions);
+  const modularUI = useModularUI(key, href, useModularUIOptions);
   const expectedModels = useMemo(
     () => options.expectedModels ?? [],
     [options.expectedModels],

package/lib/hooks/useModularUIBasic.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"useModularUIBasic.js","names":["_react","require","_useModularUI","_useRouter","~~_exceptions","~~createUseModularUIOptions","options","href","location","_context","baseOptions","targetModel","undefined","forceTargetModel","isReload","origin","contextPath","cache","state","reload","_startsWith","default","pathname","call","validateModel","model","expectedModels","length","isCorrectModel","some","expectedModel","type","console","~~error~~","~~IllegalStateException","~~useModularUIBasic","key","arguments","useLocation","memoizedHref","useMemo","toString","useModularUIOptions","modularUI","useModularUI","exports"],"sources":["../../src/hooks/useModularUIBasic.js"],"sourcesContent":["// @flow\nimport { useMemo } from \"react\";\nimport { useModularUI } from \"./useModularUI\";\nimport { useLocation } from \"./useRouter\";\~~nimport { IllegalStateException } from~~ \~~"../exceptions\";\~~nimport type { ModularUIModel, Href } from \"../models\";\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};\n\n// Helper to create useModularUI options\nconst createUseModularUIOptions = <T: ModularUIModel>(\n options: UseModularUIBasicOptions<T>,\n href: string,\n location: any,\n): Object => {\n const baseOptions = {\n targetModel: undefined,\n forceTargetModel: undefined,\n isReload: false,\n origin: undefined,\n contextPath: undefined,\n cache: false,\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 // Check for reload if location matches href\n if (location.state?.reload && location.pathname.startsWith(href)) {\n baseOptions.isReload = true;\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.~~error~~(model, \"is not of instance\", expectedModels);\n ~~throw new IllegalStateException(\"Resolved model has incorrect type\");\n~~ }\n }\n};\n\n/*\n useModularUIBasic Hook\n */\nexport const useModularUIBasic = <T: ModularUIModel>(\n key: string,\n href: string \| Href,\n options: UseModularUIBasicOptions<T> = {\n expectedModels: [],\n targetModel: undefined,\n forceTargetModel: false,\n origin: undefined,\n contextPath: undefined,\n },\n): T \| null => {\n const location = useLocation();\n const memoizedHref = useMemo(() => href.toString(), [href]);\n const useModularUIOptions = useMemo(\n () => createUseModularUIOptions(options, memoizedHref, location),\n [options, memoizedHref, location],\n );\n\n const modularUI = useModularUI(key, ~~memoizedHref~~, useModularUIOptions);\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"],"mappings":";;;;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,aAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;~~AACA,IAAAG,WAAA,GAAAH,OAAA~~;~~AAYA;~~AACA,~~MAAMI~~,yBAAyB,GAAGA,CAChCC,OAAoC,EACpCC,IAAY,EACZC,QAAa,KACF;EAAA,IAAAC,QAAA;EACX,MAAMC,WAAW,GAAG;IAClBC,WAAW,EAAEC,SAAS;IACtBC,gBAAgB,EAAED,SAAS;IAC3BE,QAAQ,EAAE,KAAK;IACfC,MAAM,EAAEH,SAAS;IACjBI,WAAW,EAAEJ,SAAS;IACtBK,KAAK,EAAE;EACT,CAAC;;EAED;EACA,IAAIX,OAAO,CAACK,WAAW,EAAE;IACvBD,WAAW,CAACC,WAAW,GAAGL,OAAO,CAACK,WAAW;IAC7CD,WAAW,CAACG,gBAAgB,GAAGP,OAAO,CAACO,gBAAgB;EACzD;;EAEA;EACA,IAAIP,OAAO,CAACW,KAAK,EAAE;IACjBP,WAAW,CAACO,KAAK,GAAGX,OAAO,CAACW,KAAK;EACnC;;EAEA;EACA,IAAIT,QAAQ,CAACU,KAAK,EAAEC,MAAM,IAAI,IAAAC,WAAA,CAAAC,OAAA,EAAAZ,QAAA,GAAAD,QAAQ,CAACc,QAAQ,EAAAC,IAAA,CAAAd,QAAA,EAAYF,IAAI,CAAC,EAAE;IAChEG,WAAW,CAACI,QAAQ,GAAG,IAAI;EAC7B;;EAEA;EACAJ,WAAW,CAACK,MAAM,GAAGT,OAAO,CAACS,MAAM,IAAIL,WAAW,CAACK,MAAM;EACzDL,WAAW,CAACM,WAAW,GAAGV,OAAO,CAACU,WAAW,IAAIN,WAAW,CAACM,WAAW;EAExE,OAAON,WAAW;AACpB,CAAC;;AAED;AACA,MAAMc,aAAa,GAAGA,CAACC,KAAU,EAAEC,cAA6B,KAAK;EACnE,IAAIA,cAAc,CAACC,MAAM,GAAG,CAAC,EAAE;IAC7B,MAAMC,cAAc,GAAGF,cAAc,CAACG,IAAI,CACvCC,aAAa,IAAKL,KAAK,CAACM,IAAI,KAAKD,aACpC,CAAC;IACD,IAAI,CAACF,cAAc,EAAE;MACnBI,OAAO,CAACC,~~KAAK~~,CAACR,KAAK,EAAE,oBAAoB,EAAEC,cAAc,CAAC;~~MAC1D,MAAM,IAAIQ,iCAAqB,CAAC,mCAAmC,CAAC~~;~~IACtE;~~EACF;AACF,CAAC;;AAED;AACA;AACA;AACO,~~MAAMC~~,iBAAiB,GAAG,SAAAA,CAC/BC,GAAW,~~EACX7B~~,IAAmB,EAQN;EAAA,IAPbD,OAAoC,~~GAAA+B~~,SAAA,~~CAAAV~~,MAAA,~~QAAAU~~,SAAA,~~QAAAzB~~,SAAA,~~GAAAyB~~,SAAA,MAAG;~~IACrCX~~,cAAc,EAAE,EAAE;IAClBf,WAAW,EAAEC,SAAS;IACtBC,gBAAgB,EAAE,KAAK;IACvBE,MAAM,EAAEH,SAAS;IACjBI,WAAW,EAAEJ;EACf,CAAC;EAED,MAAMJ,QAAQ,GAAG,~~IAAA8B~~,sBAAW,EAAC,CAAC;EAC9B,MAAMC,YAAY,GAAG,IAAAC,cAAO,EAAC,~~MAAMjC~~,IAAI,~~CAACkC~~,QAAQ,CAAC,CAAC,EAAE,~~CAAClC~~,IAAI,CAAC,CAAC;EAC3D,~~MAAMmC~~,mBAAmB,GAAG,IAAAF,cAAO,EACjC,~~MAAMnC~~,yBAAyB,CAACC,OAAO,~~EAAEiC~~,YAAY,~~EAAE/B~~,QAAQ,CAAC,EAChE,CAACF,OAAO,~~EAAEiC~~,YAAY,~~EAAE/B~~,QAAQ,CAClC,CAAC;EAED,~~MAAMmC~~,SAAS,GAAG,IAAAC,0BAAY,EAACR,GAAG,~~EAAEG~~,~~YAAY~~,~~EAAEG~~,mBAAmB,CAAC;~~EACtE~~,~~MAAMhB~~,cAAc,GAAG,~~IAAAc~~,cAAO,EAC5B,~~MAAMlC~~,OAAO,CAACoB,cAAc,IAAI,EAAE,EAClC,CAACpB,OAAO,CAACoB,cAAc,CACzB,CAAC;EAED,OAAO,~~IAAAc~~,cAAO,EAAC,MAAgB;IAC7B,IAAIG,SAAS,~~EAAElB~~,KAAK,EAAE;MACpBD,aAAa,~~CAACmB~~,SAAS,~~CAAClB~~,KAAK,EAAEC,cAAc,CAAC;MAC9C,~~OAAOiB~~,SAAS,~~CAAClB~~,KAAK;IACxB;IACA,OAAO,IAAI;EACb,CAAC,EAAE,CAACC,cAAc,~~EAAEiB~~,SAAS,CAAC,CAAC;AACjC,CAAC;AAACE,OAAA,CAAAV,iBAAA,GAAAA,iBAAA","ignoreList":[]}
1	+ {"version":3,"file":"useModularUIBasic.js","names":["_react","require","_useModularUI","_useRouter","createUseModularUIOptions","options","href","location","_context","baseOptions","targetModel","undefined","forceTargetModel","isReload","origin","contextPath","cache","state","reload","_startsWith","default","pathname","call","validateModel","model","expectedModels","length","isCorrectModel","some","expectedModel","type","console","warn","useModularUIBasic","key","arguments","useLocation","memoizedHref","useMemo","toString","useModularUIOptions","modularUI","useModularUI","exports"],"sources":["../../src/hooks/useModularUIBasic.js"],"sourcesContent":["// @flow\nimport { useMemo } from \"react\";\nimport { useModularUI } from \"./useModularUI\";\nimport { useLocation } from \"./useRouter\";\n\nimport type { ModularUIModel, Href } from \"../models\";\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};\n\n// Helper to create useModularUI options\nconst createUseModularUIOptions = <T: ModularUIModel>(\n options: UseModularUIBasicOptions<T>,\n href: string,\n location: any,\n): Object => {\n const baseOptions = {\n targetModel: undefined,\n forceTargetModel: undefined,\n isReload: false,\n origin: undefined,\n contextPath: undefined,\n cache: false,\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 // Check for reload if location matches href\n if (location.state?.reload && location.pathname.startsWith(href)) {\n baseOptions.isReload = true;\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 key: string,\n href: string \| Href,\n options: UseModularUIBasicOptions<T> = {\n expectedModels: [],\n targetModel: undefined,\n forceTargetModel: false,\n origin: undefined,\n contextPath: undefined,\n },\n): T \| null => {\n const location = useLocation();\n const memoizedHref = useMemo(() => href.toString(), [href]);\n const useModularUIOptions = useMemo(\n () => createUseModularUIOptions(options, memoizedHref, location),\n [options, memoizedHref, location],\n );\n\n const modularUI = useModularUI(key, href, useModularUIOptions);\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"],"mappings":"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","ignoreList":[]}

package/lib/hooks/useModularUIModel.js.flow CHANGED Viewed

@@ -11,6 +11,8 @@ import UserProfileModel from "../models/user/UserProfileModel";
 import { useModularUIBasic } from "./useModularUIBasic";
+import type Href from "../models/href/Href";
 type HookOptions = {
   origin?: string,
   contextPath?: string,
@@ -31,7 +33,10 @@ export const useApplication = (
 /**
  * Load a tab by href
  */
-export const useTab = (href: string, options?: HookOptions): TabModel | null =>
+export const useTab = (
+  href: string | Href,
+  options?: HookOptions,
+): TabModel | null =>
   useModularUIBasic("tab", href, {
     expectedModels: ["Tab"],
     targetModel: TabModel,
@@ -42,7 +47,7 @@ export const useTab = (href: string, options?: HookOptions): TabModel | null =>
  * Load caseview by href
  */
 export const useCaseView = (
-  href: string,
+  href: string | Href,
   options?: HookOptions,
 ): CaseViewModel | null =>
   useModularUIBasic("caseview", href, {
@@ -54,7 +59,7 @@ export const useCaseView = (
 /**
  */
 export const usePanel = (
-  href: string,
+  href: string | Href,
   options?: HookOptions,
 ): ListModel | GroupingPanelModel | DetailModel | null =>
   useModularUIBasic("panel", href, {
@@ -65,7 +70,7 @@ export const usePanel = (
 /**
  */
 export const useList = (
-  href: string,
+  href: string | Href,
   options?: HookOptions,
 ): ListModel | null =>
   useModularUIBasic("list", href, {
@@ -77,7 +82,7 @@ export const useList = (
 /**
  */
 export const useListOrDetail = (
-  href: string,
+  href: string | Href,
   options?: HookOptions,
 ): ListModel | DetailModel | null =>
   useModularUIBasic("list", href, {
@@ -89,7 +94,7 @@ export const useListOrDetail = (
 /**
  */
 export const useListDetail = (
-  href: string,
+  href: string | Href,
   options?: HookOptions,
 ): ListDetailModel | null =>
   useModularUIBasic("listdetail", href, {
@@ -102,7 +107,7 @@ export const useListDetail = (
 /**
  */
 export const useGroupingPanel = (
-  href: string,
+  href: string | Href,
   options?: HookOptions,
 ): GroupingPanelModel | null =>
   useModularUIBasic("groupingpanel", href, {
@@ -114,7 +119,7 @@ export const useGroupingPanel = (
 /**
  */
 export const useDetailPanel = (
-  href: string,
+  href: string | Href,
   options?: HookOptions,
 ): DetailModel | null =>
   useModularUIBasic("detailpanel", href, {
@@ -126,7 +131,7 @@ export const useDetailPanel = (
 /**
  */
 export const useQuicksearch = (
-  href: string,
+  href: string | Href,
   options?: HookOptions,
 ): CaseSearchModel | null =>
   useModularUIBasic("quicksearch", href, {
@@ -138,7 +143,7 @@ export const useQuicksearch = (
 /**
  */
 export const useSearch = (
-  href: string,
+  href: string | Href,
   options?: HookOptions,
 ): CaseSearchModel | null =>
   useModularUIBasic("search", href, {
@@ -150,7 +155,7 @@ export const useSearch = (
 /**
  */
 export const useUserProfile = (
-  href: string,
+  href: string | Href,
   options?: HookOptions,
 ): UserProfileModel | null =>
   useModularUIBasic("userprofile", href, {

package/lib/hooks/useModularUIModel.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"useModularUIModel.js","names":["_ApplicationModel","_interopRequireDefault","require","_CaseViewModel","_TabModel","_ListModel","_GroupingPanelModel","_DetailModel","_CaseSearchModel","_ListDetailModel","_UserProfileModel","_useModularUIBasic","useApplication","options","useModularUIBasic","expectedModels","targetModel","ApplicationModel","exports","useTab","href","TabModel","useCaseView","CaseViewModel","usePanel","useList","ListModel","useListOrDetail","DetailModel","useListDetail","ListDetailModel","forceTargetModel","useGroupingPanel","GroupingPanelModel","useDetailPanel","useQuicksearch","CaseSearchModel","useSearch","useUserProfile","UserProfileModel"],"sources":["../../src/hooks/useModularUIModel.js"],"sourcesContent":["// @flow\nimport ApplicationModel from \"../models/application/ApplicationModel\";\nimport CaseViewModel from \"../models/caseview/CaseViewModel\";\nimport TabModel from \"../models/tab/TabModel\";\nimport ListModel from \"../models/list/ListModel\";\nimport GroupingPanelModel from \"../models/panels/GroupingPanelModel\";\nimport DetailModel from \"../models/detail/DetailModel\";\nimport CaseSearchModel from \"../models/search/CaseSearchModel\";\nimport ListDetailModel from \"../models/list/ListDetailModel\";\nimport UserProfileModel from \"../models/user/UserProfileModel\";\n\nimport { useModularUIBasic } from \"./useModularUIBasic\";\n\ntype HookOptions = {\n origin?: string,\n contextPath?: string,\n};\n\n/*\n Load application\n /\nexport const useApplication = (\n options?: HookOptions,\n): ApplicationModel \| null =>\n useModularUIBasic(\"application\", \"/\", {\n expectedModels: [\"Application\"],\n targetModel: ApplicationModel,\n ...options,\n });\n\n/\n Load a tab by href\n /\nexport const useTab = (href: string, options?: HookOptions): TabModel \| null =>\n useModularUIBasic(\"tab\", href, {\n expectedModels: [\"Tab\"],\n targetModel: TabModel,\n ...options,\n });\n\n/\n Load caseview by href\n /\nexport const useCaseView = (\n href: string,\n options?: HookOptions,\n): CaseViewModel \| null =>\n useModularUIBasic(\"caseview\", href, {\n expectedModels: [\"CaseView\"],\n targetModel: CaseViewModel,\n ...options,\n });\n\n/\n /\nexport const usePanel = (\n href: string,\n options?: HookOptions,\n): ListModel \| GroupingPanelModel \| DetailModel \| null =>\n useModularUIBasic(\"panel\", href, {\n expectedModels: [\"List\", \"GroupingPanel\", \"Detail\"],\n ...options,\n });\n\n/*\n /\nexport const useList = (\n href: string,\n options?: HookOptions,\n): ListModel \| null =>\n useModularUIBasic(\"list\", href, {\n expectedModels: [\"List\"],\n targetModel: ListModel,\n ...options,\n });\n\n/*\n /\nexport const useListOrDetail = (\n href: string,\n options?: HookOptions,\n): ListModel \| DetailModel \| null =>\n useModularUIBasic(\"list\", href, {\n expectedModels: [\"List\", \"Detail\"],\n targetModel: [ListModel, DetailModel],\n ...options,\n });\n\n/*\n /\nexport const useListDetail = (\n href: string,\n options?: HookOptions,\n): ListDetailModel \| null =>\n useModularUIBasic(\"listdetail\", href, {\n expectedModels: [\"ListDetail\"],\n targetModel: ListDetailModel,\n forceTargetModel: true,\n ...options,\n });\n\n/*\n /\nexport const useGroupingPanel = (\n href: string,\n options?: HookOptions,\n): GroupingPanelModel \| null =>\n useModularUIBasic(\"groupingpanel\", href, {\n expectedModels: [\"GroupingPanel\"],\n targetModel: GroupingPanelModel,\n ...options,\n });\n\n/*\n /\nexport const useDetailPanel = (\n href: string,\n options?: HookOptions,\n): DetailModel \| null =>\n useModularUIBasic(\"detailpanel\", href, {\n expectedModels: [\"Detail\"],\n targetModel: DetailModel,\n ...options,\n });\n\n/*\n /\nexport const useQuicksearch = (\n href: string,\n options?: HookOptions,\n): CaseSearchModel \| null =>\n useModularUIBasic(\"quicksearch\", href, {\n expectedModels: [\"CaseSearch\"],\n targetModel: CaseSearchModel,\n ...options,\n });\n\n/*\n /\nexport const useSearch = (\n href: string,\n options?: HookOptions,\n): CaseSearchModel \| null =>\n useModularUIBasic(\"search\", href, {\n expectedModels: [\"CaseSearch\"],\n targetModel: CaseSearchModel,\n ...options,\n });\n\n/*\n /\nexport const useUserProfile = (\n href: string,\n options?: HookOptions,\n): UserProfileModel \| null =>\n useModularUIBasic(\"userprofile\", href, {\n expectedModels: [\"UserProfile\"],\n targetModel: UserProfileModel,\n ...options,\n });\n"],"mappings":";;;;;;;AACA,IAAAA,iBAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,cAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,SAAA,GAAAH,sBAAA,CAAAC,OAAA;AACA,IAAAG,UAAA,GAAAJ,sBAAA,CAAAC,OAAA;AACA,IAAAI,mBAAA,GAAAL,sBAAA,CAAAC,OAAA;AACA,IAAAK,YAAA,GAAAN,sBAAA,CAAAC,OAAA;AACA,IAAAM,gBAAA,GAAAP,sBAAA,CAAAC,OAAA;AACA,IAAAO,gBAAA,GAAAR,sBAAA,CAAAC,OAAA;AACA,IAAAQ,iBAAA,GAAAT,sBAAA,CAAAC,OAAA;AAEA,IAAAS,kBAAA,GAAAT,OAAA;~~AAOA~~;AACA;AACA;AACO,MAAMU,cAAc,GACzBC,OAAqB,IAErB,IAAAC,oCAAiB,EAAC,aAAa,EAAE,GAAG,EAAE;EACpCC,cAAc,EAAE,CAAC,aAAa,CAAC;EAC/BC,WAAW,EAAEC,yBAAgB;EAC7B,GAAGJ;AACL,CAAC,CAAC;;AAEJ;AACA;AACA;AAFAK,OAAA,CAAAN,cAAA,GAAAA,cAAA;AAGO,MAAMO,MAAM,GAAGA,~~CAACC~~,~~IAAY~~,~~EAAEP~~,OAAqB,~~KACxD~~,IAAAC,oCAAiB,EAAC,KAAK,EAAEM,IAAI,EAAE;EAC7BL,cAAc,EAAE,CAAC,KAAK,CAAC;EACvBC,WAAW,EAAEK,iBAAQ;EACrB,GAAGR;AACL,CAAC,CAAC;;AAEJ;AACA;AACA;AAFAK,OAAA,CAAAC,MAAA,GAAAA,MAAA;AAGO,MAAMG,WAAW,GAAGA,CACzBF,~~IAAY~~,~~EACZP~~,OAAqB,KAErB,IAAAC,oCAAiB,EAAC,UAAU,EAAEM,IAAI,EAAE;EAClCL,cAAc,EAAE,CAAC,UAAU,CAAC;EAC5BC,WAAW,EAAEO,sBAAa;EAC1B,GAAGV;AACL,CAAC,CAAC;;AAEJ;AACA;AADAK,OAAA,CAAAI,WAAA,GAAAA,WAAA;AAEO,MAAME,QAAQ,GAAGA,CACtBJ,~~IAAY~~,~~EACZP~~,OAAqB,KAErB,IAAAC,oCAAiB,EAAC,OAAO,EAAEM,IAAI,EAAE;EAC/BL,cAAc,EAAE,CAAC,MAAM,EAAE,eAAe,EAAE,QAAQ,CAAC;EACnD,GAAGF;AACL,CAAC,CAAC;;AAEJ;AACA;AADAK,OAAA,CAAAM,QAAA,GAAAA,QAAA;AAEO,MAAMC,OAAO,GAAGA,CACrBL,~~IAAY~~,~~EACZP~~,OAAqB,KAErB,IAAAC,oCAAiB,EAAC,MAAM,EAAEM,IAAI,EAAE;EAC9BL,cAAc,EAAE,CAAC,MAAM,CAAC;EACxBC,WAAW,EAAEU,kBAAS;EACtB,GAAGb;AACL,CAAC,CAAC;;AAEJ;AACA;AADAK,OAAA,CAAAO,OAAA,GAAAA,OAAA;AAEO,MAAME,eAAe,GAAGA,CAC7BP,~~IAAY~~,~~EACZP~~,OAAqB,KAErB,IAAAC,oCAAiB,EAAC,MAAM,EAAEM,IAAI,EAAE;EAC9BL,cAAc,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC;EAClCC,WAAW,EAAE,CAACU,kBAAS,EAAEE,oBAAW,CAAC;EACrC,GAAGf;AACL,CAAC,CAAC;;AAEJ;AACA;AADAK,OAAA,CAAAS,eAAA,GAAAA,eAAA;AAEO,MAAME,aAAa,GAAGA,CAC3BT,~~IAAY~~,~~EACZP~~,OAAqB,KAErB,IAAAC,oCAAiB,EAAC,YAAY,EAAEM,IAAI,EAAE;EACpCL,cAAc,EAAE,CAAC,YAAY,CAAC;EAC9BC,WAAW,EAAEc,wBAAe;EAC5BC,gBAAgB,EAAE,IAAI;EACtB,GAAGlB;AACL,CAAC,CAAC;;AAEJ;AACA;AADAK,OAAA,CAAAW,aAAA,GAAAA,aAAA;AAEO,MAAMG,gBAAgB,GAAGA,CAC9BZ,~~IAAY~~,~~EACZP~~,OAAqB,KAErB,IAAAC,oCAAiB,EAAC,eAAe,EAAEM,IAAI,EAAE;EACvCL,cAAc,EAAE,CAAC,eAAe,CAAC;EACjCC,WAAW,EAAEiB,2BAAkB;EAC/B,GAAGpB;AACL,CAAC,CAAC;;AAEJ;AACA;AADAK,OAAA,CAAAc,gBAAA,GAAAA,gBAAA;AAEO,MAAME,cAAc,GAAGA,CAC5Bd,~~IAAY~~,~~EACZP~~,OAAqB,KAErB,IAAAC,oCAAiB,EAAC,aAAa,EAAEM,IAAI,EAAE;EACrCL,cAAc,EAAE,CAAC,QAAQ,CAAC;EAC1BC,WAAW,EAAEY,oBAAW;EACxB,GAAGf;AACL,CAAC,CAAC;;AAEJ;AACA;AADAK,OAAA,CAAAgB,cAAA,GAAAA,cAAA;AAEO,MAAMC,cAAc,GAAGA,CAC5Bf,~~IAAY~~,~~EACZP~~,OAAqB,KAErB,IAAAC,oCAAiB,EAAC,aAAa,EAAEM,IAAI,EAAE;EACrCL,cAAc,EAAE,CAAC,YAAY,CAAC;EAC9BC,WAAW,EAAEoB,wBAAe;EAC5B,GAAGvB;AACL,CAAC,CAAC;;AAEJ;AACA;AADAK,OAAA,CAAAiB,cAAA,GAAAA,cAAA;AAEO,MAAME,SAAS,GAAGA,CACvBjB,~~IAAY~~,~~EACZP~~,OAAqB,KAErB,IAAAC,oCAAiB,EAAC,QAAQ,EAAEM,IAAI,EAAE;EAChCL,cAAc,EAAE,CAAC,YAAY,CAAC;EAC9BC,WAAW,EAAEoB,wBAAe;EAC5B,GAAGvB;AACL,CAAC,CAAC;;AAEJ;AACA;AADAK,OAAA,CAAAmB,SAAA,GAAAA,SAAA;AAEO,MAAMC,cAAc,GAAGA,CAC5BlB,~~IAAY~~,~~EACZP~~,OAAqB,KAErB,IAAAC,oCAAiB,EAAC,aAAa,EAAEM,IAAI,EAAE;EACrCL,cAAc,EAAE,CAAC,aAAa,CAAC;EAC/BC,WAAW,EAAEuB,yBAAgB;EAC7B,GAAG1B;AACL,CAAC,CAAC;AAACK,OAAA,CAAAoB,cAAA,GAAAA,cAAA","ignoreList":[]}
1	+ {"version":3,"file":"useModularUIModel.js","names":["_ApplicationModel","_interopRequireDefault","require","_CaseViewModel","_TabModel","_ListModel","_GroupingPanelModel","_DetailModel","_CaseSearchModel","_ListDetailModel","_UserProfileModel","_useModularUIBasic","useApplication","options","useModularUIBasic","expectedModels","targetModel","ApplicationModel","exports","useTab","href","TabModel","useCaseView","CaseViewModel","usePanel","useList","ListModel","useListOrDetail","DetailModel","useListDetail","ListDetailModel","forceTargetModel","useGroupingPanel","GroupingPanelModel","useDetailPanel","useQuicksearch","CaseSearchModel","useSearch","useUserProfile","UserProfileModel"],"sources":["../../src/hooks/useModularUIModel.js"],"sourcesContent":["// @flow\nimport ApplicationModel from \"../models/application/ApplicationModel\";\nimport CaseViewModel from \"../models/caseview/CaseViewModel\";\nimport TabModel from \"../models/tab/TabModel\";\nimport ListModel from \"../models/list/ListModel\";\nimport GroupingPanelModel from \"../models/panels/GroupingPanelModel\";\nimport DetailModel from \"../models/detail/DetailModel\";\nimport CaseSearchModel from \"../models/search/CaseSearchModel\";\nimport ListDetailModel from \"../models/list/ListDetailModel\";\nimport UserProfileModel from \"../models/user/UserProfileModel\";\n\nimport { useModularUIBasic } from \"./useModularUIBasic\";\n\nimport type Href from \"../models/href/Href\";\n\ntype HookOptions = {\n origin?: string,\n contextPath?: string,\n};\n\n/*\n Load application\n /\nexport const useApplication = (\n options?: HookOptions,\n): ApplicationModel \| null =>\n useModularUIBasic(\"application\", \"/\", {\n expectedModels: [\"Application\"],\n targetModel: ApplicationModel,\n ...options,\n });\n\n/\n Load a tab by href\n /\nexport const useTab = (\n href: string \| Href,\n options?: HookOptions,\n): TabModel \| null =>\n useModularUIBasic(\"tab\", href, {\n expectedModels: [\"Tab\"],\n targetModel: TabModel,\n ...options,\n });\n\n/\n Load caseview by href\n /\nexport const useCaseView = (\n href: string \| Href,\n options?: HookOptions,\n): CaseViewModel \| null =>\n useModularUIBasic(\"caseview\", href, {\n expectedModels: [\"CaseView\"],\n targetModel: CaseViewModel,\n ...options,\n });\n\n/\n /\nexport const usePanel = (\n href: string \| Href,\n options?: HookOptions,\n): ListModel \| GroupingPanelModel \| DetailModel \| null =>\n useModularUIBasic(\"panel\", href, {\n expectedModels: [\"List\", \"GroupingPanel\", \"Detail\"],\n ...options,\n });\n\n/*\n /\nexport const useList = (\n href: string \| Href,\n options?: HookOptions,\n): ListModel \| null =>\n useModularUIBasic(\"list\", href, {\n expectedModels: [\"List\"],\n targetModel: ListModel,\n ...options,\n });\n\n/*\n /\nexport const useListOrDetail = (\n href: string \| Href,\n options?: HookOptions,\n): ListModel \| DetailModel \| null =>\n useModularUIBasic(\"list\", href, {\n expectedModels: [\"List\", \"Detail\"],\n targetModel: [ListModel, DetailModel],\n ...options,\n });\n\n/*\n /\nexport const useListDetail = (\n href: string \| Href,\n options?: HookOptions,\n): ListDetailModel \| null =>\n useModularUIBasic(\"listdetail\", href, {\n expectedModels: [\"ListDetail\"],\n targetModel: ListDetailModel,\n forceTargetModel: true,\n ...options,\n });\n\n/*\n /\nexport const useGroupingPanel = (\n href: string \| Href,\n options?: HookOptions,\n): GroupingPanelModel \| null =>\n useModularUIBasic(\"groupingpanel\", href, {\n expectedModels: [\"GroupingPanel\"],\n targetModel: GroupingPanelModel,\n ...options,\n });\n\n/*\n /\nexport const useDetailPanel = (\n href: string \| Href,\n options?: HookOptions,\n): DetailModel \| null =>\n useModularUIBasic(\"detailpanel\", href, {\n expectedModels: [\"Detail\"],\n targetModel: DetailModel,\n ...options,\n });\n\n/*\n /\nexport const useQuicksearch = (\n href: string \| Href,\n options?: HookOptions,\n): CaseSearchModel \| null =>\n useModularUIBasic(\"quicksearch\", href, {\n expectedModels: [\"CaseSearch\"],\n targetModel: CaseSearchModel,\n ...options,\n });\n\n/*\n /\nexport const useSearch = (\n href: string \| Href,\n options?: HookOptions,\n): CaseSearchModel \| null =>\n useModularUIBasic(\"search\", href, {\n expectedModels: [\"CaseSearch\"],\n targetModel: CaseSearchModel,\n ...options,\n });\n\n/*\n /\nexport const useUserProfile = (\n href: string \| Href,\n options?: HookOptions,\n): UserProfileModel \| null =>\n useModularUIBasic(\"userprofile\", href, {\n expectedModels: [\"UserProfile\"],\n targetModel: UserProfileModel,\n ...options,\n });\n"],"mappings":"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","ignoreList":[]}

package/lib/models/actions/ActionCollection.js CHANGED Viewed

@@ -15,7 +15,7 @@ var _ActionModel = _interopRequireDefault(require("./ActionModel"));
  * Collection of actions
  */
 class ActionCollection extends _BaseCollection.default {
-  constructor(actions, actionsContributions, origin, contextPath) {
+  constructor(actions, actionsContributions, modelOptions) {
     super();
     // no actions gives an empty collection
@@ -26,7 +26,7 @@ class ActionCollection extends _BaseCollection.default {
       for (const actionData of actions) {
         const actionContribution = (0, _find.default)(actionsContributions).call(actionsContributions, actionContribution => actionContribution.name === actionData.name && actionContribution.type !== "service-operation");
         if (actionContribution) {
-          actionModels.push(new _ActionModel.default(actionData, actionContribution, origin, contextPath));
+          actionModels.push(new _ActionModel.default(actionData, actionContribution, modelOptions));
         }
       }
       this.collection = actionModels;

package/lib/models/actions/ActionCollection.js.flow CHANGED Viewed

@@ -1,6 +1,7 @@
 // @flow
 import BaseCollection from "../base/BaseCollection";
 import ActionModel from "./ActionModel";
+import type { ModelOptions } from "../types";
 /**
  * Collection of actions
@@ -9,8 +10,7 @@ export default class ActionCollection extends BaseCollection<ActionModel> {
   constructor(
     actions?: Object,
     actionsContributions?: Object,
-    origin?: string,
-    contextPath?: string,
+    modelOptions?: ModelOptions,
   ) {
     super();
@@ -28,12 +28,7 @@ export default class ActionCollection extends BaseCollection<ActionModel> {
         if (actionContribution) {
           actionModels.push(
-            new ActionModel(
-              actionData,
-              actionContribution,
-              origin,
-              contextPath,
-            ),
+            new ActionModel(actionData, actionContribution, modelOptions),
           );
         }
       }

package/lib/models/actions/ActionCollection.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ActionCollection.js","names":["_BaseCollection","_interopRequireDefault","require","_ActionModel","ActionCollection","BaseCollection","constructor","actions","actionsContributions","~~origin~~","~~contextPath","~~Array","isArray","collection","actionModels","actionData","actionContribution","_find","default","call","name","type","push","ActionModel","getActionByKey","key","_context","newCollection","_filter","action","first","getActionsByType","_context2","_includes","getActionsByLayoutHint","_context3","_len","arguments","length","hints","_key","layouthint","has","hasActionsByLayoutHint","routePath","_context4","enabledRoutes","isDisabled","path","_map","selfhref","join","exports"],"sources":["../../../src/models/actions/ActionCollection.js"],"sourcesContent":["// @flow\nimport BaseCollection from \"../base/BaseCollection\";\nimport ActionModel from \"./ActionModel\";\n\n/*\n Collection of actions\n /\nexport default class ActionCollection extends BaseCollection<ActionModel> {\n constructor(\n actions?: Object,\n actionsContributions?: Object,\n ~~origin~~?: ~~string~~,\n ~~contextPath?: string,\n~~ ) {\n super();\n\n // no actions gives an empty collection\n if (!Array.isArray(actions)) {\n this.collection = [];\n } else if (Array.isArray(actionsContributions)) {\n const actionModels = [];\n for (const actionData of actions) {\n const actionContribution = actionsContributions.find(\n (actionContribution) =>\n actionContribution.name === actionData.name &&\n actionContribution.type !== \"service-operation\",\n );\n\n if (actionContribution) {\n actionModels.push(\n new ActionModel(\n actionData~~,\n~~ actionContribution~~,\n origin,\n contextPath,\n~~ ),\n );\n }\n }\n\n this.collection = actionModels;\n }\n }\n\n /\n Retrieve action by key\n /\n getActionByKey(key: string): ActionModel \| null {\n const newCollection = new ActionCollection();\n\n newCollection.collection = this.filter((action) => action.key === key);\n\n return newCollection.first;\n }\n\n /\n Retrieve actions by type\n /\n getActionsByType(type: string \| Array<string>): ActionCollection {\n const newCollection = new ActionCollection();\n\n newCollection.collection = this.filter((action) =>\n Array.isArray(type) ? type.includes(action.type) : action.type === type,\n );\n\n return newCollection;\n }\n\n /\n Retrieve actions including a layout hint\n /\n getActionsByLayoutHint(...hints: Array<string>): ActionCollection {\n const newCollection = new ActionCollection();\n\n newCollection.collection = this.filter((action) =>\n action.layouthint.has(...hints),\n );\n\n return newCollection;\n }\n\n /\n Indicates if an action with layout hint exists\n /\n hasActionsByLayoutHint(...hints: Array<string>): boolean {\n return this.getActionsByLayoutHint(...hints).length > 0;\n }\n\n /\n Use as path regex for react router routes\n */\n get routePath(): string {\n const enabledRoutes = this.collection.filter(\n (action) => !action.isDisabled,\n );\n\n if (enabledRoutes.length === 0) {\n return \"__NON_EXISTING_ROUTE__\";\n }\n\n const path = enabledRoutes.map((action) => action.selfhref.path).join(\"\|\");\n\n return this.length > 1 ? `(${path})` : path;\n }\n}\n"],"mappings":";;;;;;;;;;;AACA,IAAAA,eAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAF,sBAAA,CAAAC,OAAA;~~AAEA~~;AACA;AACA;AACe,MAAME,gBAAgB,SAASC,uBAAc,CAAc;EACxEC,WAAWA,CACTC,OAAgB,EAChBC,oBAA6B,EAC7BC,~~MAAe~~,~~EACfC,WAAoB,EACpB~~;IACA,KAAK,CAAC,CAAC;;IAEP;IACA,IAAI,CAACC,KAAK,CAACC,OAAO,~~CAACL~~,OAAO,CAAC,EAAE;MAC3B,IAAI,~~CAACM~~,UAAU,GAAG,EAAE;IACtB,CAAC,MAAM,IAAIF,KAAK,CAACC,OAAO,~~CAACJ~~,oBAAoB,CAAC,EAAE;MAC9C,~~MAAMM~~,YAAY,GAAG,EAAE;MACvB,KAAK,MAAMC,UAAU,~~IAAIR~~,OAAO,EAAE;QAChC,~~MAAMS~~,kBAAkB,GAAG,IAAAC,KAAA,CAAAC,OAAA,~~EAAAV~~,oBAAoB,~~EAAAW~~,IAAA,~~CAApBX~~,oBAAoB,~~EAC5CQ~~,kBAAkB,IACjBA,kBAAkB,CAACI,IAAI,KAAKL,UAAU,CAACK,IAAI,IAC3CJ,kBAAkB,CAACK,IAAI,KAAK,mBAChC,CAAC;QAED,IAAIL,kBAAkB,EAAE;UACtBF,YAAY,CAACQ,IAAI,CACf,IAAIC,oBAAW,~~CACbR~~,UAAU,~~EACVC~~,kBAAkB,~~EAClBP~~,~~MAAM~~,~~EACNC~~,~~WACF,CACF,~~CAAC;QACH;MACF;MAEA,IAAI,CAACG,UAAU,GAAGC,YAAY;IAChC;EACF;;EAEA;AACF;AACA;EACEU,cAAcA,CAACC,GAAW,EAAsB;IAAA,IAAAC,QAAA;IAC9C,MAAMC,aAAa,GAAG,~~IAAIvB~~,gBAAgB,CAAC,CAAC;~~IAE5CuB~~,aAAa,CAACd,UAAU,GAAG,IAAAe,OAAA,CAAAV,OAAA,EAAAQ,QAAA,OAAI,EAAAP,IAAA,CAAAO,QAAA,EAASG,MAAM,IAAKA,MAAM,CAACJ,GAAG,KAAKA,GAAG,CAAC;IAEtE,OAAOE,aAAa,CAACG,KAAK;EAC5B;;EAEA;AACF;AACA;EACEC,gBAAgBA,CAACV,IAA4B,EAAoB;IAAA,IAAAW,SAAA;IAC/D,MAAML,aAAa,GAAG,~~IAAIvB~~,gBAAgB,CAAC,CAAC;~~IAE5CuB~~,aAAa,CAACd,UAAU,GAAG,IAAAe,OAAA,CAAAV,OAAA,EAAAc,SAAA,OAAI,EAAAb,IAAA,CAAAa,SAAA,EAASH,MAAM,IAC5ClB,KAAK,CAACC,OAAO,CAACS,IAAI,CAAC,GAAG,IAAAY,SAAA,CAAAf,OAAA,EAAAG,IAAI,EAAAF,IAAA,CAAJE,IAAI,EAAUQ,MAAM,CAACR,IAAI,CAAC,GAAGQ,MAAM,CAACR,IAAI,KAAKA,IACrE,CAAC;IAED,OAAOM,aAAa;EACtB;;EAEA;AACF;AACA;EACEO,sBAAsBA,CAAA,EAA4C;IAAA,IAAAC,SAAA;IAAA,SAAAC,IAAA,GAAAC,SAAA,CAAAC,MAAA,EAAxCC,KAAK,OAAA5B,KAAA,CAAAyB,IAAA,GAAAI,IAAA,MAAAA,IAAA,GAAAJ,IAAA,EAAAI,IAAA;MAALD,KAAK,CAAAC,IAAA,IAAAH,SAAA,CAAAG,IAAA;IAAA;IAC7B,MAAMb,aAAa,GAAG,~~IAAIvB~~,gBAAgB,CAAC,CAAC;~~IAE5CuB~~,aAAa,CAACd,UAAU,GAAG,IAAAe,OAAA,CAAAV,OAAA,EAAAiB,SAAA,OAAI,EAAAhB,IAAA,CAAAgB,SAAA,EAASN,MAAM,IAC5CA,MAAM,CAACY,UAAU,CAACC,GAAG,CAAC,GAAGH,KAAK,CAChC,CAAC;IAED,OAAOZ,aAAa;EACtB;;EAEA;AACF;AACA;EACEgB,sBAAsBA,CAAA,EAAmC;IACvD,OAAO,IAAI,CAACT,sBAAsB,CAAC,GAAAG,SAAQ,CAAC,CAACC,MAAM,GAAG,CAAC;EACzD;;EAEA;AACF;AACA;EACE,IAAIM,SAASA,CAAA,EAAW;IAAA,IAAAC,SAAA;IACtB,MAAMC,aAAa,GAAG,IAAAlB,OAAA,CAAAV,OAAA,EAAA2B,SAAA,OAAI,CAAChC,UAAU,EAAAM,IAAA,CAAA0B,SAAA,EAClChB,MAAM,IAAK,CAACA,MAAM,CAACkB,UACtB,CAAC;IAED,IAAID,aAAa,CAACR,MAAM,KAAK,CAAC,EAAE;MAC9B,OAAO,wBAAwB;IACjC;IAEA,MAAMU,IAAI,GAAG,IAAAC,IAAA,CAAA/B,OAAA,EAAA4B,aAAa,EAAA3B,IAAA,CAAb2B,aAAa,EAAMjB,MAAM,IAAKA,MAAM,CAACqB,QAAQ,CAACF,IAAI,CAAC,CAACG,IAAI,CAAC,GAAG,CAAC;IAE1E,OAAO,IAAI,CAACb,MAAM,GAAG,CAAC,GAAG,IAAIU,IAAI,GAAG,GAAGA,IAAI;EAC7C;AACF;AAACI,OAAA,CAAAlC,OAAA,~~GAAAd~~,gBAAA","ignoreList":[]}
1	+ {"version":3,"file":"ActionCollection.js","names":["_BaseCollection","_interopRequireDefault","require","_ActionModel","ActionCollection","BaseCollection","constructor","actions","actionsContributions","modelOptions","Array","isArray","collection","actionModels","actionData","actionContribution","_find","default","call","name","type","push","ActionModel","getActionByKey","key","_context","newCollection","_filter","action","first","getActionsByType","_context2","_includes","getActionsByLayoutHint","_context3","_len","arguments","length","hints","_key","layouthint","has","hasActionsByLayoutHint","routePath","_context4","enabledRoutes","isDisabled","path","_map","selfhref","join","exports"],"sources":["../../../src/models/actions/ActionCollection.js"],"sourcesContent":["// @flow\nimport BaseCollection from \"../base/BaseCollection\";\nimport ActionModel from \"./ActionModel\";\nimport type { ModelOptions } from \"../types\";\n\n/*\n Collection of actions\n /\nexport default class ActionCollection extends BaseCollection<ActionModel> {\n constructor(\n actions?: Object,\n actionsContributions?: Object,\n modelOptions?: ModelOptions,\n ) {\n super();\n\n // no actions gives an empty collection\n if (!Array.isArray(actions)) {\n this.collection = [];\n } else if (Array.isArray(actionsContributions)) {\n const actionModels = [];\n for (const actionData of actions) {\n const actionContribution = actionsContributions.find(\n (actionContribution) =>\n actionContribution.name === actionData.name &&\n actionContribution.type !== \"service-operation\",\n );\n\n if (actionContribution) {\n actionModels.push(\n new ActionModel(actionData, actionContribution, modelOptions),\n );\n }\n }\n\n this.collection = actionModels;\n }\n }\n\n /\n Retrieve action by key\n /\n getActionByKey(key: string): ActionModel \| null {\n const newCollection = new ActionCollection();\n\n newCollection.collection = this.filter((action) => action.key === key);\n\n return newCollection.first;\n }\n\n /\n Retrieve actions by type\n /\n getActionsByType(type: string \| Array<string>): ActionCollection {\n const newCollection = new ActionCollection();\n\n newCollection.collection = this.filter((action) =>\n Array.isArray(type) ? type.includes(action.type) : action.type === type,\n );\n\n return newCollection;\n }\n\n /\n Retrieve actions including a layout hint\n /\n getActionsByLayoutHint(...hints: Array<string>): ActionCollection {\n const newCollection = new ActionCollection();\n\n newCollection.collection = this.filter((action) =>\n action.layouthint.has(...hints),\n );\n\n return newCollection;\n }\n\n /\n Indicates if an action with layout hint exists\n /\n hasActionsByLayoutHint(...hints: Array<string>): boolean {\n return this.getActionsByLayoutHint(...hints).length > 0;\n }\n\n /\n Use as path regex for react router routes\n */\n get routePath(): string {\n const enabledRoutes = this.collection.filter(\n (action) => !action.isDisabled,\n );\n\n if (enabledRoutes.length === 0) {\n return \"__NON_EXISTING_ROUTE__\";\n }\n\n const path = enabledRoutes.map((action) => action.selfhref.path).join(\"\|\");\n\n return this.length > 1 ? `(${path})` : path;\n }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/models/actions/ActionModel.js CHANGED Viewed

@@ -18,16 +18,15 @@ var _constants = require("../../constants");
  * Defines an Action. For instance an action on the tab 'books', which leads to a form
  */
 class ActionModel extends _BaseModel.default {
-  constructor(data, contributions, origin, contextPath) {
-    super(data, contributions);
+  constructor(data, contributions, modelOptions) {
+    super(data, contributions, modelOptions);
     (0, _defineProperty2.default)(this, "_fieldCollection", void 0);
     (0, _defineProperty2.default)(this, "_href", void 0);
     (0, _defineProperty2.default)(this, "_icon", void 0);
-    (0, _defineProperty2.default)(this, "_origin", void 0);
-    (0, _defineProperty2.default)(this, "_contextPath", void 0);
-    this._fieldCollection = new _AttributeCollection.default(this.data.fields, this.contributions.fields);
-    this._origin = origin;
-    this._contextPath = contextPath;
+    this._fieldCollection = new _AttributeCollection.default(this.data.fields, this.contributions.fields, {
+      ...modelOptions,
+      isReadonly: false
+    });
   }
   /**
@@ -45,7 +44,10 @@ class ActionModel extends _BaseModel.default {
       label: label ?? name,
       type
     };
-    return new ActionModel(data, contributions, origin, contextPath);
+    return new ActionModel(data, contributions, {
+      origin,
+      contextPath
+    });
   }
   /**
@@ -54,23 +56,11 @@ class ActionModel extends _BaseModel.default {
     return this.data.href == null;
   }
-  /**
-   */
-  get origin() {
-    return this._origin ?? "";
-  }
-  /**
-   */
-  get contextPath() {
-    return this._contextPath ?? (0, _constants.getBasePath)();
-  }
   /**
    * retrieve href of action
    */
   get selfhref() {
-    return this._href ?? new _Href.default(`${this.data.href}?${this.querystring}`, "Form", this.origin, this.contextPath);
+    return this._href ?? new _Href.default(`${this.data.href}?${this.querystring}`, "Form", this.modelOptions);
   }
   /**
@@ -183,7 +173,7 @@ class ActionModel extends _BaseModel.default {
    */
   get processStatus() {
     if (this.isProcessTask) {
-      return new _ProcessStatusSettingsModel.default(this.getData("processStatus", {}), this.getContribution("processTask", {}));
+      return new _ProcessStatusSettingsModel.default(this.getData("processStatus", {}), this.getContribution("processTask", {}), this.modelOptions);
     }
     return null;
   }