@beinformed/ui 1.53.0 → 1.54.1

package/lib/hooks/useModelCatalog.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModelCatalog.js","names":["_useRouter","require","_createHref","_ModelCatalogModel","_interopRequireDefault","_ConceptIndexModel","_ConceptDetailModel","_BusinessScenarioModel","_ContentIndexModel","_ContentTOCModel","_ContentModel","_useModularUIBasic","_models","useModelCatalog","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\nexport type SearchFilter = {\n  index?: string,\n  label?: string,\n  type?: string | Array<string>,\n  entryDate?: string,\n};\n\n/**\n */\nexport const useModelCatalog = (): ?ModelCatalogModel =>\n  useModularUIBasic(\"modelcatalog\", \"/modelcatalog\", {\n    expectedModels: [\"ModelCatalog\"],\n    targetModel: ModelCatalogModel,\n  });\n\n/**\n */\nexport const useConceptIndex = (\n  href: string,\n  key?: string = \"conceptindex\",\n): ?ConceptIndexModel => {\n  const url = filterParameters(href, [\"entryDate\", \"index\", \"label\", \"type\"]);\n  return useModularUIBasic(key, url, {\n    expectedModels: [\"ConceptIndex\"],\n    targetModel: ConceptIndexModel,\n  });\n};\n\n/**\n */\nexport const useConceptDetail = (\n  concept: string,\n  key?: string = \"conceptdetail\",\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  });\n};\n\n/**\n */\nexport const useContentIndex = (\n  href: string,\n  key?: string = \"contentindex\",\n): ?ContentIndexModel => {\n  const url = filterParameters(href, [\"index\", \"label\", \"type\"]);\n  return useModularUIBasic(key, url, {\n    expectedModels: [\"ContentIndex\"],\n    targetModel: ContentIndexModel,\n  });\n};\n\n/**\n */\nexport const useContentTOC = (\n  content: string,\n  key?: string = \"contenttoc\",\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  });\n};\n\n/**\n */\nexport const useContent = (\n  contentSection: string,\n  key?: string = \"content\",\n): ?ContentModel => {\n  const href = createHref(\"content\", contentSection, null, [\"entryDate\"]);\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"Content\"],\n    targetModel: ContentModel,\n  });\n};\n\n/**\n */\nexport const useContentType = (\n  contentType: string,\n  key?: string = \"contenttypes\",\n): ?ContentTypeModel => {\n  const href = createHref(\"contenttypes\", contentType, null, [\"entryDate\"]);\n  return useModularUIBasic(key, href, {\n    expectedModels: [\"ContentType\"],\n    targetModel: ContentTypeModel,\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): ?ConceptIndexModel => {\n  const href = getSearchHref(\"/concepts\", filters);\n  return useConceptIndex(href, key);\n};\n\n/**\n */\nexport const useContentSearch = (\n  filters: SearchFilter,\n  key?: string = \"contentSearch\",\n): ?ContentIndexModel => {\n  const href = getSearchHref(\"/content\", filters);\n  return useContentIndex(href, key);\n};\n"],"mappings":"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","ignoreList":[]}
+{"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  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, [\"entryDate\", \"index\", \"label\", \"type\"]);\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":[]}

package/lib/hooks/useModularUIBasic.js

@@ -22,12 +22,16 @@ const useModularUIBasic = function (key, href) {
   const useModularUIOptions = {
     targetModel: undefined,
     forceTargetModel: undefined,
-    isReload: false
+    isReload: false,
+    cache: false
   };
   if (options.targetModel) {
     useModularUIOptions.targetModel = options.targetModel;
     useModularUIOptions.forceTargetModel = options.forceTargetModel;
   }
+  if (options.cache) {
+    useModularUIOptions.cache = options.cache;
+  }
 
   // reload when the modular service starts with the current location
   if (location.state?.reload && (0, _startsWith.default)(_context = location.pathname).call(_context, href.toString())) {
@@ -40,12 +44,13 @@ const useModularUIBasic = function (key, href) {
     const {
       model
     } = modularUI;
-    if (options.expectedModels.length > 0) {
-      const isCorrectModel = options.expectedModels.some(expectedModel => {
+    const expectedModels = options.expectedModels ?? [];
+    if (expectedModels.length > 0) {
+      const isCorrectModel = expectedModels.some(expectedModel => {
         return model.type === expectedModel;
       });
       if (!isCorrectModel) {
-        console.error(modularUI, "is not of instance", options.expectedModels);
+        console.error(modularUI, "is not of instance", expectedModels);
         throw new _exceptions.IllegalStateException("Resolved model has incorrect type");
       }
     }

package/lib/hooks/useModularUIBasic.js.flow

@@ -7,10 +7,11 @@ import { IllegalStateException } from "../exceptions";
 
 import type { ModularUIModel, Href } from "../models";
 
-type UseModularUIBasicOptions<T: ModularUIModel> = {
-  expectedModels: Array<string>,
+export type UseModularUIBasicOptions<T: ModularUIModel> = {
+  expectedModels?: Array<string>,
   targetModel?: Class<T> | Array<Class<T>>,
   forceTargetModel?: boolean,
+  cache?: boolean,
 };
 
 /**
@@ -30,12 +31,17 @@ export const useModularUIBasic = <T: ModularUIModel>(
     targetModel: undefined,
     forceTargetModel: undefined,
     isReload: false,
+    cache: false,
   };
   if (options.targetModel) {
     useModularUIOptions.targetModel = options.targetModel;
     useModularUIOptions.forceTargetModel = options.forceTargetModel;
   }
 
+  if (options.cache) {
+    useModularUIOptions.cache = options.cache;
+  }
+
   // reload when the modular service starts with the current location
   if (location.state?.reload && location.pathname.startsWith(href.toString())) {
     useModularUIOptions.isReload = true;
@@ -46,13 +52,15 @@ export const useModularUIBasic = <T: ModularUIModel>(
 
   if (modularUI?.model) {
     const { model } = modularUI;
-    if (options.expectedModels.length > 0) {
-      const isCorrectModel = options.expectedModels.some((expectedModel) => {
+
+    const expectedModels = options.expectedModels ?? [];
+    if (expectedModels.length > 0) {
+      const isCorrectModel = expectedModels.some((expectedModel) => {
         return model.type === expectedModel;
       });
 
       if (!isCorrectModel) {
-        console.error(modularUI, "is not of instance", options.expectedModels);
+        console.error(modularUI, "is not of instance", expectedModels);
         throw new IllegalStateException("Resolved model has incorrect type");
       }
     }

package/lib/hooks/useModularUIBasic.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModularUIBasic.js","names":["_useModularUI","require","_useRouter","_exceptions","useModularUIBasic","key","href","_context","options","arguments","length","undefined","expectedModels","targetModel","forceTargetModel","location","useLocation","useModularUIOptions","isReload","state","reload","_startsWith","default","pathname","call","toString","modularUI","useModularUI","model","isCorrectModel","some","expectedModel","type","console","error","IllegalStateException","exports"],"sources":["../../src/hooks/useModularUIBasic.js"],"sourcesContent":["// @flow\nimport { useModularUI } from \"./useModularUI\";\n\nimport { useLocation } from \"./useRouter\";\n\nimport { IllegalStateException } from \"../exceptions\";\n\nimport type { ModularUIModel, Href } from \"../models\";\n\ntype UseModularUIBasicOptions<T: ModularUIModel> = {\n  expectedModels: Array<string>,\n  targetModel?: Class<T> | Array<Class<T>>,\n  forceTargetModel?: boolean,\n};\n\n/**\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  },\n): T | null => {\n  const location = useLocation();\n\n  const useModularUIOptions = {\n    targetModel: undefined,\n    forceTargetModel: undefined,\n    isReload: false,\n  };\n  if (options.targetModel) {\n    useModularUIOptions.targetModel = options.targetModel;\n    useModularUIOptions.forceTargetModel = options.forceTargetModel;\n  }\n\n  // reload when the modular service starts with the current location\n  if (location.state?.reload && location.pathname.startsWith(href.toString())) {\n    useModularUIOptions.isReload = true;\n  }\n\n  // $FlowFixMe[incompatible-call]\n  const modularUI = useModularUI(key, href, useModularUIOptions);\n\n  if (modularUI?.model) {\n    const { model } = modularUI;\n    if (options.expectedModels.length > 0) {\n      const isCorrectModel = options.expectedModels.some((expectedModel) => {\n        return model.type === expectedModel;\n      });\n\n      if (!isCorrectModel) {\n        console.error(modularUI, \"is not of instance\", options.expectedModels);\n        throw new IllegalStateException(\"Resolved model has incorrect type\");\n      }\n    }\n\n    return model;\n  }\n\n  return null;\n};\n"],"mappings":";;;;;;;;AACA,IAAAA,aAAA,GAAAC,OAAA;AAEA,IAAAC,UAAA,GAAAD,OAAA;AAEA,IAAAE,WAAA,GAAAF,OAAA;AAUA;AACA;AACO,MAAMG,iBAAiB,GAAG,SAAAA,CAC/BC,GAAW,EACXC,IAAmB,EAMN;EAAA,IAAAC,QAAA;EAAA,IALbC,OAAoC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG;IACrCG,cAAc,EAAE,EAAE;IAClBC,WAAW,EAAEF,SAAS;IACtBG,gBAAgB,EAAE;EACpB,CAAC;EAED,MAAMC,QAAQ,GAAG,IAAAC,sBAAW,EAAC,CAAC;EAE9B,MAAMC,mBAAmB,GAAG;IAC1BJ,WAAW,EAAEF,SAAS;IACtBG,gBAAgB,EAAEH,SAAS;IAC3BO,QAAQ,EAAE;EACZ,CAAC;EACD,IAAIV,OAAO,CAACK,WAAW,EAAE;IACvBI,mBAAmB,CAACJ,WAAW,GAAGL,OAAO,CAACK,WAAW;IACrDI,mBAAmB,CAACH,gBAAgB,GAAGN,OAAO,CAACM,gBAAgB;EACjE;;EAEA;EACA,IAAIC,QAAQ,CAACI,KAAK,EAAEC,MAAM,IAAI,IAAAC,WAAA,CAAAC,OAAA,EAAAf,QAAA,GAAAQ,QAAQ,CAACQ,QAAQ,EAAAC,IAAA,CAAAjB,QAAA,EAAYD,IAAI,CAACmB,QAAQ,CAAC,CAAC,CAAC,EAAE;IAC3ER,mBAAmB,CAACC,QAAQ,GAAG,IAAI;EACrC;;EAEA;EACA,MAAMQ,SAAS,GAAG,IAAAC,0BAAY,EAACtB,GAAG,EAAEC,IAAI,EAAEW,mBAAmB,CAAC;EAE9D,IAAIS,SAAS,EAAEE,KAAK,EAAE;IACpB,MAAM;MAAEA;IAAM,CAAC,GAAGF,SAAS;IAC3B,IAAIlB,OAAO,CAACI,cAAc,CAACF,MAAM,GAAG,CAAC,EAAE;MACrC,MAAMmB,cAAc,GAAGrB,OAAO,CAACI,cAAc,CAACkB,IAAI,CAAEC,aAAa,IAAK;QACpE,OAAOH,KAAK,CAACI,IAAI,KAAKD,aAAa;MACrC,CAAC,CAAC;MAEF,IAAI,CAACF,cAAc,EAAE;QACnBI,OAAO,CAACC,KAAK,CAACR,SAAS,EAAE,oBAAoB,EAAElB,OAAO,CAACI,cAAc,CAAC;QACtE,MAAM,IAAIuB,iCAAqB,CAAC,mCAAmC,CAAC;MACtE;IACF;IAEA,OAAOP,KAAK;EACd;EAEA,OAAO,IAAI;AACb,CAAC;AAACQ,OAAA,CAAAhC,iBAAA,GAAAA,iBAAA","ignoreList":[]}
+{"version":3,"file":"useModularUIBasic.js","names":["_useModularUI","require","_useRouter","_exceptions","useModularUIBasic","key","href","_context","options","arguments","length","undefined","expectedModels","targetModel","forceTargetModel","location","useLocation","useModularUIOptions","isReload","cache","state","reload","_startsWith","default","pathname","call","toString","modularUI","useModularUI","model","isCorrectModel","some","expectedModel","type","console","error","IllegalStateException","exports"],"sources":["../../src/hooks/useModularUIBasic.js"],"sourcesContent":["// @flow\nimport { useModularUI } from \"./useModularUI\";\n\nimport { useLocation } from \"./useRouter\";\n\nimport { IllegalStateException } from \"../exceptions\";\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  cache?: boolean,\n};\n\n/**\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  },\n): T | null => {\n  const location = useLocation();\n\n  const useModularUIOptions = {\n    targetModel: undefined,\n    forceTargetModel: undefined,\n    isReload: false,\n    cache: false,\n  };\n  if (options.targetModel) {\n    useModularUIOptions.targetModel = options.targetModel;\n    useModularUIOptions.forceTargetModel = options.forceTargetModel;\n  }\n\n  if (options.cache) {\n    useModularUIOptions.cache = options.cache;\n  }\n\n  // reload when the modular service starts with the current location\n  if (location.state?.reload && location.pathname.startsWith(href.toString())) {\n    useModularUIOptions.isReload = true;\n  }\n\n  // $FlowFixMe[incompatible-call]\n  const modularUI = useModularUI(key, href, useModularUIOptions);\n\n  if (modularUI?.model) {\n    const { model } = modularUI;\n\n    const expectedModels = options.expectedModels ?? [];\n    if (expectedModels.length > 0) {\n      const isCorrectModel = expectedModels.some((expectedModel) => {\n        return model.type === expectedModel;\n      });\n\n      if (!isCorrectModel) {\n        console.error(modularUI, \"is not of instance\", expectedModels);\n        throw new IllegalStateException(\"Resolved model has incorrect type\");\n      }\n    }\n\n    return model;\n  }\n\n  return null;\n};\n"],"mappings":";;;;;;;;AACA,IAAAA,aAAA,GAAAC,OAAA;AAEA,IAAAC,UAAA,GAAAD,OAAA;AAEA,IAAAE,WAAA,GAAAF,OAAA;AAWA;AACA;AACO,MAAMG,iBAAiB,GAAG,SAAAA,CAC/BC,GAAW,EACXC,IAAmB,EAMN;EAAA,IAAAC,QAAA;EAAA,IALbC,OAAoC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG;IACrCG,cAAc,EAAE,EAAE;IAClBC,WAAW,EAAEF,SAAS;IACtBG,gBAAgB,EAAE;EACpB,CAAC;EAED,MAAMC,QAAQ,GAAG,IAAAC,sBAAW,EAAC,CAAC;EAE9B,MAAMC,mBAAmB,GAAG;IAC1BJ,WAAW,EAAEF,SAAS;IACtBG,gBAAgB,EAAEH,SAAS;IAC3BO,QAAQ,EAAE,KAAK;IACfC,KAAK,EAAE;EACT,CAAC;EACD,IAAIX,OAAO,CAACK,WAAW,EAAE;IACvBI,mBAAmB,CAACJ,WAAW,GAAGL,OAAO,CAACK,WAAW;IACrDI,mBAAmB,CAACH,gBAAgB,GAAGN,OAAO,CAACM,gBAAgB;EACjE;EAEA,IAAIN,OAAO,CAACW,KAAK,EAAE;IACjBF,mBAAmB,CAACE,KAAK,GAAGX,OAAO,CAACW,KAAK;EAC3C;;EAEA;EACA,IAAIJ,QAAQ,CAACK,KAAK,EAAEC,MAAM,IAAI,IAAAC,WAAA,CAAAC,OAAA,EAAAhB,QAAA,GAAAQ,QAAQ,CAACS,QAAQ,EAAAC,IAAA,CAAAlB,QAAA,EAAYD,IAAI,CAACoB,QAAQ,CAAC,CAAC,CAAC,EAAE;IAC3ET,mBAAmB,CAACC,QAAQ,GAAG,IAAI;EACrC;;EAEA;EACA,MAAMS,SAAS,GAAG,IAAAC,0BAAY,EAACvB,GAAG,EAAEC,IAAI,EAAEW,mBAAmB,CAAC;EAE9D,IAAIU,SAAS,EAAEE,KAAK,EAAE;IACpB,MAAM;MAAEA;IAAM,CAAC,GAAGF,SAAS;IAE3B,MAAMf,cAAc,GAAGJ,OAAO,CAACI,cAAc,IAAI,EAAE;IACnD,IAAIA,cAAc,CAACF,MAAM,GAAG,CAAC,EAAE;MAC7B,MAAMoB,cAAc,GAAGlB,cAAc,CAACmB,IAAI,CAAEC,aAAa,IAAK;QAC5D,OAAOH,KAAK,CAACI,IAAI,KAAKD,aAAa;MACrC,CAAC,CAAC;MAEF,IAAI,CAACF,cAAc,EAAE;QACnBI,OAAO,CAACC,KAAK,CAACR,SAAS,EAAE,oBAAoB,EAAEf,cAAc,CAAC;QAC9D,MAAM,IAAIwB,iCAAqB,CAAC,mCAAmC,CAAC;MACtE;IACF;IAEA,OAAOP,KAAK;EACd;EAEA,OAAO,IAAI;AACb,CAAC;AAACQ,OAAA,CAAAjC,iBAAA,GAAAA,iBAAA","ignoreList":[]}

package/lib/redux/_modularui/ModularUIActions.js

@@ -99,6 +99,7 @@ const loadModel = (key, href, options) => ({
     childmodels: options?.childmodels,
     targetModel: options?.targetModel,
     forceTargetModel: options?.forceTargetModel,
+    cache: options?.cache,
     /**
      */
     successAction: model => loadModelSuccessAction(key, model, options?.updateHandler),

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

@@ -116,6 +116,7 @@ export const loadModel = (
     childmodels: options?.childmodels,
     targetModel: options?.targetModel,
     forceTargetModel: options?.forceTargetModel,
+    cache: options?.cache,
     /**
      */
     successAction: (model) =>

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

@@ -1 +1 @@
-{"version":3,"file":"ModularUIActions.js","names":["_Constants","require","_Href","_interopRequireDefault","_ErrorResponse","_ProgressIndicator","_Error","setModel","key","model","connectKey","type","payload","exports","initModels","models","updateModel","updateForm","removeModelByKey","resetModularUI","updateStatus","status","loadModelSuccessAction","updateHandler","loadModel","href","options","Href","method","HTTP_METHODS","GET","data","locale","childmodels","targetModel","forceTargetModel","successAction","errorAction","error","errorResponse","ErrorResponse","isChangePassword","isResourceNotFoundAfterReload","MODULARUI_STATUS","ERROR","loadModularUI","dispatch","LOADING","startProgress","loadModelPromise","_promise","default","resolve","then","response","FINISHED","finishProgress","catch","handleError","reloadModel","selfhref","isReload"],"sources":["../../../src/redux/_modularui/ModularUIActions.js"],"sourcesContent":["// @flow\nimport { HTTP_METHODS, MODULARUI_STATUS } from \"../../constants/Constants\";\nimport Href from \"../../models/href/Href\";\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\nimport { finishProgress, startProgress } from \"../actions/ProgressIndicator\";\nimport { handleError } from \"../actions/Error\";\n\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { Dispatch, ThunkAction } from \"../types\";\nimport type {\n  ModularUIAction,\n  SetModelAction,\n  InitModelAction,\n  UpdateModelAction,\n  UpdateFormAction,\n  RemoveModelByKeyAction,\n  ResetModularUIAction,\n  UpdateStatusAction,\n} from \"./types\";\nimport type {\n  RequestModularUIOptions,\n  UpdateHandler,\n} from \"../../utils/fetch/types\";\n\n/**\n */\nexport const setModel = (\n  key: string,\n  model: ModularUIModel,\n): SetModelAction => {\n  // set key on model for later reference\n  model.connectKey = key;\n  return {\n    type: \"MODULARUI/SET\",\n    payload: {\n      key,\n      model,\n    },\n  };\n};\n\n/**\n */\nexport const initModels = (\n  models: Array<{ key: string, model: ModularUIModel }>,\n): InitModelAction => ({\n  type: \"MODULARUI/INIT\",\n  payload: models,\n});\n\n/**\n */\nexport const updateModel = (model: ModularUIModel): UpdateModelAction => ({\n  type: \"MODULARUI/UPDATE\",\n  payload: model,\n});\n\n/**\n */\nexport const updateForm = (model: ModularUIModel): UpdateFormAction => ({\n  type: \"MODULARUI/UPDATE_FORM\",\n  payload: model,\n});\n\n/**\n */\nexport const removeModelByKey = (key: string): RemoveModelByKeyAction => ({\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: key,\n});\n\n/**\n * Removes all models except the application model from the modular ui reducer\n */\nexport const resetModularUI = (): ResetModularUIAction => ({\n  type: \"MODULARUI/RESET\",\n});\n\n/**\n */\nexport const updateStatus = (\n  key: string,\n  status: $Keys<typeof MODULARUI_STATUS>,\n): UpdateStatusAction => ({\n  type: \"MODULARUI/STATUS\",\n  payload: { key, status },\n});\n\n/**\n */\nconst loadModelSuccessAction = (\n  key: string,\n  model: ModularUIModel,\n  updateHandler: UpdateHandler | void,\n): UpdateModelAction | SetModelAction => {\n  if (updateHandler) {\n    return updateModel(updateHandler(model));\n  }\n  return setModel(key, model);\n};\n\n/**\n * This action is handled by the modularui middleware\n */\nexport const loadModel = (\n  key: string,\n  href: Href | string,\n  options?: RequestModularUIOptions,\n): ModularUIAction => ({\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    href: href instanceof Href ? href : new Href(href),\n    method: options?.method ?? HTTP_METHODS.GET,\n    data: options?.data,\n    locale: options?.locale ?? \"en\",\n    childmodels: options?.childmodels,\n    targetModel: options?.targetModel,\n    forceTargetModel: options?.forceTargetModel,\n    /**\n     */\n    successAction: (model) =>\n      loadModelSuccessAction(key, model, options?.updateHandler),\n    /**\n     */\n    errorAction: (error) => {\n      const errorResponse = new ErrorResponse(error, key);\n      if (errorResponse.isChangePassword) {\n        return {\n          type: \"NO_ACTION\",\n        };\n      } else if (errorResponse.isResourceNotFoundAfterReload) {\n        return removeModelByKey(key);\n      }\n\n      return updateStatus(key, MODULARUI_STATUS.ERROR);\n    },\n  },\n});\n\n/**\n */\nexport const loadModularUI =\n  (\n    key: string,\n    href: Href | string,\n    options?: RequestModularUIOptions,\n  ): ThunkAction =>\n  (dispatch: Dispatch) => {\n    dispatch(updateStatus(key, MODULARUI_STATUS.LOADING));\n    dispatch(startProgress());\n\n    const loadModelPromise = dispatch(loadModel(key, href, options));\n\n    return Promise.resolve(loadModelPromise)\n      .then((response) => {\n        if (response?.type === \"FINISH_PROGRESS\") {\n          dispatch(updateStatus(key, MODULARUI_STATUS.FINISHED));\n        }\n\n        return dispatch(finishProgress());\n      })\n      .catch((error) => dispatch(handleError(error)));\n  };\n\n/**\n */\nexport const reloadModel = (\n  model: ModularUIModel,\n  options?: RequestModularUIOptions,\n): ThunkAction =>\n  loadModularUI(model.connectKey, model.selfhref, {\n    ...options,\n    isReload: true,\n  });\n"],"mappings":";;;;;;;;AACA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,KAAA,GAAAC,sBAAA,CAAAF,OAAA;AACA,IAAAG,cAAA,GAAAD,sBAAA,CAAAF,OAAA;AACA,IAAAI,kBAAA,GAAAJ,OAAA;AACA,IAAAK,MAAA,GAAAL,OAAA;AAmBA;AACA;AACO,MAAMM,QAAQ,GAAGA,CACtBC,GAAW,EACXC,KAAqB,KACF;EACnB;EACAA,KAAK,CAACC,UAAU,GAAGF,GAAG;EACtB,OAAO;IACLG,IAAI,EAAE,eAAe;IACrBC,OAAO,EAAE;MACPJ,GAAG;MACHC;IACF;EACF,CAAC;AACH,CAAC;;AAED;AACA;AADAI,OAAA,CAAAN,QAAA,GAAAA,QAAA;AAEO,MAAMO,UAAU,GACrBC,MAAqD,KAChC;EACrBJ,IAAI,EAAE,gBAAgB;EACtBC,OAAO,EAAEG;AACX,CAAC,CAAC;;AAEF;AACA;AADAF,OAAA,CAAAC,UAAA,GAAAA,UAAA;AAEO,MAAME,WAAW,GAAIP,KAAqB,KAAyB;EACxEE,IAAI,EAAE,kBAAkB;EACxBC,OAAO,EAAEH;AACX,CAAC,CAAC;;AAEF;AACA;AADAI,OAAA,CAAAG,WAAA,GAAAA,WAAA;AAEO,MAAMC,UAAU,GAAIR,KAAqB,KAAwB;EACtEE,IAAI,EAAE,uBAAuB;EAC7BC,OAAO,EAAEH;AACX,CAAC,CAAC;;AAEF;AACA;AADAI,OAAA,CAAAI,UAAA,GAAAA,UAAA;AAEO,MAAMC,gBAAgB,GAAIV,GAAW,KAA8B;EACxEG,IAAI,EAAE,sBAAsB;EAC5BC,OAAO,EAAEJ;AACX,CAAC,CAAC;;AAEF;AACA;AACA;AAFAK,OAAA,CAAAK,gBAAA,GAAAA,gBAAA;AAGO,MAAMC,cAAc,GAAGA,CAAA,MAA6B;EACzDR,IAAI,EAAE;AACR,CAAC,CAAC;;AAEF;AACA;AADAE,OAAA,CAAAM,cAAA,GAAAA,cAAA;AAEO,MAAMC,YAAY,GAAGA,CAC1BZ,GAAW,EACXa,MAAsC,MACd;EACxBV,IAAI,EAAE,kBAAkB;EACxBC,OAAO,EAAE;IAAEJ,GAAG;IAAEa;EAAO;AACzB,CAAC,CAAC;;AAEF;AACA;AADAR,OAAA,CAAAO,YAAA,GAAAA,YAAA;AAEA,MAAME,sBAAsB,GAAGA,CAC7Bd,GAAW,EACXC,KAAqB,EACrBc,aAAmC,KACI;EACvC,IAAIA,aAAa,EAAE;IACjB,OAAOP,WAAW,CAACO,aAAa,CAACd,KAAK,CAAC,CAAC;EAC1C;EACA,OAAOF,QAAQ,CAACC,GAAG,EAAEC,KAAK,CAAC;AAC7B,CAAC;;AAED;AACA;AACA;AACO,MAAMe,SAAS,GAAGA,CACvBhB,GAAW,EACXiB,IAAmB,EACnBC,OAAiC,MACZ;EACrBf,IAAI,EAAE,iBAAiB;EACvBC,OAAO,EAAE;IACPa,IAAI,EAAEA,IAAI,YAAYE,aAAI,GAAGF,IAAI,GAAG,IAAIE,aAAI,CAACF,IAAI,CAAC;IAClDG,MAAM,EAAEF,OAAO,EAAEE,MAAM,IAAIC,uBAAY,CAACC,GAAG;IAC3CC,IAAI,EAAEL,OAAO,EAAEK,IAAI;IACnBC,MAAM,EAAEN,OAAO,EAAEM,MAAM,IAAI,IAAI;IAC/BC,WAAW,EAAEP,OAAO,EAAEO,WAAW;IACjCC,WAAW,EAAER,OAAO,EAAEQ,WAAW;IACjCC,gBAAgB,EAAET,OAAO,EAAES,gBAAgB;IAC3C;AACJ;IACIC,aAAa,EAAG3B,KAAK,IACnBa,sBAAsB,CAACd,GAAG,EAAEC,KAAK,EAAEiB,OAAO,EAAEH,aAAa,CAAC;IAC5D;AACJ;IACIc,WAAW,EAAGC,KAAK,IAAK;MACtB,MAAMC,aAAa,GAAG,IAAIC,sBAAa,CAACF,KAAK,EAAE9B,GAAG,CAAC;MACnD,IAAI+B,aAAa,CAACE,gBAAgB,EAAE;QAClC,OAAO;UACL9B,IAAI,EAAE;QACR,CAAC;MACH,CAAC,MAAM,IAAI4B,aAAa,CAACG,6BAA6B,EAAE;QACtD,OAAOxB,gBAAgB,CAACV,GAAG,CAAC;MAC9B;MAEA,OAAOY,YAAY,CAACZ,GAAG,EAAEmC,2BAAgB,CAACC,KAAK,CAAC;IAClD;EACF;AACF,CAAC,CAAC;;AAEF;AACA;AADA/B,OAAA,CAAAW,SAAA,GAAAA,SAAA;AAEO,MAAMqB,aAAa,GACxBA,CACErC,GAAW,EACXiB,IAAmB,EACnBC,OAAiC,KAElCoB,QAAkB,IAAK;EACtBA,QAAQ,CAAC1B,YAAY,CAACZ,GAAG,EAAEmC,2BAAgB,CAACI,OAAO,CAAC,CAAC;EACrDD,QAAQ,CAAC,IAAAE,gCAAa,EAAC,CAAC,CAAC;EAEzB,MAAMC,gBAAgB,GAAGH,QAAQ,CAACtB,SAAS,CAAChB,GAAG,EAAEiB,IAAI,EAAEC,OAAO,CAAC,CAAC;EAEhE,OAAOwB,QAAA,CAAAC,OAAA,CAAQC,OAAO,CAACH,gBAAgB,CAAC,CACrCI,IAAI,CAAEC,QAAQ,IAAK;IAClB,IAAIA,QAAQ,EAAE3C,IAAI,KAAK,iBAAiB,EAAE;MACxCmC,QAAQ,CAAC1B,YAAY,CAACZ,GAAG,EAAEmC,2BAAgB,CAACY,QAAQ,CAAC,CAAC;IACxD;IAEA,OAAOT,QAAQ,CAAC,IAAAU,iCAAc,EAAC,CAAC,CAAC;EACnC,CAAC,CAAC,CACDC,KAAK,CAAEnB,KAAK,IAAKQ,QAAQ,CAAC,IAAAY,kBAAW,EAACpB,KAAK,CAAC,CAAC,CAAC;AACnD,CAAC;;AAEH;AACA;AADAzB,OAAA,CAAAgC,aAAA,GAAAA,aAAA;AAEO,MAAMc,WAAW,GAAGA,CACzBlD,KAAqB,EACrBiB,OAAiC,KAEjCmB,aAAa,CAACpC,KAAK,CAACC,UAAU,EAAED,KAAK,CAACmD,QAAQ,EAAE;EAC9C,GAAGlC,OAAO;EACVmC,QAAQ,EAAE;AACZ,CAAC,CAAC;AAAChD,OAAA,CAAA8C,WAAA,GAAAA,WAAA","ignoreList":[]}
+{"version":3,"file":"ModularUIActions.js","names":["_Constants","require","_Href","_interopRequireDefault","_ErrorResponse","_ProgressIndicator","_Error","setModel","key","model","connectKey","type","payload","exports","initModels","models","updateModel","updateForm","removeModelByKey","resetModularUI","updateStatus","status","loadModelSuccessAction","updateHandler","loadModel","href","options","Href","method","HTTP_METHODS","GET","data","locale","childmodels","targetModel","forceTargetModel","cache","successAction","errorAction","error","errorResponse","ErrorResponse","isChangePassword","isResourceNotFoundAfterReload","MODULARUI_STATUS","ERROR","loadModularUI","dispatch","LOADING","startProgress","loadModelPromise","_promise","default","resolve","then","response","FINISHED","finishProgress","catch","handleError","reloadModel","selfhref","isReload"],"sources":["../../../src/redux/_modularui/ModularUIActions.js"],"sourcesContent":["// @flow\nimport { HTTP_METHODS, MODULARUI_STATUS } from \"../../constants/Constants\";\nimport Href from \"../../models/href/Href\";\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\nimport { finishProgress, startProgress } from \"../actions/ProgressIndicator\";\nimport { handleError } from \"../actions/Error\";\n\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { Dispatch, ThunkAction } from \"../types\";\nimport type {\n  ModularUIAction,\n  SetModelAction,\n  InitModelAction,\n  UpdateModelAction,\n  UpdateFormAction,\n  RemoveModelByKeyAction,\n  ResetModularUIAction,\n  UpdateStatusAction,\n} from \"./types\";\nimport type {\n  RequestModularUIOptions,\n  UpdateHandler,\n} from \"../../utils/fetch/types\";\n\n/**\n */\nexport const setModel = (\n  key: string,\n  model: ModularUIModel,\n): SetModelAction => {\n  // set key on model for later reference\n  model.connectKey = key;\n  return {\n    type: \"MODULARUI/SET\",\n    payload: {\n      key,\n      model,\n    },\n  };\n};\n\n/**\n */\nexport const initModels = (\n  models: Array<{ key: string, model: ModularUIModel }>,\n): InitModelAction => ({\n  type: \"MODULARUI/INIT\",\n  payload: models,\n});\n\n/**\n */\nexport const updateModel = (model: ModularUIModel): UpdateModelAction => ({\n  type: \"MODULARUI/UPDATE\",\n  payload: model,\n});\n\n/**\n */\nexport const updateForm = (model: ModularUIModel): UpdateFormAction => ({\n  type: \"MODULARUI/UPDATE_FORM\",\n  payload: model,\n});\n\n/**\n */\nexport const removeModelByKey = (key: string): RemoveModelByKeyAction => ({\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: key,\n});\n\n/**\n * Removes all models except the application model from the modular ui reducer\n */\nexport const resetModularUI = (): ResetModularUIAction => ({\n  type: \"MODULARUI/RESET\",\n});\n\n/**\n */\nexport const updateStatus = (\n  key: string,\n  status: $Keys<typeof MODULARUI_STATUS>,\n): UpdateStatusAction => ({\n  type: \"MODULARUI/STATUS\",\n  payload: { key, status },\n});\n\n/**\n */\nconst loadModelSuccessAction = (\n  key: string,\n  model: ModularUIModel,\n  updateHandler: UpdateHandler | void,\n): UpdateModelAction | SetModelAction => {\n  if (updateHandler) {\n    return updateModel(updateHandler(model));\n  }\n  return setModel(key, model);\n};\n\n/**\n * This action is handled by the modularui middleware\n */\nexport const loadModel = (\n  key: string,\n  href: Href | string,\n  options?: RequestModularUIOptions,\n): ModularUIAction => ({\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    href: href instanceof Href ? href : new Href(href),\n    method: options?.method ?? HTTP_METHODS.GET,\n    data: options?.data,\n    locale: options?.locale ?? \"en\",\n    childmodels: options?.childmodels,\n    targetModel: options?.targetModel,\n    forceTargetModel: options?.forceTargetModel,\n    cache: options?.cache,\n    /**\n     */\n    successAction: (model) =>\n      loadModelSuccessAction(key, model, options?.updateHandler),\n    /**\n     */\n    errorAction: (error) => {\n      const errorResponse = new ErrorResponse(error, key);\n      if (errorResponse.isChangePassword) {\n        return {\n          type: \"NO_ACTION\",\n        };\n      } else if (errorResponse.isResourceNotFoundAfterReload) {\n        return removeModelByKey(key);\n      }\n\n      return updateStatus(key, MODULARUI_STATUS.ERROR);\n    },\n  },\n});\n\n/**\n */\nexport const loadModularUI =\n  (\n    key: string,\n    href: Href | string,\n    options?: RequestModularUIOptions,\n  ): ThunkAction =>\n  (dispatch: Dispatch) => {\n    dispatch(updateStatus(key, MODULARUI_STATUS.LOADING));\n    dispatch(startProgress());\n\n    const loadModelPromise = dispatch(loadModel(key, href, options));\n\n    return Promise.resolve(loadModelPromise)\n      .then((response) => {\n        if (response?.type === \"FINISH_PROGRESS\") {\n          dispatch(updateStatus(key, MODULARUI_STATUS.FINISHED));\n        }\n\n        return dispatch(finishProgress());\n      })\n      .catch((error) => dispatch(handleError(error)));\n  };\n\n/**\n */\nexport const reloadModel = (\n  model: ModularUIModel,\n  options?: RequestModularUIOptions,\n): ThunkAction =>\n  loadModularUI(model.connectKey, model.selfhref, {\n    ...options,\n    isReload: true,\n  });\n"],"mappings":"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","ignoreList":[]}

package/lib/redux/_modularui/ModularUIMiddleware.js

@@ -19,7 +19,8 @@ const createRequest = modularui => {
     data: modularui.data || {},
     locale: modularui.locale,
     childmodels: modularui.childmodels ?? true,
-    isReload: modularui.isReload
+    isReload: modularui.isReload,
+    cache: modularui.cache
   });
   if (modularui.targetModel) {
     request.targetModel = modularui.targetModel;

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

@@ -27,6 +27,7 @@ type RequestOptions = {
   targetModel?: TargetModel,
   forceTargetModel?: boolean,
   isReload?: boolean,
+  cache?: boolean,
 };
 
 /**
@@ -39,6 +40,7 @@ const createRequest = (modularui: RequestOptions): ModularUIRequest => {
     locale: modularui.locale,
     childmodels: modularui.childmodels ?? true,
     isReload: modularui.isReload,
+    cache: modularui.cache,
   });
 
   if (modularui.targetModel) {

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

@@ -1 +1 @@
-{"version":3,"file":"ModularUIMiddleware.js","names":["_ModularUIRequest","_interopRequireDefault","require","_Constants","_ProgressIndicator","_Error","createRequest","modularui","request","ModularUIRequest","href","method","HTTP_METHODS","GET","data","locale","childmodels","isReload","targetModel","forceTargetModel","responseHandler","next","dispatch","successAction","model","successResult","_promise","default","then","result","catch","error","handleError","Error","finishProgress","errorHandler","errorAction","err","errorResult","handleFetch","action","startProgress","requestOptions","payload","modularuiRequest","fetch","modularUIMiddleware","api","type","getState","i18n","exports"],"sources":["../../../src/redux/_modularui/ModularUIMiddleware.js"],"sourcesContent":["// @flow\nimport ModularUIRequest from \"../../modularui/ModularUIRequest\";\nimport { HTTP_METHODS } from \"../../constants/Constants\";\n\nimport { startProgress, finishProgress } from \"../actions/ProgressIndicator\";\n\nimport { handleError } from \"../actions/Error\";\n\nimport type { Middleware, MiddlewareAPI } from \"redux\";\nimport type {\n  ReduxAction,\n  ReduxState,\n  Dispatch,\n  PossibleAction,\n} from \"../types\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type Href from \"../../models/href/Href\";\nimport type { ModularUIAction, SuccessAction, ErrorAction } from \"./types\";\nimport type { TargetModel } from \"../../modularui/types\";\n\ntype RequestOptions = {\n  href: Href,\n  method?: $Keys<typeof HTTP_METHODS>,\n  data?: any,\n  locale: string,\n  childmodels?: boolean,\n  targetModel?: TargetModel,\n  forceTargetModel?: boolean,\n  isReload?: boolean,\n};\n\n/**\n * Symbol key that carries API call info interpreted by this Redux middleware.\n */\nconst createRequest = (modularui: RequestOptions): ModularUIRequest => {\n  const request = new ModularUIRequest(modularui.href, {\n    method: modularui.method || HTTP_METHODS.GET,\n    data: modularui.data || {},\n    locale: modularui.locale,\n    childmodels: modularui.childmodels ?? true,\n    isReload: modularui.isReload,\n  });\n\n  if (modularui.targetModel) {\n    request.targetModel = modularui.targetModel;\n    request.forceTargetModel = modularui.forceTargetModel ?? false;\n  }\n\n  return request;\n};\n\n/**\n */\nconst responseHandler = (\n  next: Dispatch,\n  dispatch: Dispatch,\n  successAction: SuccessAction,\n  model: ModularUIModel,\n) => {\n  if (successAction) {\n    const successResult = successAction(model);\n\n    if (successResult instanceof Promise) {\n      successResult\n        .then((result) => {\n          dispatch(result);\n        })\n        .catch((error) => {\n          next(handleError(error));\n        });\n    } else {\n      try {\n        dispatch(successResult);\n      } catch (error) {\n        throw new Error(\n          `Result of successResult is not a valid redux action: ${error}`,\n        );\n      }\n    }\n  }\n\n  return next(finishProgress());\n};\n\n/**\n */\nconst errorHandler = (\n  next: Dispatch,\n  dispatch: Dispatch,\n  errorAction: ?ErrorAction,\n  err: any,\n) => {\n  dispatch(finishProgress());\n\n  if (errorAction) {\n    const errorResult = errorAction(err);\n\n    if (errorResult instanceof Promise) {\n      errorResult.then((result) => dispatch(result));\n    } else {\n      dispatch(errorResult);\n    }\n  }\n\n  return next(handleError(err));\n};\n\n/**\n */\nconst handleFetch = (\n  action: ModularUIAction,\n  locale: string,\n  dispatch: Dispatch,\n  next: Dispatch,\n) => {\n  dispatch(startProgress());\n\n  const { successAction, errorAction, ...requestOptions } = action.payload;\n  requestOptions.locale = locale;\n\n  const modularuiRequest = createRequest(requestOptions);\n\n  return modularuiRequest\n    .fetch()\n    .then((model) => responseHandler(next, dispatch, successAction, model))\n    .catch((error) => errorHandler(next, dispatch, errorAction, error));\n};\n\n/**\n */\nexport const modularUIMiddleware: Middleware<\n  ReduxState,\n  ReduxAction,\n  Dispatch,\n> =\n  (api: MiddlewareAPI<ReduxState, ReduxAction, Dispatch>) =>\n  (next: Dispatch) =>\n  (action: PossibleAction) => {\n    if (action.type === \"MODULARUI/FETCH\") {\n      return handleFetch(\n        // $FlowExpectedError[incompatible-exact]\n        action,\n        api.getState().i18n.locale,\n        api.dispatch,\n        next,\n      );\n    }\n\n    return next(action);\n  };\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ModularUIMiddleware.js","names":["_ModularUIRequest","_interopRequireDefault","require","_Constants","_ProgressIndicator","_Error","createRequest","modularui","request","ModularUIRequest","href","method","HTTP_METHODS","GET","data","locale","childmodels","isReload","cache","targetModel","forceTargetModel","responseHandler","next","dispatch","successAction","model","successResult","_promise","default","then","result","catch","error","handleError","Error","finishProgress","errorHandler","errorAction","err","errorResult","handleFetch","action","startProgress","requestOptions","payload","modularuiRequest","fetch","modularUIMiddleware","api","type","getState","i18n","exports"],"sources":["../../../src/redux/_modularui/ModularUIMiddleware.js"],"sourcesContent":["// @flow\nimport ModularUIRequest from \"../../modularui/ModularUIRequest\";\nimport { HTTP_METHODS } from \"../../constants/Constants\";\n\nimport { startProgress, finishProgress } from \"../actions/ProgressIndicator\";\n\nimport { handleError } from \"../actions/Error\";\n\nimport type { Middleware, MiddlewareAPI } from \"redux\";\nimport type {\n  ReduxAction,\n  ReduxState,\n  Dispatch,\n  PossibleAction,\n} from \"../types\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type Href from \"../../models/href/Href\";\nimport type { ModularUIAction, SuccessAction, ErrorAction } from \"./types\";\nimport type { TargetModel } from \"../../modularui/types\";\n\ntype RequestOptions = {\n  href: Href,\n  method?: $Keys<typeof HTTP_METHODS>,\n  data?: any,\n  locale: string,\n  childmodels?: boolean,\n  targetModel?: TargetModel,\n  forceTargetModel?: boolean,\n  isReload?: boolean,\n  cache?: boolean,\n};\n\n/**\n * Symbol key that carries API call info interpreted by this Redux middleware.\n */\nconst createRequest = (modularui: RequestOptions): ModularUIRequest => {\n  const request = new ModularUIRequest(modularui.href, {\n    method: modularui.method || HTTP_METHODS.GET,\n    data: modularui.data || {},\n    locale: modularui.locale,\n    childmodels: modularui.childmodels ?? true,\n    isReload: modularui.isReload,\n    cache: modularui.cache,\n  });\n\n  if (modularui.targetModel) {\n    request.targetModel = modularui.targetModel;\n    request.forceTargetModel = modularui.forceTargetModel ?? false;\n  }\n\n  return request;\n};\n\n/**\n */\nconst responseHandler = (\n  next: Dispatch,\n  dispatch: Dispatch,\n  successAction: SuccessAction,\n  model: ModularUIModel,\n) => {\n  if (successAction) {\n    const successResult = successAction(model);\n\n    if (successResult instanceof Promise) {\n      successResult\n        .then((result) => {\n          dispatch(result);\n        })\n        .catch((error) => {\n          next(handleError(error));\n        });\n    } else {\n      try {\n        dispatch(successResult);\n      } catch (error) {\n        throw new Error(\n          `Result of successResult is not a valid redux action: ${error}`,\n        );\n      }\n    }\n  }\n\n  return next(finishProgress());\n};\n\n/**\n */\nconst errorHandler = (\n  next: Dispatch,\n  dispatch: Dispatch,\n  errorAction: ?ErrorAction,\n  err: any,\n) => {\n  dispatch(finishProgress());\n\n  if (errorAction) {\n    const errorResult = errorAction(err);\n\n    if (errorResult instanceof Promise) {\n      errorResult.then((result) => dispatch(result));\n    } else {\n      dispatch(errorResult);\n    }\n  }\n\n  return next(handleError(err));\n};\n\n/**\n */\nconst handleFetch = (\n  action: ModularUIAction,\n  locale: string,\n  dispatch: Dispatch,\n  next: Dispatch,\n) => {\n  dispatch(startProgress());\n\n  const { successAction, errorAction, ...requestOptions } = action.payload;\n  requestOptions.locale = locale;\n\n  const modularuiRequest = createRequest(requestOptions);\n\n  return modularuiRequest\n    .fetch()\n    .then((model) => responseHandler(next, dispatch, successAction, model))\n    .catch((error) => errorHandler(next, dispatch, errorAction, error));\n};\n\n/**\n */\nexport const modularUIMiddleware: Middleware<\n  ReduxState,\n  ReduxAction,\n  Dispatch,\n> =\n  (api: MiddlewareAPI<ReduxState, ReduxAction, Dispatch>) =>\n  (next: Dispatch) =>\n  (action: PossibleAction) => {\n    if (action.type === \"MODULARUI/FETCH\") {\n      return handleFetch(\n        // $FlowExpectedError[incompatible-exact]\n        action,\n        api.getState().i18n.locale,\n        api.dispatch,\n        next,\n      );\n    }\n\n    return next(action);\n  };\n"],"mappings":";;;;;;;;AACA,IAAAA,iBAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAEA,IAAAE,kBAAA,GAAAF,OAAA;AAEA,IAAAG,MAAA,GAAAH,OAAA;AA0BA;AACA;AACA;AACA,MAAMI,aAAa,GAAIC,SAAyB,IAAuB;EACrE,MAAMC,OAAO,GAAG,IAAIC,yBAAgB,CAACF,SAAS,CAACG,IAAI,EAAE;IACnDC,MAAM,EAAEJ,SAAS,CAACI,MAAM,IAAIC,uBAAY,CAACC,GAAG;IAC5CC,IAAI,EAAEP,SAAS,CAACO,IAAI,IAAI,CAAC,CAAC;IAC1BC,MAAM,EAAER,SAAS,CAACQ,MAAM;IACxBC,WAAW,EAAET,SAAS,CAACS,WAAW,IAAI,IAAI;IAC1CC,QAAQ,EAAEV,SAAS,CAACU,QAAQ;IAC5BC,KAAK,EAAEX,SAAS,CAACW;EACnB,CAAC,CAAC;EAEF,IAAIX,SAAS,CAACY,WAAW,EAAE;IACzBX,OAAO,CAACW,WAAW,GAAGZ,SAAS,CAACY,WAAW;IAC3CX,OAAO,CAACY,gBAAgB,GAAGb,SAAS,CAACa,gBAAgB,IAAI,KAAK;EAChE;EAEA,OAAOZ,OAAO;AAChB,CAAC;;AAED;AACA;AACA,MAAMa,eAAe,GAAGA,CACtBC,IAAc,EACdC,QAAkB,EAClBC,aAA4B,EAC5BC,KAAqB,KAClB;EACH,IAAID,aAAa,EAAE;IACjB,MAAME,aAAa,GAAGF,aAAa,CAACC,KAAK,CAAC;IAE1C,IAAIC,aAAa,YAAAC,QAAA,CAAAC,OAAmB,EAAE;MACpCF,aAAa,CACVG,IAAI,CAAEC,MAAM,IAAK;QAChBP,QAAQ,CAACO,MAAM,CAAC;MAClB,CAAC,CAAC,CACDC,KAAK,CAAEC,KAAK,IAAK;QAChBV,IAAI,CAAC,IAAAW,kBAAW,EAACD,KAAK,CAAC,CAAC;MAC1B,CAAC,CAAC;IACN,CAAC,MAAM;MACL,IAAI;QACFT,QAAQ,CAACG,aAAa,CAAC;MACzB,CAAC,CAAC,OAAOM,KAAK,EAAE;QACd,MAAM,IAAIE,KAAK,CACb,wDAAwDF,KAAK,EAC/D,CAAC;MACH;IACF;EACF;EAEA,OAAOV,IAAI,CAAC,IAAAa,iCAAc,EAAC,CAAC,CAAC;AAC/B,CAAC;;AAED;AACA;AACA,MAAMC,YAAY,GAAGA,CACnBd,IAAc,EACdC,QAAkB,EAClBc,WAAyB,EACzBC,GAAQ,KACL;EACHf,QAAQ,CAAC,IAAAY,iCAAc,EAAC,CAAC,CAAC;EAE1B,IAAIE,WAAW,EAAE;IACf,MAAME,WAAW,GAAGF,WAAW,CAACC,GAAG,CAAC;IAEpC,IAAIC,WAAW,YAAAZ,QAAA,CAAAC,OAAmB,EAAE;MAClCW,WAAW,CAACV,IAAI,CAAEC,MAAM,IAAKP,QAAQ,CAACO,MAAM,CAAC,CAAC;IAChD,CAAC,MAAM;MACLP,QAAQ,CAACgB,WAAW,CAAC;IACvB;EACF;EAEA,OAAOjB,IAAI,CAAC,IAAAW,kBAAW,EAACK,GAAG,CAAC,CAAC;AAC/B,CAAC;;AAED;AACA;AACA,MAAME,WAAW,GAAGA,CAClBC,MAAuB,EACvB1B,MAAc,EACdQ,QAAkB,EAClBD,IAAc,KACX;EACHC,QAAQ,CAAC,IAAAmB,gCAAa,EAAC,CAAC,CAAC;EAEzB,MAAM;IAAElB,aAAa;IAAEa,WAAW;IAAE,GAAGM;EAAe,CAAC,GAAGF,MAAM,CAACG,OAAO;EACxED,cAAc,CAAC5B,MAAM,GAAGA,MAAM;EAE9B,MAAM8B,gBAAgB,GAAGvC,aAAa,CAACqC,cAAc,CAAC;EAEtD,OAAOE,gBAAgB,CACpBC,KAAK,CAAC,CAAC,CACPjB,IAAI,CAAEJ,KAAK,IAAKJ,eAAe,CAACC,IAAI,EAAEC,QAAQ,EAAEC,aAAa,EAAEC,KAAK,CAAC,CAAC,CACtEM,KAAK,CAAEC,KAAK,IAAKI,YAAY,CAACd,IAAI,EAAEC,QAAQ,EAAEc,WAAW,EAAEL,KAAK,CAAC,CAAC;AACvE,CAAC;;AAED;AACA;AACO,MAAMe,mBAIZ,GACEC,GAAqD,IACrD1B,IAAc,IACdmB,MAAsB,IAAK;EAC1B,IAAIA,MAAM,CAACQ,IAAI,KAAK,iBAAiB,EAAE;IACrC,OAAOT,WAAW;IAChB;IACAC,MAAM,EACNO,GAAG,CAACE,QAAQ,CAAC,CAAC,CAACC,IAAI,CAACpC,MAAM,EAC1BiC,GAAG,CAACzB,QAAQ,EACZD,IACF,CAAC;EACH;EAEA,OAAOA,IAAI,CAACmB,MAAM,CAAC;AACrB,CAAC;AAACW,OAAA,CAAAL,mBAAA,GAAAA,mBAAA","ignoreList":[]}

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

@@ -72,6 +72,7 @@ export type ModularUIAction = {
     childmodels?: boolean,
     targetModel?: TargetModel,
     forceTargetModel?: boolean,
+    cache?: boolean,
     successAction: (
       model: ModularUIModel,
     ) => UpdateModelAction | SetModelAction,

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../../src/redux/_modularui/types.js"],"sourcesContent":["// @flow\nimport type { ModularUIModel } from \"../../models/types\";\nimport type Href from \"../../models/href/Href\";\nimport type { FetchException } from \"../../exceptions\";\nimport type { NoAction } from \"../types\";\nimport typeof {\n  HTTP_METHODS,\n  MODULARUI_STATUS,\n} from \"../../constants/Constants\";\nimport type { ComponentType } from \"react\";\nimport type { TargetModel } from \"../../modularui/types\";\nimport type { RequestModularUIOptions } from \"../../utils/fetch/types\";\n\nexport type ModularUIOptions = {\n  propName?: string,\n  removeOnUnmount?: boolean,\n  ...RequestModularUIOptions,\n};\n\nexport type ModelEntry = {\n  +status: string,\n  +model: ModularUIModel,\n  +lastModification: number,\n};\n\nexport type ModularUIState = {\n  [string]: ModelEntry,\n  ...\n};\n\nexport type SetModelAction = {\n  type: \"MODULARUI/SET\",\n  payload: {\n    key: string,\n    model: ?ModularUIModel,\n  },\n};\n\nexport type InitModelAction = {\n  type: \"MODULARUI/INIT\",\n  payload: Array<{\n    key: string,\n    model: ModularUIModel,\n  }>,\n};\n\nexport type UpdateModelAction = {\n  type: \"MODULARUI/UPDATE\",\n  payload: ModularUIModel,\n};\n\nexport type UpdateFormAction = {\n  type: \"MODULARUI/UPDATE_FORM\",\n  payload: ModularUIModel,\n};\n\nexport type SuccessAction = (\n  model: ModularUIModel,\n) => UpdateModelAction | SetModelAction;\n\nexport type ErrorAction = (\n  error: FetchException,\n) => UpdateStatusAction | RemoveModelByKeyAction | NoAction;\n\nexport type ModularUIAction = {\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    href: Href,\n    method?: $Keys<HTTP_METHODS>,\n    data?: any,\n    locale: string,\n    childmodels?: boolean,\n    targetModel?: TargetModel,\n    forceTargetModel?: boolean,\n    successAction: (\n      model: ModularUIModel,\n    ) => UpdateModelAction | SetModelAction,\n    errorAction?: ErrorAction,\n  },\n};\n\nexport type RemoveModelByKeyAction = {\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: string,\n};\n\nexport type ResetModularUIAction = {\n  type: \"MODULARUI/RESET\",\n};\n\nexport type UpdateStatusAction = {\n  type: \"MODULARUI/STATUS\",\n  payload: {\n    key: string,\n    status: $Keys<MODULARUI_STATUS>,\n  },\n};\n\nexport type ModularUIConnector = (\n  Component: ComponentType<any>,\n) => ComponentType<any>;\n"],"mappings":"","ignoreList":[]}
+{"version":3,"file":"types.js","names":[],"sources":["../../../src/redux/_modularui/types.js"],"sourcesContent":["// @flow\nimport type { ModularUIModel } from \"../../models/types\";\nimport type Href from \"../../models/href/Href\";\nimport type { FetchException } from \"../../exceptions\";\nimport type { NoAction } from \"../types\";\nimport typeof {\n  HTTP_METHODS,\n  MODULARUI_STATUS,\n} from \"../../constants/Constants\";\nimport type { ComponentType } from \"react\";\nimport type { TargetModel } from \"../../modularui/types\";\nimport type { RequestModularUIOptions } from \"../../utils/fetch/types\";\n\nexport type ModularUIOptions = {\n  propName?: string,\n  removeOnUnmount?: boolean,\n  ...RequestModularUIOptions,\n};\n\nexport type ModelEntry = {\n  +status: string,\n  +model: ModularUIModel,\n  +lastModification: number,\n};\n\nexport type ModularUIState = {\n  [string]: ModelEntry,\n  ...\n};\n\nexport type SetModelAction = {\n  type: \"MODULARUI/SET\",\n  payload: {\n    key: string,\n    model: ?ModularUIModel,\n  },\n};\n\nexport type InitModelAction = {\n  type: \"MODULARUI/INIT\",\n  payload: Array<{\n    key: string,\n    model: ModularUIModel,\n  }>,\n};\n\nexport type UpdateModelAction = {\n  type: \"MODULARUI/UPDATE\",\n  payload: ModularUIModel,\n};\n\nexport type UpdateFormAction = {\n  type: \"MODULARUI/UPDATE_FORM\",\n  payload: ModularUIModel,\n};\n\nexport type SuccessAction = (\n  model: ModularUIModel,\n) => UpdateModelAction | SetModelAction;\n\nexport type ErrorAction = (\n  error: FetchException,\n) => UpdateStatusAction | RemoveModelByKeyAction | NoAction;\n\nexport type ModularUIAction = {\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    href: Href,\n    method?: $Keys<HTTP_METHODS>,\n    data?: any,\n    locale: string,\n    childmodels?: boolean,\n    targetModel?: TargetModel,\n    forceTargetModel?: boolean,\n    cache?: boolean,\n    successAction: (\n      model: ModularUIModel,\n    ) => UpdateModelAction | SetModelAction,\n    errorAction?: ErrorAction,\n  },\n};\n\nexport type RemoveModelByKeyAction = {\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: string,\n};\n\nexport type ResetModularUIAction = {\n  type: \"MODULARUI/RESET\",\n};\n\nexport type UpdateStatusAction = {\n  type: \"MODULARUI/STATUS\",\n  payload: {\n    key: string,\n    status: $Keys<MODULARUI_STATUS>,\n  },\n};\n\nexport type ModularUIConnector = (\n  Component: ComponentType<any>,\n) => ComponentType<any>;\n"],"mappings":"","ignoreList":[]}

package/package.json

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

package/src/hooks/useModelCatalog.js

@@ -14,6 +14,7 @@ import ContentModel from "../models/content/ContentModel";
 import { useModularUIBasic } from "./useModularUIBasic";
 import { ContentTypeModel } from "../models";
 
+import type { UseModularUIBasicOptions } from "./useModularUIBasic";
 export type SearchFilter = {
   index?: string,
   label?: string,
@@ -23,10 +24,13 @@ export type SearchFilter = {
 
 /**
  */
-export const useModelCatalog = (): ?ModelCatalogModel =>
+export const useModelCatalog = (
+  options?: UseModularUIBasicOptions<ModelCatalogModel>,
+): ?ModelCatalogModel =>
   useModularUIBasic("modelcatalog", "/modelcatalog", {
     expectedModels: ["ModelCatalog"],
     targetModel: ModelCatalogModel,
+    ...options,
   });
 
 /**
@@ -34,11 +38,13 @@ export const useModelCatalog = (): ?ModelCatalogModel =>
 export const useConceptIndex = (
   href: string,
   key?: string = "conceptindex",
+  options?: UseModularUIBasicOptions<ConceptIndexModel>,
 ): ?ConceptIndexModel => {
   const url = filterParameters(href, ["entryDate", "index", "label", "type"]);
   return useModularUIBasic(key, url, {
     expectedModels: ["ConceptIndex"],
     targetModel: ConceptIndexModel,
+    ...options,
   });
 };
 
@@ -47,12 +53,16 @@ export const useConceptIndex = (
 export const useConceptDetail = (
   concept: string,
   key?: string = "conceptdetail",
+  options?: UseModularUIBasicOptions<
+    ConceptDetailModel | BusinessScenarioModel,
+  >,
 ): ?ConceptDetailModel | ?BusinessScenarioModel => {
   const location = useLocation();
 
   const href = createHref("concepts", concept, location, ["entryDate"]);
   return useModularUIBasic(key, href, {
     expectedModels: ["ConceptDetail", "BusinessScenario"],
+    ...options,
   });
 };
 
@@ -61,11 +71,13 @@ export const useConceptDetail = (
 export const useContentIndex = (
   href: string,
   key?: string = "contentindex",
+  options?: UseModularUIBasicOptions<ContentIndexModel>,
 ): ?ContentIndexModel => {
   const url = filterParameters(href, ["index", "label", "type"]);
   return useModularUIBasic(key, url, {
     expectedModels: ["ContentIndex"],
     targetModel: ContentIndexModel,
+    ...options,
   });
 };
 
@@ -74,12 +86,14 @@ export const useContentIndex = (
 export const useContentTOC = (
   content: string,
   key?: string = "contenttoc",
+  options?: UseModularUIBasicOptions<ContentTOCModel>,
 ): ?ContentTOCModel => {
   const location = useLocation();
   const href = createHref("content", content, location, ["entryDate"]);
   return useModularUIBasic(key, href, {
     expectedModels: ["ContentTOC"],
     targetModel: ContentTOCModel,
+    ...options,
   });
 };
 
@@ -88,11 +102,13 @@ export const useContentTOC = (
 export const useContent = (
   contentSection: string,
   key?: string = "content",
+  options?: UseModularUIBasicOptions<ContentModel>,
 ): ?ContentModel => {
   const href = createHref("content", contentSection, null, ["entryDate"]);
   return useModularUIBasic(key, href, {
     expectedModels: ["Content"],
     targetModel: ContentModel,
+    ...options,
   });
 };
 
@@ -101,11 +117,13 @@ export const useContent = (
 export const useContentType = (
   contentType: string,
   key?: string = "contenttypes",
+  options?: UseModularUIBasicOptions<ContentTypeModel>,
 ): ?ContentTypeModel => {
   const href = createHref("contenttypes", contentType, null, ["entryDate"]);
   return useModularUIBasic(key, href, {
     expectedModels: ["ContentType"],
     targetModel: ContentTypeModel,
+    ...options,
   });
 };
 
@@ -135,9 +153,10 @@ const getSearchHref = (uri: string, filters: SearchFilter): string => {
 export const useConceptSearch = (
   filters: SearchFilter,
   key?: string = "conceptSearch",
+  options?: UseModularUIBasicOptions<ConceptIndexModel>,
 ): ?ConceptIndexModel => {
   const href = getSearchHref("/concepts", filters);
-  return useConceptIndex(href, key);
+  return useConceptIndex(href, key, options);
 };
 
 /**
@@ -145,7 +164,8 @@ export const useConceptSearch = (
 export const useContentSearch = (
   filters: SearchFilter,
   key?: string = "contentSearch",
+  options?: UseModularUIBasicOptions<ContentIndexModel>,
 ): ?ContentIndexModel => {
   const href = getSearchHref("/content", filters);
-  return useContentIndex(href, key);
+  return useContentIndex(href, key, options);
 };

package/src/hooks/useModularUIBasic.js

@@ -7,10 +7,11 @@ import { IllegalStateException } from "../exceptions";
 
 import type { ModularUIModel, Href } from "../models";
 
-type UseModularUIBasicOptions<T: ModularUIModel> = {
-  expectedModels: Array<string>,
+export type UseModularUIBasicOptions<T: ModularUIModel> = {
+  expectedModels?: Array<string>,
   targetModel?: Class<T> | Array<Class<T>>,
   forceTargetModel?: boolean,
+  cache?: boolean,
 };
 
 /**
@@ -30,12 +31,17 @@ export const useModularUIBasic = <T: ModularUIModel>(
     targetModel: undefined,
     forceTargetModel: undefined,
     isReload: false,
+    cache: false,
   };
   if (options.targetModel) {
     useModularUIOptions.targetModel = options.targetModel;
     useModularUIOptions.forceTargetModel = options.forceTargetModel;
   }
 
+  if (options.cache) {
+    useModularUIOptions.cache = options.cache;
+  }
+
   // reload when the modular service starts with the current location
   if (location.state?.reload && location.pathname.startsWith(href.toString())) {
     useModularUIOptions.isReload = true;
@@ -46,13 +52,15 @@ export const useModularUIBasic = <T: ModularUIModel>(
 
   if (modularUI?.model) {
     const { model } = modularUI;
-    if (options.expectedModels.length > 0) {
-      const isCorrectModel = options.expectedModels.some((expectedModel) => {
+
+    const expectedModels = options.expectedModels ?? [];
+    if (expectedModels.length > 0) {
+      const isCorrectModel = expectedModels.some((expectedModel) => {
         return model.type === expectedModel;
       });
 
       if (!isCorrectModel) {
-        console.error(modularUI, "is not of instance", options.expectedModels);
+        console.error(modularUI, "is not of instance", expectedModels);
         throw new IllegalStateException("Resolved model has incorrect type");
       }
     }

package/src/redux/_modularui/ModularUIActions.js

@@ -116,6 +116,7 @@ export const loadModel = (
     childmodels: options?.childmodels,
     targetModel: options?.targetModel,
     forceTargetModel: options?.forceTargetModel,
+    cache: options?.cache,
     /**
      */
     successAction: (model) =>

package/src/redux/_modularui/ModularUIMiddleware.js

@@ -27,6 +27,7 @@ type RequestOptions = {
   targetModel?: TargetModel,
   forceTargetModel?: boolean,
   isReload?: boolean,
+  cache?: boolean,
 };
 
 /**
@@ -39,6 +40,7 @@ const createRequest = (modularui: RequestOptions): ModularUIRequest => {
     locale: modularui.locale,
     childmodels: modularui.childmodels ?? true,
     isReload: modularui.isReload,
+    cache: modularui.cache,
   });
 
   if (modularui.targetModel) {

package/src/redux/_modularui/types.js

@@ -72,6 +72,7 @@ export type ModularUIAction = {
     childmodels?: boolean,
     targetModel?: TargetModel,
     forceTargetModel?: boolean,
+    cache?: boolean,
     successAction: (
       model: ModularUIModel,
     ) => UpdateModelAction | SetModelAction,

package/types/models/concepts/ConceptDetailModel.d.ts

@@ -60,9 +60,17 @@ export default class ConceptDetailModel extends ResourceModel {
      */
     getSourceReferencesForCurrentLanguage(availableLocales: Array<string>): Array<Object>;
     /**
-     * Retrieve entrydate of content toc
+     * Retrieve entrydate
      */
     get entryDate(): string;
+    /**
+     * Indicates if the given concept type id or href exists in the hierarchy of concept types for this concept
+     */
+    isOfConceptType(conceptTypeId: string): boolean;
+    /**
+     * Indicates if the given metamodel functional identifier exists in the hierarchy of concept types for this concept
+     */
+    hasMetamodelIdInConceptTypeHierarchy(metamodelId: string): boolean;
 }
 import ResourceModel from "../base/ResourceModel";
 import ConceptRelationCollection from "./ConceptRelationCollection";

package/types/models/concepts/ConceptLinkModel.d.ts

@@ -56,6 +56,14 @@ export default class ConceptLinkModel extends BaseModel {
     /**
      */
     asLinkModel(): LinkModel;
+    /**
+     * Indicates if the given concept type id or href exists in the hierarchy of concept types for this concept
+     */
+    isOfConceptType(conceptTypeId: string): boolean;
+    /**
+     * Indicates if the given metamodel functional identifier exists in the hierarchy of concept types for this concept
+     */
+    hasMetamodelIdInConceptTypeHierarchy(metamodelId: string): boolean;
 }
 import BaseModel from "../base/BaseModel";
 import LinkCollection from "../links/LinkCollection";

package/types/models/concepts/ConceptTypeDetailModel.d.ts

@@ -3,6 +3,14 @@ export default ConceptTypeDetailModel;
  * Model for concept details, available through modelcatalog
  */
 declare class ConceptTypeDetailModel extends ResourceModel {
+    /**
+     * The name of the concept type consists of the functional id of the kmt and the functional id of the concept type separated by a #.<br>
+     * For example BEI_CaseManagement#Case
+     */
+    get name(): string;
+    /**
+     */
+    get isCoreTaxonomy(): boolean;
     /**
      * Get concept type icon
      */
@@ -35,5 +43,16 @@ declare class ConceptTypeDetailModel extends ResourceModel {
      * Get sectionReferenceTypes
      */
     get sectionReferenceTypes(): Object[];
+    /**
+     */
+    get conceptTypeHierarchy(): LinkCollection;
+    /**
+     */
+    isOfConceptType(conceptTypeId: string): boolean;
+    /**
+     * Indicates if the given metamodel functional identifier exists in the hierarchy of concept types
+     */
+    hasMetamodelIdInHierarchy(metamodelId: string): boolean;
 }
 import ResourceModel from "../base/ResourceModel";
+import LinkCollection from "../links/LinkCollection";

package/types/models/content/ContentIndexModel.d.ts

@@ -19,6 +19,9 @@ export default class ContentIndexModel extends ResourceModel {
     /**
      */
     hasIndexFilter(): boolean;
+    /**
+     */
+    hasFiltersSet(): boolean;
     /**
      */
     hasNoFiltersSet(): boolean;