@beinformed/ui 1.9.0-beta.6 → 1.9.1

package/lib/models/caseview/CaseViewModel.js.flow

@@ -76,11 +76,19 @@ export default class CaseViewModel extends DetailModel {
   }
 
   /**
+   * Retrieve the case label, this can be configured with a case property with the layout hint 'title'
    */
   get label(): string {
     return this.casename ? this.casename.value : "";
   }
 
+  /**
+   * Retrieve the label that was configured on the caseview
+   */
+  get viewLabel(): string {
+    return this.getContribution("label", "");
+  }
+
   /**
    * Check if an introtext exists for this caseview
    */
@@ -92,14 +100,16 @@ export default class CaseViewModel extends DetailModel {
    * Getting the introduction text configured on the case view
    */
   get introtext(): string {
-    if (this.contributions.texts) {
-      const text = this.contributions.texts.find(
-        (item) => item.type === "master"
-      );
+    if (this.data._text) {
+      return this.data._text.message ?? this.data._text;
+    }
 
-      if (text) {
-        return text.text;
-      }
+    if (this.contributions.text) {
+      return this.contributions.text.message ?? this.contributions.text;
+    }
+
+    if (Array.isArray(this.contributions.texts)) {
+      return this.contributions.texts[0].text;
     }
 
     return "";

package/lib/models/caseview/CaseViewModel.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/models/caseview/CaseViewModel.js"],"names":["CaseViewModel","caseviewData","createTaskGroupCollection","links","getLinksByGroup","all","models","taskGroupModels","i","length","TaskGroupModel","push","taskGroupCollection","add","attributeCollection","getAttributeByLayoutHint","TITLE","casename","value","introtext","contributions","texts","text","item","type","selfLink","getLinkByKey","Error","Href","href","allTaskgroupData","getData","allTaskgroupContributions","getContribution","taskgroup","some","taskgroupContribution","name","taskgroupContributions","create","_taskGroupCollection","taskgroups","TaskGroupCollection","hasItems","data","resourcetype","DetailModel"],"mappings":"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","sourcesContent":["// @flow\nimport DetailModel from \"../detail/DetailModel\";\nimport Href from \"../href/Href\";\nimport TaskGroupCollection from \"../taskgroup/TaskGroupCollection\";\nimport TaskGroupModel from \"../taskgroup/TaskGroupModel\";\n\nimport { TITLE } from \"../../constants/LayoutHints\";\n\nimport type { ModularUIModel, AttributeType } from \"../types\";\nimport type { ModularUIResponse } from \"../../modularui\";\nimport type LinkCollection from \"../links/LinkCollection\";\nimport type LinkModel from \"../links/LinkModel\";\n\n/**\n * Model containing the details of one case.\n */\nexport default class CaseViewModel extends DetailModel {\n  _taskGroupCollection: TaskGroupCollection;\n\n  /**\n   */\n  constructor(caseviewData: ModularUIResponse) {\n    super(caseviewData);\n\n    this.createTaskGroupCollection();\n  }\n\n  /**\n   */\n  get type(): string {\n    return \"CaseView\";\n  }\n\n  /**\n   */\n  static isApplicableModel(data: ModularUIResponse): boolean {\n    return (\n      data.contributions.resourcetype &&\n      data.contributions.resourcetype === \"CaseView\"\n    );\n  }\n\n  /**\n   */\n  getInitialChildModelLinks(): Array<LinkModel> {\n    return this.links.getLinksByGroup(\"taskgroup\").all;\n  }\n\n  /**\n   * Getting panel links\n   */\n  get panelLinks(): LinkCollection {\n    return this.links.getLinksByGroup(\"panel\");\n  }\n\n  /**\n   */\n  setChildModels(models: Array<ModularUIModel>) {\n    super.setChildModels(models);\n\n    const taskGroupModels = [];\n    for (let i = 0; i < models.length; i++) {\n      if (models[i] instanceof TaskGroupModel) {\n        taskGroupModels.push(models[i]);\n      }\n    }\n\n    this.taskGroupCollection.add(taskGroupModels);\n  }\n\n  /**\n   * Getting the case name\n   */\n  get casename(): ?AttributeType {\n    return this.attributeCollection.getAttributeByLayoutHint(TITLE);\n  }\n\n  /**\n   */\n  get label(): string {\n    return this.casename ? this.casename.value : \"\";\n  }\n\n  /**\n   * Check if an introtext exists for this caseview\n   */\n  hasIntroText(): boolean {\n    return this.introtext !== \"\";\n  }\n\n  /**\n   * Getting the introduction text configured on the case view\n   */\n  get introtext(): string {\n    if (this.contributions.texts) {\n      const text = this.contributions.texts.find(\n        (item) => item.type === \"master\"\n      );\n\n      if (text) {\n        return text.text;\n      }\n    }\n\n    return \"\";\n  }\n\n  /**\n   * Getting the self href\n   */\n  get selfhref(): Href {\n    const selfLink = this.links.getLinkByKey(\"self\");\n\n    if (selfLink === null) {\n      throw new Error(\"No self href available\");\n    }\n\n    return new Href(selfLink.href);\n  }\n\n  /**\n   */\n  createTaskGroupCollection() {\n    const allTaskgroupData = this.getData(\"taskgroups\", []);\n    const allTaskgroupContributions = this.getContribution(\"taskgroups\", []);\n\n    this.taskGroupCollection = allTaskgroupData\n      .filter((taskgroup) =>\n        allTaskgroupContributions.some(\n          (taskgroupContribution) =>\n            taskgroupContribution.name === taskgroup.name\n        )\n      )\n      .map((taskgroup) => {\n        const taskgroupContributions = allTaskgroupContributions.find(\n          (taskgroupContribution) =>\n            taskgroupContribution.name === taskgroup.name\n        );\n\n        return TaskGroupModel.create(\n          taskgroup.name,\n          taskgroup,\n          taskgroupContributions\n        );\n      });\n  }\n\n  /**\n   * Setting the taskgroup panel collection\n   */\n  set taskGroupCollection(taskgroups: Array<TaskGroupModel>) {\n    this._taskGroupCollection = new TaskGroupCollection(taskgroups);\n  }\n\n  /**\n   * Getting the taskgrouppanels on the tab\n   */\n  get taskGroupCollection(): TaskGroupCollection {\n    return this._taskGroupCollection;\n  }\n\n  /**\n   * Has taskgroups\n   */\n  hasTaskGroups(): boolean {\n    return this.taskGroupCollection && this.taskGroupCollection.hasItems;\n  }\n}\n"],"file":"CaseViewModel.js"}
+{"version":3,"sources":["../../../src/models/caseview/CaseViewModel.js"],"names":["CaseViewModel","caseviewData","createTaskGroupCollection","links","getLinksByGroup","all","models","taskGroupModels","i","length","TaskGroupModel","push","taskGroupCollection","add","attributeCollection","getAttributeByLayoutHint","TITLE","casename","value","getContribution","introtext","data","_text","message","contributions","text","Array","isArray","texts","selfLink","getLinkByKey","Error","Href","href","allTaskgroupData","getData","allTaskgroupContributions","taskgroup","some","taskgroupContribution","name","taskgroupContributions","create","_taskGroupCollection","taskgroups","TaskGroupCollection","hasItems","resourcetype","DetailModel"],"mappings":"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","sourcesContent":["// @flow\nimport DetailModel from \"../detail/DetailModel\";\nimport Href from \"../href/Href\";\nimport TaskGroupCollection from \"../taskgroup/TaskGroupCollection\";\nimport TaskGroupModel from \"../taskgroup/TaskGroupModel\";\n\nimport { TITLE } from \"../../constants/LayoutHints\";\n\nimport type { ModularUIModel, AttributeType } from \"../types\";\nimport type { ModularUIResponse } from \"../../modularui\";\nimport type LinkCollection from \"../links/LinkCollection\";\nimport type LinkModel from \"../links/LinkModel\";\n\n/**\n * Model containing the details of one case.\n */\nexport default class CaseViewModel extends DetailModel {\n  _taskGroupCollection: TaskGroupCollection;\n\n  /**\n   */\n  constructor(caseviewData: ModularUIResponse) {\n    super(caseviewData);\n\n    this.createTaskGroupCollection();\n  }\n\n  /**\n   */\n  get type(): string {\n    return \"CaseView\";\n  }\n\n  /**\n   */\n  static isApplicableModel(data: ModularUIResponse): boolean {\n    return (\n      data.contributions.resourcetype &&\n      data.contributions.resourcetype === \"CaseView\"\n    );\n  }\n\n  /**\n   */\n  getInitialChildModelLinks(): Array<LinkModel> {\n    return this.links.getLinksByGroup(\"taskgroup\").all;\n  }\n\n  /**\n   * Getting panel links\n   */\n  get panelLinks(): LinkCollection {\n    return this.links.getLinksByGroup(\"panel\");\n  }\n\n  /**\n   */\n  setChildModels(models: Array<ModularUIModel>) {\n    super.setChildModels(models);\n\n    const taskGroupModels = [];\n    for (let i = 0; i < models.length; i++) {\n      if (models[i] instanceof TaskGroupModel) {\n        taskGroupModels.push(models[i]);\n      }\n    }\n\n    this.taskGroupCollection.add(taskGroupModels);\n  }\n\n  /**\n   * Getting the case name\n   */\n  get casename(): ?AttributeType {\n    return this.attributeCollection.getAttributeByLayoutHint(TITLE);\n  }\n\n  /**\n   * Retrieve the case label, this can be configured with a case property with the layout hint 'title'\n   */\n  get label(): string {\n    return this.casename ? this.casename.value : \"\";\n  }\n\n  /**\n   * Retrieve the label that was configured on the caseview\n   */\n  get viewLabel(): string {\n    return this.getContribution(\"label\", \"\");\n  }\n\n  /**\n   * Check if an introtext exists for this caseview\n   */\n  hasIntroText(): boolean {\n    return this.introtext !== \"\";\n  }\n\n  /**\n   * Getting the introduction text configured on the case view\n   */\n  get introtext(): string {\n    if (this.data._text) {\n      return this.data._text.message ?? this.data._text;\n    }\n\n    if (this.contributions.text) {\n      return this.contributions.text.message ?? this.contributions.text;\n    }\n\n    if (Array.isArray(this.contributions.texts)) {\n      return this.contributions.texts[0].text;\n    }\n\n    return \"\";\n  }\n\n  /**\n   * Getting the self href\n   */\n  get selfhref(): Href {\n    const selfLink = this.links.getLinkByKey(\"self\");\n\n    if (selfLink === null) {\n      throw new Error(\"No self href available\");\n    }\n\n    return new Href(selfLink.href);\n  }\n\n  /**\n   */\n  createTaskGroupCollection() {\n    const allTaskgroupData = this.getData(\"taskgroups\", []);\n    const allTaskgroupContributions = this.getContribution(\"taskgroups\", []);\n\n    this.taskGroupCollection = allTaskgroupData\n      .filter((taskgroup) =>\n        allTaskgroupContributions.some(\n          (taskgroupContribution) =>\n            taskgroupContribution.name === taskgroup.name\n        )\n      )\n      .map((taskgroup) => {\n        const taskgroupContributions = allTaskgroupContributions.find(\n          (taskgroupContribution) =>\n            taskgroupContribution.name === taskgroup.name\n        );\n\n        return TaskGroupModel.create(\n          taskgroup.name,\n          taskgroup,\n          taskgroupContributions\n        );\n      });\n  }\n\n  /**\n   * Setting the taskgroup panel collection\n   */\n  set taskGroupCollection(taskgroups: Array<TaskGroupModel>) {\n    this._taskGroupCollection = new TaskGroupCollection(taskgroups);\n  }\n\n  /**\n   * Getting the taskgrouppanels on the tab\n   */\n  get taskGroupCollection(): TaskGroupCollection {\n    return this._taskGroupCollection;\n  }\n\n  /**\n   * Has taskgroups\n   */\n  hasTaskGroups(): boolean {\n    return this.taskGroupCollection && this.taskGroupCollection.hasItems;\n  }\n}\n"],"file":"CaseViewModel.js"}

package/lib/models/caseview/__tests__/CaseViewModel.spec.js.flow

@@ -1,6 +1,9 @@
 import CaseViewModel from "../CaseViewModel";
 import DetailModel from "../../detail/DetailModel";
 
+import caseviewJson from "./caseview.json";
+import caseviewContributionsJson from "./caseviewContributions.json";
+
 describe("caseViewModel", () => {
   it("should be able to create an empty casedetail", () => {
     const caseview = new CaseViewModel({});
@@ -10,200 +13,81 @@ describe("caseViewModel", () => {
 
   it("should be able to create a casedetail from a typical modular UI json structure", () => {
     const caseDetail = new CaseViewModel({
+      key: "Book",
+      data: caseviewJson,
+      contributions: caseviewContributionsJson,
+    });
+
+    expect(caseDetail).toBeInstanceOf(CaseViewModel);
+    expect(caseDetail).toBeInstanceOf(DetailModel);
+
+    expect(caseDetail.key).toBe("Book");
+    expect(caseDetail.id).toBe(24);
+
+    expect(caseDetail.casename.value).toBe("The safety of objects");
+  });
+
+  it("should be able to handle different kind of introtext", () => {
+    const caseviewOldStructure = new CaseViewModel({
+      key: "Book",
+      data: caseviewJson,
+      contributions: caseviewContributionsJson,
+    });
+
+    expect(caseviewOldStructure.introtext).toBe("<p>This is introtext</p>");
+
+    const caseviewFromDataPlain = new CaseViewModel({
       key: "Book",
       data: {
-        _links: {
-          self: {
-            href: "/books/book/24",
-          },
-          api_doc: {
-            href: "/api-docs/books/book/24",
-          },
-          contributions: {
-            href: "/contributions/books/book/24",
-          },
-          Creator: {
-            href: "/books/book/24/creator",
-          },
-          Editions: {
-            href: "/books/book/24/editions",
-          },
-          Activities: {
-            href: "/books/book/24/activities",
-          },
-          taskgroup: [
-            {
-              href: "/books/book/24/Tasks",
-              name: "Tasks",
-            },
-          ],
+        _text: "<p>This is introtext</p>",
+        ...caseviewJson,
+      },
+      contributions: caseviewContributionsJson,
+    });
+
+    expect(caseviewFromDataPlain.introtext).toBe("<p>This is introtext</p>");
+
+    const caseviewFromDataApplicationMessage = new CaseViewModel({
+      key: "Book",
+      data: {
+        ...caseviewJson,
+        _text: {
+          message: "<p>This is introtext</p>",
         },
-        _id: 24,
-        CaseName: "The safety of objects",
-        CaseType: "Book",
-        Owner: "Arnold",
-        Format: "Paperback",
-        ISBN10: "1847087302",
-        ISBN13: "9781847087300",
-        Language: "EN",
-        NumberOfPages: 176,
-        State: "Registered",
       },
+      contributions: caseviewContributionsJson,
+    });
+
+    expect(caseviewFromDataApplicationMessage.introtext).toBe(
+      "<p>This is introtext</p>"
+    );
+
+    const caseviewFromNewContributionsRawTextMessage = new CaseViewModel({
+      key: "Book",
+      data: caseviewJson,
       contributions: {
-        label: "Book",
-        resourcetype: "CaseView",
-        texts: [
-          {
-            type: "master",
-            text: "<p>This view contains all the data about this book. It contains a list of the creators and editions. A person can be an author(1) or an illustrator(2)<br /><br />This is a list of books that is ordered by the role (author (1), co-author, illustrator(2)) of the person that contributed to the book.<br /><br />1) An author is broadly defined as &quot;the person who originated or gave existence to anything&quot; and whose authorship determines responsibility for what was created. Narrowly defined, an author is the originator of any written work and can also be described as a writer.<br /><br />2) An illustrator is an artist who specializes in enhancing writing or elucidating concepts by providing a visual representation that corresponds to the content of the associated text or idea. The illustration may be intended to clarify complicated concepts or objects that are difficult to describe textually, which is the reason illustrations are often found in children&#39;s books.<br /></p>",
-          },
-        ],
-        _links: {
-          panel: [
-            {
-              name: "Creator",
-              label: "Creator",
-              resourcetype: "CaseRelationListPanel",
-            },
-            {
-              name: "Editions",
-              label: "Editions",
-              resourcetype: "RecordListPanel",
-            },
-            {
-              name: "Activities",
-              label: "Activities",
-              resourcetype: "GroupingPanel",
-            },
-          ],
-          taskgroup: [
-            {
-              name: "Tasks",
-              label: "Tasks",
-              resourcetype: "TaskGroup",
-            },
-          ],
-        },
-        metadata: {
-          _id: {
-            label: "Id",
-            type: "integer",
-          },
+        ...caseviewContributionsJson,
+        text: {
+          message: "<p>This is introtext</p>",
         },
-        attributes: [
-          {
-            CaseName: {
-              label: "Case name",
-              type: "string",
-              layouthint: ["title"],
-            },
-          },
-          {
-            CaseType: {
-              label: "Case type",
-              type: "string",
-              layouthint: ["type"],
-            },
-          },
-          {
-            Owner: {
-              label: "Case owner",
-              type: "string",
-              layouthint: ["owner"],
-            },
-          },
-          {
-            State: {
-              label: "State",
-              type: "string",
-              layouthint: ["state"],
-              options: [
-                {
-                  code: "Registered",
-                  label: "Registered",
-                },
-              ],
-            },
-          },
-          {
-            Format: {
-              label: "Format",
-              type: "string",
-              multiplechoice: false,
-              layouthint: ["combobox"],
-              options: [
-                {
-                  code: "Hardcover",
-                  label: "Hardcover",
-                },
-                {
-                  code: "Paperback",
-                  label: "Paperback",
-                },
-                {
-                  code: "Ebook",
-                  label: "Ebook",
-                },
-                {
-                  code: "Audio",
-                  label: "Audio book",
-                },
-              ],
-            },
-          },
-          {
-            ISBN10: {
-              label: "ISBN10",
-              type: "string",
-              displaysize: 50,
-            },
-          },
-          {
-            ISBN13: {
-              label: "ISBN13",
-              type: "string",
-              displaysize: 50,
-            },
-          },
-          {
-            Language: {
-              label: "Language",
-              type: "string",
-              multiplechoice: false,
-              layouthint: ["radiobutton"],
-              options: [
-                {
-                  code: "EN",
-                  label: "English",
-                },
-                {
-                  code: "DU",
-                  label: "Dutch",
-                },
-              ],
-            },
-          },
-          {
-            NumberOfPages: {
-              label: "Number of pages",
-              type: "number",
-              format: "0",
-              groupingSeparator: ".",
-              decimalSeparator: ",",
-              minimum: 1,
-              maximum: 1000,
-            },
-          },
-        ],
       },
     });
 
-    expect(caseDetail).toBeInstanceOf(CaseViewModel);
-    expect(caseDetail).toBeInstanceOf(DetailModel);
+    expect(caseviewFromNewContributionsRawTextMessage.introtext).toBe(
+      "<p>This is introtext</p>"
+    );
 
-    expect(caseDetail.key).toBe("Book");
-    expect(caseDetail.id).toBe(24);
+    const caseviewFromNewContributionsSimpleMessage = new CaseViewModel({
+      key: "Book",
+      data: caseviewJson,
+      contributions: {
+        ...caseviewContributionsJson,
+        text: "<p>This is introtext</p>",
+      },
+    });
 
-    expect(caseDetail.casename.value).toBe("The safety of objects");
+    expect(caseviewFromNewContributionsSimpleMessage.introtext).toBe(
+      "<p>This is introtext</p>"
+    );
   });
 });

package/lib/models/concepts/__mock__/business_scenario.js.flow

@@ -1,13 +1,26 @@
 import BusinessScenarioModel from "../BusinessScenarioModel";
 import ModularUIResponse from "../../../modularui/ModularUIResponse";
+import ConceptDetailModel from "../ConceptDetailModel";
 
 import data from "./business_scenario_data.json";
 import contributions from "./conceptdetail_contributions.json";
 
+import stepData from "./business_scenario_step.json";
+import conceptType from "./concepttype";
+
 const response = ModularUIResponse.create({
   key: "business_scenario",
   data,
   contributions,
 });
+const scenario = new BusinessScenarioModel(response);
+
+const stepResponse = ModularUIResponse.create({
+  key: "business_scenario_step",
+  data: stepData,
+  contributions,
+});
+const step = new ConceptDetailModel(stepResponse);
+step.conceptType = conceptType;
 
-export default new BusinessScenarioModel(response);
+export { scenario, step };

package/lib/models/concepts/__mock__/conceptdetail.js.flow

@@ -1,18 +1,27 @@
 import ConceptDetailModel from "../ConceptDetailModel";
+import ConceptTypeDetailModel from "../ConceptTypeDetailModel";
 import ModularUIResponse from "../../../modularui/ModularUIResponse";
 
 import data from "./conceptdetail_data.json";
 import contributions from "./conceptdetail_contributions.json";
+import conceptTypeData from "./concepttype_Calculation.json";
+import conceptTypeContributions from "./concepttype_contributions.json";
 
-import conceptType from "./concepttype";
-
-const response = ModularUIResponse.create({
-  key: "conceptdetail",
+const conceptResponse = ModularUIResponse.create({
+  key: "concept",
   data,
   contributions,
 });
 
-const conceptDetail = new ConceptDetailModel(response);
+const conceptTypeResponse = ModularUIResponse.create({
+  key: "concepttype",
+  data: conceptTypeData,
+  contributions: conceptTypeContributions,
+});
+
+const conceptType = new ConceptTypeDetailModel(conceptTypeResponse);
+
+const conceptDetail = new ConceptDetailModel(conceptResponse);
 conceptDetail.conceptType = conceptType;
 
-export default conceptDetail;
+export { conceptDetail };

package/lib/models/concepts/__tests__/BusinessScenarioModel.spec.js.flow

@@ -1,6 +1,5 @@
 import BusinessScenarioModel from "../BusinessScenarioModel";
-import businessScenario from "../__mock__/business_scenario";
-import conceptDetail from "../__mock__/conceptdetail";
+import { scenario, step } from "../__mock__/business_scenario";
 import conceptType from "../__mock__/concepttype";
 
 describe("businessScenarioModel", () => {
@@ -12,16 +11,16 @@ describe("businessScenarioModel", () => {
   });
 
   it("can retrieve child model links", () => {
-    const initialChildModelLinks = businessScenario.getInitialChildModelLinks();
+    const initialChildModelLinks = scenario.getInitialChildModelLinks();
 
     expect(initialChildModelLinks).toHaveLength(13);
   });
 
   it("can set scenarioSteps", () => {
-    businessScenario.setChildModels([conceptType, conceptDetail]);
+    scenario.setChildModels([conceptType, step]);
 
-    const scenarioSteps = businessScenario.scenarioSteps;
-    const actors = businessScenario.actors;
+    const scenarioSteps = scenario.scenarioSteps;
+    const actors = scenario.actors;
 
     expect(scenarioSteps).toHaveLength(1);
     expect(actors).toHaveLength(1);

package/lib/models/concepts/__tests__/ConceptDetailModel.spec.js.flow

@@ -1,10 +1,65 @@
 import ConceptDetailModel from "../ConceptDetailModel";
 
-describe("conceptDetailModel", () => {
-  it("should be able to create an empty ConceptDetailModel object", () => {
-    const conceptDetail = new ConceptDetailModel();
+import { conceptDetail } from "../__mock__/conceptdetail";
 
+describe("conceptDetailModel", () => {
+  it("should be able to create a ConceptDetailModel object", () => {
     expect(conceptDetail).toBeInstanceOf(ConceptDetailModel);
     expect(conceptDetail.type).toBe("ConceptDetail");
+
+    expect(conceptDetail.key).toBe("DurationDrivingBan");
+    expect(conceptDetail.conceptType.label).toBe("Calculation");
+
+    expect(conceptDetail.label).toBe("Duration driving ban");
+    expect(conceptDetail.taxonomyType).toBe("default");
+
+    expect(conceptDetail.formula).toBe(
+      "IF (NoviceDriver) (NUMBER)DurationDrivingBanNoviceDriver ELSE IF\n(ExperiencedDriver) (NUMBER)DurationDrivingBanExperiencedDriver ENDIF ENDIF"
+    );
+    expect(conceptDetail.labels).toStrictEqual([
+      {
+        _id: "QuestionLabel",
+        label: "Question label",
+      },
+      {
+        _id: "ResultLabel",
+        label: "Result label",
+        type: "ResultLabel",
+        value: "Duration of driving ban (in months)",
+      },
+    ]);
+    expect(conceptDetail.conceptProperties).toStrictEqual([
+      {
+        _id: "PartnerService",
+        label: "Partner Service",
+        mandatory: "false",
+        type: "string",
+      },
+      {
+        _id: "Abbreviation",
+        label: "Abbreviation",
+        mandatory: "false",
+        type: "Abbreviation",
+        value: "DDB",
+      },
+    ]);
+    expect(conceptDetail.textfragments).toStrictEqual([
+      {
+        _id: "Description",
+        label: "Description",
+        id: "DurationDrivingBan.tv852.Description",
+        text: "Text fragment for duration driving ban",
+        type: "Description",
+      },
+      { _id: "Definition", label: "Definition" },
+      { _id: "IconSmall", label: "Icon-small" },
+      { _id: "IconMedium", label: "Icon-medium" },
+      { _id: "IconLarge", label: "Icon-large" },
+      { _id: "NonFunctionalRequirement", label: "Non functional requirement" },
+      { _id: "FunctionalRequirement", label: "Functional requirement" },
+      { _id: "Rationale", label: "Rationale" },
+      { _id: "tfNote", label: "NL TF NOTE" },
+    ]);
+    expect(conceptDetail.entryDate).toBe("2021-09-23");
   });
 });

package/lib/models/content/SectionModel.js

@@ -47,6 +47,8 @@ var _createHash = require("../../utils/helpers/createHash");
 
 var _LinkModel = _interopRequireDefault(require("../links/LinkModel"));
 
+var _utils = require("../../utils");
+
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray(o, minLen) { var _context5; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context5 = Object.prototype.toString.call(o)).call(_context5, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -171,7 +173,7 @@ var SectionModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "body",
     get: function get() {
-      return this.data.body;
+      return (0, _utils.retrieveText)(this.data.body);
     }
     /**
      * Retrieve child section links

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

@@ -7,6 +7,7 @@ import { createHashFromHref } from "../../utils/helpers/createHash";
 import LinkModel from "../links/LinkModel";
 
 import type Href from "../href/Href";
+import { retrieveText } from "../../utils";
 
 class SectionModel extends BaseModel {
   _entryDate: ISO_DATE | null;
@@ -88,7 +89,7 @@ class SectionModel extends BaseModel {
    * Get content body
    */
   get body(): ?string {
-    return this.data.body;
+    return retrieveText(this.data.body);
   }
 
   /**

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/models/content/SectionModel.js"],"names":["SectionModel","data","entryDate","_entryDate","referred","_selflink","LinkModel","_links","self","selflink","href","type","sourceLabel","id","_id","getData","number","body","childSections","childSection","ContentLinkModel","section","label","_childSections","sections","subSections","subSection","SubSectionModel","selfhref","push","referredChilds","getReferredSections","BaseModel"],"mappings":"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","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 type Href from \"../href/Href\";\n\nclass SectionModel extends BaseModel {\n  _entryDate: ISO_DATE | null;\n  _selflink: ?LinkModel;\n  _childSections: Array<SectionModel>;\n\n  constructor(data: Object, entryDate: ISO_DATE | null) {\n    super(data, {});\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(this.data._links?.self);\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 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            )\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    );\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((childSection) => new SectionModel(childSection, this.entryDate));\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   * Get sub sections\n   */\n  get subSections(): Array<SubSectionModel> {\n    return this.data.subSections\n      ? this.data.subSections.map(\n          (subSection) => new SubSectionModel(subSection)\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"],"file":"SectionModel.js"}
+{"version":3,"sources":["../../../src/models/content/SectionModel.js"],"names":["SectionModel","data","entryDate","_entryDate","referred","_selflink","LinkModel","_links","self","selflink","href","type","sourceLabel","id","_id","getData","number","body","childSections","childSection","ContentLinkModel","section","label","_childSections","sections","subSections","subSection","SubSectionModel","selfhref","push","referredChilds","getReferredSections","BaseModel"],"mappings":"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","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 type Href from \"../href/Href\";\nimport { retrieveText } from \"../../utils\";\n\nclass SectionModel extends BaseModel {\n  _entryDate: ISO_DATE | null;\n  _selflink: ?LinkModel;\n  _childSections: Array<SectionModel>;\n\n  constructor(data: Object, entryDate: ISO_DATE | null) {\n    super(data, {});\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(this.data._links?.self);\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            )\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    );\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((childSection) => new SectionModel(childSection, this.entryDate));\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   * Get sub sections\n   */\n  get subSections(): Array<SubSectionModel> {\n    return this.data.subSections\n      ? this.data.subSections.map(\n          (subSection) => new SubSectionModel(subSection)\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"],"file":"SectionModel.js"}

package/lib/models/content/SubSectionModel.js

@@ -45,6 +45,8 @@ var _Href = _interopRequireDefault(require("../href/Href"));
 
 var _LinkModel = _interopRequireDefault(require("../links/LinkModel"));
 
+var _utils = require("../../utils");
+
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray(o, minLen) { var _context2; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context2 = Object.prototype.toString.call(o)).call(_context2, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -106,7 +108,8 @@ var SubSectionModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "body",
     get: function get() {
-      return this.getData("body", "");
+      var body = this.getData("body", "");
+      return (0, _utils.retrieveText)(body);
     }
     /**
      * Retrieve number of section

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

@@ -5,6 +5,7 @@ import BaseModel from "../base/BaseModel";
 import LinkCollection from "../links/LinkCollection";
 import Href from "../href/Href";
 import LinkModel from "../links/LinkModel";
+import { retrieveText } from "../../utils";
 
 /**
  * Link to a concept
@@ -41,7 +42,8 @@ export default class SubSectionModel extends BaseModel {
    * Retrieve html body
    */
   get body(): string {
-    return this.getData("body", "");
+    const body = this.getData("body", "");
+    return retrieveText(body);
   }
 
   /**