@beinformed/ui 1.62.9 → 1.63.1

package/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 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.63.1](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.63.0...v1.63.1) (2025-07-04)
+
+
+### Bug Fixes
+
+* **server-request:** escape querystring ([d39da26](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/d39da267eb9dc695718001fead168350ad542cec))
+
+## [1.63.0](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.62.8...v1.63.0) (2025-07-02)
+
+
+### Features
+
+* **content:** handle rename of childSections to sections ([8ba3298](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/8ba329856ca539c2e24f77c91992134a293667e4))
+
+
+### Bug Fixes
+
+* **server-request:** escape deeplink ([07c24a7](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/07c24a727806e7cfe3b2fc154886e9187ca93759))
+
 ## [1.62.9](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.62.8...v1.62.9) (2025-06-30)
 
 

package/esm/models/attributes/__tests__/AttributeContent.spec.js.flow

@@ -55,7 +55,7 @@ const json = {
                 href: "/content/_Context/Police%20incident%20decisions/Content/Breath%20analysis/Breathalyzer%20test.formalsource/Alert.%3A-",
               },
             },
-            childSections: [
+            sections: [
               {
                 id: "pass",
                 label: "Pass",

package/esm/models/content/SectionModel.js

@@ -94,14 +94,19 @@ class SectionModel extends BaseModel {
    * Retrieve child section links
    */
   get childSectionLinks() {
-    var _context;
-    return this.data.childSections ? _mapInstanceProperty(_context = this.data.childSections).call(_context, childSection => new ContentLinkModel({
+    let sections = [];
+    if (this.data.childSections) {
+      sections = this.data.childSections;
+    } else if (this.data.sections) {
+      sections = this.data.sections;
+    }
+    return _mapInstanceProperty(sections).call(sections, childSection => new ContentLinkModel({
       section: childSection.id || childSection._id,
       _id: childSection.id || childSection._id,
       label: childSection.label,
       sourceLabel: childSection.sourceLabel,
       _links: childSection._links
-    }, this.entryDate, this.modelOptions)) : [];
+    }, this.entryDate, this.modelOptions));
   }
 
   /**
@@ -120,11 +125,17 @@ class SectionModel extends BaseModel {
    * Get tree of child sections
    */
   get childSections() {
-    if (!this._childSections && this.data.childSections) {
-      var _context2, _context3;
-      this._childSections = _mapInstanceProperty(_context2 = _filterInstanceProperty(_context3 = this.data.childSections).call(_context3, childSection => "body" in childSection)).call(_context2, childSection => new SectionModel(childSection, this.entryDate, this.modelOptions));
+    if (!this._childSections) {
+      var _context;
+      let sections = [];
+      if (this.data.childSections) {
+        sections = this.data.childSections;
+      } else if (this.data.sections) {
+        sections = this.data.sections;
+      }
+      this._childSections = _mapInstanceProperty(_context = _filterInstanceProperty(sections).call(sections, childSection => "body" in childSection)).call(_context, childSection => new SectionModel(childSection, this.entryDate, this.modelOptions));
     }
-    return this._childSections || [];
+    return this._childSections;
   }
 
   /**
@@ -138,8 +149,8 @@ class SectionModel extends BaseModel {
    */
   get sections() {
     if (this.data.sections) {
-      var _context4;
-      return _mapInstanceProperty(_context4 = this.data.sections).call(_context4, section => new SectionModel(section, this.entryDate, this.modelOptions));
+      var _context2;
+      return _mapInstanceProperty(_context2 = this.data.sections).call(_context2, section => new SectionModel(section, this.entryDate, this.modelOptions));
     }
     return [];
   }
@@ -147,8 +158,8 @@ class SectionModel extends BaseModel {
    * Get sub sections
    */
   get subSections() {
-    var _context5;
-    return this.data.subSections ? _mapInstanceProperty(_context5 = this.data.subSections).call(_context5, subSection => new SubSectionModel(subSection, this.entryDate, this.modelOptions)) : [];
+    var _context3;
+    return this.data.subSections ? _mapInstanceProperty(_context3 = this.data.subSections).call(_context3, subSection => new SubSectionModel(subSection, this.entryDate, this.modelOptions)) : [];
   }
 
   /**

package/esm/models/content/SectionModel.js.flow

@@ -108,22 +108,27 @@ class SectionModel extends BaseModel {
    * Retrieve child section links
    */
   get childSectionLinks(): Array<ContentLinkModel> {
-    return this.data.childSections
-      ? this.data.childSections.map(
-          (childSection) =>
-            new ContentLinkModel(
-              {
-                section: childSection.id || childSection._id,
-                _id: childSection.id || childSection._id,
-                label: childSection.label,
-                sourceLabel: childSection.sourceLabel,
-                _links: childSection._links,
-              },
-              this.entryDate,
-              this.modelOptions,
-            ),
-        )
-      : [];
+    let sections = [];
+    if (this.data.childSections) {
+      sections = this.data.childSections;
+    } else if (this.data.sections) {
+      sections = this.data.sections;
+    }
+
+    return sections.map(
+      (childSection) =>
+        new ContentLinkModel(
+          {
+            section: childSection.id || childSection._id,
+            _id: childSection.id || childSection._id,
+            label: childSection.label,
+            sourceLabel: childSection.sourceLabel,
+            _links: childSection._links,
+          },
+          this.entryDate,
+          this.modelOptions,
+        ),
+    );
   }
 
   /**
@@ -146,15 +151,23 @@ class SectionModel extends BaseModel {
    * Get tree of child sections
    */
   get childSections(): Array<SectionModel> {
-    if (!this._childSections && this.data.childSections) {
-      this._childSections = this.data.childSections
+    if (!this._childSections) {
+      let sections = [];
+      if (this.data.childSections) {
+        sections = this.data.childSections;
+      } else if (this.data.sections) {
+        sections = this.data.sections;
+      }
+
+      this._childSections = sections
         .filter((childSection) => "body" in childSection)
         .map(
           (childSection) =>
             new SectionModel(childSection, this.entryDate, this.modelOptions),
         );
     }
-    return this._childSections || [];
+
+    return this._childSections;
   }
 
   /**

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

@@ -1 +1 @@
-{"version":3,"file":"SectionModel.js","names":["BaseModel","ContentLinkModel","SubSectionModel","createHashFromHref","LinkModel","retrieveText","SectionModel","constructor","data","entryDate","modelOptions","_defineProperty","_entryDate","referred","selflink","_selflink","_links","self","selfhref","href","type","sourceLabel","id","_id","key","label","getData","number","body","childSectionLinks","_context","childSections","_mapInstanceProperty","call","childSection","section","selfContentLink","_childSections","_context2","_context3","_filterInstanceProperty","sections","_context4","subSections","_context5","subSection","referenceHash","getReferredSections","push","referredChilds"],"sources":["../../../src/models/content/SectionModel.js"],"sourcesContent":["// @flow\nimport BaseModel from \"../base/BaseModel\";\nimport ContentLinkModel from \"./ContentLinkModel\";\nimport SubSectionModel from \"./SubSectionModel\";\n\nimport { createHashFromHref } from \"../../utils/helpers/createHash\";\nimport LinkModel from \"../links/LinkModel\";\n\nimport { retrieveText } from \"../../utils\";\n\nimport type Href from \"../href/Href\";\nimport type { ModelOptions } from \"../types\";\n\n/**\n */\nclass SectionModel extends BaseModel {\n  _entryDate: ISO_DATE | null;\n  _selflink: ?LinkModel;\n  _childSections: Array<SectionModel>;\n\n  constructor(\n    data: Object,\n    entryDate: ISO_DATE | null,\n    modelOptions?: ModelOptions,\n  ) {\n    super(data, {}, modelOptions);\n\n    this._entryDate = entryDate;\n  }\n\n  /**\n   */\n  get referred(): boolean {\n    return this.data.referred;\n  }\n\n  /**\n   */\n  get selflink(): LinkModel {\n    if (!this._selflink) {\n      this._selflink = new LinkModel(\n        this.data._links?.self,\n        null,\n        this.modelOptions,\n      );\n    }\n    return this._selflink;\n  }\n\n  /**\n   */\n  get selfhref(): Href {\n    return this.selflink.href;\n  }\n\n  /**\n   */\n  get entryDate(): ISO_DATE | null {\n    return this._entryDate;\n  }\n\n  /**\n   */\n  get type(): string {\n    return this.data.type;\n  }\n\n  /**\n   */\n  get sourceLabel(): string {\n    return this.data.sourceLabel;\n  }\n\n  /**\n   */\n  get id(): string {\n    return this.data.id || this.data._id;\n  }\n\n  /**\n   */\n  get key(): string {\n    return this.id;\n  }\n\n  /**\n   * Get content label\n   */\n  get label(): string {\n    return this.getData(\"label\", \"\");\n  }\n\n  /**\n   * Retrieve number of section\n   */\n  get number(): string | null {\n    return this.data.number ?? null;\n  }\n\n  /**\n   * Get content body\n   */\n  get body(): ?string {\n    return retrieveText(this.data.body);\n  }\n\n  /**\n   * Retrieve child section links\n   */\n  get childSectionLinks(): Array<ContentLinkModel> {\n    return this.data.childSections\n      ? this.data.childSections.map(\n          (childSection) =>\n            new ContentLinkModel(\n              {\n                section: childSection.id || childSection._id,\n                _id: childSection.id || childSection._id,\n                label: childSection.label,\n                sourceLabel: childSection.sourceLabel,\n                _links: childSection._links,\n              },\n              this.entryDate,\n              this.modelOptions,\n            ),\n        )\n      : [];\n  }\n\n  /**\n   */\n  get selfContentLink(): ContentLinkModel {\n    return new ContentLinkModel(\n      {\n        section: this.id,\n        _id: this.id,\n        label: this.data.label,\n        sourceLabel: this.data.sourceLabel,\n        _links: this.data._links,\n      },\n      this.entryDate,\n      this.modelOptions,\n    );\n  }\n\n  /**\n   * Get tree of child sections\n   */\n  get childSections(): Array<SectionModel> {\n    if (!this._childSections && this.data.childSections) {\n      this._childSections = this.data.childSections\n        .filter((childSection) => \"body\" in childSection)\n        .map(\n          (childSection) =>\n            new SectionModel(childSection, this.entryDate, this.modelOptions),\n        );\n    }\n    return this._childSections || [];\n  }\n\n  /**\n   * set resolved child sections\n   */\n  set childSections(sections: Array<SectionModel>) {\n    this._childSections = sections || [];\n  }\n\n  /**\n   */\n  get sections(): Array<SectionModel> {\n    if (this.data.sections) {\n      return this.data.sections.map(\n        (section) =>\n          new SectionModel(section, this.entryDate, this.modelOptions),\n      );\n    }\n    return [];\n  }\n  /**\n   * Get sub sections\n   */\n  get subSections(): Array<SubSectionModel> {\n    return this.data.subSections\n      ? this.data.subSections.map(\n          (subSection) =>\n            new SubSectionModel(subSection, this.entryDate, this.modelOptions),\n        )\n      : [];\n  }\n\n  /**\n   */\n  get referenceHash(): number {\n    return createHashFromHref(this.selfhref);\n  }\n\n  /**\n   */\n  getReferredSections(): Array<SubSectionModel | SectionModel> {\n    const sections = [];\n\n    for (const subSection of this.subSections) {\n      if (subSection.referred) {\n        sections.push(subSection);\n      }\n\n      const referredChilds = subSection.getReferredSections();\n      sections.push(...referredChilds);\n    }\n\n    for (const childSection of this.childSections) {\n      if (childSection.referred) {\n        sections.push(childSection);\n      }\n\n      const referredChilds = childSection.getReferredSections();\n      sections.push(...referredChilds);\n    }\n\n    return sections;\n  }\n}\n\nexport default SectionModel;\n"],"mappings":";;;AACA,OAAOA,SAAS,MAAM,mBAAmB;AACzC,OAAOC,gBAAgB,MAAM,oBAAoB;AACjD,OAAOC,eAAe,MAAM,mBAAmB;AAE/C,SAASC,kBAAkB,QAAQ,gCAAgC;AACnE,OAAOC,SAAS,MAAM,oBAAoB;AAE1C,SAASC,YAAY,QAAQ,aAAa;AAK1C;AACA;AACA,MAAMC,YAAY,SAASN,SAAS,CAAC;EAKnCO,WAAWA,CACTC,IAAY,EACZC,SAA0B,EAC1BC,YAA2B,EAC3B;IACA,KAAK,CAACF,IAAI,EAAE,CAAC,CAAC,EAAEE,YAAY,CAAC;IAACC,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAE9B,IAAI,CAACC,UAAU,GAAGH,SAAS;EAC7B;;EAEA;AACF;EACE,IAAII,QAAQA,CAAA,EAAY;IACtB,OAAO,IAAI,CAACL,IAAI,CAACK,QAAQ;EAC3B;;EAEA;AACF;EACE,IAAIC,QAAQA,CAAA,EAAc;IACxB,IAAI,CAAC,IAAI,CAACC,SAAS,EAAE;MACnB,IAAI,CAACA,SAAS,GAAG,IAAIX,SAAS,CAC5B,IAAI,CAACI,IAAI,CAACQ,MAAM,EAAEC,IAAI,EACtB,IAAI,EACJ,IAAI,CAACP,YACP,CAAC;IACH;IACA,OAAO,IAAI,CAACK,SAAS;EACvB;;EAEA;AACF;EACE,IAAIG,QAAQA,CAAA,EAAS;IACnB,OAAO,IAAI,CAACJ,QAAQ,CAACK,IAAI;EAC3B;;EAEA;AACF;EACE,IAAIV,SAASA,CAAA,EAAoB;IAC/B,OAAO,IAAI,CAACG,UAAU;EACxB;;EAEA;AACF;EACE,IAAIQ,IAAIA,CAAA,EAAW;IACjB,OAAO,IAAI,CAACZ,IAAI,CAACY,IAAI;EACvB;;EAEA;AACF;EACE,IAAIC,WAAWA,CAAA,EAAW;IACxB,OAAO,IAAI,CAACb,IAAI,CAACa,WAAW;EAC9B;;EAEA;AACF;EACE,IAAIC,EAAEA,CAAA,EAAW;IACf,OAAO,IAAI,CAACd,IAAI,CAACc,EAAE,IAAI,IAAI,CAACd,IAAI,CAACe,GAAG;EACtC;;EAEA;AACF;EACE,IAAIC,GAAGA,CAAA,EAAW;IAChB,OAAO,IAAI,CAACF,EAAE;EAChB;;EAEA;AACF;AACA;EACE,IAAIG,KAAKA,CAAA,EAAW;IAClB,OAAO,IAAI,CAACC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;EAClC;;EAEA;AACF;AACA;EACE,IAAIC,MAAMA,CAAA,EAAkB;IAC1B,OAAO,IAAI,CAACnB,IAAI,CAACmB,MAAM,IAAI,IAAI;EACjC;;EAEA;AACF;AACA;EACE,IAAIC,IAAIA,CAAA,EAAY;IAClB,OAAOvB,YAAY,CAAC,IAAI,CAACG,IAAI,CAACoB,IAAI,CAAC;EACrC;;EAEA;AACF;AACA;EACE,IAAIC,iBAAiBA,CAAA,EAA4B;IAAA,IAAAC,QAAA;IAC/C,OAAO,IAAI,CAACtB,IAAI,CAACuB,aAAa,GAC1BC,oBAAA,CAAAF,QAAA,OAAI,CAACtB,IAAI,CAACuB,aAAa,EAAAE,IAAA,CAAAH,QAAA,EACpBI,YAAY,IACX,IAAIjC,gBAAgB,CAClB;MACEkC,OAAO,EAAED,YAAY,CAACZ,EAAE,IAAIY,YAAY,CAACX,GAAG;MAC5CA,GAAG,EAAEW,YAAY,CAACZ,EAAE,IAAIY,YAAY,CAACX,GAAG;MACxCE,KAAK,EAAES,YAAY,CAACT,KAAK;MACzBJ,WAAW,EAAEa,YAAY,CAACb,WAAW;MACrCL,MAAM,EAAEkB,YAAY,CAAClB;IACvB,CAAC,EACD,IAAI,CAACP,SAAS,EACd,IAAI,CAACC,YACP,CACJ,CAAC,GACD,EAAE;EACR;;EAEA;AACF;EACE,IAAI0B,eAAeA,CAAA,EAAqB;IACtC,OAAO,IAAInC,gBAAgB,CACzB;MACEkC,OAAO,EAAE,IAAI,CAACb,EAAE;MAChBC,GAAG,EAAE,IAAI,CAACD,EAAE;MACZG,KAAK,EAAE,IAAI,CAACjB,IAAI,CAACiB,KAAK;MACtBJ,WAAW,EAAE,IAAI,CAACb,IAAI,CAACa,WAAW;MAClCL,MAAM,EAAE,IAAI,CAACR,IAAI,CAACQ;IACpB,CAAC,EACD,IAAI,CAACP,SAAS,EACd,IAAI,CAACC,YACP,CAAC;EACH;;EAEA;AACF;AACA;EACE,IAAIqB,aAAaA,CAAA,EAAwB;IACvC,IAAI,CAAC,IAAI,CAACM,cAAc,IAAI,IAAI,CAAC7B,IAAI,CAACuB,aAAa,EAAE;MAAA,IAAAO,SAAA,EAAAC,SAAA;MACnD,IAAI,CAACF,cAAc,GAAGL,oBAAA,CAAAM,SAAA,GAAAE,uBAAA,CAAAD,SAAA,OAAI,CAAC/B,IAAI,CAACuB,aAAa,EAAAE,IAAA,CAAAM,SAAA,EAClCL,YAAY,IAAK,MAAM,IAAIA,YAAY,CAAC,EAAAD,IAAA,CAAAK,SAAA,EAE9CJ,YAAY,IACX,IAAI5B,YAAY,CAAC4B,YAAY,EAAE,IAAI,CAACzB,SAAS,EAAE,IAAI,CAACC,YAAY,CACpE,CAAC;IACL;IACA,OAAO,IAAI,CAAC2B,cAAc,IAAI,EAAE;EAClC;;EAEA;AACF;AACA;EACE,IAAIN,aAAaA,CAACU,QAA6B,EAAE;IAC/C,IAAI,CAACJ,cAAc,GAAGI,QAAQ,IAAI,EAAE;EACtC;;EAEA;AACF;EACE,IAAIA,QAAQA,CAAA,EAAwB;IAClC,IAAI,IAAI,CAACjC,IAAI,CAACiC,QAAQ,EAAE;MAAA,IAAAC,SAAA;MACtB,OAAOV,oBAAA,CAAAU,SAAA,OAAI,CAAClC,IAAI,CAACiC,QAAQ,EAAAR,IAAA,CAAAS,SAAA,EACtBP,OAAO,IACN,IAAI7B,YAAY,CAAC6B,OAAO,EAAE,IAAI,CAAC1B,SAAS,EAAE,IAAI,CAACC,YAAY,CAC/D,CAAC;IACH;IACA,OAAO,EAAE;EACX;EACA;AACF;AACA;EACE,IAAIiC,WAAWA,CAAA,EAA2B;IAAA,IAAAC,SAAA;IACxC,OAAO,IAAI,CAACpC,IAAI,CAACmC,WAAW,GACxBX,oBAAA,CAAAY,SAAA,OAAI,CAACpC,IAAI,CAACmC,WAAW,EAAAV,IAAA,CAAAW,SAAA,EAClBC,UAAU,IACT,IAAI3C,eAAe,CAAC2C,UAAU,EAAE,IAAI,CAACpC,SAAS,EAAE,IAAI,CAACC,YAAY,CACrE,CAAC,GACD,EAAE;EACR;;EAEA;AACF;EACE,IAAIoC,aAAaA,CAAA,EAAW;IAC1B,OAAO3C,kBAAkB,CAAC,IAAI,CAACe,QAAQ,CAAC;EAC1C;;EAEA;AACF;EACE6B,mBAAmBA,CAAA,EAA0C;IAC3D,MAAMN,QAAQ,GAAG,EAAE;IAEnB,KAAK,MAAMI,UAAU,IAAI,IAAI,CAACF,WAAW,EAAE;MACzC,IAAIE,UAAU,CAAChC,QAAQ,EAAE;QACvB4B,QAAQ,CAACO,IAAI,CAACH,UAAU,CAAC;MAC3B;MAEA,MAAMI,cAAc,GAAGJ,UAAU,CAACE,mBAAmB,CAAC,CAAC;MACvDN,QAAQ,CAACO,IAAI,CAAC,GAAGC,cAAc,CAAC;IAClC;IAEA,KAAK,MAAMf,YAAY,IAAI,IAAI,CAACH,aAAa,EAAE;MAC7C,IAAIG,YAAY,CAACrB,QAAQ,EAAE;QACzB4B,QAAQ,CAACO,IAAI,CAACd,YAAY,CAAC;MAC7B;MAEA,MAAMe,cAAc,GAAGf,YAAY,CAACa,mBAAmB,CAAC,CAAC;MACzDN,QAAQ,CAACO,IAAI,CAAC,GAAGC,cAAc,CAAC;IAClC;IAEA,OAAOR,QAAQ;EACjB;AACF;AAEA,eAAenC,YAAY","ignoreList":[]}
+{"version":3,"file":"SectionModel.js","names":["BaseModel","ContentLinkModel","SubSectionModel","createHashFromHref","LinkModel","retrieveText","SectionModel","constructor","data","entryDate","modelOptions","_defineProperty","_entryDate","referred","selflink","_selflink","_links","self","selfhref","href","type","sourceLabel","id","_id","key","label","getData","number","body","childSectionLinks","sections","childSections","_mapInstanceProperty","call","childSection","section","selfContentLink","_childSections","_context","_filterInstanceProperty","_context2","subSections","_context3","subSection","referenceHash","getReferredSections","push","referredChilds"],"sources":["../../../src/models/content/SectionModel.js"],"sourcesContent":["// @flow\nimport BaseModel from \"../base/BaseModel\";\nimport ContentLinkModel from \"./ContentLinkModel\";\nimport SubSectionModel from \"./SubSectionModel\";\n\nimport { createHashFromHref } from \"../../utils/helpers/createHash\";\nimport LinkModel from \"../links/LinkModel\";\n\nimport { retrieveText } from \"../../utils\";\n\nimport type Href from \"../href/Href\";\nimport type { ModelOptions } from \"../types\";\n\n/**\n */\nclass SectionModel extends BaseModel {\n  _entryDate: ISO_DATE | null;\n  _selflink: ?LinkModel;\n  _childSections: Array<SectionModel>;\n\n  constructor(\n    data: Object,\n    entryDate: ISO_DATE | null,\n    modelOptions?: ModelOptions,\n  ) {\n    super(data, {}, modelOptions);\n\n    this._entryDate = entryDate;\n  }\n\n  /**\n   */\n  get referred(): boolean {\n    return this.data.referred;\n  }\n\n  /**\n   */\n  get selflink(): LinkModel {\n    if (!this._selflink) {\n      this._selflink = new LinkModel(\n        this.data._links?.self,\n        null,\n        this.modelOptions,\n      );\n    }\n    return this._selflink;\n  }\n\n  /**\n   */\n  get selfhref(): Href {\n    return this.selflink.href;\n  }\n\n  /**\n   */\n  get entryDate(): ISO_DATE | null {\n    return this._entryDate;\n  }\n\n  /**\n   */\n  get type(): string {\n    return this.data.type;\n  }\n\n  /**\n   */\n  get sourceLabel(): string {\n    return this.data.sourceLabel;\n  }\n\n  /**\n   */\n  get id(): string {\n    return this.data.id || this.data._id;\n  }\n\n  /**\n   */\n  get key(): string {\n    return this.id;\n  }\n\n  /**\n   * Get content label\n   */\n  get label(): string {\n    return this.getData(\"label\", \"\");\n  }\n\n  /**\n   * Retrieve number of section\n   */\n  get number(): string | null {\n    return this.data.number ?? null;\n  }\n\n  /**\n   * Get content body\n   */\n  get body(): ?string {\n    return retrieveText(this.data.body);\n  }\n\n  /**\n   * Retrieve child section links\n   */\n  get childSectionLinks(): Array<ContentLinkModel> {\n    let sections = [];\n    if (this.data.childSections) {\n      sections = this.data.childSections;\n    } else if (this.data.sections) {\n      sections = this.data.sections;\n    }\n\n    return sections.map(\n      (childSection) =>\n        new ContentLinkModel(\n          {\n            section: childSection.id || childSection._id,\n            _id: childSection.id || childSection._id,\n            label: childSection.label,\n            sourceLabel: childSection.sourceLabel,\n            _links: childSection._links,\n          },\n          this.entryDate,\n          this.modelOptions,\n        ),\n    );\n  }\n\n  /**\n   */\n  get selfContentLink(): ContentLinkModel {\n    return new ContentLinkModel(\n      {\n        section: this.id,\n        _id: this.id,\n        label: this.data.label,\n        sourceLabel: this.data.sourceLabel,\n        _links: this.data._links,\n      },\n      this.entryDate,\n      this.modelOptions,\n    );\n  }\n\n  /**\n   * Get tree of child sections\n   */\n  get childSections(): Array<SectionModel> {\n    if (!this._childSections) {\n      let sections = [];\n      if (this.data.childSections) {\n        sections = this.data.childSections;\n      } else if (this.data.sections) {\n        sections = this.data.sections;\n      }\n\n      this._childSections = sections\n        .filter((childSection) => \"body\" in childSection)\n        .map(\n          (childSection) =>\n            new SectionModel(childSection, this.entryDate, this.modelOptions),\n        );\n    }\n\n    return this._childSections;\n  }\n\n  /**\n   * set resolved child sections\n   */\n  set childSections(sections: Array<SectionModel>) {\n    this._childSections = sections || [];\n  }\n\n  /**\n   */\n  get sections(): Array<SectionModel> {\n    if (this.data.sections) {\n      return this.data.sections.map(\n        (section) =>\n          new SectionModel(section, this.entryDate, this.modelOptions),\n      );\n    }\n    return [];\n  }\n  /**\n   * Get sub sections\n   */\n  get subSections(): Array<SubSectionModel> {\n    return this.data.subSections\n      ? this.data.subSections.map(\n          (subSection) =>\n            new SubSectionModel(subSection, this.entryDate, this.modelOptions),\n        )\n      : [];\n  }\n\n  /**\n   */\n  get referenceHash(): number {\n    return createHashFromHref(this.selfhref);\n  }\n\n  /**\n   */\n  getReferredSections(): Array<SubSectionModel | SectionModel> {\n    const sections = [];\n\n    for (const subSection of this.subSections) {\n      if (subSection.referred) {\n        sections.push(subSection);\n      }\n\n      const referredChilds = subSection.getReferredSections();\n      sections.push(...referredChilds);\n    }\n\n    for (const childSection of this.childSections) {\n      if (childSection.referred) {\n        sections.push(childSection);\n      }\n\n      const referredChilds = childSection.getReferredSections();\n      sections.push(...referredChilds);\n    }\n\n    return sections;\n  }\n}\n\nexport default SectionModel;\n"],"mappings":";;;AACA,OAAOA,SAAS,MAAM,mBAAmB;AACzC,OAAOC,gBAAgB,MAAM,oBAAoB;AACjD,OAAOC,eAAe,MAAM,mBAAmB;AAE/C,SAASC,kBAAkB,QAAQ,gCAAgC;AACnE,OAAOC,SAAS,MAAM,oBAAoB;AAE1C,SAASC,YAAY,QAAQ,aAAa;AAK1C;AACA;AACA,MAAMC,YAAY,SAASN,SAAS,CAAC;EAKnCO,WAAWA,CACTC,IAAY,EACZC,SAA0B,EAC1BC,YAA2B,EAC3B;IACA,KAAK,CAACF,IAAI,EAAE,CAAC,CAAC,EAAEE,YAAY,CAAC;IAACC,eAAA;IAAAA,eAAA;IAAAA,eAAA;IAE9B,IAAI,CAACC,UAAU,GAAGH,SAAS;EAC7B;;EAEA;AACF;EACE,IAAII,QAAQA,CAAA,EAAY;IACtB,OAAO,IAAI,CAACL,IAAI,CAACK,QAAQ;EAC3B;;EAEA;AACF;EACE,IAAIC,QAAQA,CAAA,EAAc;IACxB,IAAI,CAAC,IAAI,CAACC,SAAS,EAAE;MACnB,IAAI,CAACA,SAAS,GAAG,IAAIX,SAAS,CAC5B,IAAI,CAACI,IAAI,CAACQ,MAAM,EAAEC,IAAI,EACtB,IAAI,EACJ,IAAI,CAACP,YACP,CAAC;IACH;IACA,OAAO,IAAI,CAACK,SAAS;EACvB;;EAEA;AACF;EACE,IAAIG,QAAQA,CAAA,EAAS;IACnB,OAAO,IAAI,CAACJ,QAAQ,CAACK,IAAI;EAC3B;;EAEA;AACF;EACE,IAAIV,SAASA,CAAA,EAAoB;IAC/B,OAAO,IAAI,CAACG,UAAU;EACxB;;EAEA;AACF;EACE,IAAIQ,IAAIA,CAAA,EAAW;IACjB,OAAO,IAAI,CAACZ,IAAI,CAACY,IAAI;EACvB;;EAEA;AACF;EACE,IAAIC,WAAWA,CAAA,EAAW;IACxB,OAAO,IAAI,CAACb,IAAI,CAACa,WAAW;EAC9B;;EAEA;AACF;EACE,IAAIC,EAAEA,CAAA,EAAW;IACf,OAAO,IAAI,CAACd,IAAI,CAACc,EAAE,IAAI,IAAI,CAACd,IAAI,CAACe,GAAG;EACtC;;EAEA;AACF;EACE,IAAIC,GAAGA,CAAA,EAAW;IAChB,OAAO,IAAI,CAACF,EAAE;EAChB;;EAEA;AACF;AACA;EACE,IAAIG,KAAKA,CAAA,EAAW;IAClB,OAAO,IAAI,CAACC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;EAClC;;EAEA;AACF;AACA;EACE,IAAIC,MAAMA,CAAA,EAAkB;IAC1B,OAAO,IAAI,CAACnB,IAAI,CAACmB,MAAM,IAAI,IAAI;EACjC;;EAEA;AACF;AACA;EACE,IAAIC,IAAIA,CAAA,EAAY;IAClB,OAAOvB,YAAY,CAAC,IAAI,CAACG,IAAI,CAACoB,IAAI,CAAC;EACrC;;EAEA;AACF;AACA;EACE,IAAIC,iBAAiBA,CAAA,EAA4B;IAC/C,IAAIC,QAAQ,GAAG,EAAE;IACjB,IAAI,IAAI,CAACtB,IAAI,CAACuB,aAAa,EAAE;MAC3BD,QAAQ,GAAG,IAAI,CAACtB,IAAI,CAACuB,aAAa;IACpC,CAAC,MAAM,IAAI,IAAI,CAACvB,IAAI,CAACsB,QAAQ,EAAE;MAC7BA,QAAQ,GAAG,IAAI,CAACtB,IAAI,CAACsB,QAAQ;IAC/B;IAEA,OAAOE,oBAAA,CAAAF,QAAQ,EAAAG,IAAA,CAARH,QAAQ,EACZI,YAAY,IACX,IAAIjC,gBAAgB,CAClB;MACEkC,OAAO,EAAED,YAAY,CAACZ,EAAE,IAAIY,YAAY,CAACX,GAAG;MAC5CA,GAAG,EAAEW,YAAY,CAACZ,EAAE,IAAIY,YAAY,CAACX,GAAG;MACxCE,KAAK,EAAES,YAAY,CAACT,KAAK;MACzBJ,WAAW,EAAEa,YAAY,CAACb,WAAW;MACrCL,MAAM,EAAEkB,YAAY,CAAClB;IACvB,CAAC,EACD,IAAI,CAACP,SAAS,EACd,IAAI,CAACC,YACP,CACJ,CAAC;EACH;;EAEA;AACF;EACE,IAAI0B,eAAeA,CAAA,EAAqB;IACtC,OAAO,IAAInC,gBAAgB,CACzB;MACEkC,OAAO,EAAE,IAAI,CAACb,EAAE;MAChBC,GAAG,EAAE,IAAI,CAACD,EAAE;MACZG,KAAK,EAAE,IAAI,CAACjB,IAAI,CAACiB,KAAK;MACtBJ,WAAW,EAAE,IAAI,CAACb,IAAI,CAACa,WAAW;MAClCL,MAAM,EAAE,IAAI,CAACR,IAAI,CAACQ;IACpB,CAAC,EACD,IAAI,CAACP,SAAS,EACd,IAAI,CAACC,YACP,CAAC;EACH;;EAEA;AACF;AACA;EACE,IAAIqB,aAAaA,CAAA,EAAwB;IACvC,IAAI,CAAC,IAAI,CAACM,cAAc,EAAE;MAAA,IAAAC,QAAA;MACxB,IAAIR,QAAQ,GAAG,EAAE;MACjB,IAAI,IAAI,CAACtB,IAAI,CAACuB,aAAa,EAAE;QAC3BD,QAAQ,GAAG,IAAI,CAACtB,IAAI,CAACuB,aAAa;MACpC,CAAC,MAAM,IAAI,IAAI,CAACvB,IAAI,CAACsB,QAAQ,EAAE;QAC7BA,QAAQ,GAAG,IAAI,CAACtB,IAAI,CAACsB,QAAQ;MAC/B;MAEA,IAAI,CAACO,cAAc,GAAGL,oBAAA,CAAAM,QAAA,GAAAC,uBAAA,CAAAT,QAAQ,EAAAG,IAAA,CAARH,QAAQ,EACnBI,YAAY,IAAK,MAAM,IAAIA,YAAY,CAAC,EAAAD,IAAA,CAAAK,QAAA,EAE9CJ,YAAY,IACX,IAAI5B,YAAY,CAAC4B,YAAY,EAAE,IAAI,CAACzB,SAAS,EAAE,IAAI,CAACC,YAAY,CACpE,CAAC;IACL;IAEA,OAAO,IAAI,CAAC2B,cAAc;EAC5B;;EAEA;AACF;AACA;EACE,IAAIN,aAAaA,CAACD,QAA6B,EAAE;IAC/C,IAAI,CAACO,cAAc,GAAGP,QAAQ,IAAI,EAAE;EACtC;;EAEA;AACF;EACE,IAAIA,QAAQA,CAAA,EAAwB;IAClC,IAAI,IAAI,CAACtB,IAAI,CAACsB,QAAQ,EAAE;MAAA,IAAAU,SAAA;MACtB,OAAOR,oBAAA,CAAAQ,SAAA,OAAI,CAAChC,IAAI,CAACsB,QAAQ,EAAAG,IAAA,CAAAO,SAAA,EACtBL,OAAO,IACN,IAAI7B,YAAY,CAAC6B,OAAO,EAAE,IAAI,CAAC1B,SAAS,EAAE,IAAI,CAACC,YAAY,CAC/D,CAAC;IACH;IACA,OAAO,EAAE;EACX;EACA;AACF;AACA;EACE,IAAI+B,WAAWA,CAAA,EAA2B;IAAA,IAAAC,SAAA;IACxC,OAAO,IAAI,CAAClC,IAAI,CAACiC,WAAW,GACxBT,oBAAA,CAAAU,SAAA,OAAI,CAAClC,IAAI,CAACiC,WAAW,EAAAR,IAAA,CAAAS,SAAA,EAClBC,UAAU,IACT,IAAIzC,eAAe,CAACyC,UAAU,EAAE,IAAI,CAAClC,SAAS,EAAE,IAAI,CAACC,YAAY,CACrE,CAAC,GACD,EAAE;EACR;;EAEA;AACF;EACE,IAAIkC,aAAaA,CAAA,EAAW;IAC1B,OAAOzC,kBAAkB,CAAC,IAAI,CAACe,QAAQ,CAAC;EAC1C;;EAEA;AACF;EACE2B,mBAAmBA,CAAA,EAA0C;IAC3D,MAAMf,QAAQ,GAAG,EAAE;IAEnB,KAAK,MAAMa,UAAU,IAAI,IAAI,CAACF,WAAW,EAAE;MACzC,IAAIE,UAAU,CAAC9B,QAAQ,EAAE;QACvBiB,QAAQ,CAACgB,IAAI,CAACH,UAAU,CAAC;MAC3B;MAEA,MAAMI,cAAc,GAAGJ,UAAU,CAACE,mBAAmB,CAAC,CAAC;MACvDf,QAAQ,CAACgB,IAAI,CAAC,GAAGC,cAAc,CAAC;IAClC;IAEA,KAAK,MAAMb,YAAY,IAAI,IAAI,CAACH,aAAa,EAAE;MAC7C,IAAIG,YAAY,CAACrB,QAAQ,EAAE;QACzBiB,QAAQ,CAACgB,IAAI,CAACZ,YAAY,CAAC;MAC7B;MAEA,MAAMa,cAAc,GAAGb,YAAY,CAACW,mBAAmB,CAAC,CAAC;MACzDf,QAAQ,CAACgB,IAAI,CAAC,GAAGC,cAAc,CAAC;IAClC;IAEA,OAAOjB,QAAQ;EACjB;AACF;AAEA,eAAexB,YAAY","ignoreList":[]}

package/esm/models/content/__tests__/ContentModel.spec.js.flow

@@ -8,6 +8,7 @@ import content from "./content.json";
 import contentWithSubsections from "./content-with-subsections.json";
 import contentWithSubsections2 from "./content-with-subsections2.json";
 import contentWithChildsections from "./content-with-childsections.json";
+import contentWithSections from "./content-with-sections.json";
 import ContentLinkModel from "../ContentLinkModel";
 
 describe("contentmodel", () => {
@@ -119,6 +120,40 @@ describe("contentmodel", () => {
     );
   });
 
+  it("can handle content service with sections", () => {
+    const response = ModularUIResponse.create({
+      key: "contentmodel",
+      data: contentWithSections,
+      contributions,
+    });
+
+    expect(ContentModel.isApplicableModel(response)).toBe(true);
+
+    const contentModel = new ContentModel(response);
+    expect(contentModel.getInitialChildModelLinks()).toHaveLength(0);
+
+    expect(contentModel.id).toBe("uitslag");
+
+    expect(contentModel.childSectionLinks).toHaveLength(4);
+    expect(contentModel.childSections).toHaveLength(0);
+    expect(contentModel.subSections).toHaveLength(0);
+    expect(contentModel.relatedConceptsHrefs).toHaveLength(1);
+    expect(contentModel.relatedConceptsHref.href.toString()).toBe(
+      "/content/Incident/Business design/Content/Blaastest.textilesource/uitslag/relatedConcepts?entryDate=2021-08-31",
+    );
+    expect(contentModel.referenceHash).toBe(8236987459042);
+
+    const firstChildSectionLink = contentModel.childSectionLinks[0];
+    expect(firstChildSectionLink instanceof ContentLinkModel).toBe(true);
+
+    expect(firstChildSectionLink.key).toBe("pass");
+    expect(firstChildSectionLink.label).toBe("Pass");
+    expect(firstChildSectionLink.sourceLabel).toBeNull();
+    expect(firstChildSectionLink.encodedHref.toString()).toBe(
+      "/content/Incident%2FBusiness%20design%2FContent%2FBlaastest.textilesource/pass?entryDate=2021-08-31",
+    );
+  });
+
   it("can handle content service with subsections and correct related concepts", () => {
     const response = ModularUIResponse.create({
       key: "contentmodel",

package/esm/models/types.js.flow

@@ -201,7 +201,8 @@ export type SectionData = {
   number?: string,
   body: string | { id?: string, message: string, properties?: Object },
   _links: { self: { href: string } },
-  childSections: Array<SectionData>,
+  childSections?: Array<SectionData>,
+  sections?: Array<SectionData>,
   subSections: Array<SectionData>,
 };
 

package/esm/models/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../src/models/types.js"],"sourcesContent":["// @flow\nimport type ApplicationModel from \"./application/ApplicationModel\";\nimport type BooleanAttributeModel from \"./attributes/BooleanAttributeModel\";\nimport type CaptchaAttributeModel from \"./attributes/CaptchaAttributeModel\";\nimport type ChoiceAttributeModel from \"./attributes/ChoiceAttributeModel\";\nimport type CompositeAttributeModel from \"./attributes/CompositeAttributeModel\";\nimport type DatetimeAttributeModel from \"./attributes/DatetimeAttributeModel\";\nimport type HelptextAttributeModel from \"./attributes/HelptextAttributeModel\";\nimport type LabelAttributeModel from \"./attributes/LabelAttributeModel\";\nimport type MemoAttributeModel from \"./attributes/MemoAttributeModel\";\nimport type MoneyAttributeModel from \"./attributes/MoneyAttributeModel\";\nimport type NumberAttributeModel from \"./attributes/NumberAttributeModel\";\nimport type PasswordAttributeModel from \"./attributes/PasswordAttributeModel\";\nimport type StringAttributeModel from \"./attributes/StringAttributeModel\";\nimport type UploadAttributeModel from \"./attributes/UploadAttributeModel\";\nimport type XMLAttributeModel from \"./attributes/XMLAttributeModel\";\nimport type CaseViewModel from \"./caseview/CaseViewModel\";\nimport type BusinessScenarioModel from \"./concepts/BusinessScenarioModel\";\nimport type ConceptDetailModel from \"./concepts/ConceptDetailModel\";\nimport type ConceptIndexModel from \"./concepts/ConceptIndexModel\";\nimport type ConceptTypeDetailModel from \"./concepts/ConceptTypeDetailModel\";\nimport type ContentIndexModel from \"./content/ContentIndexModel\";\nimport type ContentModel from \"./content/ContentModel\";\nimport type SectionModel from \"./content/SectionModel\";\nimport type ContentTOCModel from \"./content/ContentTOCModel\";\nimport type ContentTypeModel from \"./content/ContentTypeModel\";\nimport type DetailModel from \"./detail/DetailModel\";\nimport type AssignmentFilterModel from \"./filters/AssignmentFilterModel\";\nimport type FilterModel from \"./filters/FilterModel\";\nimport type RangeFilterModel from \"./filters/RangeFilterModel\";\nimport type ConceptIndexFilterModel from \"./filters/ConceptIndexFilterModel\";\nimport type FormModel from \"./form/FormModel\";\nimport type ListDetailModel from \"./list/ListDetailModel\";\nimport type ListModel from \"./list/ListModel\";\nimport type ModelCatalogModel from \"./modelcatalog/ModelCatalogModel\";\nimport type GroupingPanelModel from \"./panels/GroupingPanelModel\";\nimport type CaseSearchModel from \"./search/CaseSearchModel\";\nimport type TabModel from \"./tab/TabModel\";\nimport type TaskGroupModel from \"./taskgroup/TaskGroupModel\";\nimport type UserModel from \"./user/UserModel\";\nimport type UserServicesModel from \"./user/UserServicesModel\";\nimport type LinkModel from \"./links/LinkModel\";\nimport type LookupOptionsModel from \"./lookup/LookupOptionsModel\";\nimport type BaseFilterModel from \"./filters/BaseFilterModel\";\nimport type AttributeCollection from \"./attributes/AttributeCollection\";\nimport type AttributeModel from \"./attributes/AttributeModel\";\nimport type LayoutHintCollection from \"./layouthint/LayoutHintCollection\";\nimport type ErrorResponse from \"./error/ErrorResponse\";\n\nexport type ModularUIModel =\n  | ApplicationModel\n  | CaseSearchModel\n  | CaseViewModel\n  | ListDetailModel\n  | DetailModel\n  | FormModel\n  | GroupingPanelModel\n  | ListModel\n  | TabModel\n  | TaskGroupModel\n  | UserModel\n  | UserServicesModel\n  | ModelCatalogModel\n  | ConceptIndexModel\n  | ConceptDetailModel\n  | BusinessScenarioModel\n  | ConceptTypeDetailModel\n  | ContentIndexModel\n  | ContentTOCModel\n  | ContentModel\n  | ContentTypeModel\n  | LookupOptionsModel;\n\nexport type AttributeType =\n  | BooleanAttributeModel\n  | CaptchaAttributeModel\n  | ChoiceAttributeModel\n  | DatetimeAttributeModel\n  | HelptextAttributeModel\n  | LabelAttributeModel\n  | MemoAttributeModel\n  | MoneyAttributeModel\n  | NumberAttributeModel\n  | PasswordAttributeModel\n  | CompositeAttributeModel\n  | StringAttributeModel\n  | UploadAttributeModel\n  | XMLAttributeModel;\n\nexport type RangeChildAttributeType =\n  | NumberAttributeModel\n  | DatetimeAttributeModel;\n\nexport type FilterType =\n  | BaseFilterModel\n  | FilterModel\n  | AssignmentFilterModel\n  | RangeFilterModel\n  | ConceptIndexFilterModel;\n\nexport type FormErrorAnchor = {\n  id: string,\n  properties?: {\n    [propertyName: string]: string | number,\n  },\n  anchor?: {\n    objectid: string,\n    elementid?: string,\n    _links?: Object,\n    index?: number,\n    \"index-identifier\"?: string,\n  },\n  layouthint: LayoutHintCollection,\n  message: string,\n  param?: {\n    name: string,\n  },\n};\n\nexport type labelsJSON = {\n  _id: string,\n  label: string,\n  value: string,\n};\n\nexport type propertyJSON = {\n  _id: string,\n  type: string,\n  mandatory: string,\n  label: string,\n  value: string,\n};\n\nexport type textfragmentJSON = {\n  label: string,\n  text: string,\n  type: string,\n};\n\nexport interface IConstraintModel {\n  +id: string;\n  +defaultMessage: string;\n  +parameters: Object;\n  +isMandatoryConstraint: boolean;\n  validate(value: any): boolean;\n  hasValidation(): boolean;\n}\n\nexport interface ILayoutHintRule {\n  process(attribute: AttributeModel, attributes: AttributeCollection): void;\n}\n\nexport interface IModelWithChildModels {\n  getInitialChildModelLinks(): Array<LinkModel>;\n  setChildModels(\n    models: Array<ModularUIModel>,\n    errors: Array<ErrorResponse>,\n  ): void;\n}\n\nexport type AuthenticationType = {\n  name: string,\n  authentication: string,\n  redirectUri?: string,\n  isPrimary: boolean,\n};\n\nexport type FileEntryType = {\n  name: string,\n  size?: number,\n  progress: number,\n  error?: string,\n  token?: string,\n};\n\nexport type FilesType = {\n  [filename: string]: FileEntryType,\n};\n\nexport type FiletypeConstraintsType = Array<{|\n  extensions: Array<string>,\n  mimeTypes: Array<string>,\n|}>;\n\nexport type FilesizeConstraintsType = {\n  fileSize: ?number,\n  maxTotalFileSize: ?number,\n  isMaxTotal: boolean,\n};\n\nexport type PropertyData = { type: string, label: string, value: string };\nexport type TextFragmentData = {\n  type: string,\n  label: string,\n  text: string | { id?: string, message: string, properties?: Object },\n};\nexport type SectionData = {\n  id: string,\n  type: string,\n  label?: string,\n  number?: string,\n  body: string | { id?: string, message: string, properties?: Object },\n  _links: { self: { href: string } },\n  childSections: Array<SectionData>,\n  subSections: Array<SectionData>,\n};\n\nexport type PropertyElement = {\n  propertyElement: {\n    label: string,\n    layouthint: Array<string>,\n    properties: Array<PropertyData>,\n  },\n};\nexport type TextFragmentElement = {\n  textFragmentElement: {\n    label: string,\n    layouthint: Array<string>,\n    textfragments: Array<TextFragmentData>,\n  },\n};\nexport type ContentElement = {\n  contentElement: {\n    label: string,\n    layouthint: Array<string>,\n    sections: Array<SectionData>,\n  },\n};\n\nexport type PropertyElementMapped = {\n  propertyElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    properties: Array<PropertyData>,\n  },\n};\nexport type TextFragmentElementMapped = {\n  textFragmentElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    textfragments: Array<TextFragmentData>,\n  },\n};\nexport type ContentElementMapped = {\n  contentElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    sections: Array<SectionModel>,\n  },\n};\n\nexport type ContentAll = Array<\n  PropertyElementMapped | TextFragmentElementMapped | ContentElementMapped,\n>;\n\nexport type ContentData = {\n  header: {\n    label?: string,\n    description?: { id?: string, message: string, properties?: Object },\n  },\n  label?: string,\n  elements: Array<PropertyElement | TextFragmentElement | ContentElement>,\n};\n\nexport type SectionFragment = {\n  text: string,\n  startOffset: number,\n  endOffset: number,\n};\n\nexport type ModelOptions = {\n  origin?: ?string,\n  contextPath?: ?string,\n};\n"],"mappings":"","ignoreList":[]}
+{"version":3,"file":"types.js","names":[],"sources":["../../src/models/types.js"],"sourcesContent":["// @flow\nimport type ApplicationModel from \"./application/ApplicationModel\";\nimport type BooleanAttributeModel from \"./attributes/BooleanAttributeModel\";\nimport type CaptchaAttributeModel from \"./attributes/CaptchaAttributeModel\";\nimport type ChoiceAttributeModel from \"./attributes/ChoiceAttributeModel\";\nimport type CompositeAttributeModel from \"./attributes/CompositeAttributeModel\";\nimport type DatetimeAttributeModel from \"./attributes/DatetimeAttributeModel\";\nimport type HelptextAttributeModel from \"./attributes/HelptextAttributeModel\";\nimport type LabelAttributeModel from \"./attributes/LabelAttributeModel\";\nimport type MemoAttributeModel from \"./attributes/MemoAttributeModel\";\nimport type MoneyAttributeModel from \"./attributes/MoneyAttributeModel\";\nimport type NumberAttributeModel from \"./attributes/NumberAttributeModel\";\nimport type PasswordAttributeModel from \"./attributes/PasswordAttributeModel\";\nimport type StringAttributeModel from \"./attributes/StringAttributeModel\";\nimport type UploadAttributeModel from \"./attributes/UploadAttributeModel\";\nimport type XMLAttributeModel from \"./attributes/XMLAttributeModel\";\nimport type CaseViewModel from \"./caseview/CaseViewModel\";\nimport type BusinessScenarioModel from \"./concepts/BusinessScenarioModel\";\nimport type ConceptDetailModel from \"./concepts/ConceptDetailModel\";\nimport type ConceptIndexModel from \"./concepts/ConceptIndexModel\";\nimport type ConceptTypeDetailModel from \"./concepts/ConceptTypeDetailModel\";\nimport type ContentIndexModel from \"./content/ContentIndexModel\";\nimport type ContentModel from \"./content/ContentModel\";\nimport type SectionModel from \"./content/SectionModel\";\nimport type ContentTOCModel from \"./content/ContentTOCModel\";\nimport type ContentTypeModel from \"./content/ContentTypeModel\";\nimport type DetailModel from \"./detail/DetailModel\";\nimport type AssignmentFilterModel from \"./filters/AssignmentFilterModel\";\nimport type FilterModel from \"./filters/FilterModel\";\nimport type RangeFilterModel from \"./filters/RangeFilterModel\";\nimport type ConceptIndexFilterModel from \"./filters/ConceptIndexFilterModel\";\nimport type FormModel from \"./form/FormModel\";\nimport type ListDetailModel from \"./list/ListDetailModel\";\nimport type ListModel from \"./list/ListModel\";\nimport type ModelCatalogModel from \"./modelcatalog/ModelCatalogModel\";\nimport type GroupingPanelModel from \"./panels/GroupingPanelModel\";\nimport type CaseSearchModel from \"./search/CaseSearchModel\";\nimport type TabModel from \"./tab/TabModel\";\nimport type TaskGroupModel from \"./taskgroup/TaskGroupModel\";\nimport type UserModel from \"./user/UserModel\";\nimport type UserServicesModel from \"./user/UserServicesModel\";\nimport type LinkModel from \"./links/LinkModel\";\nimport type LookupOptionsModel from \"./lookup/LookupOptionsModel\";\nimport type BaseFilterModel from \"./filters/BaseFilterModel\";\nimport type AttributeCollection from \"./attributes/AttributeCollection\";\nimport type AttributeModel from \"./attributes/AttributeModel\";\nimport type LayoutHintCollection from \"./layouthint/LayoutHintCollection\";\nimport type ErrorResponse from \"./error/ErrorResponse\";\n\nexport type ModularUIModel =\n  | ApplicationModel\n  | CaseSearchModel\n  | CaseViewModel\n  | ListDetailModel\n  | DetailModel\n  | FormModel\n  | GroupingPanelModel\n  | ListModel\n  | TabModel\n  | TaskGroupModel\n  | UserModel\n  | UserServicesModel\n  | ModelCatalogModel\n  | ConceptIndexModel\n  | ConceptDetailModel\n  | BusinessScenarioModel\n  | ConceptTypeDetailModel\n  | ContentIndexModel\n  | ContentTOCModel\n  | ContentModel\n  | ContentTypeModel\n  | LookupOptionsModel;\n\nexport type AttributeType =\n  | BooleanAttributeModel\n  | CaptchaAttributeModel\n  | ChoiceAttributeModel\n  | DatetimeAttributeModel\n  | HelptextAttributeModel\n  | LabelAttributeModel\n  | MemoAttributeModel\n  | MoneyAttributeModel\n  | NumberAttributeModel\n  | PasswordAttributeModel\n  | CompositeAttributeModel\n  | StringAttributeModel\n  | UploadAttributeModel\n  | XMLAttributeModel;\n\nexport type RangeChildAttributeType =\n  | NumberAttributeModel\n  | DatetimeAttributeModel;\n\nexport type FilterType =\n  | BaseFilterModel\n  | FilterModel\n  | AssignmentFilterModel\n  | RangeFilterModel\n  | ConceptIndexFilterModel;\n\nexport type FormErrorAnchor = {\n  id: string,\n  properties?: {\n    [propertyName: string]: string | number,\n  },\n  anchor?: {\n    objectid: string,\n    elementid?: string,\n    _links?: Object,\n    index?: number,\n    \"index-identifier\"?: string,\n  },\n  layouthint: LayoutHintCollection,\n  message: string,\n  param?: {\n    name: string,\n  },\n};\n\nexport type labelsJSON = {\n  _id: string,\n  label: string,\n  value: string,\n};\n\nexport type propertyJSON = {\n  _id: string,\n  type: string,\n  mandatory: string,\n  label: string,\n  value: string,\n};\n\nexport type textfragmentJSON = {\n  label: string,\n  text: string,\n  type: string,\n};\n\nexport interface IConstraintModel {\n  +id: string;\n  +defaultMessage: string;\n  +parameters: Object;\n  +isMandatoryConstraint: boolean;\n  validate(value: any): boolean;\n  hasValidation(): boolean;\n}\n\nexport interface ILayoutHintRule {\n  process(attribute: AttributeModel, attributes: AttributeCollection): void;\n}\n\nexport interface IModelWithChildModels {\n  getInitialChildModelLinks(): Array<LinkModel>;\n  setChildModels(\n    models: Array<ModularUIModel>,\n    errors: Array<ErrorResponse>,\n  ): void;\n}\n\nexport type AuthenticationType = {\n  name: string,\n  authentication: string,\n  redirectUri?: string,\n  isPrimary: boolean,\n};\n\nexport type FileEntryType = {\n  name: string,\n  size?: number,\n  progress: number,\n  error?: string,\n  token?: string,\n};\n\nexport type FilesType = {\n  [filename: string]: FileEntryType,\n};\n\nexport type FiletypeConstraintsType = Array<{|\n  extensions: Array<string>,\n  mimeTypes: Array<string>,\n|}>;\n\nexport type FilesizeConstraintsType = {\n  fileSize: ?number,\n  maxTotalFileSize: ?number,\n  isMaxTotal: boolean,\n};\n\nexport type PropertyData = { type: string, label: string, value: string };\nexport type TextFragmentData = {\n  type: string,\n  label: string,\n  text: string | { id?: string, message: string, properties?: Object },\n};\nexport type SectionData = {\n  id: string,\n  type: string,\n  label?: string,\n  number?: string,\n  body: string | { id?: string, message: string, properties?: Object },\n  _links: { self: { href: string } },\n  childSections?: Array<SectionData>,\n  sections?: Array<SectionData>,\n  subSections: Array<SectionData>,\n};\n\nexport type PropertyElement = {\n  propertyElement: {\n    label: string,\n    layouthint: Array<string>,\n    properties: Array<PropertyData>,\n  },\n};\nexport type TextFragmentElement = {\n  textFragmentElement: {\n    label: string,\n    layouthint: Array<string>,\n    textfragments: Array<TextFragmentData>,\n  },\n};\nexport type ContentElement = {\n  contentElement: {\n    label: string,\n    layouthint: Array<string>,\n    sections: Array<SectionData>,\n  },\n};\n\nexport type PropertyElementMapped = {\n  propertyElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    properties: Array<PropertyData>,\n  },\n};\nexport type TextFragmentElementMapped = {\n  textFragmentElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    textfragments: Array<TextFragmentData>,\n  },\n};\nexport type ContentElementMapped = {\n  contentElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    sections: Array<SectionModel>,\n  },\n};\n\nexport type ContentAll = Array<\n  PropertyElementMapped | TextFragmentElementMapped | ContentElementMapped,\n>;\n\nexport type ContentData = {\n  header: {\n    label?: string,\n    description?: { id?: string, message: string, properties?: Object },\n  },\n  label?: string,\n  elements: Array<PropertyElement | TextFragmentElement | ContentElement>,\n};\n\nexport type SectionFragment = {\n  text: string,\n  startOffset: number,\n  endOffset: number,\n};\n\nexport type ModelOptions = {\n  origin?: ?string,\n  contextPath?: ?string,\n};\n"],"mappings":"","ignoreList":[]}

package/esm/react-server/__tests__/requestInformation.spec.js.flow

@@ -92,7 +92,7 @@ describe("requestInformation", () => {
         queryString: "q=hello world&filter=test",
       });
       expect(getFullRequestUrl(request)).toBe(
-        "/search?q%3Dhello%20world%26filter%3Dtest",
+        "/search?q=hello%20world&filter=test",
       );
     });
 
@@ -120,7 +120,7 @@ describe("requestInformation", () => {
         queryString: "name=John Doe & email=john@example.com",
       });
       expect(getFullRequestUrl(request)).toBe(
-        "/api/data?name%3DJohn%20Doe%20%26%20email%3Djohn%40example.com",
+        "/api/data?name=John%20Doe%20&%20email=john%40example.com",
       );
     });
 
@@ -144,11 +144,11 @@ describe("requestInformation", () => {
       // Verify that Href constructor was called with the correct URL
       expect(require("../../models/href/Href")).toHaveBeenCalledTimes(1);
       expect(require("../../models/href/Href")).toHaveBeenCalledWith(
-        "/products?id%3D123",
+        "/products?id=123",
       );
 
       // Verify the returned object is an instance of the mock Href
-      expect(hrefInstance.url).toBe("/products?id%3D123");
+      expect(hrefInstance.url).toBe("/products?id=123");
     });
 
     it("should handle complex URLs and pass them to Href", () => {
@@ -158,10 +158,10 @@ describe("requestInformation", () => {
       });
       const hrefInstance = getFullRequestHref(request);
       expect(require("../../models/href/Href")).toHaveBeenCalledWith(
-        "/search/results?q%3Djavascript%2520xss%26param%3Dvalue",
+        "/search/results?q=javascript%2520xss&param=value",
       );
       expect(hrefInstance.url).toBe(
-        "/search/results?q%3Djavascript%2520xss%26param%3Dvalue",
+        "/search/results?q=javascript%2520xss&param=value",
       );
     });
   });

package/esm/react-server/requestInformation.js

@@ -1,5 +1,21 @@
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import Href from "../models/href/Href";
+/**
+ */
+const encodeQueryString = queryString => {
+  if (!queryString) return "";
+  const params = [];
+  queryString.split("&").forEach(part => {
+    const [key, value] = part.split("=");
+    if (key && value) {
+      params.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
+    } else if (key) {
+      params.push(encodeURIComponent(key));
+    }
+  });
+  return params.join("&");
+};
+
 /**
  */
 export const getFullRequestUrl = request => {
@@ -8,7 +24,7 @@ export const getFullRequestUrl = request => {
   let queryString = request.getQueryString();
   pathInfo = _mapInstanceProperty(_context = pathInfo.split("/")).call(_context, segment => encodeURIComponent(segment)).join("/");
   if (queryString) {
-    return `${pathInfo}?${encodeURIComponent(queryString)}`;
+    return `${pathInfo}?${encodeQueryString(queryString)}`;
   }
   return pathInfo;
 };

package/esm/react-server/requestInformation.js.flow

@@ -3,6 +3,23 @@ import Href from "../models/href/Href";
 
 import type Locales from "../i18n/Locales";
 
+/**
+ */
+const encodeQueryString = (queryString: string) => {
+  if (!queryString) return "";
+
+  const params = [];
+  queryString.split("&").forEach((part) => {
+    const [key, value] = part.split("=");
+    if (key && value) {
+      params.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
+    } else if (key) {
+      params.push(encodeURIComponent(key));
+    }
+  });
+  return params.join("&");
+};
+
 /**
  */
 export const getFullRequestUrl = (request: HttpServletRequestJava): string => {
@@ -15,7 +32,7 @@ export const getFullRequestUrl = (request: HttpServletRequestJava): string => {
     .join("/");
 
   if (queryString) {
-    return `${pathInfo}?${encodeURIComponent(queryString)}`;
+    return `${pathInfo}?${encodeQueryString(queryString)}`;
   }
 
   return pathInfo;

package/esm/react-server/requestInformation.js.map

@@ -1 +1 @@
-{"version":3,"file":"requestInformation.js","names":["Href","getFullRequestUrl","request","_context","pathInfo","getPathInfo","queryString","getQueryString","_mapInstanceProperty","split","call","segment","encodeURIComponent","join","getFullRequestHref","getCookieFromRequest","cookieName","getCookieByName","getPreferredLocale","locales","languageFromCookie","acceptLanguageHeader","getHeader","availableLocaleCodes"],"sources":["../../src/react-server/requestInformation.js"],"sourcesContent":["// @flow\nimport Href from \"../models/href/Href\";\n\nimport type Locales from \"../i18n/Locales\";\n\n/**\n */\nexport const getFullRequestUrl = (request: HttpServletRequestJava): string => {\n  let pathInfo = request.getPathInfo() || \"/\";\n  let queryString = request.getQueryString();\n\n  pathInfo = pathInfo\n    .split(\"/\")\n    .map((segment) => encodeURIComponent(segment))\n    .join(\"/\");\n\n  if (queryString) {\n    return `${pathInfo}?${encodeURIComponent(queryString)}`;\n  }\n\n  return pathInfo;\n};\n\n/**\n */\nexport const getFullRequestHref = (request: HttpServletRequestJava): Href =>\n  new Href(getFullRequestUrl(request));\n\n/**\n */\nexport const getCookieFromRequest = (\n  request: HttpServletRequestJava,\n  cookieName: string,\n): null | string => {\n  return request.getCookieByName(cookieName);\n};\n\n/**\n */\nexport const getPreferredLocale = (\n  request: HttpServletRequestJava,\n  locales: Locales,\n): void | string => {\n  const languageFromCookie = getCookieFromRequest(request, \"locale\");\n  const acceptLanguageHeader =\n    languageFromCookie || request.getHeader(\"Accept-Language\");\n\n  // when no accept language header or cookie present, get first locale code\n  if (acceptLanguageHeader === null) {\n    return locales.availableLocaleCodes[0];\n  }\n\n  return locales.getPreferredLocale(acceptLanguageHeader);\n};\n"],"mappings":";AACA,OAAOA,IAAI,MAAM,qBAAqB;AAItC;AACA;AACA,OAAO,MAAMC,iBAAiB,GAAIC,OAA+B,IAAa;EAAA,IAAAC,QAAA;EAC5E,IAAIC,QAAQ,GAAGF,OAAO,CAACG,WAAW,CAAC,CAAC,IAAI,GAAG;EAC3C,IAAIC,WAAW,GAAGJ,OAAO,CAACK,cAAc,CAAC,CAAC;EAE1CH,QAAQ,GAAGI,oBAAA,CAAAL,QAAA,GAAAC,QAAQ,CAChBK,KAAK,CAAC,GAAG,CAAC,EAAAC,IAAA,CAAAP,QAAA,EACLQ,OAAO,IAAKC,kBAAkB,CAACD,OAAO,CAAC,CAAC,CAC7CE,IAAI,CAAC,GAAG,CAAC;EAEZ,IAAIP,WAAW,EAAE;IACf,OAAO,GAAGF,QAAQ,IAAIQ,kBAAkB,CAACN,WAAW,CAAC,EAAE;EACzD;EAEA,OAAOF,QAAQ;AACjB,CAAC;;AAED;AACA;AACA,OAAO,MAAMU,kBAAkB,GAAIZ,OAA+B,IAChE,IAAIF,IAAI,CAACC,iBAAiB,CAACC,OAAO,CAAC,CAAC;;AAEtC;AACA;AACA,OAAO,MAAMa,oBAAoB,GAAGA,CAClCb,OAA+B,EAC/Bc,UAAkB,KACA;EAClB,OAAOd,OAAO,CAACe,eAAe,CAACD,UAAU,CAAC;AAC5C,CAAC;;AAED;AACA;AACA,OAAO,MAAME,kBAAkB,GAAGA,CAChChB,OAA+B,EAC/BiB,OAAgB,KACE;EAClB,MAAMC,kBAAkB,GAAGL,oBAAoB,CAACb,OAAO,EAAE,QAAQ,CAAC;EAClE,MAAMmB,oBAAoB,GACxBD,kBAAkB,IAAIlB,OAAO,CAACoB,SAAS,CAAC,iBAAiB,CAAC;;EAE5D;EACA,IAAID,oBAAoB,KAAK,IAAI,EAAE;IACjC,OAAOF,OAAO,CAACI,oBAAoB,CAAC,CAAC,CAAC;EACxC;EAEA,OAAOJ,OAAO,CAACD,kBAAkB,CAACG,oBAAoB,CAAC;AACzD,CAAC","ignoreList":[]}
+{"version":3,"file":"requestInformation.js","names":["Href","encodeQueryString","queryString","params","split","forEach","part","key","value","push","encodeURIComponent","join","getFullRequestUrl","request","_context","pathInfo","getPathInfo","getQueryString","_mapInstanceProperty","call","segment","getFullRequestHref","getCookieFromRequest","cookieName","getCookieByName","getPreferredLocale","locales","languageFromCookie","acceptLanguageHeader","getHeader","availableLocaleCodes"],"sources":["../../src/react-server/requestInformation.js"],"sourcesContent":["// @flow\nimport Href from \"../models/href/Href\";\n\nimport type Locales from \"../i18n/Locales\";\n\n/**\n */\nconst encodeQueryString = (queryString: string) => {\n  if (!queryString) return \"\";\n\n  const params = [];\n  queryString.split(\"&\").forEach((part) => {\n    const [key, value] = part.split(\"=\");\n    if (key && value) {\n      params.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);\n    } else if (key) {\n      params.push(encodeURIComponent(key));\n    }\n  });\n  return params.join(\"&\");\n};\n\n/**\n */\nexport const getFullRequestUrl = (request: HttpServletRequestJava): string => {\n  let pathInfo = request.getPathInfo() || \"/\";\n  let queryString = request.getQueryString();\n\n  pathInfo = pathInfo\n    .split(\"/\")\n    .map((segment) => encodeURIComponent(segment))\n    .join(\"/\");\n\n  if (queryString) {\n    return `${pathInfo}?${encodeQueryString(queryString)}`;\n  }\n\n  return pathInfo;\n};\n\n/**\n */\nexport const getFullRequestHref = (request: HttpServletRequestJava): Href =>\n  new Href(getFullRequestUrl(request));\n\n/**\n */\nexport const getCookieFromRequest = (\n  request: HttpServletRequestJava,\n  cookieName: string,\n): null | string => {\n  return request.getCookieByName(cookieName);\n};\n\n/**\n */\nexport const getPreferredLocale = (\n  request: HttpServletRequestJava,\n  locales: Locales,\n): void | string => {\n  const languageFromCookie = getCookieFromRequest(request, \"locale\");\n  const acceptLanguageHeader =\n    languageFromCookie || request.getHeader(\"Accept-Language\");\n\n  // when no accept language header or cookie present, get first locale code\n  if (acceptLanguageHeader === null) {\n    return locales.availableLocaleCodes[0];\n  }\n\n  return locales.getPreferredLocale(acceptLanguageHeader);\n};\n"],"mappings":";AACA,OAAOA,IAAI,MAAM,qBAAqB;AAItC;AACA;AACA,MAAMC,iBAAiB,GAAIC,WAAmB,IAAK;EACjD,IAAI,CAACA,WAAW,EAAE,OAAO,EAAE;EAE3B,MAAMC,MAAM,GAAG,EAAE;EACjBD,WAAW,CAACE,KAAK,CAAC,GAAG,CAAC,CAACC,OAAO,CAAEC,IAAI,IAAK;IACvC,MAAM,CAACC,GAAG,EAAEC,KAAK,CAAC,GAAGF,IAAI,CAACF,KAAK,CAAC,GAAG,CAAC;IACpC,IAAIG,GAAG,IAAIC,KAAK,EAAE;MAChBL,MAAM,CAACM,IAAI,CAAC,GAAGC,kBAAkB,CAACH,GAAG,CAAC,IAAIG,kBAAkB,CAACF,KAAK,CAAC,EAAE,CAAC;IACxE,CAAC,MAAM,IAAID,GAAG,EAAE;MACdJ,MAAM,CAACM,IAAI,CAACC,kBAAkB,CAACH,GAAG,CAAC,CAAC;IACtC;EACF,CAAC,CAAC;EACF,OAAOJ,MAAM,CAACQ,IAAI,CAAC,GAAG,CAAC;AACzB,CAAC;;AAED;AACA;AACA,OAAO,MAAMC,iBAAiB,GAAIC,OAA+B,IAAa;EAAA,IAAAC,QAAA;EAC5E,IAAIC,QAAQ,GAAGF,OAAO,CAACG,WAAW,CAAC,CAAC,IAAI,GAAG;EAC3C,IAAId,WAAW,GAAGW,OAAO,CAACI,cAAc,CAAC,CAAC;EAE1CF,QAAQ,GAAGG,oBAAA,CAAAJ,QAAA,GAAAC,QAAQ,CAChBX,KAAK,CAAC,GAAG,CAAC,EAAAe,IAAA,CAAAL,QAAA,EACLM,OAAO,IAAKV,kBAAkB,CAACU,OAAO,CAAC,CAAC,CAC7CT,IAAI,CAAC,GAAG,CAAC;EAEZ,IAAIT,WAAW,EAAE;IACf,OAAO,GAAGa,QAAQ,IAAId,iBAAiB,CAACC,WAAW,CAAC,EAAE;EACxD;EAEA,OAAOa,QAAQ;AACjB,CAAC;;AAED;AACA;AACA,OAAO,MAAMM,kBAAkB,GAAIR,OAA+B,IAChE,IAAIb,IAAI,CAACY,iBAAiB,CAACC,OAAO,CAAC,CAAC;;AAEtC;AACA;AACA,OAAO,MAAMS,oBAAoB,GAAGA,CAClCT,OAA+B,EAC/BU,UAAkB,KACA;EAClB,OAAOV,OAAO,CAACW,eAAe,CAACD,UAAU,CAAC;AAC5C,CAAC;;AAED;AACA;AACA,OAAO,MAAME,kBAAkB,GAAGA,CAChCZ,OAA+B,EAC/Ba,OAAgB,KACE;EAClB,MAAMC,kBAAkB,GAAGL,oBAAoB,CAACT,OAAO,EAAE,QAAQ,CAAC;EAClE,MAAMe,oBAAoB,GACxBD,kBAAkB,IAAId,OAAO,CAACgB,SAAS,CAAC,iBAAiB,CAAC;;EAE5D;EACA,IAAID,oBAAoB,KAAK,IAAI,EAAE;IACjC,OAAOF,OAAO,CAACI,oBAAoB,CAAC,CAAC,CAAC;EACxC;EAEA,OAAOJ,OAAO,CAACD,kBAAkB,CAACG,oBAAoB,CAAC;AACzD,CAAC","ignoreList":[]}

package/lib/models/content/SectionModel.js

@@ -101,14 +101,19 @@ class SectionModel extends _BaseModel.default {
    * Retrieve child section links
    */
   get childSectionLinks() {
-    var _context;
-    return this.data.childSections ? (0, _map.default)(_context = this.data.childSections).call(_context, childSection => new _ContentLinkModel.default({
+    let sections = [];
+    if (this.data.childSections) {
+      sections = this.data.childSections;
+    } else if (this.data.sections) {
+      sections = this.data.sections;
+    }
+    return (0, _map.default)(sections).call(sections, childSection => new _ContentLinkModel.default({
       section: childSection.id || childSection._id,
       _id: childSection.id || childSection._id,
       label: childSection.label,
       sourceLabel: childSection.sourceLabel,
       _links: childSection._links
-    }, this.entryDate, this.modelOptions)) : [];
+    }, this.entryDate, this.modelOptions));
   }
 
   /**
@@ -127,11 +132,17 @@ class SectionModel extends _BaseModel.default {
    * Get tree of child sections
    */
   get childSections() {
-    if (!this._childSections && this.data.childSections) {
-      var _context2, _context3;
-      this._childSections = (0, _map.default)(_context2 = (0, _filter.default)(_context3 = this.data.childSections).call(_context3, childSection => "body" in childSection)).call(_context2, childSection => new SectionModel(childSection, this.entryDate, this.modelOptions));
+    if (!this._childSections) {
+      var _context;
+      let sections = [];
+      if (this.data.childSections) {
+        sections = this.data.childSections;
+      } else if (this.data.sections) {
+        sections = this.data.sections;
+      }
+      this._childSections = (0, _map.default)(_context = (0, _filter.default)(sections).call(sections, childSection => "body" in childSection)).call(_context, childSection => new SectionModel(childSection, this.entryDate, this.modelOptions));
     }
-    return this._childSections || [];
+    return this._childSections;
   }
 
   /**
@@ -145,8 +156,8 @@ class SectionModel extends _BaseModel.default {
    */
   get sections() {
     if (this.data.sections) {
-      var _context4;
-      return (0, _map.default)(_context4 = this.data.sections).call(_context4, section => new SectionModel(section, this.entryDate, this.modelOptions));
+      var _context2;
+      return (0, _map.default)(_context2 = this.data.sections).call(_context2, section => new SectionModel(section, this.entryDate, this.modelOptions));
     }
     return [];
   }
@@ -154,8 +165,8 @@ class SectionModel extends _BaseModel.default {
    * Get sub sections
    */
   get subSections() {
-    var _context5;
-    return this.data.subSections ? (0, _map.default)(_context5 = this.data.subSections).call(_context5, subSection => new _SubSectionModel.default(subSection, this.entryDate, this.modelOptions)) : [];
+    var _context3;
+    return this.data.subSections ? (0, _map.default)(_context3 = this.data.subSections).call(_context3, subSection => new _SubSectionModel.default(subSection, this.entryDate, this.modelOptions)) : [];
   }
 
   /**

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

@@ -1 +1 @@
-{"version":3,"file":"SectionModel.js","names":["_BaseModel","_interopRequireDefault","require","_ContentLinkModel","_SubSectionModel","_createHash","_LinkModel","_utils","SectionModel","BaseModel","constructor","data","entryDate","modelOptions","_defineProperty2","default","_entryDate","referred","selflink","_selflink","LinkModel","_links","self","selfhref","href","type","sourceLabel","id","_id","key","label","getData","number","body","retrieveText","childSectionLinks","_context","childSections","_map","call","childSection","ContentLinkModel","section","selfContentLink","_childSections","_context2","_context3","_filter","sections","_context4","subSections","_context5","subSection","SubSectionModel","referenceHash","createHashFromHref","getReferredSections","push","referredChilds","_default","exports"],"sources":["../../../src/models/content/SectionModel.js"],"sourcesContent":["// @flow\nimport BaseModel from \"../base/BaseModel\";\nimport ContentLinkModel from \"./ContentLinkModel\";\nimport SubSectionModel from \"./SubSectionModel\";\n\nimport { createHashFromHref } from \"../../utils/helpers/createHash\";\nimport LinkModel from \"../links/LinkModel\";\n\nimport { retrieveText } from \"../../utils\";\n\nimport type Href from \"../href/Href\";\nimport type { ModelOptions } from \"../types\";\n\n/**\n */\nclass SectionModel extends BaseModel {\n  _entryDate: ISO_DATE | null;\n  _selflink: ?LinkModel;\n  _childSections: Array<SectionModel>;\n\n  constructor(\n    data: Object,\n    entryDate: ISO_DATE | null,\n    modelOptions?: ModelOptions,\n  ) {\n    super(data, {}, modelOptions);\n\n    this._entryDate = entryDate;\n  }\n\n  /**\n   */\n  get referred(): boolean {\n    return this.data.referred;\n  }\n\n  /**\n   */\n  get selflink(): LinkModel {\n    if (!this._selflink) {\n      this._selflink = new LinkModel(\n        this.data._links?.self,\n        null,\n        this.modelOptions,\n      );\n    }\n    return this._selflink;\n  }\n\n  /**\n   */\n  get selfhref(): Href {\n    return this.selflink.href;\n  }\n\n  /**\n   */\n  get entryDate(): ISO_DATE | null {\n    return this._entryDate;\n  }\n\n  /**\n   */\n  get type(): string {\n    return this.data.type;\n  }\n\n  /**\n   */\n  get sourceLabel(): string {\n    return this.data.sourceLabel;\n  }\n\n  /**\n   */\n  get id(): string {\n    return this.data.id || this.data._id;\n  }\n\n  /**\n   */\n  get key(): string {\n    return this.id;\n  }\n\n  /**\n   * Get content label\n   */\n  get label(): string {\n    return this.getData(\"label\", \"\");\n  }\n\n  /**\n   * Retrieve number of section\n   */\n  get number(): string | null {\n    return this.data.number ?? null;\n  }\n\n  /**\n   * Get content body\n   */\n  get body(): ?string {\n    return retrieveText(this.data.body);\n  }\n\n  /**\n   * Retrieve child section links\n   */\n  get childSectionLinks(): Array<ContentLinkModel> {\n    return this.data.childSections\n      ? this.data.childSections.map(\n          (childSection) =>\n            new ContentLinkModel(\n              {\n                section: childSection.id || childSection._id,\n                _id: childSection.id || childSection._id,\n                label: childSection.label,\n                sourceLabel: childSection.sourceLabel,\n                _links: childSection._links,\n              },\n              this.entryDate,\n              this.modelOptions,\n            ),\n        )\n      : [];\n  }\n\n  /**\n   */\n  get selfContentLink(): ContentLinkModel {\n    return new ContentLinkModel(\n      {\n        section: this.id,\n        _id: this.id,\n        label: this.data.label,\n        sourceLabel: this.data.sourceLabel,\n        _links: this.data._links,\n      },\n      this.entryDate,\n      this.modelOptions,\n    );\n  }\n\n  /**\n   * Get tree of child sections\n   */\n  get childSections(): Array<SectionModel> {\n    if (!this._childSections && this.data.childSections) {\n      this._childSections = this.data.childSections\n        .filter((childSection) => \"body\" in childSection)\n        .map(\n          (childSection) =>\n            new SectionModel(childSection, this.entryDate, this.modelOptions),\n        );\n    }\n    return this._childSections || [];\n  }\n\n  /**\n   * set resolved child sections\n   */\n  set childSections(sections: Array<SectionModel>) {\n    this._childSections = sections || [];\n  }\n\n  /**\n   */\n  get sections(): Array<SectionModel> {\n    if (this.data.sections) {\n      return this.data.sections.map(\n        (section) =>\n          new SectionModel(section, this.entryDate, this.modelOptions),\n      );\n    }\n    return [];\n  }\n  /**\n   * Get sub sections\n   */\n  get subSections(): Array<SubSectionModel> {\n    return this.data.subSections\n      ? this.data.subSections.map(\n          (subSection) =>\n            new SubSectionModel(subSection, this.entryDate, this.modelOptions),\n        )\n      : [];\n  }\n\n  /**\n   */\n  get referenceHash(): number {\n    return createHashFromHref(this.selfhref);\n  }\n\n  /**\n   */\n  getReferredSections(): Array<SubSectionModel | SectionModel> {\n    const sections = [];\n\n    for (const subSection of this.subSections) {\n      if (subSection.referred) {\n        sections.push(subSection);\n      }\n\n      const referredChilds = subSection.getReferredSections();\n      sections.push(...referredChilds);\n    }\n\n    for (const childSection of this.childSections) {\n      if (childSection.referred) {\n        sections.push(childSection);\n      }\n\n      const referredChilds = childSection.getReferredSections();\n      sections.push(...referredChilds);\n    }\n\n    return sections;\n  }\n}\n\nexport default SectionModel;\n"],"mappings":";;;;;;;;;;AACA,IAAAA,UAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,iBAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,gBAAA,GAAAH,sBAAA,CAAAC,OAAA;AAEA,IAAAG,WAAA,GAAAH,OAAA;AACA,IAAAI,UAAA,GAAAL,sBAAA,CAAAC,OAAA;AAEA,IAAAK,MAAA,GAAAL,OAAA;AAKA;AACA;AACA,MAAMM,YAAY,SAASC,kBAAS,CAAC;EAKnCC,WAAWA,CACTC,IAAY,EACZC,SAA0B,EAC1BC,YAA2B,EAC3B;IACA,KAAK,CAACF,IAAI,EAAE,CAAC,CAAC,EAAEE,YAAY,CAAC;IAAC,IAAAC,gBAAA,CAAAC,OAAA;IAAA,IAAAD,gBAAA,CAAAC,OAAA;IAAA,IAAAD,gBAAA,CAAAC,OAAA;IAE9B,IAAI,CAACC,UAAU,GAAGJ,SAAS;EAC7B;;EAEA;AACF;EACE,IAAIK,QAAQA,CAAA,EAAY;IACtB,OAAO,IAAI,CAACN,IAAI,CAACM,QAAQ;EAC3B;;EAEA;AACF;EACE,IAAIC,QAAQA,CAAA,EAAc;IACxB,IAAI,CAAC,IAAI,CAACC,SAAS,EAAE;MACnB,IAAI,CAACA,SAAS,GAAG,IAAIC,kBAAS,CAC5B,IAAI,CAACT,IAAI,CAACU,MAAM,EAAEC,IAAI,EACtB,IAAI,EACJ,IAAI,CAACT,YACP,CAAC;IACH;IACA,OAAO,IAAI,CAACM,SAAS;EACvB;;EAEA;AACF;EACE,IAAII,QAAQA,CAAA,EAAS;IACnB,OAAO,IAAI,CAACL,QAAQ,CAACM,IAAI;EAC3B;;EAEA;AACF;EACE,IAAIZ,SAASA,CAAA,EAAoB;IAC/B,OAAO,IAAI,CAACI,UAAU;EACxB;;EAEA;AACF;EACE,IAAIS,IAAIA,CAAA,EAAW;IACjB,OAAO,IAAI,CAACd,IAAI,CAACc,IAAI;EACvB;;EAEA;AACF;EACE,IAAIC,WAAWA,CAAA,EAAW;IACxB,OAAO,IAAI,CAACf,IAAI,CAACe,WAAW;EAC9B;;EAEA;AACF;EACE,IAAIC,EAAEA,CAAA,EAAW;IACf,OAAO,IAAI,CAAChB,IAAI,CAACgB,EAAE,IAAI,IAAI,CAAChB,IAAI,CAACiB,GAAG;EACtC;;EAEA;AACF;EACE,IAAIC,GAAGA,CAAA,EAAW;IAChB,OAAO,IAAI,CAACF,EAAE;EAChB;;EAEA;AACF;AACA;EACE,IAAIG,KAAKA,CAAA,EAAW;IAClB,OAAO,IAAI,CAACC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;EAClC;;EAEA;AACF;AACA;EACE,IAAIC,MAAMA,CAAA,EAAkB;IAC1B,OAAO,IAAI,CAACrB,IAAI,CAACqB,MAAM,IAAI,IAAI;EACjC;;EAEA;AACF;AACA;EACE,IAAIC,IAAIA,CAAA,EAAY;IAClB,OAAO,IAAAC,mBAAY,EAAC,IAAI,CAACvB,IAAI,CAACsB,IAAI,CAAC;EACrC;;EAEA;AACF;AACA;EACE,IAAIE,iBAAiBA,CAAA,EAA4B;IAAA,IAAAC,QAAA;IAC/C,OAAO,IAAI,CAACzB,IAAI,CAAC0B,aAAa,GAC1B,IAAAC,IAAA,CAAAvB,OAAA,EAAAqB,QAAA,OAAI,CAACzB,IAAI,CAAC0B,aAAa,EAAAE,IAAA,CAAAH,QAAA,EACpBI,YAAY,IACX,IAAIC,yBAAgB,CAClB;MACEC,OAAO,EAAEF,YAAY,CAACb,EAAE,IAAIa,YAAY,CAACZ,GAAG;MAC5CA,GAAG,EAAEY,YAAY,CAACb,EAAE,IAAIa,YAAY,CAACZ,GAAG;MACxCE,KAAK,EAAEU,YAAY,CAACV,KAAK;MACzBJ,WAAW,EAAEc,YAAY,CAACd,WAAW;MACrCL,MAAM,EAAEmB,YAAY,CAACnB;IACvB,CAAC,EACD,IAAI,CAACT,SAAS,EACd,IAAI,CAACC,YACP,CACJ,CAAC,GACD,EAAE;EACR;;EAEA;AACF;EACE,IAAI8B,eAAeA,CAAA,EAAqB;IACtC,OAAO,IAAIF,yBAAgB,CACzB;MACEC,OAAO,EAAE,IAAI,CAACf,EAAE;MAChBC,GAAG,EAAE,IAAI,CAACD,EAAE;MACZG,KAAK,EAAE,IAAI,CAACnB,IAAI,CAACmB,KAAK;MACtBJ,WAAW,EAAE,IAAI,CAACf,IAAI,CAACe,WAAW;MAClCL,MAAM,EAAE,IAAI,CAACV,IAAI,CAACU;IACpB,CAAC,EACD,IAAI,CAACT,SAAS,EACd,IAAI,CAACC,YACP,CAAC;EACH;;EAEA;AACF;AACA;EACE,IAAIwB,aAAaA,CAAA,EAAwB;IACvC,IAAI,CAAC,IAAI,CAACO,cAAc,IAAI,IAAI,CAACjC,IAAI,CAAC0B,aAAa,EAAE;MAAA,IAAAQ,SAAA,EAAAC,SAAA;MACnD,IAAI,CAACF,cAAc,GAAG,IAAAN,IAAA,CAAAvB,OAAA,EAAA8B,SAAA,OAAAE,OAAA,CAAAhC,OAAA,EAAA+B,SAAA,OAAI,CAACnC,IAAI,CAAC0B,aAAa,EAAAE,IAAA,CAAAO,SAAA,EAClCN,YAAY,IAAK,MAAM,IAAIA,YAAY,CAAC,EAAAD,IAAA,CAAAM,SAAA,EAE9CL,YAAY,IACX,IAAIhC,YAAY,CAACgC,YAAY,EAAE,IAAI,CAAC5B,SAAS,EAAE,IAAI,CAACC,YAAY,CACpE,CAAC;IACL;IACA,OAAO,IAAI,CAAC+B,cAAc,IAAI,EAAE;EAClC;;EAEA;AACF;AACA;EACE,IAAIP,aAAaA,CAACW,QAA6B,EAAE;IAC/C,IAAI,CAACJ,cAAc,GAAGI,QAAQ,IAAI,EAAE;EACtC;;EAEA;AACF;EACE,IAAIA,QAAQA,CAAA,EAAwB;IAClC,IAAI,IAAI,CAACrC,IAAI,CAACqC,QAAQ,EAAE;MAAA,IAAAC,SAAA;MACtB,OAAO,IAAAX,IAAA,CAAAvB,OAAA,EAAAkC,SAAA,OAAI,CAACtC,IAAI,CAACqC,QAAQ,EAAAT,IAAA,CAAAU,SAAA,EACtBP,OAAO,IACN,IAAIlC,YAAY,CAACkC,OAAO,EAAE,IAAI,CAAC9B,SAAS,EAAE,IAAI,CAACC,YAAY,CAC/D,CAAC;IACH;IACA,OAAO,EAAE;EACX;EACA;AACF;AACA;EACE,IAAIqC,WAAWA,CAAA,EAA2B;IAAA,IAAAC,SAAA;IACxC,OAAO,IAAI,CAACxC,IAAI,CAACuC,WAAW,GACxB,IAAAZ,IAAA,CAAAvB,OAAA,EAAAoC,SAAA,OAAI,CAACxC,IAAI,CAACuC,WAAW,EAAAX,IAAA,CAAAY,SAAA,EAClBC,UAAU,IACT,IAAIC,wBAAe,CAACD,UAAU,EAAE,IAAI,CAACxC,SAAS,EAAE,IAAI,CAACC,YAAY,CACrE,CAAC,GACD,EAAE;EACR;;EAEA;AACF;EACE,IAAIyC,aAAaA,CAAA,EAAW;IAC1B,OAAO,IAAAC,8BAAkB,EAAC,IAAI,CAAChC,QAAQ,CAAC;EAC1C;;EAEA;AACF;EACEiC,mBAAmBA,CAAA,EAA0C;IAC3D,MAAMR,QAAQ,GAAG,EAAE;IAEnB,KAAK,MAAMI,UAAU,IAAI,IAAI,CAACF,WAAW,EAAE;MACzC,IAAIE,UAAU,CAACnC,QAAQ,EAAE;QACvB+B,QAAQ,CAACS,IAAI,CAACL,UAAU,CAAC;MAC3B;MAEA,MAAMM,cAAc,GAAGN,UAAU,CAACI,mBAAmB,CAAC,CAAC;MACvDR,QAAQ,CAACS,IAAI,CAAC,GAAGC,cAAc,CAAC;IAClC;IAEA,KAAK,MAAMlB,YAAY,IAAI,IAAI,CAACH,aAAa,EAAE;MAC7C,IAAIG,YAAY,CAACvB,QAAQ,EAAE;QACzB+B,QAAQ,CAACS,IAAI,CAACjB,YAAY,CAAC;MAC7B;MAEA,MAAMkB,cAAc,GAAGlB,YAAY,CAACgB,mBAAmB,CAAC,CAAC;MACzDR,QAAQ,CAACS,IAAI,CAAC,GAAGC,cAAc,CAAC;IAClC;IAEA,OAAOV,QAAQ;EACjB;AACF;AAAC,IAAAW,QAAA,GAAAC,OAAA,CAAA7C,OAAA,GAEcP,YAAY","ignoreList":[]}
+{"version":3,"file":"SectionModel.js","names":["_BaseModel","_interopRequireDefault","require","_ContentLinkModel","_SubSectionModel","_createHash","_LinkModel","_utils","SectionModel","BaseModel","constructor","data","entryDate","modelOptions","_defineProperty2","default","_entryDate","referred","selflink","_selflink","LinkModel","_links","self","selfhref","href","type","sourceLabel","id","_id","key","label","getData","number","body","retrieveText","childSectionLinks","sections","childSections","_map","call","childSection","ContentLinkModel","section","selfContentLink","_childSections","_context","_filter","_context2","subSections","_context3","subSection","SubSectionModel","referenceHash","createHashFromHref","getReferredSections","push","referredChilds","_default","exports"],"sources":["../../../src/models/content/SectionModel.js"],"sourcesContent":["// @flow\nimport BaseModel from \"../base/BaseModel\";\nimport ContentLinkModel from \"./ContentLinkModel\";\nimport SubSectionModel from \"./SubSectionModel\";\n\nimport { createHashFromHref } from \"../../utils/helpers/createHash\";\nimport LinkModel from \"../links/LinkModel\";\n\nimport { retrieveText } from \"../../utils\";\n\nimport type Href from \"../href/Href\";\nimport type { ModelOptions } from \"../types\";\n\n/**\n */\nclass SectionModel extends BaseModel {\n  _entryDate: ISO_DATE | null;\n  _selflink: ?LinkModel;\n  _childSections: Array<SectionModel>;\n\n  constructor(\n    data: Object,\n    entryDate: ISO_DATE | null,\n    modelOptions?: ModelOptions,\n  ) {\n    super(data, {}, modelOptions);\n\n    this._entryDate = entryDate;\n  }\n\n  /**\n   */\n  get referred(): boolean {\n    return this.data.referred;\n  }\n\n  /**\n   */\n  get selflink(): LinkModel {\n    if (!this._selflink) {\n      this._selflink = new LinkModel(\n        this.data._links?.self,\n        null,\n        this.modelOptions,\n      );\n    }\n    return this._selflink;\n  }\n\n  /**\n   */\n  get selfhref(): Href {\n    return this.selflink.href;\n  }\n\n  /**\n   */\n  get entryDate(): ISO_DATE | null {\n    return this._entryDate;\n  }\n\n  /**\n   */\n  get type(): string {\n    return this.data.type;\n  }\n\n  /**\n   */\n  get sourceLabel(): string {\n    return this.data.sourceLabel;\n  }\n\n  /**\n   */\n  get id(): string {\n    return this.data.id || this.data._id;\n  }\n\n  /**\n   */\n  get key(): string {\n    return this.id;\n  }\n\n  /**\n   * Get content label\n   */\n  get label(): string {\n    return this.getData(\"label\", \"\");\n  }\n\n  /**\n   * Retrieve number of section\n   */\n  get number(): string | null {\n    return this.data.number ?? null;\n  }\n\n  /**\n   * Get content body\n   */\n  get body(): ?string {\n    return retrieveText(this.data.body);\n  }\n\n  /**\n   * Retrieve child section links\n   */\n  get childSectionLinks(): Array<ContentLinkModel> {\n    let sections = [];\n    if (this.data.childSections) {\n      sections = this.data.childSections;\n    } else if (this.data.sections) {\n      sections = this.data.sections;\n    }\n\n    return sections.map(\n      (childSection) =>\n        new ContentLinkModel(\n          {\n            section: childSection.id || childSection._id,\n            _id: childSection.id || childSection._id,\n            label: childSection.label,\n            sourceLabel: childSection.sourceLabel,\n            _links: childSection._links,\n          },\n          this.entryDate,\n          this.modelOptions,\n        ),\n    );\n  }\n\n  /**\n   */\n  get selfContentLink(): ContentLinkModel {\n    return new ContentLinkModel(\n      {\n        section: this.id,\n        _id: this.id,\n        label: this.data.label,\n        sourceLabel: this.data.sourceLabel,\n        _links: this.data._links,\n      },\n      this.entryDate,\n      this.modelOptions,\n    );\n  }\n\n  /**\n   * Get tree of child sections\n   */\n  get childSections(): Array<SectionModel> {\n    if (!this._childSections) {\n      let sections = [];\n      if (this.data.childSections) {\n        sections = this.data.childSections;\n      } else if (this.data.sections) {\n        sections = this.data.sections;\n      }\n\n      this._childSections = sections\n        .filter((childSection) => \"body\" in childSection)\n        .map(\n          (childSection) =>\n            new SectionModel(childSection, this.entryDate, this.modelOptions),\n        );\n    }\n\n    return this._childSections;\n  }\n\n  /**\n   * set resolved child sections\n   */\n  set childSections(sections: Array<SectionModel>) {\n    this._childSections = sections || [];\n  }\n\n  /**\n   */\n  get sections(): Array<SectionModel> {\n    if (this.data.sections) {\n      return this.data.sections.map(\n        (section) =>\n          new SectionModel(section, this.entryDate, this.modelOptions),\n      );\n    }\n    return [];\n  }\n  /**\n   * Get sub sections\n   */\n  get subSections(): Array<SubSectionModel> {\n    return this.data.subSections\n      ? this.data.subSections.map(\n          (subSection) =>\n            new SubSectionModel(subSection, this.entryDate, this.modelOptions),\n        )\n      : [];\n  }\n\n  /**\n   */\n  get referenceHash(): number {\n    return createHashFromHref(this.selfhref);\n  }\n\n  /**\n   */\n  getReferredSections(): Array<SubSectionModel | SectionModel> {\n    const sections = [];\n\n    for (const subSection of this.subSections) {\n      if (subSection.referred) {\n        sections.push(subSection);\n      }\n\n      const referredChilds = subSection.getReferredSections();\n      sections.push(...referredChilds);\n    }\n\n    for (const childSection of this.childSections) {\n      if (childSection.referred) {\n        sections.push(childSection);\n      }\n\n      const referredChilds = childSection.getReferredSections();\n      sections.push(...referredChilds);\n    }\n\n    return sections;\n  }\n}\n\nexport default SectionModel;\n"],"mappings":"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","ignoreList":[]}

package/lib/models/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../src/models/types.js"],"sourcesContent":["// @flow\nimport type ApplicationModel from \"./application/ApplicationModel\";\nimport type BooleanAttributeModel from \"./attributes/BooleanAttributeModel\";\nimport type CaptchaAttributeModel from \"./attributes/CaptchaAttributeModel\";\nimport type ChoiceAttributeModel from \"./attributes/ChoiceAttributeModel\";\nimport type CompositeAttributeModel from \"./attributes/CompositeAttributeModel\";\nimport type DatetimeAttributeModel from \"./attributes/DatetimeAttributeModel\";\nimport type HelptextAttributeModel from \"./attributes/HelptextAttributeModel\";\nimport type LabelAttributeModel from \"./attributes/LabelAttributeModel\";\nimport type MemoAttributeModel from \"./attributes/MemoAttributeModel\";\nimport type MoneyAttributeModel from \"./attributes/MoneyAttributeModel\";\nimport type NumberAttributeModel from \"./attributes/NumberAttributeModel\";\nimport type PasswordAttributeModel from \"./attributes/PasswordAttributeModel\";\nimport type StringAttributeModel from \"./attributes/StringAttributeModel\";\nimport type UploadAttributeModel from \"./attributes/UploadAttributeModel\";\nimport type XMLAttributeModel from \"./attributes/XMLAttributeModel\";\nimport type CaseViewModel from \"./caseview/CaseViewModel\";\nimport type BusinessScenarioModel from \"./concepts/BusinessScenarioModel\";\nimport type ConceptDetailModel from \"./concepts/ConceptDetailModel\";\nimport type ConceptIndexModel from \"./concepts/ConceptIndexModel\";\nimport type ConceptTypeDetailModel from \"./concepts/ConceptTypeDetailModel\";\nimport type ContentIndexModel from \"./content/ContentIndexModel\";\nimport type ContentModel from \"./content/ContentModel\";\nimport type SectionModel from \"./content/SectionModel\";\nimport type ContentTOCModel from \"./content/ContentTOCModel\";\nimport type ContentTypeModel from \"./content/ContentTypeModel\";\nimport type DetailModel from \"./detail/DetailModel\";\nimport type AssignmentFilterModel from \"./filters/AssignmentFilterModel\";\nimport type FilterModel from \"./filters/FilterModel\";\nimport type RangeFilterModel from \"./filters/RangeFilterModel\";\nimport type ConceptIndexFilterModel from \"./filters/ConceptIndexFilterModel\";\nimport type FormModel from \"./form/FormModel\";\nimport type ListDetailModel from \"./list/ListDetailModel\";\nimport type ListModel from \"./list/ListModel\";\nimport type ModelCatalogModel from \"./modelcatalog/ModelCatalogModel\";\nimport type GroupingPanelModel from \"./panels/GroupingPanelModel\";\nimport type CaseSearchModel from \"./search/CaseSearchModel\";\nimport type TabModel from \"./tab/TabModel\";\nimport type TaskGroupModel from \"./taskgroup/TaskGroupModel\";\nimport type UserModel from \"./user/UserModel\";\nimport type UserServicesModel from \"./user/UserServicesModel\";\nimport type LinkModel from \"./links/LinkModel\";\nimport type LookupOptionsModel from \"./lookup/LookupOptionsModel\";\nimport type BaseFilterModel from \"./filters/BaseFilterModel\";\nimport type AttributeCollection from \"./attributes/AttributeCollection\";\nimport type AttributeModel from \"./attributes/AttributeModel\";\nimport type LayoutHintCollection from \"./layouthint/LayoutHintCollection\";\nimport type ErrorResponse from \"./error/ErrorResponse\";\n\nexport type ModularUIModel =\n  | ApplicationModel\n  | CaseSearchModel\n  | CaseViewModel\n  | ListDetailModel\n  | DetailModel\n  | FormModel\n  | GroupingPanelModel\n  | ListModel\n  | TabModel\n  | TaskGroupModel\n  | UserModel\n  | UserServicesModel\n  | ModelCatalogModel\n  | ConceptIndexModel\n  | ConceptDetailModel\n  | BusinessScenarioModel\n  | ConceptTypeDetailModel\n  | ContentIndexModel\n  | ContentTOCModel\n  | ContentModel\n  | ContentTypeModel\n  | LookupOptionsModel;\n\nexport type AttributeType =\n  | BooleanAttributeModel\n  | CaptchaAttributeModel\n  | ChoiceAttributeModel\n  | DatetimeAttributeModel\n  | HelptextAttributeModel\n  | LabelAttributeModel\n  | MemoAttributeModel\n  | MoneyAttributeModel\n  | NumberAttributeModel\n  | PasswordAttributeModel\n  | CompositeAttributeModel\n  | StringAttributeModel\n  | UploadAttributeModel\n  | XMLAttributeModel;\n\nexport type RangeChildAttributeType =\n  | NumberAttributeModel\n  | DatetimeAttributeModel;\n\nexport type FilterType =\n  | BaseFilterModel\n  | FilterModel\n  | AssignmentFilterModel\n  | RangeFilterModel\n  | ConceptIndexFilterModel;\n\nexport type FormErrorAnchor = {\n  id: string,\n  properties?: {\n    [propertyName: string]: string | number,\n  },\n  anchor?: {\n    objectid: string,\n    elementid?: string,\n    _links?: Object,\n    index?: number,\n    \"index-identifier\"?: string,\n  },\n  layouthint: LayoutHintCollection,\n  message: string,\n  param?: {\n    name: string,\n  },\n};\n\nexport type labelsJSON = {\n  _id: string,\n  label: string,\n  value: string,\n};\n\nexport type propertyJSON = {\n  _id: string,\n  type: string,\n  mandatory: string,\n  label: string,\n  value: string,\n};\n\nexport type textfragmentJSON = {\n  label: string,\n  text: string,\n  type: string,\n};\n\nexport interface IConstraintModel {\n  +id: string;\n  +defaultMessage: string;\n  +parameters: Object;\n  +isMandatoryConstraint: boolean;\n  validate(value: any): boolean;\n  hasValidation(): boolean;\n}\n\nexport interface ILayoutHintRule {\n  process(attribute: AttributeModel, attributes: AttributeCollection): void;\n}\n\nexport interface IModelWithChildModels {\n  getInitialChildModelLinks(): Array<LinkModel>;\n  setChildModels(\n    models: Array<ModularUIModel>,\n    errors: Array<ErrorResponse>,\n  ): void;\n}\n\nexport type AuthenticationType = {\n  name: string,\n  authentication: string,\n  redirectUri?: string,\n  isPrimary: boolean,\n};\n\nexport type FileEntryType = {\n  name: string,\n  size?: number,\n  progress: number,\n  error?: string,\n  token?: string,\n};\n\nexport type FilesType = {\n  [filename: string]: FileEntryType,\n};\n\nexport type FiletypeConstraintsType = Array<{|\n  extensions: Array<string>,\n  mimeTypes: Array<string>,\n|}>;\n\nexport type FilesizeConstraintsType = {\n  fileSize: ?number,\n  maxTotalFileSize: ?number,\n  isMaxTotal: boolean,\n};\n\nexport type PropertyData = { type: string, label: string, value: string };\nexport type TextFragmentData = {\n  type: string,\n  label: string,\n  text: string | { id?: string, message: string, properties?: Object },\n};\nexport type SectionData = {\n  id: string,\n  type: string,\n  label?: string,\n  number?: string,\n  body: string | { id?: string, message: string, properties?: Object },\n  _links: { self: { href: string } },\n  childSections: Array<SectionData>,\n  subSections: Array<SectionData>,\n};\n\nexport type PropertyElement = {\n  propertyElement: {\n    label: string,\n    layouthint: Array<string>,\n    properties: Array<PropertyData>,\n  },\n};\nexport type TextFragmentElement = {\n  textFragmentElement: {\n    label: string,\n    layouthint: Array<string>,\n    textfragments: Array<TextFragmentData>,\n  },\n};\nexport type ContentElement = {\n  contentElement: {\n    label: string,\n    layouthint: Array<string>,\n    sections: Array<SectionData>,\n  },\n};\n\nexport type PropertyElementMapped = {\n  propertyElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    properties: Array<PropertyData>,\n  },\n};\nexport type TextFragmentElementMapped = {\n  textFragmentElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    textfragments: Array<TextFragmentData>,\n  },\n};\nexport type ContentElementMapped = {\n  contentElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    sections: Array<SectionModel>,\n  },\n};\n\nexport type ContentAll = Array<\n  PropertyElementMapped | TextFragmentElementMapped | ContentElementMapped,\n>;\n\nexport type ContentData = {\n  header: {\n    label?: string,\n    description?: { id?: string, message: string, properties?: Object },\n  },\n  label?: string,\n  elements: Array<PropertyElement | TextFragmentElement | ContentElement>,\n};\n\nexport type SectionFragment = {\n  text: string,\n  startOffset: number,\n  endOffset: number,\n};\n\nexport type ModelOptions = {\n  origin?: ?string,\n  contextPath?: ?string,\n};\n"],"mappings":"","ignoreList":[]}
+{"version":3,"file":"types.js","names":[],"sources":["../../src/models/types.js"],"sourcesContent":["// @flow\nimport type ApplicationModel from \"./application/ApplicationModel\";\nimport type BooleanAttributeModel from \"./attributes/BooleanAttributeModel\";\nimport type CaptchaAttributeModel from \"./attributes/CaptchaAttributeModel\";\nimport type ChoiceAttributeModel from \"./attributes/ChoiceAttributeModel\";\nimport type CompositeAttributeModel from \"./attributes/CompositeAttributeModel\";\nimport type DatetimeAttributeModel from \"./attributes/DatetimeAttributeModel\";\nimport type HelptextAttributeModel from \"./attributes/HelptextAttributeModel\";\nimport type LabelAttributeModel from \"./attributes/LabelAttributeModel\";\nimport type MemoAttributeModel from \"./attributes/MemoAttributeModel\";\nimport type MoneyAttributeModel from \"./attributes/MoneyAttributeModel\";\nimport type NumberAttributeModel from \"./attributes/NumberAttributeModel\";\nimport type PasswordAttributeModel from \"./attributes/PasswordAttributeModel\";\nimport type StringAttributeModel from \"./attributes/StringAttributeModel\";\nimport type UploadAttributeModel from \"./attributes/UploadAttributeModel\";\nimport type XMLAttributeModel from \"./attributes/XMLAttributeModel\";\nimport type CaseViewModel from \"./caseview/CaseViewModel\";\nimport type BusinessScenarioModel from \"./concepts/BusinessScenarioModel\";\nimport type ConceptDetailModel from \"./concepts/ConceptDetailModel\";\nimport type ConceptIndexModel from \"./concepts/ConceptIndexModel\";\nimport type ConceptTypeDetailModel from \"./concepts/ConceptTypeDetailModel\";\nimport type ContentIndexModel from \"./content/ContentIndexModel\";\nimport type ContentModel from \"./content/ContentModel\";\nimport type SectionModel from \"./content/SectionModel\";\nimport type ContentTOCModel from \"./content/ContentTOCModel\";\nimport type ContentTypeModel from \"./content/ContentTypeModel\";\nimport type DetailModel from \"./detail/DetailModel\";\nimport type AssignmentFilterModel from \"./filters/AssignmentFilterModel\";\nimport type FilterModel from \"./filters/FilterModel\";\nimport type RangeFilterModel from \"./filters/RangeFilterModel\";\nimport type ConceptIndexFilterModel from \"./filters/ConceptIndexFilterModel\";\nimport type FormModel from \"./form/FormModel\";\nimport type ListDetailModel from \"./list/ListDetailModel\";\nimport type ListModel from \"./list/ListModel\";\nimport type ModelCatalogModel from \"./modelcatalog/ModelCatalogModel\";\nimport type GroupingPanelModel from \"./panels/GroupingPanelModel\";\nimport type CaseSearchModel from \"./search/CaseSearchModel\";\nimport type TabModel from \"./tab/TabModel\";\nimport type TaskGroupModel from \"./taskgroup/TaskGroupModel\";\nimport type UserModel from \"./user/UserModel\";\nimport type UserServicesModel from \"./user/UserServicesModel\";\nimport type LinkModel from \"./links/LinkModel\";\nimport type LookupOptionsModel from \"./lookup/LookupOptionsModel\";\nimport type BaseFilterModel from \"./filters/BaseFilterModel\";\nimport type AttributeCollection from \"./attributes/AttributeCollection\";\nimport type AttributeModel from \"./attributes/AttributeModel\";\nimport type LayoutHintCollection from \"./layouthint/LayoutHintCollection\";\nimport type ErrorResponse from \"./error/ErrorResponse\";\n\nexport type ModularUIModel =\n  | ApplicationModel\n  | CaseSearchModel\n  | CaseViewModel\n  | ListDetailModel\n  | DetailModel\n  | FormModel\n  | GroupingPanelModel\n  | ListModel\n  | TabModel\n  | TaskGroupModel\n  | UserModel\n  | UserServicesModel\n  | ModelCatalogModel\n  | ConceptIndexModel\n  | ConceptDetailModel\n  | BusinessScenarioModel\n  | ConceptTypeDetailModel\n  | ContentIndexModel\n  | ContentTOCModel\n  | ContentModel\n  | ContentTypeModel\n  | LookupOptionsModel;\n\nexport type AttributeType =\n  | BooleanAttributeModel\n  | CaptchaAttributeModel\n  | ChoiceAttributeModel\n  | DatetimeAttributeModel\n  | HelptextAttributeModel\n  | LabelAttributeModel\n  | MemoAttributeModel\n  | MoneyAttributeModel\n  | NumberAttributeModel\n  | PasswordAttributeModel\n  | CompositeAttributeModel\n  | StringAttributeModel\n  | UploadAttributeModel\n  | XMLAttributeModel;\n\nexport type RangeChildAttributeType =\n  | NumberAttributeModel\n  | DatetimeAttributeModel;\n\nexport type FilterType =\n  | BaseFilterModel\n  | FilterModel\n  | AssignmentFilterModel\n  | RangeFilterModel\n  | ConceptIndexFilterModel;\n\nexport type FormErrorAnchor = {\n  id: string,\n  properties?: {\n    [propertyName: string]: string | number,\n  },\n  anchor?: {\n    objectid: string,\n    elementid?: string,\n    _links?: Object,\n    index?: number,\n    \"index-identifier\"?: string,\n  },\n  layouthint: LayoutHintCollection,\n  message: string,\n  param?: {\n    name: string,\n  },\n};\n\nexport type labelsJSON = {\n  _id: string,\n  label: string,\n  value: string,\n};\n\nexport type propertyJSON = {\n  _id: string,\n  type: string,\n  mandatory: string,\n  label: string,\n  value: string,\n};\n\nexport type textfragmentJSON = {\n  label: string,\n  text: string,\n  type: string,\n};\n\nexport interface IConstraintModel {\n  +id: string;\n  +defaultMessage: string;\n  +parameters: Object;\n  +isMandatoryConstraint: boolean;\n  validate(value: any): boolean;\n  hasValidation(): boolean;\n}\n\nexport interface ILayoutHintRule {\n  process(attribute: AttributeModel, attributes: AttributeCollection): void;\n}\n\nexport interface IModelWithChildModels {\n  getInitialChildModelLinks(): Array<LinkModel>;\n  setChildModels(\n    models: Array<ModularUIModel>,\n    errors: Array<ErrorResponse>,\n  ): void;\n}\n\nexport type AuthenticationType = {\n  name: string,\n  authentication: string,\n  redirectUri?: string,\n  isPrimary: boolean,\n};\n\nexport type FileEntryType = {\n  name: string,\n  size?: number,\n  progress: number,\n  error?: string,\n  token?: string,\n};\n\nexport type FilesType = {\n  [filename: string]: FileEntryType,\n};\n\nexport type FiletypeConstraintsType = Array<{|\n  extensions: Array<string>,\n  mimeTypes: Array<string>,\n|}>;\n\nexport type FilesizeConstraintsType = {\n  fileSize: ?number,\n  maxTotalFileSize: ?number,\n  isMaxTotal: boolean,\n};\n\nexport type PropertyData = { type: string, label: string, value: string };\nexport type TextFragmentData = {\n  type: string,\n  label: string,\n  text: string | { id?: string, message: string, properties?: Object },\n};\nexport type SectionData = {\n  id: string,\n  type: string,\n  label?: string,\n  number?: string,\n  body: string | { id?: string, message: string, properties?: Object },\n  _links: { self: { href: string } },\n  childSections?: Array<SectionData>,\n  sections?: Array<SectionData>,\n  subSections: Array<SectionData>,\n};\n\nexport type PropertyElement = {\n  propertyElement: {\n    label: string,\n    layouthint: Array<string>,\n    properties: Array<PropertyData>,\n  },\n};\nexport type TextFragmentElement = {\n  textFragmentElement: {\n    label: string,\n    layouthint: Array<string>,\n    textfragments: Array<TextFragmentData>,\n  },\n};\nexport type ContentElement = {\n  contentElement: {\n    label: string,\n    layouthint: Array<string>,\n    sections: Array<SectionData>,\n  },\n};\n\nexport type PropertyElementMapped = {\n  propertyElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    properties: Array<PropertyData>,\n  },\n};\nexport type TextFragmentElementMapped = {\n  textFragmentElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    textfragments: Array<TextFragmentData>,\n  },\n};\nexport type ContentElementMapped = {\n  contentElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    sections: Array<SectionModel>,\n  },\n};\n\nexport type ContentAll = Array<\n  PropertyElementMapped | TextFragmentElementMapped | ContentElementMapped,\n>;\n\nexport type ContentData = {\n  header: {\n    label?: string,\n    description?: { id?: string, message: string, properties?: Object },\n  },\n  label?: string,\n  elements: Array<PropertyElement | TextFragmentElement | ContentElement>,\n};\n\nexport type SectionFragment = {\n  text: string,\n  startOffset: number,\n  endOffset: number,\n};\n\nexport type ModelOptions = {\n  origin?: ?string,\n  contextPath?: ?string,\n};\n"],"mappings":"","ignoreList":[]}

package/lib/react-server/requestInformation.js

@@ -7,6 +7,22 @@ Object.defineProperty(exports, "__esModule", {
 exports.getPreferredLocale = exports.getFullRequestUrl = exports.getFullRequestHref = exports.getCookieFromRequest = void 0;
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
 var _Href = _interopRequireDefault(require("../models/href/Href"));
+/**
+ */
+const encodeQueryString = queryString => {
+  if (!queryString) return "";
+  const params = [];
+  queryString.split("&").forEach(part => {
+    const [key, value] = part.split("=");
+    if (key && value) {
+      params.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
+    } else if (key) {
+      params.push(encodeURIComponent(key));
+    }
+  });
+  return params.join("&");
+};
+
 /**
  */
 const getFullRequestUrl = request => {
@@ -15,7 +31,7 @@ const getFullRequestUrl = request => {
   let queryString = request.getQueryString();
   pathInfo = (0, _map.default)(_context = pathInfo.split("/")).call(_context, segment => encodeURIComponent(segment)).join("/");
   if (queryString) {
-    return `${pathInfo}?${encodeURIComponent(queryString)}`;
+    return `${pathInfo}?${encodeQueryString(queryString)}`;
   }
   return pathInfo;
 };

package/lib/react-server/requestInformation.js.map

@@ -1 +1 @@
-{"version":3,"file":"requestInformation.js","names":["_Href","_interopRequireDefault","require","getFullRequestUrl","request","_context","pathInfo","getPathInfo","queryString","getQueryString","_map","default","split","call","segment","encodeURIComponent","join","exports","getFullRequestHref","Href","getCookieFromRequest","cookieName","getCookieByName","getPreferredLocale","locales","languageFromCookie","acceptLanguageHeader","getHeader","availableLocaleCodes"],"sources":["../../src/react-server/requestInformation.js"],"sourcesContent":["// @flow\nimport Href from \"../models/href/Href\";\n\nimport type Locales from \"../i18n/Locales\";\n\n/**\n */\nexport const getFullRequestUrl = (request: HttpServletRequestJava): string => {\n  let pathInfo = request.getPathInfo() || \"/\";\n  let queryString = request.getQueryString();\n\n  pathInfo = pathInfo\n    .split(\"/\")\n    .map((segment) => encodeURIComponent(segment))\n    .join(\"/\");\n\n  if (queryString) {\n    return `${pathInfo}?${encodeURIComponent(queryString)}`;\n  }\n\n  return pathInfo;\n};\n\n/**\n */\nexport const getFullRequestHref = (request: HttpServletRequestJava): Href =>\n  new Href(getFullRequestUrl(request));\n\n/**\n */\nexport const getCookieFromRequest = (\n  request: HttpServletRequestJava,\n  cookieName: string,\n): null | string => {\n  return request.getCookieByName(cookieName);\n};\n\n/**\n */\nexport const getPreferredLocale = (\n  request: HttpServletRequestJava,\n  locales: Locales,\n): void | string => {\n  const languageFromCookie = getCookieFromRequest(request, \"locale\");\n  const acceptLanguageHeader =\n    languageFromCookie || request.getHeader(\"Accept-Language\");\n\n  // when no accept language header or cookie present, get first locale code\n  if (acceptLanguageHeader === null) {\n    return locales.availableLocaleCodes[0];\n  }\n\n  return locales.getPreferredLocale(acceptLanguageHeader);\n};\n"],"mappings":";;;;;;;;AACA,IAAAA,KAAA,GAAAC,sBAAA,CAAAC,OAAA;AAIA;AACA;AACO,MAAMC,iBAAiB,GAAIC,OAA+B,IAAa;EAAA,IAAAC,QAAA;EAC5E,IAAIC,QAAQ,GAAGF,OAAO,CAACG,WAAW,CAAC,CAAC,IAAI,GAAG;EAC3C,IAAIC,WAAW,GAAGJ,OAAO,CAACK,cAAc,CAAC,CAAC;EAE1CH,QAAQ,GAAG,IAAAI,IAAA,CAAAC,OAAA,EAAAN,QAAA,GAAAC,QAAQ,CAChBM,KAAK,CAAC,GAAG,CAAC,EAAAC,IAAA,CAAAR,QAAA,EACLS,OAAO,IAAKC,kBAAkB,CAACD,OAAO,CAAC,CAAC,CAC7CE,IAAI,CAAC,GAAG,CAAC;EAEZ,IAAIR,WAAW,EAAE;IACf,OAAO,GAAGF,QAAQ,IAAIS,kBAAkB,CAACP,WAAW,CAAC,EAAE;EACzD;EAEA,OAAOF,QAAQ;AACjB,CAAC;;AAED;AACA;AADAW,OAAA,CAAAd,iBAAA,GAAAA,iBAAA;AAEO,MAAMe,kBAAkB,GAAId,OAA+B,IAChE,IAAIe,aAAI,CAAChB,iBAAiB,CAACC,OAAO,CAAC,CAAC;;AAEtC;AACA;AADAa,OAAA,CAAAC,kBAAA,GAAAA,kBAAA;AAEO,MAAME,oBAAoB,GAAGA,CAClChB,OAA+B,EAC/BiB,UAAkB,KACA;EAClB,OAAOjB,OAAO,CAACkB,eAAe,CAACD,UAAU,CAAC;AAC5C,CAAC;;AAED;AACA;AADAJ,OAAA,CAAAG,oBAAA,GAAAA,oBAAA;AAEO,MAAMG,kBAAkB,GAAGA,CAChCnB,OAA+B,EAC/BoB,OAAgB,KACE;EAClB,MAAMC,kBAAkB,GAAGL,oBAAoB,CAAChB,OAAO,EAAE,QAAQ,CAAC;EAClE,MAAMsB,oBAAoB,GACxBD,kBAAkB,IAAIrB,OAAO,CAACuB,SAAS,CAAC,iBAAiB,CAAC;;EAE5D;EACA,IAAID,oBAAoB,KAAK,IAAI,EAAE;IACjC,OAAOF,OAAO,CAACI,oBAAoB,CAAC,CAAC,CAAC;EACxC;EAEA,OAAOJ,OAAO,CAACD,kBAAkB,CAACG,oBAAoB,CAAC;AACzD,CAAC;AAACT,OAAA,CAAAM,kBAAA,GAAAA,kBAAA","ignoreList":[]}
+{"version":3,"file":"requestInformation.js","names":["_Href","_interopRequireDefault","require","encodeQueryString","queryString","params","split","forEach","part","key","value","push","encodeURIComponent","join","getFullRequestUrl","request","_context","pathInfo","getPathInfo","getQueryString","_map","default","call","segment","exports","getFullRequestHref","Href","getCookieFromRequest","cookieName","getCookieByName","getPreferredLocale","locales","languageFromCookie","acceptLanguageHeader","getHeader","availableLocaleCodes"],"sources":["../../src/react-server/requestInformation.js"],"sourcesContent":["// @flow\nimport Href from \"../models/href/Href\";\n\nimport type Locales from \"../i18n/Locales\";\n\n/**\n */\nconst encodeQueryString = (queryString: string) => {\n  if (!queryString) return \"\";\n\n  const params = [];\n  queryString.split(\"&\").forEach((part) => {\n    const [key, value] = part.split(\"=\");\n    if (key && value) {\n      params.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);\n    } else if (key) {\n      params.push(encodeURIComponent(key));\n    }\n  });\n  return params.join(\"&\");\n};\n\n/**\n */\nexport const getFullRequestUrl = (request: HttpServletRequestJava): string => {\n  let pathInfo = request.getPathInfo() || \"/\";\n  let queryString = request.getQueryString();\n\n  pathInfo = pathInfo\n    .split(\"/\")\n    .map((segment) => encodeURIComponent(segment))\n    .join(\"/\");\n\n  if (queryString) {\n    return `${pathInfo}?${encodeQueryString(queryString)}`;\n  }\n\n  return pathInfo;\n};\n\n/**\n */\nexport const getFullRequestHref = (request: HttpServletRequestJava): Href =>\n  new Href(getFullRequestUrl(request));\n\n/**\n */\nexport const getCookieFromRequest = (\n  request: HttpServletRequestJava,\n  cookieName: string,\n): null | string => {\n  return request.getCookieByName(cookieName);\n};\n\n/**\n */\nexport const getPreferredLocale = (\n  request: HttpServletRequestJava,\n  locales: Locales,\n): void | string => {\n  const languageFromCookie = getCookieFromRequest(request, \"locale\");\n  const acceptLanguageHeader =\n    languageFromCookie || request.getHeader(\"Accept-Language\");\n\n  // when no accept language header or cookie present, get first locale code\n  if (acceptLanguageHeader === null) {\n    return locales.availableLocaleCodes[0];\n  }\n\n  return locales.getPreferredLocale(acceptLanguageHeader);\n};\n"],"mappings":";;;;;;;;AACA,IAAAA,KAAA,GAAAC,sBAAA,CAAAC,OAAA;AAIA;AACA;AACA,MAAMC,iBAAiB,GAAIC,WAAmB,IAAK;EACjD,IAAI,CAACA,WAAW,EAAE,OAAO,EAAE;EAE3B,MAAMC,MAAM,GAAG,EAAE;EACjBD,WAAW,CAACE,KAAK,CAAC,GAAG,CAAC,CAACC,OAAO,CAAEC,IAAI,IAAK;IACvC,MAAM,CAACC,GAAG,EAAEC,KAAK,CAAC,GAAGF,IAAI,CAACF,KAAK,CAAC,GAAG,CAAC;IACpC,IAAIG,GAAG,IAAIC,KAAK,EAAE;MAChBL,MAAM,CAACM,IAAI,CAAC,GAAGC,kBAAkB,CAACH,GAAG,CAAC,IAAIG,kBAAkB,CAACF,KAAK,CAAC,EAAE,CAAC;IACxE,CAAC,MAAM,IAAID,GAAG,EAAE;MACdJ,MAAM,CAACM,IAAI,CAACC,kBAAkB,CAACH,GAAG,CAAC,CAAC;IACtC;EACF,CAAC,CAAC;EACF,OAAOJ,MAAM,CAACQ,IAAI,CAAC,GAAG,CAAC;AACzB,CAAC;;AAED;AACA;AACO,MAAMC,iBAAiB,GAAIC,OAA+B,IAAa;EAAA,IAAAC,QAAA;EAC5E,IAAIC,QAAQ,GAAGF,OAAO,CAACG,WAAW,CAAC,CAAC,IAAI,GAAG;EAC3C,IAAId,WAAW,GAAGW,OAAO,CAACI,cAAc,CAAC,CAAC;EAE1CF,QAAQ,GAAG,IAAAG,IAAA,CAAAC,OAAA,EAAAL,QAAA,GAAAC,QAAQ,CAChBX,KAAK,CAAC,GAAG,CAAC,EAAAgB,IAAA,CAAAN,QAAA,EACLO,OAAO,IAAKX,kBAAkB,CAACW,OAAO,CAAC,CAAC,CAC7CV,IAAI,CAAC,GAAG,CAAC;EAEZ,IAAIT,WAAW,EAAE;IACf,OAAO,GAAGa,QAAQ,IAAId,iBAAiB,CAACC,WAAW,CAAC,EAAE;EACxD;EAEA,OAAOa,QAAQ;AACjB,CAAC;;AAED;AACA;AADAO,OAAA,CAAAV,iBAAA,GAAAA,iBAAA;AAEO,MAAMW,kBAAkB,GAAIV,OAA+B,IAChE,IAAIW,aAAI,CAACZ,iBAAiB,CAACC,OAAO,CAAC,CAAC;;AAEtC;AACA;AADAS,OAAA,CAAAC,kBAAA,GAAAA,kBAAA;AAEO,MAAME,oBAAoB,GAAGA,CAClCZ,OAA+B,EAC/Ba,UAAkB,KACA;EAClB,OAAOb,OAAO,CAACc,eAAe,CAACD,UAAU,CAAC;AAC5C,CAAC;;AAED;AACA;AADAJ,OAAA,CAAAG,oBAAA,GAAAA,oBAAA;AAEO,MAAMG,kBAAkB,GAAGA,CAChCf,OAA+B,EAC/BgB,OAAgB,KACE;EAClB,MAAMC,kBAAkB,GAAGL,oBAAoB,CAACZ,OAAO,EAAE,QAAQ,CAAC;EAClE,MAAMkB,oBAAoB,GACxBD,kBAAkB,IAAIjB,OAAO,CAACmB,SAAS,CAAC,iBAAiB,CAAC;;EAE5D;EACA,IAAID,oBAAoB,KAAK,IAAI,EAAE;IACjC,OAAOF,OAAO,CAACI,oBAAoB,CAAC,CAAC,CAAC;EACxC;EAEA,OAAOJ,OAAO,CAACD,kBAAkB,CAACG,oBAAoB,CAAC;AACzD,CAAC;AAACT,OAAA,CAAAM,kBAAA,GAAAA,kBAAA","ignoreList":[]}

package/package.json

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

package/src/models/attributes/__tests__/AttributeContent.spec.js

@@ -55,7 +55,7 @@ const json = {
                 href: "/content/_Context/Police%20incident%20decisions/Content/Breath%20analysis/Breathalyzer%20test.formalsource/Alert.%3A-",
               },
             },
-            childSections: [
+            sections: [
               {
                 id: "pass",
                 label: "Pass",

package/src/models/content/SectionModel.js

@@ -108,22 +108,27 @@ class SectionModel extends BaseModel {
    * Retrieve child section links
    */
   get childSectionLinks(): Array<ContentLinkModel> {
-    return this.data.childSections
-      ? this.data.childSections.map(
-          (childSection) =>
-            new ContentLinkModel(
-              {
-                section: childSection.id || childSection._id,
-                _id: childSection.id || childSection._id,
-                label: childSection.label,
-                sourceLabel: childSection.sourceLabel,
-                _links: childSection._links,
-              },
-              this.entryDate,
-              this.modelOptions,
-            ),
-        )
-      : [];
+    let sections = [];
+    if (this.data.childSections) {
+      sections = this.data.childSections;
+    } else if (this.data.sections) {
+      sections = this.data.sections;
+    }
+
+    return sections.map(
+      (childSection) =>
+        new ContentLinkModel(
+          {
+            section: childSection.id || childSection._id,
+            _id: childSection.id || childSection._id,
+            label: childSection.label,
+            sourceLabel: childSection.sourceLabel,
+            _links: childSection._links,
+          },
+          this.entryDate,
+          this.modelOptions,
+        ),
+    );
   }
 
   /**
@@ -146,15 +151,23 @@ class SectionModel extends BaseModel {
    * Get tree of child sections
    */
   get childSections(): Array<SectionModel> {
-    if (!this._childSections && this.data.childSections) {
-      this._childSections = this.data.childSections
+    if (!this._childSections) {
+      let sections = [];
+      if (this.data.childSections) {
+        sections = this.data.childSections;
+      } else if (this.data.sections) {
+        sections = this.data.sections;
+      }
+
+      this._childSections = sections
         .filter((childSection) => "body" in childSection)
         .map(
           (childSection) =>
             new SectionModel(childSection, this.entryDate, this.modelOptions),
         );
     }
-    return this._childSections || [];
+
+    return this._childSections;
   }
 
   /**

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

@@ -8,6 +8,7 @@ import content from "./content.json";
 import contentWithSubsections from "./content-with-subsections.json";
 import contentWithSubsections2 from "./content-with-subsections2.json";
 import contentWithChildsections from "./content-with-childsections.json";
+import contentWithSections from "./content-with-sections.json";
 import ContentLinkModel from "../ContentLinkModel";
 
 describe("contentmodel", () => {
@@ -119,6 +120,40 @@ describe("contentmodel", () => {
     );
   });
 
+  it("can handle content service with sections", () => {
+    const response = ModularUIResponse.create({
+      key: "contentmodel",
+      data: contentWithSections,
+      contributions,
+    });
+
+    expect(ContentModel.isApplicableModel(response)).toBe(true);
+
+    const contentModel = new ContentModel(response);
+    expect(contentModel.getInitialChildModelLinks()).toHaveLength(0);
+
+    expect(contentModel.id).toBe("uitslag");
+
+    expect(contentModel.childSectionLinks).toHaveLength(4);
+    expect(contentModel.childSections).toHaveLength(0);
+    expect(contentModel.subSections).toHaveLength(0);
+    expect(contentModel.relatedConceptsHrefs).toHaveLength(1);
+    expect(contentModel.relatedConceptsHref.href.toString()).toBe(
+      "/content/Incident/Business design/Content/Blaastest.textilesource/uitslag/relatedConcepts?entryDate=2021-08-31",
+    );
+    expect(contentModel.referenceHash).toBe(8236987459042);
+
+    const firstChildSectionLink = contentModel.childSectionLinks[0];
+    expect(firstChildSectionLink instanceof ContentLinkModel).toBe(true);
+
+    expect(firstChildSectionLink.key).toBe("pass");
+    expect(firstChildSectionLink.label).toBe("Pass");
+    expect(firstChildSectionLink.sourceLabel).toBeNull();
+    expect(firstChildSectionLink.encodedHref.toString()).toBe(
+      "/content/Incident%2FBusiness%20design%2FContent%2FBlaastest.textilesource/pass?entryDate=2021-08-31",
+    );
+  });
+
   it("can handle content service with subsections and correct related concepts", () => {
     const response = ModularUIResponse.create({
       key: "contentmodel",

package/src/models/content/__tests__/content-with-sections.json

@@ -0,0 +1,105 @@
+{
+  "section": {
+    "_id": "uitslag",
+    "label": "Uitslag blaastest",
+    "body": "<p>Nog een sectie voor uitslag blaastest</p>",
+    "sections": [
+      {
+        "_links": {
+          "self": {
+            "href": "/content/Incident/Business design/Content/Blaastest.textilesource/pass"
+          },
+          "api_doc": {
+            "href": "/api-docs/v3/content/(content-identifier)/(section-identifier)"
+          },
+          "contributions": {
+            "href": "/contributions/content/(content-identifier)/(section-identifier)"
+          },
+          "relatedConcepts": {
+            "href": "/content/Incident/Business design/Content/Blaastest.textilesource/pass/relatedConcepts"
+          }
+        },
+        "_id": "pass",
+        "label": "Pass"
+      },
+      {
+        "_links": {
+          "self": {
+            "href": "/content/Incident/Business design/Content/Blaastest.textilesource/pass_alert"
+          },
+          "api_doc": {
+            "href": "/api-docs/v3/content/(content-identifier)/(section-identifier)"
+          },
+          "contributions": {
+            "href": "/contributions/content/(content-identifier)/(section-identifier)"
+          },
+          "relatedConcepts": {
+            "href": "/content/Incident/Business design/Content/Blaastest.textilesource/pass_alert/relatedConcepts"
+          }
+        },
+        "_id": "pass_alert",
+        "label": "Pass / Alert"
+      },
+      {
+        "_links": {
+          "self": {
+            "href": "/content/Incident/Business design/Content/Blaastest.textilesource/alert"
+          },
+          "api_doc": {
+            "href": "/api-docs/v3/content/(content-identifier)/(section-identifier)"
+          },
+          "contributions": {
+            "href": "/contributions/content/(content-identifier)/(section-identifier)"
+          },
+          "relatedConcepts": {
+            "href": "/content/Incident/Business design/Content/Blaastest.textilesource/alert/relatedConcepts"
+          }
+        },
+        "_id": "alert",
+        "label": "Alert"
+      },
+      {
+        "_links": {
+          "self": {
+            "href": "/content/Incident/Business design/Content/Blaastest.textilesource/fail"
+          },
+          "api_doc": {
+            "href": "/api-docs/v3/content/(content-identifier)/(section-identifier)"
+          },
+          "contributions": {
+            "href": "/contributions/content/(content-identifier)/(section-identifier)"
+          },
+          "relatedConcepts": {
+            "href": "/content/Incident/Business design/Content/Blaastest.textilesource/fail/relatedConcepts"
+          }
+        },
+        "_id": "fail",
+        "label": "Fail"
+      }
+    ],
+    "_links": {
+      "self": {
+        "href": "/content/Incident/Business design/Content/Blaastest.textilesource/uitslag"
+      },
+      "api_doc": {
+        "href": "/api-docs/v3/content/(content-identifier)/(section-identifier)"
+      },
+      "contributions": {
+        "href": "/contributions/content/(content-identifier)/(section-identifier)"
+      },
+      "relatedConcepts": {
+        "href": "/content/Incident/Business design/Content/Blaastest.textilesource/uitslag/relatedConcepts"
+      },
+      "content": {
+        "href": "/content/Incident/Business design/Content/Blaastest.textilesource"
+      }
+    },
+    "filter": {
+      "entryDate": {
+        "param": "entryDate",
+        "name": "entryDate",
+        "value": "2021-08-31"
+      }
+    }
+  }
+}

package/src/models/types.js

@@ -201,7 +201,8 @@ export type SectionData = {
   number?: string,
   body: string | { id?: string, message: string, properties?: Object },
   _links: { self: { href: string } },
-  childSections: Array<SectionData>,
+  childSections?: Array<SectionData>,
+  sections?: Array<SectionData>,
   subSections: Array<SectionData>,
 };
 

package/src/react-server/__tests__/requestInformation.spec.js

@@ -92,7 +92,7 @@ describe("requestInformation", () => {
         queryString: "q=hello world&filter=test",
       });
       expect(getFullRequestUrl(request)).toBe(
-        "/search?q%3Dhello%20world%26filter%3Dtest",
+        "/search?q=hello%20world&filter=test",
       );
     });
 
@@ -120,7 +120,7 @@ describe("requestInformation", () => {
         queryString: "name=John Doe & email=john@example.com",
       });
       expect(getFullRequestUrl(request)).toBe(
-        "/api/data?name%3DJohn%20Doe%20%26%20email%3Djohn%40example.com",
+        "/api/data?name=John%20Doe%20&%20email=john%40example.com",
       );
     });
 
@@ -144,11 +144,11 @@ describe("requestInformation", () => {
       // Verify that Href constructor was called with the correct URL
       expect(require("../../models/href/Href")).toHaveBeenCalledTimes(1);
       expect(require("../../models/href/Href")).toHaveBeenCalledWith(
-        "/products?id%3D123",
+        "/products?id=123",
       );
 
       // Verify the returned object is an instance of the mock Href
-      expect(hrefInstance.url).toBe("/products?id%3D123");
+      expect(hrefInstance.url).toBe("/products?id=123");
     });
 
     it("should handle complex URLs and pass them to Href", () => {
@@ -158,10 +158,10 @@ describe("requestInformation", () => {
       });
       const hrefInstance = getFullRequestHref(request);
       expect(require("../../models/href/Href")).toHaveBeenCalledWith(
-        "/search/results?q%3Djavascript%2520xss%26param%3Dvalue",
+        "/search/results?q=javascript%2520xss&param=value",
       );
       expect(hrefInstance.url).toBe(
-        "/search/results?q%3Djavascript%2520xss%26param%3Dvalue",
+        "/search/results?q=javascript%2520xss&param=value",
       );
     });
   });

package/src/react-server/requestInformation.js

@@ -3,6 +3,23 @@ import Href from "../models/href/Href";
 
 import type Locales from "../i18n/Locales";
 
+/**
+ */
+const encodeQueryString = (queryString: string) => {
+  if (!queryString) return "";
+
+  const params = [];
+  queryString.split("&").forEach((part) => {
+    const [key, value] = part.split("=");
+    if (key && value) {
+      params.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
+    } else if (key) {
+      params.push(encodeURIComponent(key));
+    }
+  });
+  return params.join("&");
+};
+
 /**
  */
 export const getFullRequestUrl = (request: HttpServletRequestJava): string => {
@@ -15,7 +32,7 @@ export const getFullRequestUrl = (request: HttpServletRequestJava): string => {
     .join("/");
 
   if (queryString) {
-    return `${pathInfo}?${encodeURIComponent(queryString)}`;
+    return `${pathInfo}?${encodeQueryString(queryString)}`;
   }
 
   return pathInfo;