@beinformed/ui 1.54.3 → 1.55.0

package/lib/models/modelcatalog/ModelCategoryCollection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModelCategoryCollection.js","names":["_BaseCollection","_interopRequireDefault","require","_ModelCategoryModel","SourceReferenceCollection","BaseCollection","constructor","modelCategories","arguments","length","undefined","collection","_map","default","call","modelCategory","ModelCategoryModel","exports"],"sources":["../../../src/models/modelcatalog/ModelCategoryCollection.js"],"sourcesContent":["// @flow\nimport BaseCollection from \"../base/BaseCollection\";\nimport ModelCategoryModel from \"./ModelCategoryModel\";\n\nimport type { ModelCategory } from \"./ModelCategoryModel\";\n\n/**\n * Model category collection\n */\nexport default class SourceReferenceCollection extends BaseCollection<ModelCategoryModel> {\n  /**\n   */\n  constructor(modelCategories: Array<ModelCategory> = []) {\n    super();\n\n    this.collection = modelCategories\n      ? modelCategories.map(\n          (modelCategory) => new ModelCategoryModel(modelCategory),\n        )\n      : [];\n  }\n}\n"],"mappings":";;;;;;;;AACA,IAAAA,eAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,mBAAA,GAAAF,sBAAA,CAAAC,OAAA;AAIA;AACA;AACA;AACe,MAAME,yBAAyB,SAASC,uBAAc,CAAqB;EACxF;AACF;EACEC,WAAWA,CAAA,EAA6C;IAAA,IAA5CC,eAAqC,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,EAAE;IACpD,KAAK,CAAC,CAAC;IAEP,IAAI,CAACG,UAAU,GAAGJ,eAAe,GAC7B,IAAAK,IAAA,CAAAC,OAAA,EAAAN,eAAe,EAAAO,IAAA,CAAfP,eAAe,EACZQ,aAAa,IAAK,IAAIC,2BAAkB,CAACD,aAAa,CACzD,CAAC,GACD,EAAE;EACR;AACF;AAACE,OAAA,CAAAJ,OAAA,GAAAT,yBAAA","ignoreList":[]}

package/lib/models/modelcatalog/ModelCategoryModel.js

@@ -0,0 +1,60 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
+/**
+ */
+class ModelCategoryModel {
+  constructor(modelCategory) {
+    (0, _defineProperty2.default)(this, "_modelCategory", void 0);
+    this._modelCategory = modelCategory;
+  }
+
+  /**
+   * Id of the category
+   */
+  get key() {
+    return this._modelCategory._id;
+  }
+
+  /**
+   * Label of the category
+   */
+  get label() {
+    return this._modelCategory.label;
+  }
+
+  /**
+   * Description of the category
+   */
+  get description() {
+    return this._modelCategory.description;
+  }
+
+  /**
+   * Small icon of the category
+   */
+  get iconSmall() {
+    return this._modelCategory.iconSmall;
+  }
+
+  /**
+   * Medium icon of the category
+   */
+  get iconMedium() {
+    return this._modelCategory.iconMedium;
+  }
+
+  /**
+   * Large icon of the category
+   */
+  get iconLarge() {
+    return this._modelCategory.iconLarge;
+  }
+}
+var _default = exports.default = ModelCategoryModel;
+//# sourceMappingURL=ModelCategoryModel.js.map

package/lib/models/modelcatalog/ModelCategoryModel.js.flow

@@ -0,0 +1,63 @@
+// @flow
+export type ModelCategory = {
+  _id: string,
+  label: string,
+  description: string,
+  iconSmall: string,
+  iconMedium: string,
+  iconLarge: string,
+};
+
+/**
+ */
+class ModelCategoryModel {
+  _modelCategory: ModelCategory;
+
+  constructor(modelCategory: ModelCategory) {
+    this._modelCategory = modelCategory;
+  }
+
+  /**
+   * Id of the category
+   */
+  get key(): string {
+    return this._modelCategory._id;
+  }
+
+  /**
+   * Label of the category
+   */
+  get label(): string {
+    return this._modelCategory.label;
+  }
+
+  /**
+   * Description of the category
+   */
+  get description(): string {
+    return this._modelCategory.description;
+  }
+
+  /**
+   * Small icon of the category
+   */
+  get iconSmall(): string {
+    return this._modelCategory.iconSmall;
+  }
+
+  /**
+   * Medium icon of the category
+   */
+  get iconMedium(): string {
+    return this._modelCategory.iconMedium;
+  }
+
+  /**
+   * Large icon of the category
+   */
+  get iconLarge(): string {
+    return this._modelCategory.iconLarge;
+  }
+}
+
+export default ModelCategoryModel;

package/lib/models/modelcatalog/ModelCategoryModel.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModelCategoryModel.js","names":["ModelCategoryModel","constructor","modelCategory","_defineProperty2","default","_modelCategory","key","_id","label","description","iconSmall","iconMedium","iconLarge","_default","exports"],"sources":["../../../src/models/modelcatalog/ModelCategoryModel.js"],"sourcesContent":["// @flow\nexport type ModelCategory = {\n  _id: string,\n  label: string,\n  description: string,\n  iconSmall: string,\n  iconMedium: string,\n  iconLarge: string,\n};\n\n/**\n */\nclass ModelCategoryModel {\n  _modelCategory: ModelCategory;\n\n  constructor(modelCategory: ModelCategory) {\n    this._modelCategory = modelCategory;\n  }\n\n  /**\n   * Id of the category\n   */\n  get key(): string {\n    return this._modelCategory._id;\n  }\n\n  /**\n   * Label of the category\n   */\n  get label(): string {\n    return this._modelCategory.label;\n  }\n\n  /**\n   * Description of the category\n   */\n  get description(): string {\n    return this._modelCategory.description;\n  }\n\n  /**\n   * Small icon of the category\n   */\n  get iconSmall(): string {\n    return this._modelCategory.iconSmall;\n  }\n\n  /**\n   * Medium icon of the category\n   */\n  get iconMedium(): string {\n    return this._modelCategory.iconMedium;\n  }\n\n  /**\n   * Large icon of the category\n   */\n  get iconLarge(): string {\n    return this._modelCategory.iconLarge;\n  }\n}\n\nexport default ModelCategoryModel;\n"],"mappings":";;;;;;;;AAUA;AACA;AACA,MAAMA,kBAAkB,CAAC;EAGvBC,WAAWA,CAACC,aAA4B,EAAE;IAAA,IAAAC,gBAAA,CAAAC,OAAA;IACxC,IAAI,CAACC,cAAc,GAAGH,aAAa;EACrC;;EAEA;AACF;AACA;EACE,IAAII,GAAGA,CAAA,EAAW;IAChB,OAAO,IAAI,CAACD,cAAc,CAACE,GAAG;EAChC;;EAEA;AACF;AACA;EACE,IAAIC,KAAKA,CAAA,EAAW;IAClB,OAAO,IAAI,CAACH,cAAc,CAACG,KAAK;EAClC;;EAEA;AACF;AACA;EACE,IAAIC,WAAWA,CAAA,EAAW;IACxB,OAAO,IAAI,CAACJ,cAAc,CAACI,WAAW;EACxC;;EAEA;AACF;AACA;EACE,IAAIC,SAASA,CAAA,EAAW;IACtB,OAAO,IAAI,CAACL,cAAc,CAACK,SAAS;EACtC;;EAEA;AACF;AACA;EACE,IAAIC,UAAUA,CAAA,EAAW;IACvB,OAAO,IAAI,CAACN,cAAc,CAACM,UAAU;EACvC;;EAEA;AACF;AACA;EACE,IAAIC,SAASA,CAAA,EAAW;IACtB,OAAO,IAAI,CAACP,cAAc,CAACO,SAAS;EACtC;AACF;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAAV,OAAA,GAEcJ,kBAAkB","ignoreList":[]}

package/lib/models/modelcatalog/__tests__/ModelCatalogModel.spec.js.flow

@@ -12,6 +12,8 @@ describe("modelCatalogModel", () => {
     expect(modelcatalog.type).toBe("ModelCatalog");
     expect(modelcatalog.label).toBe("Model catalog");
 
+    expect(modelcatalog.modelcategories.isEmpty).toBe(true);
+
     expect(() => {
       modelcatalog.conceptIndexLink;
     }).toThrow(IllegalStateException);
@@ -24,4 +26,24 @@ describe("modelCatalogModel", () => {
     expect(modelCatalogModel.conceptIndexLink).toBeInstanceOf(LinkModel);
     expect(modelCatalogModel.contentIndexLink).toBeInstanceOf(LinkModel);
   });
+
+  it("has model categories", () => {
+    expect(modelCatalogModel.modelcategories.size).toBe(2);
+    expect(modelCatalogModel.modelcategories.first.key).toBe("BusinessDesign");
+    expect(modelCatalogModel.modelcategories.first.label).toBe(
+      "Business design",
+    );
+    expect(modelCatalogModel.modelcategories.first.description).toBe(
+      "The business design includes the 'what' of the solution",
+    );
+    expect(modelCatalogModel.modelcategories.first.iconSmall).toBe(
+      "/resource/Library/General/Icons/business_design_16x16.png",
+    );
+    expect(modelCatalogModel.modelcategories.first.iconMedium).toBe(
+      "/resource/Library/General/Icons/business_design_24x24.png",
+    );
+    expect(modelCatalogModel.modelcategories.first.iconLarge).toBe(
+      "/resource/Library/General/Icons/business_design_48x48.png",
+    );
+  });
 });

package/lib/redux/_modularui/ModularUIConnector.js

@@ -49,7 +49,7 @@ const modularUIConnector = function (name, resource) {
   return Component => {
     const WrappedComponent = props => {
       // explicit property for removeOnMount overwrite the setting
-      const finalRemoveOnUnmount = props.removeOnUnmount === true ? true : removeOnUnmount;
+      const finalRemoveOnUnmount = props.removeOnUnmount ?? removeOnUnmount;
       const dispatch = (0, _reactRedux.useDispatch)();
       const location = (0, _reactRouter.useLocation)();
       const url = (0, _ModularUIUtils.useUrl)(resource, {
@@ -101,10 +101,10 @@ const modularUIConnector = function (name, resource) {
       const locale = (0, _useI18n.useLocale)();
       const newProps = {
         modelKey,
-        [propName]: modelEntry ? modelEntry.model : null,
+        [propName]: modelEntry?.model ?? null,
         location,
-        status: modelEntry ? modelEntry.status : null,
-        lastModification: modelEntry ? modelEntry.lastModification : null,
+        status: modelEntry?.status ?? null,
+        lastModification: modelEntry.lastModification ?? null,
         hasModel: Boolean(modelEntry),
         locale,
         fetchModularUI: handleFetch,

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

@@ -72,8 +72,7 @@ const modularUIConnector = (
   return (Component: ComponentType<any>) => {
     const WrappedComponent = (props: any) => {
       // explicit property for removeOnMount overwrite the setting
-      const finalRemoveOnUnmount =
-        props.removeOnUnmount === true ? true : removeOnUnmount;
+      const finalRemoveOnUnmount = props.removeOnUnmount ?? removeOnUnmount;
 
       const dispatch = useDispatch();
       const location = useLocation();
@@ -131,10 +130,10 @@ const modularUIConnector = (
       const locale = useLocale();
       const newProps: InjectedProps = {
         modelKey,
-        [propName]: modelEntry ? modelEntry.model : null,
+        [propName]: modelEntry?.model ?? null,
         location,
-        status: modelEntry ? modelEntry.status : null,
-        lastModification: modelEntry ? modelEntry.lastModification : null,
+        status: modelEntry?.status ?? null,
+        lastModification: modelEntry.lastModification ?? null,
         hasModel: Boolean(modelEntry),
         locale,
         fetchModularUI: handleFetch,

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

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

package/package.json

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

package/src/hooks/useModelCatalog.js

@@ -19,6 +19,7 @@ export type SearchFilter = {
   index?: string,
   label?: string,
   type?: string | Array<string>,
+  modelCategory?: string | Array<string>,
   entryDate?: string,
 };
 
@@ -40,7 +41,13 @@ export const useConceptIndex = (
   key?: string = "conceptindex",
   options?: UseModularUIBasicOptions<ConceptIndexModel>,
 ): ?ConceptIndexModel => {
-  const url = filterParameters(href, ["entryDate", "index", "label", "type"]);
+  const url = filterParameters(href, [
+    "entryDate",
+    "index",
+    "label",
+    "modelcategory",
+    "type",
+  ]);
   return useModularUIBasic(key, url, {
     expectedModels: ["ConceptIndex"],
     targetModel: ConceptIndexModel,

package/src/models/concepts/ConceptDetailModel.js

@@ -137,6 +137,13 @@ export default class ConceptDetailModel extends ResourceModel {
     return this.data.conceptLabel;
   }
 
+  /**
+   * Get model category of the concept
+   */
+  get modelCategory(): string {
+    return this.getData("modelCategory", "");
+  }
+
   /**
    * Get taxonomy type
    */

package/src/models/concepts/ConceptIndexModel.js

@@ -136,6 +136,13 @@ export default class ConceptIndexModel extends ResourceModel {
     return this.filterCollection.getFilterByAttributeKey("label");
   }
 
+  /**
+   * Get model category filter
+   */
+  get modelCategoryFilter(): FilterType | null {
+    return this.filterCollection.getFilterByAttributeKey("modelCategory");
+  }
+
   /**
    * Get concept links found by index filter
    */

package/src/models/concepts/ConceptTypeDetailModel.js

@@ -50,6 +50,13 @@ class ConceptTypeDetailModel extends ResourceModel {
     return this.getData("label", "");
   }
 
+  /**
+   * Get model category of the concept type
+   */
+  get modelCategory(): string {
+    return this.getData("modelCategory", "");
+  }
+
   /**
    */
   get isCoreTaxonomy(): boolean {

package/src/models/index.js

@@ -105,6 +105,7 @@ export { default as LookupOptionsModel } from "./lookup/LookupOptionsModel";
 export { default as LookupOptionCollection } from "./lookup/LookupOptionCollection";
 
 import { default as ModelCatalogModel } from "./modelcatalog/ModelCatalogModel";
+export { default as ModelCategory } from "./modelcatalog/ModelCategoryModel";
 
 export { default as ProcessStatusSettingsModel } from "./process/ProcessStatusSettingsModel";
 

package/src/models/modelcatalog/ModelCatalogModel.js

@@ -1,9 +1,12 @@
 // @flow
 import ResourceModel from "../base/ResourceModel";
 
-import type LinkModel from "../links/LinkModel";
+import ModelCategoryCollection from "./ModelCategoryCollection";
+
 import { IllegalStateException } from "../../exceptions";
 
+import type LinkModel from "../links/LinkModel";
+
 /**
  * The Application model
  */
@@ -60,4 +63,11 @@ export default class ModelCatalogModel extends ResourceModel {
     }
     return link;
   }
+
+  /**
+   * Retrieve model categories as a collection
+   */
+  get modelcategories(): ModelCategoryCollection {
+    return new ModelCategoryCollection(this.data.modelcategories);
+  }
 }

package/src/models/modelcatalog/ModelCategoryCollection.js

@@ -0,0 +1,22 @@
+// @flow
+import BaseCollection from "../base/BaseCollection";
+import ModelCategoryModel from "./ModelCategoryModel";
+
+import type { ModelCategory } from "./ModelCategoryModel";
+
+/**
+ * Model category collection
+ */
+export default class SourceReferenceCollection extends BaseCollection<ModelCategoryModel> {
+  /**
+   */
+  constructor(modelCategories: Array<ModelCategory> = []) {
+    super();
+
+    this.collection = modelCategories
+      ? modelCategories.map(
+          (modelCategory) => new ModelCategoryModel(modelCategory),
+        )
+      : [];
+  }
+}

package/src/models/modelcatalog/ModelCategoryModel.js

@@ -0,0 +1,63 @@
+// @flow
+export type ModelCategory = {
+  _id: string,
+  label: string,
+  description: string,
+  iconSmall: string,
+  iconMedium: string,
+  iconLarge: string,
+};
+
+/**
+ */
+class ModelCategoryModel {
+  _modelCategory: ModelCategory;
+
+  constructor(modelCategory: ModelCategory) {
+    this._modelCategory = modelCategory;
+  }
+
+  /**
+   * Id of the category
+   */
+  get key(): string {
+    return this._modelCategory._id;
+  }
+
+  /**
+   * Label of the category
+   */
+  get label(): string {
+    return this._modelCategory.label;
+  }
+
+  /**
+   * Description of the category
+   */
+  get description(): string {
+    return this._modelCategory.description;
+  }
+
+  /**
+   * Small icon of the category
+   */
+  get iconSmall(): string {
+    return this._modelCategory.iconSmall;
+  }
+
+  /**
+   * Medium icon of the category
+   */
+  get iconMedium(): string {
+    return this._modelCategory.iconMedium;
+  }
+
+  /**
+   * Large icon of the category
+   */
+  get iconLarge(): string {
+    return this._modelCategory.iconLarge;
+  }
+}
+
+export default ModelCategoryModel;

package/src/models/modelcatalog/__mock__/data.json

@@ -6,6 +6,24 @@
       "contributions": { "href": "/contributions/modelcatalog" },
       "concepts": { "href": "/concepts" },
       "content": { "href": "/content" }
-    }
+    },
+    "modelcategories": [
+      {
+        "_id": "BusinessDesign",
+        "label": "Business design",
+        "iconSmall": "/resource/Library/General/Icons/business_design_16x16.png",
+        "iconMedium": "/resource/Library/General/Icons/business_design_24x24.png",
+        "iconLarge": "/resource/Library/General/Icons/business_design_48x48.png",
+        "description": "The business design includes the 'what' of the solution"
+      },
+      {
+        "_id": "Requirements",
+        "label": "Requirements",
+        "iconSmall": "/resource/Library/General/Icons/requirements_16x16.png",
+        "iconMedium": "/resource/Library/General/Icons/requirements_24x24.png",
+        "iconLarge": "/resource/Library/General/Icons/requirements_48x48.png",
+        "description": "Requirements describe what functions to provide"
+      }
+    ]
   }
 }

package/src/models/modelcatalog/__tests__/ModelCatalogModel.spec.js

@@ -12,6 +12,8 @@ describe("modelCatalogModel", () => {
     expect(modelcatalog.type).toBe("ModelCatalog");
     expect(modelcatalog.label).toBe("Model catalog");
 
+    expect(modelcatalog.modelcategories.isEmpty).toBe(true);
+
     expect(() => {
       modelcatalog.conceptIndexLink;
     }).toThrow(IllegalStateException);
@@ -24,4 +26,24 @@ describe("modelCatalogModel", () => {
     expect(modelCatalogModel.conceptIndexLink).toBeInstanceOf(LinkModel);
     expect(modelCatalogModel.contentIndexLink).toBeInstanceOf(LinkModel);
   });
+
+  it("has model categories", () => {
+    expect(modelCatalogModel.modelcategories.size).toBe(2);
+    expect(modelCatalogModel.modelcategories.first.key).toBe("BusinessDesign");
+    expect(modelCatalogModel.modelcategories.first.label).toBe(
+      "Business design",
+    );
+    expect(modelCatalogModel.modelcategories.first.description).toBe(
+      "The business design includes the 'what' of the solution",
+    );
+    expect(modelCatalogModel.modelcategories.first.iconSmall).toBe(
+      "/resource/Library/General/Icons/business_design_16x16.png",
+    );
+    expect(modelCatalogModel.modelcategories.first.iconMedium).toBe(
+      "/resource/Library/General/Icons/business_design_24x24.png",
+    );
+    expect(modelCatalogModel.modelcategories.first.iconLarge).toBe(
+      "/resource/Library/General/Icons/business_design_48x48.png",
+    );
+  });
 });

package/src/redux/_modularui/ModularUIConnector.js

@@ -72,8 +72,7 @@ const modularUIConnector = (
   return (Component: ComponentType<any>) => {
     const WrappedComponent = (props: any) => {
       // explicit property for removeOnMount overwrite the setting
-      const finalRemoveOnUnmount =
-        props.removeOnUnmount === true ? true : removeOnUnmount;
+      const finalRemoveOnUnmount = props.removeOnUnmount ?? removeOnUnmount;
 
       const dispatch = useDispatch();
       const location = useLocation();
@@ -131,10 +130,10 @@ const modularUIConnector = (
       const locale = useLocale();
       const newProps: InjectedProps = {
         modelKey,
-        [propName]: modelEntry ? modelEntry.model : null,
+        [propName]: modelEntry?.model ?? null,
         location,
-        status: modelEntry ? modelEntry.status : null,
-        lastModification: modelEntry ? modelEntry.lastModification : null,
+        status: modelEntry?.status ?? null,
+        lastModification: modelEntry.lastModification ?? null,
         hasModel: Boolean(modelEntry),
         locale,
         fetchModularUI: handleFetch,