@beinformed/ui 1.43.5 → 1.43.7

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.43.7](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.43.6...v1.43.7) (2024-03-18)
+
+
+### Bug Fixes
+
+* **settings:** merge custom settings into default settings ([29fcc31](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/29fcc312b70559cdd8ec52044087839e4bff91ec))
+
+## [1.43.6](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.43.5...v1.43.6) (2024-03-13)
+
+
+### Bug Fixes
+
+* **content-link:** fix encoded selfhref ([91188c0](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/91188c0251577484e70da12f9eebd64501b3a736))
+
 ## [1.43.5](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.43.3...v1.43.5) (2024-03-13)
 
 

package/esm/hooks/useModels.js

@@ -1,6 +1,5 @@
-import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
+import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
-import _Object$values from "@babel/runtime-corejs3/core-js-stable/object/values";
 import { createSelector } from "reselect";
 import { useSelector, useDispatch } from "react-redux";
 import { reloadModel } from "../redux/_modularui/ModularUIActions";
@@ -12,8 +11,15 @@ export const useModels = () => {
   const dispatch = useDispatch();
   const selectModularUI = state => state.modularui;
   const selector = createSelector([selectModularUI], modularui => {
-    var _context, _context2;
-    return _mapInstanceProperty(_context = _filterInstanceProperty(_context2 = _Object$values(modularui)).call(_context2, model => model.status === MODULARUI_STATUS.FINISHED)).call(_context, model => model.model);
+    const models = [];
+    const keys = _Object$keys(modularui);
+    for (const key of keys) {
+      const model = modularui[key];
+      if (model?.status === MODULARUI_STATUS.FINISHED) {
+        models.push(model.model);
+      }
+    }
+    return models;
   });
   const modularuiModels = useSelector(selector);
   return {

package/esm/hooks/useModels.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModels.js","names":["createSelector","useSelector","useDispatch","reloadModel","MODULARUI_STATUS","useModels","dispatch","selectModularUI","state","modularui","selector","_context","_context2","_mapInstanceProperty","_filterInstanceProperty","_Object$values","call","model","status","FINISHED","modularuiModels","reload","options","reloadWithFilter","callbackFn","modelsToReload","modelToReload"],"sources":["../../src/hooks/useModels.js"],"sourcesContent":["// @flow\nimport { createSelector } from \"reselect\";\nimport { useSelector, useDispatch } from \"react-redux\";\n\nimport { reloadModel } from \"../redux/_modularui/ModularUIActions\";\nimport { MODULARUI_STATUS } from \"../constants/Constants\";\n\nimport type { ModularUIModel } from \"../models/types\";\nimport type { ReduxState } from \"../redux\";\n\ntype ReloadCallback = (model: ModularUIModel) => boolean;\n\ntype UseModels = () => {\n  reload: (model: ModularUIModel, options?: any) => void,\n  reloadWithFilter: (callbackFn: ReloadCallback, options?: any) => void,\n};\n\n/**\n * Hook that contains the reload property that can be used to reload a model\n */\nexport const useModels: UseModels = () => {\n  const dispatch = useDispatch();\n\n  const selectModularUI = (state: ReduxState) => state.modularui;\n  const selector = createSelector([selectModularUI], (modularui) =>\n    Object.values(modularui)\n      .filter((model) => model.status === MODULARUI_STATUS.FINISHED)\n      .map((model) => model.model),\n  );\n  const modularuiModels = useSelector(selector);\n\n  return {\n    reload: (model: ModularUIModel, options?: Object) => {\n      dispatch(reloadModel(model, options));\n    },\n    reloadWithFilter: (callbackFn: ReloadCallback, options?: Object) => {\n      const modelsToReload = modularuiModels.filter(callbackFn);\n      for (const modelToReload of modelsToReload) {\n        dispatch(reloadModel(modelToReload, options));\n      }\n    },\n  };\n};\n"],"mappings":";;;AACA,SAASA,cAAc,QAAQ,UAAU;AACzC,SAASC,WAAW,EAAEC,WAAW,QAAQ,aAAa;AAEtD,SAASC,WAAW,QAAQ,sCAAsC;AAClE,SAASC,gBAAgB,QAAQ,wBAAwB;AAYzD;AACA;AACA;AACA,OAAO,MAAMC,SAAoB,GAAGA,CAAA,KAAM;EACxC,MAAMC,QAAQ,GAAGJ,WAAW,CAAC,CAAC;EAE9B,MAAMK,eAAe,GAAIC,KAAiB,IAAKA,KAAK,CAACC,SAAS;EAC9D,MAAMC,QAAQ,GAAGV,cAAc,CAAC,CAACO,eAAe,CAAC,EAAGE,SAAS;IAAA,IAAAE,QAAA,EAAAC,SAAA;IAAA,OAC3DC,oBAAA,CAAAF,QAAA,GAAAG,uBAAA,CAAAF,SAAA,GAAAG,cAAA,CAAcN,SAAS,CAAC,EAAAO,IAAA,CAAAJ,SAAA,EACbK,KAAK,IAAKA,KAAK,CAACC,MAAM,KAAKd,gBAAgB,CAACe,QAAQ,CAAC,EAAAH,IAAA,CAAAL,QAAA,EACxDM,KAAK,IAAKA,KAAK,CAACA,KAAK,CAAC;EAAA,CAChC,CAAC;EACD,MAAMG,eAAe,GAAGnB,WAAW,CAACS,QAAQ,CAAC;EAE7C,OAAO;IACLW,MAAM,EAAEA,CAACJ,KAAqB,EAAEK,OAAgB,KAAK;MACnDhB,QAAQ,CAACH,WAAW,CAACc,KAAK,EAAEK,OAAO,CAAC,CAAC;IACvC,CAAC;IACDC,gBAAgB,EAAEA,CAACC,UAA0B,EAAEF,OAAgB,KAAK;MAClE,MAAMG,cAAc,GAAGX,uBAAA,CAAAM,eAAe,EAAAJ,IAAA,CAAfI,eAAe,EAAQI,UAAU,CAAC;MACzD,KAAK,MAAME,aAAa,IAAID,cAAc,EAAE;QAC1CnB,QAAQ,CAACH,WAAW,CAACuB,aAAa,EAAEJ,OAAO,CAAC,CAAC;MAC/C;IACF;EACF,CAAC;AACH,CAAC","ignoreList":[]}
+{"version":3,"file":"useModels.js","names":["createSelector","useSelector","useDispatch","reloadModel","MODULARUI_STATUS","useModels","dispatch","selectModularUI","state","modularui","selector","models","keys","_Object$keys","key","model","status","FINISHED","push","modularuiModels","reload","options","reloadWithFilter","callbackFn","modelsToReload","_filterInstanceProperty","call","modelToReload"],"sources":["../../src/hooks/useModels.js"],"sourcesContent":["// @flow\nimport { createSelector } from \"reselect\";\nimport { useSelector, useDispatch } from \"react-redux\";\n\nimport { reloadModel } from \"../redux/_modularui/ModularUIActions\";\nimport { MODULARUI_STATUS } from \"../constants/Constants\";\n\nimport type { ModularUIModel } from \"../models/types\";\nimport type { ReduxState, ModelEntry } from \"../redux\";\n\ntype ReloadCallback = (model: ModularUIModel) => boolean;\n\ntype UseModels = () => {\n  reload: (model: ModularUIModel, options?: any) => void,\n  reloadWithFilter: (callbackFn: ReloadCallback, options?: any) => void,\n};\n\n/**\n * Hook that contains the reload property that can be used to reload a model\n */\nexport const useModels: UseModels = () => {\n  const dispatch = useDispatch();\n\n  const selectModularUI = (state: ReduxState) => state.modularui;\n  const selector = createSelector([selectModularUI], (modularui) => {\n    const models = [];\n    const keys = Object.keys(modularui);\n    for (const key of keys) {\n      const model: ModelEntry = modularui[key];\n      if (model?.status === MODULARUI_STATUS.FINISHED) {\n        models.push(model.model);\n      }\n    }\n    return models;\n  });\n\n  const modularuiModels = useSelector(selector);\n\n  return {\n    reload: (model: ModularUIModel, options?: Object) => {\n      dispatch(reloadModel(model, options));\n    },\n    reloadWithFilter: (callbackFn: ReloadCallback, options?: Object) => {\n      const modelsToReload = modularuiModels.filter(callbackFn);\n      for (const modelToReload of modelsToReload) {\n        dispatch(reloadModel(modelToReload, options));\n      }\n    },\n  };\n};\n"],"mappings":";;AACA,SAASA,cAAc,QAAQ,UAAU;AACzC,SAASC,WAAW,EAAEC,WAAW,QAAQ,aAAa;AAEtD,SAASC,WAAW,QAAQ,sCAAsC;AAClE,SAASC,gBAAgB,QAAQ,wBAAwB;AAYzD;AACA;AACA;AACA,OAAO,MAAMC,SAAoB,GAAGA,CAAA,KAAM;EACxC,MAAMC,QAAQ,GAAGJ,WAAW,CAAC,CAAC;EAE9B,MAAMK,eAAe,GAAIC,KAAiB,IAAKA,KAAK,CAACC,SAAS;EAC9D,MAAMC,QAAQ,GAAGV,cAAc,CAAC,CAACO,eAAe,CAAC,EAAGE,SAAS,IAAK;IAChE,MAAME,MAAM,GAAG,EAAE;IACjB,MAAMC,IAAI,GAAGC,YAAA,CAAYJ,SAAS,CAAC;IACnC,KAAK,MAAMK,GAAG,IAAIF,IAAI,EAAE;MACtB,MAAMG,KAAiB,GAAGN,SAAS,CAACK,GAAG,CAAC;MACxC,IAAIC,KAAK,EAAEC,MAAM,KAAKZ,gBAAgB,CAACa,QAAQ,EAAE;QAC/CN,MAAM,CAACO,IAAI,CAACH,KAAK,CAACA,KAAK,CAAC;MAC1B;IACF;IACA,OAAOJ,MAAM;EACf,CAAC,CAAC;EAEF,MAAMQ,eAAe,GAAGlB,WAAW,CAACS,QAAQ,CAAC;EAE7C,OAAO;IACLU,MAAM,EAAEA,CAACL,KAAqB,EAAEM,OAAgB,KAAK;MACnDf,QAAQ,CAACH,WAAW,CAACY,KAAK,EAAEM,OAAO,CAAC,CAAC;IACvC,CAAC;IACDC,gBAAgB,EAAEA,CAACC,UAA0B,EAAEF,OAAgB,KAAK;MAClE,MAAMG,cAAc,GAAGC,uBAAA,CAAAN,eAAe,EAAAO,IAAA,CAAfP,eAAe,EAAQI,UAAU,CAAC;MACzD,KAAK,MAAMI,aAAa,IAAIH,cAAc,EAAE;QAC1ClB,QAAQ,CAACH,WAAW,CAACwB,aAAa,EAAEN,OAAO,CAAC,CAAC;MAC/C;IACF;EACF,CAAC;AACH,CAAC","ignoreList":[]}

package/esm/models/content/ContentLinkModel.js

@@ -91,17 +91,16 @@ export default class ContentLinkModel extends BaseModel {
    */
   createEncodedHref() {
     const startURI = "/content/";
-    const selfhref = this.data._links.self.href;
+    const selfHref = new Href(this.data._links.self.href);
+    const href = selfHref.path;
     const section = this.data.section;
-    const sourceId = section ? selfhref.substring(startURI.length, selfhref.lastIndexOf("/")) : selfhref.substring(startURI.length, selfhref.lastIndexOf("#"));
-    let hash = "";
-    if (selfhref.hash) {
-      hash = `#${selfhref.hash}`;
-    }
+    const sourceId = section ? href.substring(startURI.length, href.lastIndexOf("/")) : href.substring(startURI.length);
     if (section) {
-      return new Href(`${startURI}${encodeURIComponent(sourceId)}/${encodeURIComponent(section)}${hash}`);
+      selfHref.path = `${startURI}${encodeURIComponent(sourceId)}/${encodeURIComponent(section)}`;
+    } else {
+      selfHref.path = `${startURI}${encodeURIComponent(sourceId)}`;
     }
-    return new Href(`${startURI}${encodeURIComponent(sourceId)}${hash}`);
+    return selfHref;
   }
 
   /**

package/esm/models/content/ContentLinkModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"ContentLinkModel.js","names":["BaseModel","Href","LinkModel","ContentTypeModel","TIMEVERSION_FILTER_NAME","LinkCollection","ContentLinkModel","constructor","data","entryDate","arguments","length","undefined","_defineProperty","_entryDate","getInitialChildModelLinks","contentTypeLink","isCacheable","setChildModels","models","href","contentTypeModel","_findInstanceProperty","call","model","selfhref","equalsWithParameters","type","contentType","_contentType","key","getData","label","sourceLabel","createEncodedHref","startURI","_links","self","section","sourceId","substring","lastIndexOf","hash","encodeURIComponent","encodedHref","addParameter","links","Array","isArray","selflink","getLinkByKey","Error","subSectionID","contentTypeHref","items","_items"],"sources":["../../../src/models/content/ContentLinkModel.js"],"sourcesContent":["// @flow\nimport BaseModel from \"../base/BaseModel\";\nimport Href from \"../href/Href\";\nimport LinkModel from \"../links/LinkModel\";\nimport ContentTypeModel from \"./ContentTypeModel\";\nimport { TIMEVERSION_FILTER_NAME } from \"../../constants/Constants\";\n\nimport LinkCollection from \"../links/LinkCollection\";\n\nimport type { ModularUIModel, IModelWithChildModels } from \"../types\";\n\n/**\n * Link to a concept\n */\nexport default class ContentLinkModel\n  extends BaseModel\n  implements IModelWithChildModels\n{\n  _links: ?LinkCollection;\n  _entryDate: ?ISO_DATE;\n  _contentType: ContentTypeModel | null = null;\n  _items: Array<ContentLinkModel>;\n\n  /**\n   */\n  constructor(data: Object, entryDate: ?ISO_DATE = null) {\n    super(data, {});\n\n    this._entryDate = entryDate;\n  }\n\n  /**\n   */\n  // $FlowFixMe[method-unbinding]\n  getInitialChildModelLinks(): Array<LinkModel> {\n    if (this.contentTypeLink) {\n      this.contentTypeLink.isCacheable = true;\n      return [this.contentTypeLink];\n    }\n\n    return [];\n  }\n\n  /**\n   */\n  // $FlowFixMe[method-unbinding]\n  setChildModels(models: Array<ModularUIModel>) {\n    if (this.contentTypeLink) {\n      const href = this.contentTypeLink.href;\n      const contentTypeModel = models.find((model) =>\n        model.selfhref.equalsWithParameters(href),\n      );\n\n      if (contentTypeModel?.type === \"ContentType\") {\n        this.contentType = contentTypeModel;\n      }\n    }\n  }\n\n  /**\n   * Retrieve content type\n   */\n  get contentType(): ?ContentTypeModel | null {\n    return this._contentType;\n  }\n\n  /**\n   * Set concept type\n   */\n  set contentType(contentType: ?ModularUIModel) {\n    this._contentType =\n      contentType instanceof ContentTypeModel ? contentType : null;\n  }\n\n  /**\n   */\n  set entryDate(entryDate: ISO_DATE) {\n    this._entryDate = entryDate;\n  }\n\n  /**\n   * Retrieve key\n   */\n  get key(): string {\n    return this.getData(\"_id\", \"\");\n  }\n\n  /**\n   * Retrieve label\n   */\n  get label(): string {\n    return this.getData(\"label\", \"\");\n  }\n\n  /**\n   * Retrieve the label of the source a link to a section belongs to\n   */\n  get sourceLabel(): string | null {\n    return this.getData(\"sourceLabel\");\n  }\n\n  /**\n   */\n  createEncodedHref(): Href {\n    const startURI = \"/content/\";\n    const selfhref = this.data._links.self.href;\n\n    const section = this.data.section;\n    const sourceId = section\n      ? selfhref.substring(startURI.length, selfhref.lastIndexOf(\"/\"))\n      : selfhref.substring(startURI.length, selfhref.lastIndexOf(\"#\"));\n\n    let hash = \"\";\n    if (selfhref.hash) {\n      hash = `#${selfhref.hash}`;\n    }\n\n    if (section) {\n      return new Href(\n        `${startURI}${encodeURIComponent(sourceId)}/${encodeURIComponent(section)}${hash}`,\n      );\n    }\n\n    return new Href(`${startURI}${encodeURIComponent(sourceId)}${hash}`);\n  }\n\n  /**\n   * Encode the content-identifier of the path to the content resource.\n   * This makes it a single uri part, which can be used on routes to make nested routes\n   */\n  get encodedHref(): Href {\n    const href = this.createEncodedHref();\n\n    if (this._entryDate !== null) {\n      return href.addParameter(TIMEVERSION_FILTER_NAME, this._entryDate);\n    }\n\n    return href;\n  }\n\n  /**\n   * Getting the links of the resource\n   */\n  get links(): LinkCollection {\n    if (!this._links) {\n      this._links = new LinkCollection(\n        Array.isArray(this.data._links)\n          ? this.data._links[0]\n          : this.data._links,\n      );\n    }\n\n    return this._links;\n  }\n\n  /**\n   * Get self link of model\n   */\n  get selflink(): LinkModel {\n    const selflink = this.links.getLinkByKey(\"self\");\n\n    if (selflink === null) {\n      throw new Error(\n        `Could not find self link for ${\n          this.key === null ? \"unknown\" : this.key\n        }`,\n      );\n    }\n\n    return selflink;\n  }\n\n  /**\n   * Self href of concept\n   */\n  get selfhref(): Href {\n    if (this._entryDate !== null) {\n      return this.selflink.href.addParameter(\n        TIMEVERSION_FILTER_NAME,\n        this._entryDate,\n      );\n    }\n\n    return this.selflink.href;\n  }\n\n  /**\n   */\n  get subSectionID(): string {\n    return this.selfhref.hash;\n  }\n\n  /**\n   */\n  get contentTypeLink(): LinkModel | null {\n    return this.links.getLinkByKey(\"contenttype\");\n  }\n\n  /**\n   * Concept type href of concept\n   */\n  get contentTypeHref(): Href | null {\n    if (this.contentTypeLink) {\n      return this.contentTypeLink.href;\n    }\n\n    return null;\n  }\n\n  /**\n   * Children of link model in TOC\n   */\n  set items(items: Array<ContentLinkModel>) {\n    this._items = items;\n  }\n\n  /**\n   */\n  get items(): Array<ContentLinkModel> {\n    return this._items;\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ContentLinkModel.js","names":["BaseModel","Href","LinkModel","ContentTypeModel","TIMEVERSION_FILTER_NAME","LinkCollection","ContentLinkModel","constructor","data","entryDate","arguments","length","undefined","_defineProperty","_entryDate","getInitialChildModelLinks","contentTypeLink","isCacheable","setChildModels","models","href","contentTypeModel","_findInstanceProperty","call","model","selfhref","equalsWithParameters","type","contentType","_contentType","key","getData","label","sourceLabel","createEncodedHref","startURI","selfHref","_links","self","path","section","sourceId","substring","lastIndexOf","encodeURIComponent","encodedHref","addParameter","links","Array","isArray","selflink","getLinkByKey","Error","subSectionID","hash","contentTypeHref","items","_items"],"sources":["../../../src/models/content/ContentLinkModel.js"],"sourcesContent":["// @flow\nimport BaseModel from \"../base/BaseModel\";\nimport Href from \"../href/Href\";\nimport LinkModel from \"../links/LinkModel\";\nimport ContentTypeModel from \"./ContentTypeModel\";\nimport { TIMEVERSION_FILTER_NAME } from \"../../constants/Constants\";\n\nimport LinkCollection from \"../links/LinkCollection\";\n\nimport type { ModularUIModel, IModelWithChildModels } from \"../types\";\n\n/**\n * Link to a concept\n */\nexport default class ContentLinkModel\n  extends BaseModel\n  implements IModelWithChildModels\n{\n  _links: ?LinkCollection;\n  _entryDate: ?ISO_DATE;\n  _contentType: ContentTypeModel | null = null;\n  _items: Array<ContentLinkModel>;\n\n  /**\n   */\n  constructor(data: Object, entryDate: ?ISO_DATE = null) {\n    super(data, {});\n\n    this._entryDate = entryDate;\n  }\n\n  /**\n   */\n  // $FlowFixMe[method-unbinding]\n  getInitialChildModelLinks(): Array<LinkModel> {\n    if (this.contentTypeLink) {\n      this.contentTypeLink.isCacheable = true;\n      return [this.contentTypeLink];\n    }\n\n    return [];\n  }\n\n  /**\n   */\n  // $FlowFixMe[method-unbinding]\n  setChildModels(models: Array<ModularUIModel>) {\n    if (this.contentTypeLink) {\n      const href = this.contentTypeLink.href;\n      const contentTypeModel = models.find((model) =>\n        model.selfhref.equalsWithParameters(href),\n      );\n\n      if (contentTypeModel?.type === \"ContentType\") {\n        this.contentType = contentTypeModel;\n      }\n    }\n  }\n\n  /**\n   * Retrieve content type\n   */\n  get contentType(): ?ContentTypeModel | null {\n    return this._contentType;\n  }\n\n  /**\n   * Set concept type\n   */\n  set contentType(contentType: ?ModularUIModel) {\n    this._contentType =\n      contentType instanceof ContentTypeModel ? contentType : null;\n  }\n\n  /**\n   */\n  set entryDate(entryDate: ISO_DATE) {\n    this._entryDate = entryDate;\n  }\n\n  /**\n   * Retrieve key\n   */\n  get key(): string {\n    return this.getData(\"_id\", \"\");\n  }\n\n  /**\n   * Retrieve label\n   */\n  get label(): string {\n    return this.getData(\"label\", \"\");\n  }\n\n  /**\n   * Retrieve the label of the source a link to a section belongs to\n   */\n  get sourceLabel(): string | null {\n    return this.getData(\"sourceLabel\");\n  }\n\n  /**\n   */\n  createEncodedHref(): Href {\n    const startURI = \"/content/\";\n    const selfHref = new Href(this.data._links.self.href);\n    const href = selfHref.path;\n\n    const section = this.data.section;\n    const sourceId = section\n      ? href.substring(startURI.length, href.lastIndexOf(\"/\"))\n      : href.substring(startURI.length);\n\n    if (section) {\n      selfHref.path = `${startURI}${encodeURIComponent(sourceId)}/${encodeURIComponent(section)}`;\n    } else {\n      selfHref.path = `${startURI}${encodeURIComponent(sourceId)}`;\n    }\n\n    return selfHref;\n  }\n\n  /**\n   * Encode the content-identifier of the path to the content resource.\n   * This makes it a single uri part, which can be used on routes to make nested routes\n   */\n  get encodedHref(): Href {\n    const href = this.createEncodedHref();\n\n    if (this._entryDate !== null) {\n      return href.addParameter(TIMEVERSION_FILTER_NAME, this._entryDate);\n    }\n\n    return href;\n  }\n\n  /**\n   * Getting the links of the resource\n   */\n  get links(): LinkCollection {\n    if (!this._links) {\n      this._links = new LinkCollection(\n        Array.isArray(this.data._links)\n          ? this.data._links[0]\n          : this.data._links,\n      );\n    }\n\n    return this._links;\n  }\n\n  /**\n   * Get self link of model\n   */\n  get selflink(): LinkModel {\n    const selflink = this.links.getLinkByKey(\"self\");\n\n    if (selflink === null) {\n      throw new Error(\n        `Could not find self link for ${\n          this.key === null ? \"unknown\" : this.key\n        }`,\n      );\n    }\n\n    return selflink;\n  }\n\n  /**\n   * Self href of concept\n   */\n  get selfhref(): Href {\n    if (this._entryDate !== null) {\n      return this.selflink.href.addParameter(\n        TIMEVERSION_FILTER_NAME,\n        this._entryDate,\n      );\n    }\n\n    return this.selflink.href;\n  }\n\n  /**\n   */\n  get subSectionID(): string {\n    return this.selfhref.hash;\n  }\n\n  /**\n   */\n  get contentTypeLink(): LinkModel | null {\n    return this.links.getLinkByKey(\"contenttype\");\n  }\n\n  /**\n   * Concept type href of concept\n   */\n  get contentTypeHref(): Href | null {\n    if (this.contentTypeLink) {\n      return this.contentTypeLink.href;\n    }\n\n    return null;\n  }\n\n  /**\n   * Children of link model in TOC\n   */\n  set items(items: Array<ContentLinkModel>) {\n    this._items = items;\n  }\n\n  /**\n   */\n  get items(): Array<ContentLinkModel> {\n    return this._items;\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/esm/react-theme/createTheme.js

@@ -19,6 +19,7 @@ const replacePlaceholders = inputTheme => {
   return inputTheme;
 };
 const generateTheme = function (storedTheme) {
+  const storedSettings = storedTheme?.settings ?? {};
   let generatedTheme = {
     settings: {}
   };
@@ -29,12 +30,20 @@ const generateTheme = function (storedTheme) {
     if (typeof element === "function") {
       generatedTheme = element(replacePlaceholders(generatedTheme));
     } else if (isPlainObject(element)) {
+      const generatedSettings = generatedTheme.settings;
       // $FlowFixMe[cannot-spread-indexer]
       generatedTheme = {
         ...generatedTheme,
         ...element,
         ...storedTheme
       };
+      if ("settings" in element) {
+        generatedTheme.settings = {
+          ...generatedSettings,
+          ...element.settings,
+          ...storedSettings
+        };
+      }
     }
   }
 

package/esm/react-theme/createTheme.js.map

@@ -1 +1 @@
-{"version":3,"file":"createTheme.js","names":["flattenDeep","isPlainObject","setSettings","replacePlaceholders","inputTheme","_context","possibleKeys","_mapInstanceProperty","_Object$keys","call","key","join","re","RegExp","_Object$entries","forEach","_ref","value","replace","match","capture","generateTheme","storedTheme","generatedTheme","settings","_len","arguments","length","themeElements","Array","_key","element","createTheme","_len2","themeConfigs","_key2","customTheme"],"sources":["../../src/react-theme/createTheme.js"],"sourcesContent":["// @flow\nimport flattenDeep from \"lodash/flattenDeep\";\n\nimport { isPlainObject } from \"../utils/helpers/objects\";\n\nimport { setSettings } from \"../constants/Settings\";\n\nimport type { Theme } from \"./types\";\n\nconst replacePlaceholders = (inputTheme: Theme) => {\n  const possibleKeys = Object.keys(inputTheme)\n    .map((key) => `\\\\b${key}\\\\b`)\n    .join(\"|\");\n\n  const re = new RegExp(`\\\\$(${possibleKeys})`, \"g\");\n  Object.entries(inputTheme).forEach(([key, value]) => {\n    if (key !== \"settings\" && typeof value === \"string\") {\n      inputTheme[key] = value.replace(\n        re,\n        // $FlowIssue[incompatible-call]\n        (match, capture) => inputTheme[capture],\n      );\n    }\n  });\n\n  return inputTheme;\n};\n\nconst generateTheme = (storedTheme: Theme, ...themeElements: Array<Theme>) => {\n  let generatedTheme = { settings: {} };\n  for (const element of themeElements) {\n    if (typeof element === \"function\") {\n      generatedTheme = element(replacePlaceholders(generatedTheme));\n    } else if (isPlainObject(element)) {\n      // $FlowFixMe[cannot-spread-indexer]\n      generatedTheme = { ...generatedTheme, ...element, ...storedTheme };\n    }\n  }\n\n  // final - replace any assignments inside the theme\n  return replacePlaceholders(generatedTheme);\n};\n\n/**\n * Create a theme from multiple theme configuration objects.\n * Properties are overwriten by iterating the configuration objects from left to right.\n *\n * The first argument represents a stored theme part, this is optional. The stored theme part will overwrite every part in the collection of theme parts.\n * Thus a stored configuration is leading as it can be configured by a modeller through the repository.\n *\n * Placeholders can be used, they are replaced before calling a function theme part or at the end of the theme creation.\n *\n * Both objects and function can be used, where a function receives the previous objects as input arguments.\n * For example using the method createTheme(ThemeObject, ThemeObject2, ThemeFunction, ThemeFunction2), will be handled as:\n *\n * ThemeFunction2(ThemeFunction1({ ...ThemeObject, ...ThemeObject2 }))\n *\n * @example\n * Example where the primary color of the default theme is overwritten with a primary color of the custom theme,\n * but the button bg still uses the yiq function of the default theme:\n *\n * const DefaultTheme = {\n *   PRIMARY_COLOR: \"#0000ff\",\n *   SECONDARY_COLOR: \"#00ff00\",\n *   BUTTON_COLOR: \"$PRIMARY_COLOR\"\n * }\n *\n * const createDefaultTheme = (input) => ({\n *   ...input,\n *   BUTTON_BG: getContrastYIQ(input.BUTTON_COLOR)\n * })\n *\n * const CustomTheme = {\n *   PRIMARY_COLOR: \"#ff0000\"\n * }\n *\n * createTheme(null, DefaultTheme, CustomTheme, createDefaultTheme);\n *\n * // Result:\n * {\n *   PRIMARY_COLOR: \"#ff0000\",\n *   BUTTON_COLOR: \"#ff0000\",\n *   BUTTON_BG: \"#fff\",\n *   SECONDARY_COLOR: \"#00ff00\",\n * }\n */\nconst createTheme = (\n  storedTheme: Theme,\n  ...themeConfigs: Array<Theme | Array<Theme> | void>\n):\n  | any\n  | {}\n  | {\n      INPUT_FOCUS_BORDER_COLOR?: string,\n      LINK_HOVER_COLOR?: string,\n      PAGING_HOVER_COLOR?: string,\n      settings?: { [settingName: string]: string },\n    } => {\n  const customTheme = generateTheme(storedTheme, ...flattenDeep(themeConfigs));\n\n  if (customTheme) {\n    setSettings(customTheme.settings);\n  }\n\n  return customTheme;\n};\n\nexport default createTheme;\n"],"mappings":";;;AACA,OAAOA,WAAW,MAAM,oBAAoB;AAE5C,SAASC,aAAa,QAAQ,0BAA0B;AAExD,SAASC,WAAW,QAAQ,uBAAuB;AAInD,MAAMC,mBAAmB,GAAIC,UAAiB,IAAK;EAAA,IAAAC,QAAA;EACjD,MAAMC,YAAY,GAAGC,oBAAA,CAAAF,QAAA,GAAAG,YAAA,CAAYJ,UAAU,CAAC,EAAAK,IAAA,CAAAJ,QAAA,EACpCK,GAAG,IAAM,MAAKA,GAAI,KAAI,CAAC,CAC5BC,IAAI,CAAC,GAAG,CAAC;EAEZ,MAAMC,EAAE,GAAG,IAAIC,MAAM,CAAE,OAAMP,YAAa,GAAE,EAAE,GAAG,CAAC;EAClDQ,eAAA,CAAeV,UAAU,CAAC,CAACW,OAAO,CAACC,IAAA,IAAkB;IAAA,IAAjB,CAACN,GAAG,EAAEO,KAAK,CAAC,GAAAD,IAAA;IAC9C,IAAIN,GAAG,KAAK,UAAU,IAAI,OAAOO,KAAK,KAAK,QAAQ,EAAE;MACnDb,UAAU,CAACM,GAAG,CAAC,GAAGO,KAAK,CAACC,OAAO,CAC7BN,EAAE;MACF;MACA,CAACO,KAAK,EAAEC,OAAO,KAAKhB,UAAU,CAACgB,OAAO,CACxC,CAAC;IACH;EACF,CAAC,CAAC;EAEF,OAAOhB,UAAU;AACnB,CAAC;AAED,MAAMiB,aAAa,GAAG,SAAAA,CAACC,WAAkB,EAAqC;EAC5E,IAAIC,cAAc,GAAG;IAAEC,QAAQ,EAAE,CAAC;EAAE,CAAC;EAAC,SAAAC,IAAA,GAAAC,SAAA,CAAAC,MAAA,EADMC,aAAa,OAAAC,KAAA,CAAAJ,IAAA,OAAAA,IAAA,WAAAK,IAAA,MAAAA,IAAA,GAAAL,IAAA,EAAAK,IAAA;IAAbF,aAAa,CAAAE,IAAA,QAAAJ,SAAA,CAAAI,IAAA;EAAA;EAEzD,KAAK,MAAMC,OAAO,IAAIH,aAAa,EAAE;IACnC,IAAI,OAAOG,OAAO,KAAK,UAAU,EAAE;MACjCR,cAAc,GAAGQ,OAAO,CAAC5B,mBAAmB,CAACoB,cAAc,CAAC,CAAC;IAC/D,CAAC,MAAM,IAAItB,aAAa,CAAC8B,OAAO,CAAC,EAAE;MACjC;MACAR,cAAc,GAAG;QAAE,GAAGA,cAAc;QAAE,GAAGQ,OAAO;QAAE,GAAGT;MAAY,CAAC;IACpE;EACF;;EAEA;EACA,OAAOnB,mBAAmB,CAACoB,cAAc,CAAC;AAC5C,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMS,WAAW,GAAG,SAAAA,CAClBV,WAAkB,EAUX;EAAA,SAAAW,KAAA,GAAAP,SAAA,CAAAC,MAAA,EATJO,YAAY,OAAAL,KAAA,CAAAI,KAAA,OAAAA,KAAA,WAAAE,KAAA,MAAAA,KAAA,GAAAF,KAAA,EAAAE,KAAA;IAAZD,YAAY,CAAAC,KAAA,QAAAT,SAAA,CAAAS,KAAA;EAAA;EAUf,MAAMC,WAAW,GAAGf,aAAa,CAACC,WAAW,EAAE,GAAGtB,WAAW,CAACkC,YAAY,CAAC,CAAC;EAE5E,IAAIE,WAAW,EAAE;IACflC,WAAW,CAACkC,WAAW,CAACZ,QAAQ,CAAC;EACnC;EAEA,OAAOY,WAAW;AACpB,CAAC;AAED,eAAeJ,WAAW","ignoreList":[]}
+{"version":3,"file":"createTheme.js","names":["flattenDeep","isPlainObject","setSettings","replacePlaceholders","inputTheme","_context","possibleKeys","_mapInstanceProperty","_Object$keys","call","key","join","re","RegExp","_Object$entries","forEach","_ref","value","replace","match","capture","generateTheme","storedTheme","storedSettings","settings","generatedTheme","_len","arguments","length","themeElements","Array","_key","element","generatedSettings","createTheme","_len2","themeConfigs","_key2","customTheme"],"sources":["../../src/react-theme/createTheme.js"],"sourcesContent":["// @flow\nimport flattenDeep from \"lodash/flattenDeep\";\n\nimport { isPlainObject } from \"../utils/helpers/objects\";\n\nimport { setSettings } from \"../constants/Settings\";\n\nimport type { Theme } from \"./types\";\n\nconst replacePlaceholders = (inputTheme: Theme) => {\n  const possibleKeys = Object.keys(inputTheme)\n    .map((key) => `\\\\b${key}\\\\b`)\n    .join(\"|\");\n\n  const re = new RegExp(`\\\\$(${possibleKeys})`, \"g\");\n  Object.entries(inputTheme).forEach(([key, value]) => {\n    if (key !== \"settings\" && typeof value === \"string\") {\n      inputTheme[key] = value.replace(\n        re,\n        // $FlowIssue[incompatible-call]\n        (match, capture) => inputTheme[capture],\n      );\n    }\n  });\n\n  return inputTheme;\n};\n\nconst generateTheme = (storedTheme: Theme, ...themeElements: Array<Theme>) => {\n  const storedSettings = storedTheme?.settings ?? {};\n\n  let generatedTheme = { settings: {} };\n  for (const element of themeElements) {\n    if (typeof element === \"function\") {\n      generatedTheme = element(replacePlaceholders(generatedTheme));\n    } else if (isPlainObject(element)) {\n      const generatedSettings = generatedTheme.settings;\n      // $FlowFixMe[cannot-spread-indexer]\n      generatedTheme = { ...generatedTheme, ...element, ...storedTheme };\n      if (\"settings\" in element) {\n        generatedTheme.settings = {\n          ...generatedSettings,\n          ...element.settings,\n          ...storedSettings,\n        };\n      }\n    }\n  }\n\n  // final - replace any assignments inside the theme\n  return replacePlaceholders(generatedTheme);\n};\n\n/**\n * Create a theme from multiple theme configuration objects.\n * Properties are overwriten by iterating the configuration objects from left to right.\n *\n * The first argument represents a stored theme part, this is optional. The stored theme part will overwrite every part in the collection of theme parts.\n * Thus a stored configuration is leading as it can be configured by a modeller through the repository.\n *\n * Placeholders can be used, they are replaced before calling a function theme part or at the end of the theme creation.\n *\n * Both objects and function can be used, where a function receives the previous objects as input arguments.\n * For example using the method createTheme(ThemeObject, ThemeObject2, ThemeFunction, ThemeFunction2), will be handled as:\n *\n * ThemeFunction2(ThemeFunction1({ ...ThemeObject, ...ThemeObject2 }))\n *\n * @example\n * Example where the primary color of the default theme is overwritten with a primary color of the custom theme,\n * but the button bg still uses the yiq function of the default theme:\n *\n * const DefaultTheme = {\n *   PRIMARY_COLOR: \"#0000ff\",\n *   SECONDARY_COLOR: \"#00ff00\",\n *   BUTTON_COLOR: \"$PRIMARY_COLOR\"\n * }\n *\n * const createDefaultTheme = (input) => ({\n *   ...input,\n *   BUTTON_BG: getContrastYIQ(input.BUTTON_COLOR)\n * })\n *\n * const CustomTheme = {\n *   PRIMARY_COLOR: \"#ff0000\"\n * }\n *\n * createTheme(null, DefaultTheme, CustomTheme, createDefaultTheme);\n *\n * // Result:\n * {\n *   PRIMARY_COLOR: \"#ff0000\",\n *   BUTTON_COLOR: \"#ff0000\",\n *   BUTTON_BG: \"#fff\",\n *   SECONDARY_COLOR: \"#00ff00\",\n * }\n */\nconst createTheme = (\n  storedTheme: Theme,\n  ...themeConfigs: Array<Theme | Array<Theme> | void>\n):\n  | any\n  | {}\n  | {\n      INPUT_FOCUS_BORDER_COLOR?: string,\n      LINK_HOVER_COLOR?: string,\n      PAGING_HOVER_COLOR?: string,\n      settings?: { [settingName: string]: string },\n    } => {\n  const customTheme = generateTheme(storedTheme, ...flattenDeep(themeConfigs));\n\n  if (customTheme) {\n    setSettings(customTheme.settings);\n  }\n\n  return customTheme;\n};\n\nexport default createTheme;\n"],"mappings":"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","ignoreList":[]}

package/lib/hooks/useModels.js

@@ -5,9 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useModels = void 0;
-var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
+var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
-var _values = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/values"));
 var _reselect = require("reselect");
 var _reactRedux = require("react-redux");
 var _ModularUIActions = require("../redux/_modularui/ModularUIActions");
@@ -19,8 +18,15 @@ const useModels = () => {
   const dispatch = (0, _reactRedux.useDispatch)();
   const selectModularUI = state => state.modularui;
   const selector = (0, _reselect.createSelector)([selectModularUI], modularui => {
-    var _context, _context2;
-    return (0, _map.default)(_context = (0, _filter.default)(_context2 = (0, _values.default)(modularui)).call(_context2, model => model.status === _Constants.MODULARUI_STATUS.FINISHED)).call(_context, model => model.model);
+    const models = [];
+    const keys = (0, _keys.default)(modularui);
+    for (const key of keys) {
+      const model = modularui[key];
+      if (model?.status === _Constants.MODULARUI_STATUS.FINISHED) {
+        models.push(model.model);
+      }
+    }
+    return models;
   });
   const modularuiModels = (0, _reactRedux.useSelector)(selector);
   return {

package/lib/hooks/useModels.js.flow

@@ -6,7 +6,7 @@ import { reloadModel } from "../redux/_modularui/ModularUIActions";
 import { MODULARUI_STATUS } from "../constants/Constants";
 
 import type { ModularUIModel } from "../models/types";
-import type { ReduxState } from "../redux";
+import type { ReduxState, ModelEntry } from "../redux";
 
 type ReloadCallback = (model: ModularUIModel) => boolean;
 
@@ -22,11 +22,18 @@ export const useModels: UseModels = () => {
   const dispatch = useDispatch();
 
   const selectModularUI = (state: ReduxState) => state.modularui;
-  const selector = createSelector([selectModularUI], (modularui) =>
-    Object.values(modularui)
-      .filter((model) => model.status === MODULARUI_STATUS.FINISHED)
-      .map((model) => model.model),
-  );
+  const selector = createSelector([selectModularUI], (modularui) => {
+    const models = [];
+    const keys = Object.keys(modularui);
+    for (const key of keys) {
+      const model: ModelEntry = modularui[key];
+      if (model?.status === MODULARUI_STATUS.FINISHED) {
+        models.push(model.model);
+      }
+    }
+    return models;
+  });
+
   const modularuiModels = useSelector(selector);
 
   return {

package/lib/hooks/useModels.js.map

@@ -1 +1 @@
-{"version":3,"file":"useModels.js","names":["_reselect","require","_reactRedux","_ModularUIActions","_Constants","useModels","dispatch","useDispatch","selectModularUI","state","modularui","selector","createSelector","_context","_context2","_map","default","_filter","_values","call","model","status","MODULARUI_STATUS","FINISHED","modularuiModels","useSelector","reload","options","reloadModel","reloadWithFilter","callbackFn","modelsToReload","modelToReload","exports"],"sources":["../../src/hooks/useModels.js"],"sourcesContent":["// @flow\nimport { createSelector } from \"reselect\";\nimport { useSelector, useDispatch } from \"react-redux\";\n\nimport { reloadModel } from \"../redux/_modularui/ModularUIActions\";\nimport { MODULARUI_STATUS } from \"../constants/Constants\";\n\nimport type { ModularUIModel } from \"../models/types\";\nimport type { ReduxState } from \"../redux\";\n\ntype ReloadCallback = (model: ModularUIModel) => boolean;\n\ntype UseModels = () => {\n  reload: (model: ModularUIModel, options?: any) => void,\n  reloadWithFilter: (callbackFn: ReloadCallback, options?: any) => void,\n};\n\n/**\n * Hook that contains the reload property that can be used to reload a model\n */\nexport const useModels: UseModels = () => {\n  const dispatch = useDispatch();\n\n  const selectModularUI = (state: ReduxState) => state.modularui;\n  const selector = createSelector([selectModularUI], (modularui) =>\n    Object.values(modularui)\n      .filter((model) => model.status === MODULARUI_STATUS.FINISHED)\n      .map((model) => model.model),\n  );\n  const modularuiModels = useSelector(selector);\n\n  return {\n    reload: (model: ModularUIModel, options?: Object) => {\n      dispatch(reloadModel(model, options));\n    },\n    reloadWithFilter: (callbackFn: ReloadCallback, options?: Object) => {\n      const modelsToReload = modularuiModels.filter(callbackFn);\n      for (const modelToReload of modelsToReload) {\n        dispatch(reloadModel(modelToReload, options));\n      }\n    },\n  };\n};\n"],"mappings":";;;;;;;;;;AACA,IAAAA,SAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AAEA,IAAAE,iBAAA,GAAAF,OAAA;AACA,IAAAG,UAAA,GAAAH,OAAA;AAYA;AACA;AACA;AACO,MAAMI,SAAoB,GAAGA,CAAA,KAAM;EACxC,MAAMC,QAAQ,GAAG,IAAAC,uBAAW,EAAC,CAAC;EAE9B,MAAMC,eAAe,GAAIC,KAAiB,IAAKA,KAAK,CAACC,SAAS;EAC9D,MAAMC,QAAQ,GAAG,IAAAC,wBAAc,EAAC,CAACJ,eAAe,CAAC,EAAGE,SAAS;IAAA,IAAAG,QAAA,EAAAC,SAAA;IAAA,OAC3D,IAAAC,IAAA,CAAAC,OAAA,EAAAH,QAAA,OAAAI,OAAA,CAAAD,OAAA,EAAAF,SAAA,OAAAI,OAAA,CAAAF,OAAA,EAAcN,SAAS,CAAC,EAAAS,IAAA,CAAAL,SAAA,EACbM,KAAK,IAAKA,KAAK,CAACC,MAAM,KAAKC,2BAAgB,CAACC,QAAQ,CAAC,EAAAJ,IAAA,CAAAN,QAAA,EACxDO,KAAK,IAAKA,KAAK,CAACA,KAAK,CAAC;EAAA,CAChC,CAAC;EACD,MAAMI,eAAe,GAAG,IAAAC,uBAAW,EAACd,QAAQ,CAAC;EAE7C,OAAO;IACLe,MAAM,EAAEA,CAACN,KAAqB,EAAEO,OAAgB,KAAK;MACnDrB,QAAQ,CAAC,IAAAsB,6BAAW,EAACR,KAAK,EAAEO,OAAO,CAAC,CAAC;IACvC,CAAC;IACDE,gBAAgB,EAAEA,CAACC,UAA0B,EAAEH,OAAgB,KAAK;MAClE,MAAMI,cAAc,GAAG,IAAAd,OAAA,CAAAD,OAAA,EAAAQ,eAAe,EAAAL,IAAA,CAAfK,eAAe,EAAQM,UAAU,CAAC;MACzD,KAAK,MAAME,aAAa,IAAID,cAAc,EAAE;QAC1CzB,QAAQ,CAAC,IAAAsB,6BAAW,EAACI,aAAa,EAAEL,OAAO,CAAC,CAAC;MAC/C;IACF;EACF,CAAC;AACH,CAAC;AAACM,OAAA,CAAA5B,SAAA,GAAAA,SAAA","ignoreList":[]}
+{"version":3,"file":"useModels.js","names":["_reselect","require","_reactRedux","_ModularUIActions","_Constants","useModels","dispatch","useDispatch","selectModularUI","state","modularui","selector","createSelector","models","keys","_keys","default","key","model","status","MODULARUI_STATUS","FINISHED","push","modularuiModels","useSelector","reload","options","reloadModel","reloadWithFilter","callbackFn","modelsToReload","_filter","call","modelToReload","exports"],"sources":["../../src/hooks/useModels.js"],"sourcesContent":["// @flow\nimport { createSelector } from \"reselect\";\nimport { useSelector, useDispatch } from \"react-redux\";\n\nimport { reloadModel } from \"../redux/_modularui/ModularUIActions\";\nimport { MODULARUI_STATUS } from \"../constants/Constants\";\n\nimport type { ModularUIModel } from \"../models/types\";\nimport type { ReduxState, ModelEntry } from \"../redux\";\n\ntype ReloadCallback = (model: ModularUIModel) => boolean;\n\ntype UseModels = () => {\n  reload: (model: ModularUIModel, options?: any) => void,\n  reloadWithFilter: (callbackFn: ReloadCallback, options?: any) => void,\n};\n\n/**\n * Hook that contains the reload property that can be used to reload a model\n */\nexport const useModels: UseModels = () => {\n  const dispatch = useDispatch();\n\n  const selectModularUI = (state: ReduxState) => state.modularui;\n  const selector = createSelector([selectModularUI], (modularui) => {\n    const models = [];\n    const keys = Object.keys(modularui);\n    for (const key of keys) {\n      const model: ModelEntry = modularui[key];\n      if (model?.status === MODULARUI_STATUS.FINISHED) {\n        models.push(model.model);\n      }\n    }\n    return models;\n  });\n\n  const modularuiModels = useSelector(selector);\n\n  return {\n    reload: (model: ModularUIModel, options?: Object) => {\n      dispatch(reloadModel(model, options));\n    },\n    reloadWithFilter: (callbackFn: ReloadCallback, options?: Object) => {\n      const modelsToReload = modularuiModels.filter(callbackFn);\n      for (const modelToReload of modelsToReload) {\n        dispatch(reloadModel(modelToReload, options));\n      }\n    },\n  };\n};\n"],"mappings":";;;;;;;;;AACA,IAAAA,SAAA,GAAAC,OAAA;AACA,IAAAC,WAAA,GAAAD,OAAA;AAEA,IAAAE,iBAAA,GAAAF,OAAA;AACA,IAAAG,UAAA,GAAAH,OAAA;AAYA;AACA;AACA;AACO,MAAMI,SAAoB,GAAGA,CAAA,KAAM;EACxC,MAAMC,QAAQ,GAAG,IAAAC,uBAAW,EAAC,CAAC;EAE9B,MAAMC,eAAe,GAAIC,KAAiB,IAAKA,KAAK,CAACC,SAAS;EAC9D,MAAMC,QAAQ,GAAG,IAAAC,wBAAc,EAAC,CAACJ,eAAe,CAAC,EAAGE,SAAS,IAAK;IAChE,MAAMG,MAAM,GAAG,EAAE;IACjB,MAAMC,IAAI,GAAG,IAAAC,KAAA,CAAAC,OAAA,EAAYN,SAAS,CAAC;IACnC,KAAK,MAAMO,GAAG,IAAIH,IAAI,EAAE;MACtB,MAAMI,KAAiB,GAAGR,SAAS,CAACO,GAAG,CAAC;MACxC,IAAIC,KAAK,EAAEC,MAAM,KAAKC,2BAAgB,CAACC,QAAQ,EAAE;QAC/CR,MAAM,CAACS,IAAI,CAACJ,KAAK,CAACA,KAAK,CAAC;MAC1B;IACF;IACA,OAAOL,MAAM;EACf,CAAC,CAAC;EAEF,MAAMU,eAAe,GAAG,IAAAC,uBAAW,EAACb,QAAQ,CAAC;EAE7C,OAAO;IACLc,MAAM,EAAEA,CAACP,KAAqB,EAAEQ,OAAgB,KAAK;MACnDpB,QAAQ,CAAC,IAAAqB,6BAAW,EAACT,KAAK,EAAEQ,OAAO,CAAC,CAAC;IACvC,CAAC;IACDE,gBAAgB,EAAEA,CAACC,UAA0B,EAAEH,OAAgB,KAAK;MAClE,MAAMI,cAAc,GAAG,IAAAC,OAAA,CAAAf,OAAA,EAAAO,eAAe,EAAAS,IAAA,CAAfT,eAAe,EAAQM,UAAU,CAAC;MACzD,KAAK,MAAMI,aAAa,IAAIH,cAAc,EAAE;QAC1CxB,QAAQ,CAAC,IAAAqB,6BAAW,EAACM,aAAa,EAAEP,OAAO,CAAC,CAAC;MAC/C;IACF;EACF,CAAC;AACH,CAAC;AAACQ,OAAA,CAAA7B,SAAA,GAAAA,SAAA","ignoreList":[]}

package/lib/models/content/ContentLinkModel.js

@@ -98,17 +98,16 @@ class ContentLinkModel extends _BaseModel.default {
    */
   createEncodedHref() {
     const startURI = "/content/";
-    const selfhref = this.data._links.self.href;
+    const selfHref = new _Href.default(this.data._links.self.href);
+    const href = selfHref.path;
     const section = this.data.section;
-    const sourceId = section ? selfhref.substring(startURI.length, selfhref.lastIndexOf("/")) : selfhref.substring(startURI.length, selfhref.lastIndexOf("#"));
-    let hash = "";
-    if (selfhref.hash) {
-      hash = `#${selfhref.hash}`;
-    }
+    const sourceId = section ? href.substring(startURI.length, href.lastIndexOf("/")) : href.substring(startURI.length);
     if (section) {
-      return new _Href.default(`${startURI}${encodeURIComponent(sourceId)}/${encodeURIComponent(section)}${hash}`);
+      selfHref.path = `${startURI}${encodeURIComponent(sourceId)}/${encodeURIComponent(section)}`;
+    } else {
+      selfHref.path = `${startURI}${encodeURIComponent(sourceId)}`;
     }
-    return new _Href.default(`${startURI}${encodeURIComponent(sourceId)}${hash}`);
+    return selfHref;
   }
 
   /**

package/lib/models/content/ContentLinkModel.js.flow

@@ -103,25 +103,21 @@ export default class ContentLinkModel
    */
   createEncodedHref(): Href {
     const startURI = "/content/";
-    const selfhref = this.data._links.self.href;
+    const selfHref = new Href(this.data._links.self.href);
+    const href = selfHref.path;
 
     const section = this.data.section;
     const sourceId = section
-      ? selfhref.substring(startURI.length, selfhref.lastIndexOf("/"))
-      : selfhref.substring(startURI.length, selfhref.lastIndexOf("#"));
-
-    let hash = "";
-    if (selfhref.hash) {
-      hash = `#${selfhref.hash}`;
-    }
+      ? href.substring(startURI.length, href.lastIndexOf("/"))
+      : href.substring(startURI.length);
 
     if (section) {
-      return new Href(
-        `${startURI}${encodeURIComponent(sourceId)}/${encodeURIComponent(section)}${hash}`,
-      );
+      selfHref.path = `${startURI}${encodeURIComponent(sourceId)}/${encodeURIComponent(section)}`;
+    } else {
+      selfHref.path = `${startURI}${encodeURIComponent(sourceId)}`;
     }
 
-    return new Href(`${startURI}${encodeURIComponent(sourceId)}${hash}`);
+    return selfHref;
   }
 
   /**

package/lib/models/content/ContentLinkModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"ContentLinkModel.js","names":["_BaseModel","_interopRequireDefault","require","_Href","_LinkModel","_ContentTypeModel","_Constants","_LinkCollection","ContentLinkModel","BaseModel","constructor","data","entryDate","arguments","length","undefined","_defineProperty2","default","_entryDate","getInitialChildModelLinks","contentTypeLink","isCacheable","setChildModels","models","href","contentTypeModel","_find","call","model","selfhref","equalsWithParameters","type","contentType","_contentType","ContentTypeModel","key","getData","label","sourceLabel","createEncodedHref","startURI","_links","self","section","sourceId","substring","lastIndexOf","hash","Href","encodeURIComponent","encodedHref","addParameter","TIMEVERSION_FILTER_NAME","links","LinkCollection","Array","isArray","selflink","getLinkByKey","Error","subSectionID","contentTypeHref","items","_items","exports"],"sources":["../../../src/models/content/ContentLinkModel.js"],"sourcesContent":["// @flow\nimport BaseModel from \"../base/BaseModel\";\nimport Href from \"../href/Href\";\nimport LinkModel from \"../links/LinkModel\";\nimport ContentTypeModel from \"./ContentTypeModel\";\nimport { TIMEVERSION_FILTER_NAME } from \"../../constants/Constants\";\n\nimport LinkCollection from \"../links/LinkCollection\";\n\nimport type { ModularUIModel, IModelWithChildModels } from \"../types\";\n\n/**\n * Link to a concept\n */\nexport default class ContentLinkModel\n  extends BaseModel\n  implements IModelWithChildModels\n{\n  _links: ?LinkCollection;\n  _entryDate: ?ISO_DATE;\n  _contentType: ContentTypeModel | null = null;\n  _items: Array<ContentLinkModel>;\n\n  /**\n   */\n  constructor(data: Object, entryDate: ?ISO_DATE = null) {\n    super(data, {});\n\n    this._entryDate = entryDate;\n  }\n\n  /**\n   */\n  // $FlowFixMe[method-unbinding]\n  getInitialChildModelLinks(): Array<LinkModel> {\n    if (this.contentTypeLink) {\n      this.contentTypeLink.isCacheable = true;\n      return [this.contentTypeLink];\n    }\n\n    return [];\n  }\n\n  /**\n   */\n  // $FlowFixMe[method-unbinding]\n  setChildModels(models: Array<ModularUIModel>) {\n    if (this.contentTypeLink) {\n      const href = this.contentTypeLink.href;\n      const contentTypeModel = models.find((model) =>\n        model.selfhref.equalsWithParameters(href),\n      );\n\n      if (contentTypeModel?.type === \"ContentType\") {\n        this.contentType = contentTypeModel;\n      }\n    }\n  }\n\n  /**\n   * Retrieve content type\n   */\n  get contentType(): ?ContentTypeModel | null {\n    return this._contentType;\n  }\n\n  /**\n   * Set concept type\n   */\n  set contentType(contentType: ?ModularUIModel) {\n    this._contentType =\n      contentType instanceof ContentTypeModel ? contentType : null;\n  }\n\n  /**\n   */\n  set entryDate(entryDate: ISO_DATE) {\n    this._entryDate = entryDate;\n  }\n\n  /**\n   * Retrieve key\n   */\n  get key(): string {\n    return this.getData(\"_id\", \"\");\n  }\n\n  /**\n   * Retrieve label\n   */\n  get label(): string {\n    return this.getData(\"label\", \"\");\n  }\n\n  /**\n   * Retrieve the label of the source a link to a section belongs to\n   */\n  get sourceLabel(): string | null {\n    return this.getData(\"sourceLabel\");\n  }\n\n  /**\n   */\n  createEncodedHref(): Href {\n    const startURI = \"/content/\";\n    const selfhref = this.data._links.self.href;\n\n    const section = this.data.section;\n    const sourceId = section\n      ? selfhref.substring(startURI.length, selfhref.lastIndexOf(\"/\"))\n      : selfhref.substring(startURI.length, selfhref.lastIndexOf(\"#\"));\n\n    let hash = \"\";\n    if (selfhref.hash) {\n      hash = `#${selfhref.hash}`;\n    }\n\n    if (section) {\n      return new Href(\n        `${startURI}${encodeURIComponent(sourceId)}/${encodeURIComponent(section)}${hash}`,\n      );\n    }\n\n    return new Href(`${startURI}${encodeURIComponent(sourceId)}${hash}`);\n  }\n\n  /**\n   * Encode the content-identifier of the path to the content resource.\n   * This makes it a single uri part, which can be used on routes to make nested routes\n   */\n  get encodedHref(): Href {\n    const href = this.createEncodedHref();\n\n    if (this._entryDate !== null) {\n      return href.addParameter(TIMEVERSION_FILTER_NAME, this._entryDate);\n    }\n\n    return href;\n  }\n\n  /**\n   * Getting the links of the resource\n   */\n  get links(): LinkCollection {\n    if (!this._links) {\n      this._links = new LinkCollection(\n        Array.isArray(this.data._links)\n          ? this.data._links[0]\n          : this.data._links,\n      );\n    }\n\n    return this._links;\n  }\n\n  /**\n   * Get self link of model\n   */\n  get selflink(): LinkModel {\n    const selflink = this.links.getLinkByKey(\"self\");\n\n    if (selflink === null) {\n      throw new Error(\n        `Could not find self link for ${\n          this.key === null ? \"unknown\" : this.key\n        }`,\n      );\n    }\n\n    return selflink;\n  }\n\n  /**\n   * Self href of concept\n   */\n  get selfhref(): Href {\n    if (this._entryDate !== null) {\n      return this.selflink.href.addParameter(\n        TIMEVERSION_FILTER_NAME,\n        this._entryDate,\n      );\n    }\n\n    return this.selflink.href;\n  }\n\n  /**\n   */\n  get subSectionID(): string {\n    return this.selfhref.hash;\n  }\n\n  /**\n   */\n  get contentTypeLink(): LinkModel | null {\n    return this.links.getLinkByKey(\"contenttype\");\n  }\n\n  /**\n   * Concept type href of concept\n   */\n  get contentTypeHref(): Href | null {\n    if (this.contentTypeLink) {\n      return this.contentTypeLink.href;\n    }\n\n    return null;\n  }\n\n  /**\n   * Children of link model in TOC\n   */\n  set items(items: Array<ContentLinkModel>) {\n    this._items = items;\n  }\n\n  /**\n   */\n  get items(): Array<ContentLinkModel> {\n    return this._items;\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ContentLinkModel.js","names":["_BaseModel","_interopRequireDefault","require","_Href","_LinkModel","_ContentTypeModel","_Constants","_LinkCollection","ContentLinkModel","BaseModel","constructor","data","entryDate","arguments","length","undefined","_defineProperty2","default","_entryDate","getInitialChildModelLinks","contentTypeLink","isCacheable","setChildModels","models","href","contentTypeModel","_find","call","model","selfhref","equalsWithParameters","type","contentType","_contentType","ContentTypeModel","key","getData","label","sourceLabel","createEncodedHref","startURI","selfHref","Href","_links","self","path","section","sourceId","substring","lastIndexOf","encodeURIComponent","encodedHref","addParameter","TIMEVERSION_FILTER_NAME","links","LinkCollection","Array","isArray","selflink","getLinkByKey","Error","subSectionID","hash","contentTypeHref","items","_items","exports"],"sources":["../../../src/models/content/ContentLinkModel.js"],"sourcesContent":["// @flow\nimport BaseModel from \"../base/BaseModel\";\nimport Href from \"../href/Href\";\nimport LinkModel from \"../links/LinkModel\";\nimport ContentTypeModel from \"./ContentTypeModel\";\nimport { TIMEVERSION_FILTER_NAME } from \"../../constants/Constants\";\n\nimport LinkCollection from \"../links/LinkCollection\";\n\nimport type { ModularUIModel, IModelWithChildModels } from \"../types\";\n\n/**\n * Link to a concept\n */\nexport default class ContentLinkModel\n  extends BaseModel\n  implements IModelWithChildModels\n{\n  _links: ?LinkCollection;\n  _entryDate: ?ISO_DATE;\n  _contentType: ContentTypeModel | null = null;\n  _items: Array<ContentLinkModel>;\n\n  /**\n   */\n  constructor(data: Object, entryDate: ?ISO_DATE = null) {\n    super(data, {});\n\n    this._entryDate = entryDate;\n  }\n\n  /**\n   */\n  // $FlowFixMe[method-unbinding]\n  getInitialChildModelLinks(): Array<LinkModel> {\n    if (this.contentTypeLink) {\n      this.contentTypeLink.isCacheable = true;\n      return [this.contentTypeLink];\n    }\n\n    return [];\n  }\n\n  /**\n   */\n  // $FlowFixMe[method-unbinding]\n  setChildModels(models: Array<ModularUIModel>) {\n    if (this.contentTypeLink) {\n      const href = this.contentTypeLink.href;\n      const contentTypeModel = models.find((model) =>\n        model.selfhref.equalsWithParameters(href),\n      );\n\n      if (contentTypeModel?.type === \"ContentType\") {\n        this.contentType = contentTypeModel;\n      }\n    }\n  }\n\n  /**\n   * Retrieve content type\n   */\n  get contentType(): ?ContentTypeModel | null {\n    return this._contentType;\n  }\n\n  /**\n   * Set concept type\n   */\n  set contentType(contentType: ?ModularUIModel) {\n    this._contentType =\n      contentType instanceof ContentTypeModel ? contentType : null;\n  }\n\n  /**\n   */\n  set entryDate(entryDate: ISO_DATE) {\n    this._entryDate = entryDate;\n  }\n\n  /**\n   * Retrieve key\n   */\n  get key(): string {\n    return this.getData(\"_id\", \"\");\n  }\n\n  /**\n   * Retrieve label\n   */\n  get label(): string {\n    return this.getData(\"label\", \"\");\n  }\n\n  /**\n   * Retrieve the label of the source a link to a section belongs to\n   */\n  get sourceLabel(): string | null {\n    return this.getData(\"sourceLabel\");\n  }\n\n  /**\n   */\n  createEncodedHref(): Href {\n    const startURI = \"/content/\";\n    const selfHref = new Href(this.data._links.self.href);\n    const href = selfHref.path;\n\n    const section = this.data.section;\n    const sourceId = section\n      ? href.substring(startURI.length, href.lastIndexOf(\"/\"))\n      : href.substring(startURI.length);\n\n    if (section) {\n      selfHref.path = `${startURI}${encodeURIComponent(sourceId)}/${encodeURIComponent(section)}`;\n    } else {\n      selfHref.path = `${startURI}${encodeURIComponent(sourceId)}`;\n    }\n\n    return selfHref;\n  }\n\n  /**\n   * Encode the content-identifier of the path to the content resource.\n   * This makes it a single uri part, which can be used on routes to make nested routes\n   */\n  get encodedHref(): Href {\n    const href = this.createEncodedHref();\n\n    if (this._entryDate !== null) {\n      return href.addParameter(TIMEVERSION_FILTER_NAME, this._entryDate);\n    }\n\n    return href;\n  }\n\n  /**\n   * Getting the links of the resource\n   */\n  get links(): LinkCollection {\n    if (!this._links) {\n      this._links = new LinkCollection(\n        Array.isArray(this.data._links)\n          ? this.data._links[0]\n          : this.data._links,\n      );\n    }\n\n    return this._links;\n  }\n\n  /**\n   * Get self link of model\n   */\n  get selflink(): LinkModel {\n    const selflink = this.links.getLinkByKey(\"self\");\n\n    if (selflink === null) {\n      throw new Error(\n        `Could not find self link for ${\n          this.key === null ? \"unknown\" : this.key\n        }`,\n      );\n    }\n\n    return selflink;\n  }\n\n  /**\n   * Self href of concept\n   */\n  get selfhref(): Href {\n    if (this._entryDate !== null) {\n      return this.selflink.href.addParameter(\n        TIMEVERSION_FILTER_NAME,\n        this._entryDate,\n      );\n    }\n\n    return this.selflink.href;\n  }\n\n  /**\n   */\n  get subSectionID(): string {\n    return this.selfhref.hash;\n  }\n\n  /**\n   */\n  get contentTypeLink(): LinkModel | null {\n    return this.links.getLinkByKey(\"contenttype\");\n  }\n\n  /**\n   * Concept type href of concept\n   */\n  get contentTypeHref(): Href | null {\n    if (this.contentTypeLink) {\n      return this.contentTypeLink.href;\n    }\n\n    return null;\n  }\n\n  /**\n   * Children of link model in TOC\n   */\n  set items(items: Array<ContentLinkModel>) {\n    this._items = items;\n  }\n\n  /**\n   */\n  get items(): Array<ContentLinkModel> {\n    return this._items;\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/models/content/__tests__/ContentIndexModel.spec.js.flow

@@ -0,0 +1,37 @@
+import ContentIndexModel from "../ContentIndexModel";
+
+import data from "./content-index.json";
+import contributions from "./content-index-contributions.json";
+import ModularUIResponse from "../../../modularui/ModularUIResponse";
+import ContentLinkModel from "../ContentLinkModel";
+
+describe("content index model", () => {
+  it("should be able to create an empty ContentIndexModel object", () => {
+    const model = new ContentIndexModel();
+
+    expect(model).toBeInstanceOf(ContentIndexModel);
+    expect(model.type).toBe("ContentIndex");
+  });
+
+  it("can handle a search result", () => {
+    const response = ModularUIResponse.create({
+      key: "contentindexmodel",
+      data,
+      contributions,
+    });
+
+    expect(ContentIndexModel.isApplicableModel(response)).toBe(true);
+
+    const contentIndexModel = new ContentIndexModel(response);
+    expect(contentIndexModel.label).toBe("content");
+
+    expect(contentIndexModel.items).toHaveLength(1);
+
+    const firstLink = contentIndexModel.items.first;
+    expect(firstLink).toBeInstanceOf(ContentLinkModel);
+
+    expect(firstLink.encodedHref.toString()).toBe(
+      "/content/Content%2FSources%2FFormal%2FAnother%2520formal%2520content.formalsource",
+    );
+  });
+});

package/lib/models/content/__tests__/ContentLinkModel.spec.js.flow

@@ -0,0 +1,81 @@
+import ContentLinkModel from "../ContentLinkModel";
+
+describe("content link model", () => {
+  it("should be able to create an empty ContentLinkModel object", () => {
+    const contentLinkModel = new ContentLinkModel();
+
+    expect(contentLinkModel).toBeInstanceOf(ContentLinkModel);
+  });
+
+  it("can handle href to source", () => {
+    const contentLinkModel = new ContentLinkModel({
+      _id: "/Content/Sources/Formal/Another formal content.formalsource",
+      label: "Another formal content",
+      _links: {
+        self: {
+          href: "/content/Content/Sources/Formal/Another%20formal%20content.formalsource",
+          name: "self",
+        },
+        contenttype: {
+          href: "/contenttypes/Content/Source%20types/Content%20type%20definitions.bixml/Policy",
+          name: "contenttype",
+        },
+      },
+    });
+
+    expect(contentLinkModel).toBeInstanceOf(ContentLinkModel);
+    expect(contentLinkModel.selfhref.toString()).toBe(
+      "/content/Content/Sources/Formal/Another%20formal%20content.formalsource",
+    );
+    expect(contentLinkModel.encodedHref.toString()).toBe(
+      "/content/Content%2FSources%2FFormal%2FAnother%2520formal%2520content.formalsource",
+    );
+  });
+
+  it("can handle href to source section", () => {
+    const contentLinkModel = new ContentLinkModel({
+      _links: {
+        self: {
+          href: "/content/Content/Sources/Formal/Another%20formal%20content.formalsource/section-id.%3A-",
+        },
+      },
+      _id: "section-id.:-",
+      label: "Another formal content Section",
+      section: "section-id.:-",
+    });
+
+    expect(contentLinkModel).toBeInstanceOf(ContentLinkModel);
+    expect(contentLinkModel.selfhref.toString()).toBe(
+      "/content/Content/Sources/Formal/Another%20formal%20content.formalsource/section-id.%3A-",
+    );
+    expect(contentLinkModel.encodedHref.toString()).toBe(
+      "/content/Content%2FSources%2FFormal%2FAnother%2520formal%2520content.formalsource/section-id.%3A-",
+    );
+  });
+
+  it("can handle href to source with hash", () => {
+    const contentLinkModel = new ContentLinkModel({
+      _id: "/Content/Sources/Formal/Another formal content.formalsource#hashid",
+      label: "Another formal content",
+      _links: {
+        self: {
+          href: "/content/Content/Sources/Formal/Another%20formal%20content.formalsource#hashid",
+          name: "self",
+        },
+        contenttype: {
+          href: "/contenttypes/Content/Source%20types/Content%20type%20definitions.bixml/Policy",
+          name: "contenttype",
+        },
+      },
+    });
+
+    expect(contentLinkModel).toBeInstanceOf(ContentLinkModel);
+
+    expect(contentLinkModel.selfhref.toString()).toBe(
+      "/content/Content/Sources/Formal/Another%20formal%20content.formalsource",
+    );
+    expect(contentLinkModel.encodedHref.toString()).toBe(
+      "/content/Content%2FSources%2FFormal%2FAnother%2520formal%2520content.formalsource",
+    );
+  });
+});

package/lib/react-theme/__tests__/ThemeProvider.spec.js.flow

@@ -5,6 +5,10 @@ import { getContrastYIQ } from "../utils/contrast";
 describe("themeProvider", () => {
   it("tests configuration as found in ThemeProvider.js, with stored theme", () => {
     const DefaultTheme = {
+      settings: {
+        SettingA: "ValueA",
+        SettingOVerride: "DefaultValue",
+      },
       PRIMARY_ACCENT_COLOR: "#0d3256",
       APPLICATION_LABEL_COLOR: "$PRIMARY_ACCENT_COLOR",
       PRIMARY_COLOR: "#0000ff",
@@ -18,6 +22,10 @@ describe("themeProvider", () => {
     });
 
     const CustomThemeFromRepo = {
+      settings: {
+        SettingB: "ValueB",
+        SettingOVerride: "CustomValue",
+      },
       BRAND_COLOR: "green",
       APPLICATION_LABEL_COLOR: "$BRAND_COLOR",
       PRIMARY_COLOR: "red",
@@ -29,7 +37,11 @@ describe("themeProvider", () => {
     ]);
 
     expect(theme).toStrictEqual({
-      settings: {},
+      settings: {
+        SettingA: "ValueA",
+        SettingB: "ValueB",
+        SettingOVerride: "CustomValue",
+      },
       APPLICATION_LABEL_COLOR: "green",
       BRAND_COLOR: "green",
       BUTTON_BG: "#fff",
@@ -42,6 +54,9 @@ describe("themeProvider", () => {
 
   it("tests configuration as found in ThemeProvider.js, without stored theme", () => {
     const DefaultTheme = {
+      settings: {
+        SettingA: "ValueA",
+      },
       PRIMARY_ACCENT_COLOR: "#0d3256",
       APPLICATION_LABEL_COLOR: "$PRIMARY_ACCENT_COLOR",
       PRIMARY_COLOR: "#0000ff",
@@ -57,7 +72,7 @@ describe("themeProvider", () => {
     const theme = createTheme(void 0, [DefaultTheme, createDefaultTheme]);
 
     expect(theme).toStrictEqual({
-      settings: {},
+      settings: { SettingA: "ValueA" },
       APPLICATION_LABEL_COLOR: "#0d3256",
       BUTTON_BG: "#fff",
       BUTTON_COLOR: "#0000ff",

package/lib/react-theme/createTheme.js

@@ -26,6 +26,7 @@ const replacePlaceholders = inputTheme => {
   return inputTheme;
 };
 const generateTheme = function (storedTheme) {
+  const storedSettings = storedTheme?.settings ?? {};
   let generatedTheme = {
     settings: {}
   };
@@ -36,12 +37,20 @@ const generateTheme = function (storedTheme) {
     if (typeof element === "function") {
       generatedTheme = element(replacePlaceholders(generatedTheme));
     } else if ((0, _objects.isPlainObject)(element)) {
+      const generatedSettings = generatedTheme.settings;
       // $FlowFixMe[cannot-spread-indexer]
       generatedTheme = {
         ...generatedTheme,
         ...element,
         ...storedTheme
       };
+      if ("settings" in element) {
+        generatedTheme.settings = {
+          ...generatedSettings,
+          ...element.settings,
+          ...storedSettings
+        };
+      }
     }
   }
 

package/lib/react-theme/createTheme.js.flow

@@ -27,13 +27,23 @@ const replacePlaceholders = (inputTheme: Theme) => {
 };
 
 const generateTheme = (storedTheme: Theme, ...themeElements: Array<Theme>) => {
+  const storedSettings = storedTheme?.settings ?? {};
+
   let generatedTheme = { settings: {} };
   for (const element of themeElements) {
     if (typeof element === "function") {
       generatedTheme = element(replacePlaceholders(generatedTheme));
     } else if (isPlainObject(element)) {
+      const generatedSettings = generatedTheme.settings;
       // $FlowFixMe[cannot-spread-indexer]
       generatedTheme = { ...generatedTheme, ...element, ...storedTheme };
+      if ("settings" in element) {
+        generatedTheme.settings = {
+          ...generatedSettings,
+          ...element.settings,
+          ...storedSettings,
+        };
+      }
     }
   }
 

package/lib/react-theme/createTheme.js.map

@@ -1 +1 @@
-{"version":3,"file":"createTheme.js","names":["_flattenDeep","_interopRequireDefault","require","_objects","_Settings","replacePlaceholders","inputTheme","_context","possibleKeys","_map","default","_keys","call","key","join","re","RegExp","_entries","forEach","_ref","value","replace","match","capture","generateTheme","storedTheme","generatedTheme","settings","_len","arguments","length","themeElements","Array","_key","element","isPlainObject","createTheme","_len2","themeConfigs","_key2","customTheme","flattenDeep","setSettings","_default","exports"],"sources":["../../src/react-theme/createTheme.js"],"sourcesContent":["// @flow\nimport flattenDeep from \"lodash/flattenDeep\";\n\nimport { isPlainObject } from \"../utils/helpers/objects\";\n\nimport { setSettings } from \"../constants/Settings\";\n\nimport type { Theme } from \"./types\";\n\nconst replacePlaceholders = (inputTheme: Theme) => {\n  const possibleKeys = Object.keys(inputTheme)\n    .map((key) => `\\\\b${key}\\\\b`)\n    .join(\"|\");\n\n  const re = new RegExp(`\\\\$(${possibleKeys})`, \"g\");\n  Object.entries(inputTheme).forEach(([key, value]) => {\n    if (key !== \"settings\" && typeof value === \"string\") {\n      inputTheme[key] = value.replace(\n        re,\n        // $FlowIssue[incompatible-call]\n        (match, capture) => inputTheme[capture],\n      );\n    }\n  });\n\n  return inputTheme;\n};\n\nconst generateTheme = (storedTheme: Theme, ...themeElements: Array<Theme>) => {\n  let generatedTheme = { settings: {} };\n  for (const element of themeElements) {\n    if (typeof element === \"function\") {\n      generatedTheme = element(replacePlaceholders(generatedTheme));\n    } else if (isPlainObject(element)) {\n      // $FlowFixMe[cannot-spread-indexer]\n      generatedTheme = { ...generatedTheme, ...element, ...storedTheme };\n    }\n  }\n\n  // final - replace any assignments inside the theme\n  return replacePlaceholders(generatedTheme);\n};\n\n/**\n * Create a theme from multiple theme configuration objects.\n * Properties are overwriten by iterating the configuration objects from left to right.\n *\n * The first argument represents a stored theme part, this is optional. The stored theme part will overwrite every part in the collection of theme parts.\n * Thus a stored configuration is leading as it can be configured by a modeller through the repository.\n *\n * Placeholders can be used, they are replaced before calling a function theme part or at the end of the theme creation.\n *\n * Both objects and function can be used, where a function receives the previous objects as input arguments.\n * For example using the method createTheme(ThemeObject, ThemeObject2, ThemeFunction, ThemeFunction2), will be handled as:\n *\n * ThemeFunction2(ThemeFunction1({ ...ThemeObject, ...ThemeObject2 }))\n *\n * @example\n * Example where the primary color of the default theme is overwritten with a primary color of the custom theme,\n * but the button bg still uses the yiq function of the default theme:\n *\n * const DefaultTheme = {\n *   PRIMARY_COLOR: \"#0000ff\",\n *   SECONDARY_COLOR: \"#00ff00\",\n *   BUTTON_COLOR: \"$PRIMARY_COLOR\"\n * }\n *\n * const createDefaultTheme = (input) => ({\n *   ...input,\n *   BUTTON_BG: getContrastYIQ(input.BUTTON_COLOR)\n * })\n *\n * const CustomTheme = {\n *   PRIMARY_COLOR: \"#ff0000\"\n * }\n *\n * createTheme(null, DefaultTheme, CustomTheme, createDefaultTheme);\n *\n * // Result:\n * {\n *   PRIMARY_COLOR: \"#ff0000\",\n *   BUTTON_COLOR: \"#ff0000\",\n *   BUTTON_BG: \"#fff\",\n *   SECONDARY_COLOR: \"#00ff00\",\n * }\n */\nconst createTheme = (\n  storedTheme: Theme,\n  ...themeConfigs: Array<Theme | Array<Theme> | void>\n):\n  | any\n  | {}\n  | {\n      INPUT_FOCUS_BORDER_COLOR?: string,\n      LINK_HOVER_COLOR?: string,\n      PAGING_HOVER_COLOR?: string,\n      settings?: { [settingName: string]: string },\n    } => {\n  const customTheme = generateTheme(storedTheme, ...flattenDeep(themeConfigs));\n\n  if (customTheme) {\n    setSettings(customTheme.settings);\n  }\n\n  return customTheme;\n};\n\nexport default createTheme;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"createTheme.js","names":["_flattenDeep","_interopRequireDefault","require","_objects","_Settings","replacePlaceholders","inputTheme","_context","possibleKeys","_map","default","_keys","call","key","join","re","RegExp","_entries","forEach","_ref","value","replace","match","capture","generateTheme","storedTheme","storedSettings","settings","generatedTheme","_len","arguments","length","themeElements","Array","_key","element","isPlainObject","generatedSettings","createTheme","_len2","themeConfigs","_key2","customTheme","flattenDeep","setSettings","_default","exports"],"sources":["../../src/react-theme/createTheme.js"],"sourcesContent":["// @flow\nimport flattenDeep from \"lodash/flattenDeep\";\n\nimport { isPlainObject } from \"../utils/helpers/objects\";\n\nimport { setSettings } from \"../constants/Settings\";\n\nimport type { Theme } from \"./types\";\n\nconst replacePlaceholders = (inputTheme: Theme) => {\n  const possibleKeys = Object.keys(inputTheme)\n    .map((key) => `\\\\b${key}\\\\b`)\n    .join(\"|\");\n\n  const re = new RegExp(`\\\\$(${possibleKeys})`, \"g\");\n  Object.entries(inputTheme).forEach(([key, value]) => {\n    if (key !== \"settings\" && typeof value === \"string\") {\n      inputTheme[key] = value.replace(\n        re,\n        // $FlowIssue[incompatible-call]\n        (match, capture) => inputTheme[capture],\n      );\n    }\n  });\n\n  return inputTheme;\n};\n\nconst generateTheme = (storedTheme: Theme, ...themeElements: Array<Theme>) => {\n  const storedSettings = storedTheme?.settings ?? {};\n\n  let generatedTheme = { settings: {} };\n  for (const element of themeElements) {\n    if (typeof element === \"function\") {\n      generatedTheme = element(replacePlaceholders(generatedTheme));\n    } else if (isPlainObject(element)) {\n      const generatedSettings = generatedTheme.settings;\n      // $FlowFixMe[cannot-spread-indexer]\n      generatedTheme = { ...generatedTheme, ...element, ...storedTheme };\n      if (\"settings\" in element) {\n        generatedTheme.settings = {\n          ...generatedSettings,\n          ...element.settings,\n          ...storedSettings,\n        };\n      }\n    }\n  }\n\n  // final - replace any assignments inside the theme\n  return replacePlaceholders(generatedTheme);\n};\n\n/**\n * Create a theme from multiple theme configuration objects.\n * Properties are overwriten by iterating the configuration objects from left to right.\n *\n * The first argument represents a stored theme part, this is optional. The stored theme part will overwrite every part in the collection of theme parts.\n * Thus a stored configuration is leading as it can be configured by a modeller through the repository.\n *\n * Placeholders can be used, they are replaced before calling a function theme part or at the end of the theme creation.\n *\n * Both objects and function can be used, where a function receives the previous objects as input arguments.\n * For example using the method createTheme(ThemeObject, ThemeObject2, ThemeFunction, ThemeFunction2), will be handled as:\n *\n * ThemeFunction2(ThemeFunction1({ ...ThemeObject, ...ThemeObject2 }))\n *\n * @example\n * Example where the primary color of the default theme is overwritten with a primary color of the custom theme,\n * but the button bg still uses the yiq function of the default theme:\n *\n * const DefaultTheme = {\n *   PRIMARY_COLOR: \"#0000ff\",\n *   SECONDARY_COLOR: \"#00ff00\",\n *   BUTTON_COLOR: \"$PRIMARY_COLOR\"\n * }\n *\n * const createDefaultTheme = (input) => ({\n *   ...input,\n *   BUTTON_BG: getContrastYIQ(input.BUTTON_COLOR)\n * })\n *\n * const CustomTheme = {\n *   PRIMARY_COLOR: \"#ff0000\"\n * }\n *\n * createTheme(null, DefaultTheme, CustomTheme, createDefaultTheme);\n *\n * // Result:\n * {\n *   PRIMARY_COLOR: \"#ff0000\",\n *   BUTTON_COLOR: \"#ff0000\",\n *   BUTTON_BG: \"#fff\",\n *   SECONDARY_COLOR: \"#00ff00\",\n * }\n */\nconst createTheme = (\n  storedTheme: Theme,\n  ...themeConfigs: Array<Theme | Array<Theme> | void>\n):\n  | any\n  | {}\n  | {\n      INPUT_FOCUS_BORDER_COLOR?: string,\n      LINK_HOVER_COLOR?: string,\n      PAGING_HOVER_COLOR?: string,\n      settings?: { [settingName: string]: string },\n    } => {\n  const customTheme = generateTheme(storedTheme, ...flattenDeep(themeConfigs));\n\n  if (customTheme) {\n    setSettings(customTheme.settings);\n  }\n\n  return customTheme;\n};\n\nexport default createTheme;\n"],"mappings":"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","ignoreList":[]}

package/package.json

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

package/src/hooks/useModels.js

@@ -6,7 +6,7 @@ import { reloadModel } from "../redux/_modularui/ModularUIActions";
 import { MODULARUI_STATUS } from "../constants/Constants";
 
 import type { ModularUIModel } from "../models/types";
-import type { ReduxState } from "../redux";
+import type { ReduxState, ModelEntry } from "../redux";
 
 type ReloadCallback = (model: ModularUIModel) => boolean;
 
@@ -22,11 +22,18 @@ export const useModels: UseModels = () => {
   const dispatch = useDispatch();
 
   const selectModularUI = (state: ReduxState) => state.modularui;
-  const selector = createSelector([selectModularUI], (modularui) =>
-    Object.values(modularui)
-      .filter((model) => model.status === MODULARUI_STATUS.FINISHED)
-      .map((model) => model.model),
-  );
+  const selector = createSelector([selectModularUI], (modularui) => {
+    const models = [];
+    const keys = Object.keys(modularui);
+    for (const key of keys) {
+      const model: ModelEntry = modularui[key];
+      if (model?.status === MODULARUI_STATUS.FINISHED) {
+        models.push(model.model);
+      }
+    }
+    return models;
+  });
+
   const modularuiModels = useSelector(selector);
 
   return {

package/src/models/content/ContentLinkModel.js

@@ -103,25 +103,21 @@ export default class ContentLinkModel
    */
   createEncodedHref(): Href {
     const startURI = "/content/";
-    const selfhref = this.data._links.self.href;
+    const selfHref = new Href(this.data._links.self.href);
+    const href = selfHref.path;
 
     const section = this.data.section;
     const sourceId = section
-      ? selfhref.substring(startURI.length, selfhref.lastIndexOf("/"))
-      : selfhref.substring(startURI.length, selfhref.lastIndexOf("#"));
-
-    let hash = "";
-    if (selfhref.hash) {
-      hash = `#${selfhref.hash}`;
-    }
+      ? href.substring(startURI.length, href.lastIndexOf("/"))
+      : href.substring(startURI.length);
 
     if (section) {
-      return new Href(
-        `${startURI}${encodeURIComponent(sourceId)}/${encodeURIComponent(section)}${hash}`,
-      );
+      selfHref.path = `${startURI}${encodeURIComponent(sourceId)}/${encodeURIComponent(section)}`;
+    } else {
+      selfHref.path = `${startURI}${encodeURIComponent(sourceId)}`;
     }
 
-    return new Href(`${startURI}${encodeURIComponent(sourceId)}${hash}`);
+    return selfHref;
   }
 
   /**

package/src/models/content/__tests__/ContentIndexModel.spec.js

@@ -0,0 +1,37 @@
+import ContentIndexModel from "../ContentIndexModel";
+
+import data from "./content-index.json";
+import contributions from "./content-index-contributions.json";
+import ModularUIResponse from "../../../modularui/ModularUIResponse";
+import ContentLinkModel from "../ContentLinkModel";
+
+describe("content index model", () => {
+  it("should be able to create an empty ContentIndexModel object", () => {
+    const model = new ContentIndexModel();
+
+    expect(model).toBeInstanceOf(ContentIndexModel);
+    expect(model.type).toBe("ContentIndex");
+  });
+
+  it("can handle a search result", () => {
+    const response = ModularUIResponse.create({
+      key: "contentindexmodel",
+      data,
+      contributions,
+    });
+
+    expect(ContentIndexModel.isApplicableModel(response)).toBe(true);
+
+    const contentIndexModel = new ContentIndexModel(response);
+    expect(contentIndexModel.label).toBe("content");
+
+    expect(contentIndexModel.items).toHaveLength(1);
+
+    const firstLink = contentIndexModel.items.first;
+    expect(firstLink).toBeInstanceOf(ContentLinkModel);
+
+    expect(firstLink.encodedHref.toString()).toBe(
+      "/content/Content%2FSources%2FFormal%2FAnother%2520formal%2520content.formalsource",
+    );
+  });
+});

package/src/models/content/__tests__/ContentLinkModel.spec.js

@@ -0,0 +1,81 @@
+import ContentLinkModel from "../ContentLinkModel";
+
+describe("content link model", () => {
+  it("should be able to create an empty ContentLinkModel object", () => {
+    const contentLinkModel = new ContentLinkModel();
+
+    expect(contentLinkModel).toBeInstanceOf(ContentLinkModel);
+  });
+
+  it("can handle href to source", () => {
+    const contentLinkModel = new ContentLinkModel({
+      _id: "/Content/Sources/Formal/Another formal content.formalsource",
+      label: "Another formal content",
+      _links: {
+        self: {
+          href: "/content/Content/Sources/Formal/Another%20formal%20content.formalsource",
+          name: "self",
+        },
+        contenttype: {
+          href: "/contenttypes/Content/Source%20types/Content%20type%20definitions.bixml/Policy",
+          name: "contenttype",
+        },
+      },
+    });
+
+    expect(contentLinkModel).toBeInstanceOf(ContentLinkModel);
+    expect(contentLinkModel.selfhref.toString()).toBe(
+      "/content/Content/Sources/Formal/Another%20formal%20content.formalsource",
+    );
+    expect(contentLinkModel.encodedHref.toString()).toBe(
+      "/content/Content%2FSources%2FFormal%2FAnother%2520formal%2520content.formalsource",
+    );
+  });
+
+  it("can handle href to source section", () => {
+    const contentLinkModel = new ContentLinkModel({
+      _links: {
+        self: {
+          href: "/content/Content/Sources/Formal/Another%20formal%20content.formalsource/section-id.%3A-",
+        },
+      },
+      _id: "section-id.:-",
+      label: "Another formal content Section",
+      section: "section-id.:-",
+    });
+
+    expect(contentLinkModel).toBeInstanceOf(ContentLinkModel);
+    expect(contentLinkModel.selfhref.toString()).toBe(
+      "/content/Content/Sources/Formal/Another%20formal%20content.formalsource/section-id.%3A-",
+    );
+    expect(contentLinkModel.encodedHref.toString()).toBe(
+      "/content/Content%2FSources%2FFormal%2FAnother%2520formal%2520content.formalsource/section-id.%3A-",
+    );
+  });
+
+  it("can handle href to source with hash", () => {
+    const contentLinkModel = new ContentLinkModel({
+      _id: "/Content/Sources/Formal/Another formal content.formalsource#hashid",
+      label: "Another formal content",
+      _links: {
+        self: {
+          href: "/content/Content/Sources/Formal/Another%20formal%20content.formalsource#hashid",
+          name: "self",
+        },
+        contenttype: {
+          href: "/contenttypes/Content/Source%20types/Content%20type%20definitions.bixml/Policy",
+          name: "contenttype",
+        },
+      },
+    });
+
+    expect(contentLinkModel).toBeInstanceOf(ContentLinkModel);
+
+    expect(contentLinkModel.selfhref.toString()).toBe(
+      "/content/Content/Sources/Formal/Another%20formal%20content.formalsource",
+    );
+    expect(contentLinkModel.encodedHref.toString()).toBe(
+      "/content/Content%2FSources%2FFormal%2FAnother%2520formal%2520content.formalsource",
+    );
+  });
+});

package/src/models/content/__tests__/content-index-contributions.json

@@ -0,0 +1,50 @@
+{
+  "content": {
+    "label": "content",
+    "resourcetype": "ContentSearch",
+    "filter": [
+      {
+        "index": {
+          "type": "choicefilter",
+          "label": "Index",
+          "layouthint": ["combobox"],
+          "multiplechoice": false,
+          "optionMode": "dynamic"
+        }
+      },
+      {
+        "label": {
+          "type": "stringfilter",
+          "label": "Label",
+          "multiplechoice": false
+        }
+      },
+      {
+        "type": {
+          "type": "choicefilter",
+          "label": "Type",
+          "layouthint": ["checkbox"],
+          "multiplechoice": true,
+          "optionMode": "dynamic"
+        }
+      }
+    ],
+    "results": {
+      "content": {
+        "metadata": {
+          "_id": {
+            "type": "string"
+          }
+        },
+        "attributes": [
+          {
+            "label": {
+              "type": "string",
+              "label": "content label"
+            }
+          }
+        ]
+      }
+    }
+  }
+}

package/src/models/content/__tests__/content-index.json

@@ -0,0 +1,163 @@
+{
+  "content": {
+    "_links": {
+      "self": {
+        "href": "/content"
+      },
+      "api_doc": {
+        "href": "/api-docs/v3/content"
+      },
+      "contributions": {
+        "href": "/contributions/content"
+      }
+    },
+    "dynamicschema": {
+      "index": [
+        {
+          "code": "A",
+          "label": "A"
+        },
+        {
+          "code": "B",
+          "label": "B"
+        },
+        {
+          "code": "C",
+          "label": "C"
+        },
+        {
+          "code": "L",
+          "label": "L"
+        },
+        {
+          "code": "N",
+          "label": "N"
+        },
+        {
+          "code": "R",
+          "label": "R"
+        },
+        {
+          "code": "S",
+          "label": "S"
+        },
+        {
+          "code": "T",
+          "label": "T"
+        },
+        {
+          "code": "U",
+          "label": "U"
+        },
+        {
+          "code": "X",
+          "label": "X"
+        }
+      ],
+      "type": [
+        {
+          "code": "/Content/Source types/Source type definitions.bixml/Law",
+          "label": "Law"
+        },
+        {
+          "code": "/Content/Source types/Content type definitions.bixml/Memo",
+          "label": "Memo"
+        },
+        {
+          "code": "/Content/Source types/Content type definitions.bixml/Policy",
+          "label": "Policy"
+        },
+        {
+          "code": "/Content/Source types/Content type definitions.bixml/Regulation",
+          "label": "Regulation"
+        },
+        {
+          "code": "untyped",
+          "label": "Untyped"
+        }
+      ]
+    },
+    "filter": {
+      "index": {
+        "param": "index",
+        "name": "index",
+        "options": [
+          {
+            "key": "A",
+            "selected": true
+          },
+          {
+            "key": "B"
+          },
+          {
+            "key": "C"
+          },
+          {
+            "key": "L"
+          },
+          {
+            "key": "N"
+          },
+          {
+            "key": "R"
+          },
+          {
+            "key": "S"
+          },
+          {
+            "key": "T"
+          },
+          {
+            "key": "U"
+          },
+          {
+            "key": "X"
+          }
+        ]
+      },
+      "label": {
+        "param": "label",
+        "name": "label"
+      },
+      "type": {
+        "param": "type",
+        "name": "type",
+        "options": [
+          {
+            "key": "/Content/Source types/Source type definitions.bixml/Law"
+          },
+          {
+            "key": "/Content/Source types/Content type definitions.bixml/Memo"
+          },
+          {
+            "key": "/Content/Source types/Content type definitions.bixml/Policy"
+          },
+          {
+            "key": "/Content/Source types/Content type definitions.bixml/Regulation"
+          },
+          {
+            "key": "untyped"
+          }
+        ]
+      }
+    },
+    "_embedded": {
+      "results": [
+        {
+          "content": {
+            "_id": "/Content/Sources/Formal/Another formal content.formalsource",
+            "label": "Another formal content",
+            "_links": {
+              "self": {
+                "href": "/content/Content/Sources/Formal/Another%20formal%20content.formalsource"
+              },
+              "contenttype": {
+                "href": "/contenttypes/Content/Source%20types/Content%20type%20definitions.bixml/Policy"
+              }
+            }
+          }
+        }
+      ]
+    }
+  }
+}

package/src/react-theme/__tests__/ThemeProvider.spec.js

@@ -5,6 +5,10 @@ import { getContrastYIQ } from "../utils/contrast";
 describe("themeProvider", () => {
   it("tests configuration as found in ThemeProvider.js, with stored theme", () => {
     const DefaultTheme = {
+      settings: {
+        SettingA: "ValueA",
+        SettingOVerride: "DefaultValue",
+      },
       PRIMARY_ACCENT_COLOR: "#0d3256",
       APPLICATION_LABEL_COLOR: "$PRIMARY_ACCENT_COLOR",
       PRIMARY_COLOR: "#0000ff",
@@ -18,6 +22,10 @@ describe("themeProvider", () => {
     });
 
     const CustomThemeFromRepo = {
+      settings: {
+        SettingB: "ValueB",
+        SettingOVerride: "CustomValue",
+      },
       BRAND_COLOR: "green",
       APPLICATION_LABEL_COLOR: "$BRAND_COLOR",
       PRIMARY_COLOR: "red",
@@ -29,7 +37,11 @@ describe("themeProvider", () => {
     ]);
 
     expect(theme).toStrictEqual({
-      settings: {},
+      settings: {
+        SettingA: "ValueA",
+        SettingB: "ValueB",
+        SettingOVerride: "CustomValue",
+      },
       APPLICATION_LABEL_COLOR: "green",
       BRAND_COLOR: "green",
       BUTTON_BG: "#fff",
@@ -42,6 +54,9 @@ describe("themeProvider", () => {
 
   it("tests configuration as found in ThemeProvider.js, without stored theme", () => {
     const DefaultTheme = {
+      settings: {
+        SettingA: "ValueA",
+      },
       PRIMARY_ACCENT_COLOR: "#0d3256",
       APPLICATION_LABEL_COLOR: "$PRIMARY_ACCENT_COLOR",
       PRIMARY_COLOR: "#0000ff",
@@ -57,7 +72,7 @@ describe("themeProvider", () => {
     const theme = createTheme(void 0, [DefaultTheme, createDefaultTheme]);
 
     expect(theme).toStrictEqual({
-      settings: {},
+      settings: { SettingA: "ValueA" },
       APPLICATION_LABEL_COLOR: "#0d3256",
       BUTTON_BG: "#fff",
       BUTTON_COLOR: "#0000ff",

package/src/react-theme/createTheme.js

@@ -27,13 +27,23 @@ const replacePlaceholders = (inputTheme: Theme) => {
 };
 
 const generateTheme = (storedTheme: Theme, ...themeElements: Array<Theme>) => {
+  const storedSettings = storedTheme?.settings ?? {};
+
   let generatedTheme = { settings: {} };
   for (const element of themeElements) {
     if (typeof element === "function") {
       generatedTheme = element(replacePlaceholders(generatedTheme));
     } else if (isPlainObject(element)) {
+      const generatedSettings = generatedTheme.settings;
       // $FlowFixMe[cannot-spread-indexer]
       generatedTheme = { ...generatedTheme, ...element, ...storedTheme };
+      if ("settings" in element) {
+        generatedTheme.settings = {
+          ...generatedSettings,
+          ...element.settings,
+          ...storedSettings,
+        };
+      }
     }
   }