@beinformed/ui 1.9.0-beta.9 → 1.9.3

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/contentconfiguration/ContentConfigurationResults.js

@@ -66,8 +66,8 @@ var ContentConfigurationResults = /*#__PURE__*/function () {
 
       var description = this._configuration.description;
 
-      if ((0, _utils.isPlainObject)(description) && "rawText" in description) {
-        return description.rawText;
+      if ((0, _utils.isPlainObject)(description) && "message" in description) {
+        return description.message;
       }
 
       return description;

package/lib/models/contentconfiguration/ContentConfigurationResults.js.flow

@@ -35,8 +35,8 @@ class ContentConfigurationResults {
     }
 
     const description = this._configuration.description;
-    if (isPlainObject(description) && "rawText" in description) {
-      return description.rawText;
+    if (isPlainObject(description) && "message" in description) {
+      return description.message;
     }
 
     return description;

package/lib/models/contentconfiguration/ContentConfigurationResults.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/models/contentconfiguration/ContentConfigurationResults.js"],"names":["ContentConfigurationResults","configuration","_configuration","_layouthint","LayoutHintCollection","layouthint","label","description","rawText","attributes","all","hint","substring","length","elementKey","ContentConfigurationElements","configElement","getFormConfigElement"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA;;AACA;;AACA;;AAEA;AACA;IACMA,2B;AAIJ;AACF;AACE,uCAAYC,aAAZ,EAAmC;AAAA;AAAA;AAAA;AACjC,SAAKC,cAAL,GAAsBD,aAAa,IAAI,IAAvC;AAEA,SAAKE,WAAL,GAAmB,IAAIC,6BAAJ,CAAyBH,aAAzB,aAAyBA,aAAzB,uBAAyBA,aAAa,CAAEI,UAAxC,CAAnB;AACD;AAED;AACF;;;;;SACE,eAA2B;AACzB,UAAI,KAAKH,cAAL,KAAwB,IAA5B,EAAkC;AAChC,eAAO,IAAP;AACD;;AAED,aAAO,KAAKA,cAAL,CAAoBI,KAA3B;AACD;AAED;AACF;;;;SACE,eAAiC;AAC/B,UAAI,KAAKJ,cAAL,KAAwB,IAA5B,EAAkC;AAChC,eAAO,IAAP;AACD;;AAED,UAAMK,WAAW,GAAG,KAAKL,cAAL,CAAoBK,WAAxC;;AACA,UAAI,0BAAcA,WAAd,KAA8B,aAAaA,WAA/C,EAA4D;AAC1D,eAAOA,WAAW,CAACC,OAAnB;AACD;;AAED,aAAOD,WAAP;AACD;AAED;AACF;;;;SACE,eAAgC;AAAA;;AAC9B,UAAI,KAAKL,cAAL,KAAwB,IAA5B,EAAkC;AAChC,eAAO,EAAP;AACD,OAH6B,CAK9B;AACA;;;AACA,iGACK,KAAKA,cAAL,CAAoBO,UADzB,oCAEK,oEAAKJ,UAAL,CAAgBK,GAAhB,kBACO,UAACC,IAAD;AAAA,eAAU,uBAAAA,IAAI,MAAJ,CAAAA,IAAI,EAAU,YAAV,CAAd;AAAA,OADP,mBAEI,UAACA,IAAD;AAAA,eAAUA,IAAI,CAACC,SAAL,CAAe,aAAaC,MAA5B,CAAV;AAAA,OAFJ,CAFL;AAMD;AAED;AACF;;;;WACE,8BAAqBC,UAArB,EAAuE;AACrE,UAAI,KAAKZ,cAAL,KAAwB,IAA5B,EAAkC;AAChC,eAAO,IAAIa,qCAAJ,CAAiC,EAAjC,CAAP;AACD;;AAED,UAAMC,aAAa,GAAG,KAAKd,cAAL,CAAoBY,UAApB,CAAtB;AAEA,aAAO,IAAIC,qCAAJ,CAAiCC,aAAjC,CAAP;AACD;AAED;AACF;;;;SACE,eAA6D;AAC3D,aAAO,KAAKC,oBAAL,CAA0B,0BAA1B,CAAP;AACD;AAED;AACF;;;;SACE,eAA2D;AACzD,aAAO,KAAKA,oBAAL,CAA0B,wBAA1B,CAAP;AACD;AAED;AACF;;;;SACE,eAA2D;AACzD,aAAO,KAAKA,oBAAL,CAA0B,wBAA1B,CAAP;AACD;AAED;AACF;;;;SACE,eAAmD;AACjD,aAAO,KAAKA,oBAAL,CAA0B,gBAA1B,CAAP;AACD;AAED;AACF;;;;SACE,eAAuC;AACrC,aAAO,KAAKd,WAAZ;AACD;;;;;eAGYH,2B","sourcesContent":["// @flow\nimport ContentConfigurationElements from \"./ContentConfigurationElements\";\nimport LayoutHintCollection from \"../layouthint/LayoutHintCollection\";\nimport { isPlainObject } from \"../../utils\";\n\n/**\n */\nclass ContentConfigurationResults {\n  _configuration: Object;\n  _layouthint: LayoutHintCollection;\n\n  /**\n   */\n  constructor(configuration: Object) {\n    this._configuration = configuration || null;\n\n    this._layouthint = new LayoutHintCollection(configuration?.layouthint);\n  }\n\n  /**\n   */\n  get label(): string | null {\n    if (this._configuration === null) {\n      return null;\n    }\n\n    return this._configuration.label;\n  }\n\n  /**\n   */\n  get description(): string | null {\n    if (this._configuration === null) {\n      return null;\n    }\n\n    const description = this._configuration.description;\n    if (isPlainObject(description) && \"rawText\" in description) {\n      return description.rawText;\n    }\n\n    return description;\n  }\n\n  /**\n   */\n  get attributes(): Array<string> {\n    if (this._configuration === null) {\n      return [];\n    }\n\n    // An issue with mapped attributes is giving us the wrong attribute keys in the attributes property\n    // as a temporary fix a layouthint with the correct mapped attribute key can be set in the configuration of the end results\n    return [\n      ...this._configuration.attributes,\n      ...this.layouthint.all\n        .filter((hint) => hint.includes(\"attribute:\"))\n        .map((hint) => hint.substring(\"attribute:\".length)),\n    ];\n  }\n\n  /**\n   */\n  getFormConfigElement(elementKey: string): ContentConfigurationElements {\n    if (this._configuration === null) {\n      return new ContentConfigurationElements([]);\n    }\n\n    const configElement = this._configuration[elementKey];\n\n    return new ContentConfigurationElements(configElement);\n  }\n\n  /**\n   */\n  get calculatedResultElements(): ContentConfigurationElements {\n    return this.getFormConfigElement(\"calculatedResultElements\");\n  }\n\n  /**\n   */\n  get positiveResultElements(): ContentConfigurationElements {\n    return this.getFormConfigElement(\"positiveResultElements\");\n  }\n\n  /**\n   */\n  get negativeResultElements(): ContentConfigurationElements {\n    return this.getFormConfigElement(\"negativeResultElements\");\n  }\n\n  /**\n   */\n  get resultElements(): ContentConfigurationElements {\n    return this.getFormConfigElement(\"resultElements\");\n  }\n\n  /**\n   */\n  get layouthint(): LayoutHintCollection {\n    return this._layouthint;\n  }\n}\n\nexport default ContentConfigurationResults;\n"],"file":"ContentConfigurationResults.js"}
+{"version":3,"sources":["../../../src/models/contentconfiguration/ContentConfigurationResults.js"],"names":["ContentConfigurationResults","configuration","_configuration","_layouthint","LayoutHintCollection","layouthint","label","description","message","attributes","all","hint","substring","length","elementKey","ContentConfigurationElements","configElement","getFormConfigElement"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AACA;;AACA;;AACA;;AAEA;AACA;IACMA,2B;AAIJ;AACF;AACE,uCAAYC,aAAZ,EAAmC;AAAA;AAAA;AAAA;AACjC,SAAKC,cAAL,GAAsBD,aAAa,IAAI,IAAvC;AAEA,SAAKE,WAAL,GAAmB,IAAIC,6BAAJ,CAAyBH,aAAzB,aAAyBA,aAAzB,uBAAyBA,aAAa,CAAEI,UAAxC,CAAnB;AACD;AAED;AACF;;;;;SACE,eAA2B;AACzB,UAAI,KAAKH,cAAL,KAAwB,IAA5B,EAAkC;AAChC,eAAO,IAAP;AACD;;AAED,aAAO,KAAKA,cAAL,CAAoBI,KAA3B;AACD;AAED;AACF;;;;SACE,eAAiC;AAC/B,UAAI,KAAKJ,cAAL,KAAwB,IAA5B,EAAkC;AAChC,eAAO,IAAP;AACD;;AAED,UAAMK,WAAW,GAAG,KAAKL,cAAL,CAAoBK,WAAxC;;AACA,UAAI,0BAAcA,WAAd,KAA8B,aAAaA,WAA/C,EAA4D;AAC1D,eAAOA,WAAW,CAACC,OAAnB;AACD;;AAED,aAAOD,WAAP;AACD;AAED;AACF;;;;SACE,eAAgC;AAAA;;AAC9B,UAAI,KAAKL,cAAL,KAAwB,IAA5B,EAAkC;AAChC,eAAO,EAAP;AACD,OAH6B,CAK9B;AACA;;;AACA,iGACK,KAAKA,cAAL,CAAoBO,UADzB,oCAEK,oEAAKJ,UAAL,CAAgBK,GAAhB,kBACO,UAACC,IAAD;AAAA,eAAU,uBAAAA,IAAI,MAAJ,CAAAA,IAAI,EAAU,YAAV,CAAd;AAAA,OADP,mBAEI,UAACA,IAAD;AAAA,eAAUA,IAAI,CAACC,SAAL,CAAe,aAAaC,MAA5B,CAAV;AAAA,OAFJ,CAFL;AAMD;AAED;AACF;;;;WACE,8BAAqBC,UAArB,EAAuE;AACrE,UAAI,KAAKZ,cAAL,KAAwB,IAA5B,EAAkC;AAChC,eAAO,IAAIa,qCAAJ,CAAiC,EAAjC,CAAP;AACD;;AAED,UAAMC,aAAa,GAAG,KAAKd,cAAL,CAAoBY,UAApB,CAAtB;AAEA,aAAO,IAAIC,qCAAJ,CAAiCC,aAAjC,CAAP;AACD;AAED;AACF;;;;SACE,eAA6D;AAC3D,aAAO,KAAKC,oBAAL,CAA0B,0BAA1B,CAAP;AACD;AAED;AACF;;;;SACE,eAA2D;AACzD,aAAO,KAAKA,oBAAL,CAA0B,wBAA1B,CAAP;AACD;AAED;AACF;;;;SACE,eAA2D;AACzD,aAAO,KAAKA,oBAAL,CAA0B,wBAA1B,CAAP;AACD;AAED;AACF;;;;SACE,eAAmD;AACjD,aAAO,KAAKA,oBAAL,CAA0B,gBAA1B,CAAP;AACD;AAED;AACF;;;;SACE,eAAuC;AACrC,aAAO,KAAKd,WAAZ;AACD;;;;;eAGYH,2B","sourcesContent":["// @flow\nimport ContentConfigurationElements from \"./ContentConfigurationElements\";\nimport LayoutHintCollection from \"../layouthint/LayoutHintCollection\";\nimport { isPlainObject } from \"../../utils\";\n\n/**\n */\nclass ContentConfigurationResults {\n  _configuration: Object;\n  _layouthint: LayoutHintCollection;\n\n  /**\n   */\n  constructor(configuration: Object) {\n    this._configuration = configuration || null;\n\n    this._layouthint = new LayoutHintCollection(configuration?.layouthint);\n  }\n\n  /**\n   */\n  get label(): string | null {\n    if (this._configuration === null) {\n      return null;\n    }\n\n    return this._configuration.label;\n  }\n\n  /**\n   */\n  get description(): string | null {\n    if (this._configuration === null) {\n      return null;\n    }\n\n    const description = this._configuration.description;\n    if (isPlainObject(description) && \"message\" in description) {\n      return description.message;\n    }\n\n    return description;\n  }\n\n  /**\n   */\n  get attributes(): Array<string> {\n    if (this._configuration === null) {\n      return [];\n    }\n\n    // An issue with mapped attributes is giving us the wrong attribute keys in the attributes property\n    // as a temporary fix a layouthint with the correct mapped attribute key can be set in the configuration of the end results\n    return [\n      ...this._configuration.attributes,\n      ...this.layouthint.all\n        .filter((hint) => hint.includes(\"attribute:\"))\n        .map((hint) => hint.substring(\"attribute:\".length)),\n    ];\n  }\n\n  /**\n   */\n  getFormConfigElement(elementKey: string): ContentConfigurationElements {\n    if (this._configuration === null) {\n      return new ContentConfigurationElements([]);\n    }\n\n    const configElement = this._configuration[elementKey];\n\n    return new ContentConfigurationElements(configElement);\n  }\n\n  /**\n   */\n  get calculatedResultElements(): ContentConfigurationElements {\n    return this.getFormConfigElement(\"calculatedResultElements\");\n  }\n\n  /**\n   */\n  get positiveResultElements(): ContentConfigurationElements {\n    return this.getFormConfigElement(\"positiveResultElements\");\n  }\n\n  /**\n   */\n  get negativeResultElements(): ContentConfigurationElements {\n    return this.getFormConfigElement(\"negativeResultElements\");\n  }\n\n  /**\n   */\n  get resultElements(): ContentConfigurationElements {\n    return this.getFormConfigElement(\"resultElements\");\n  }\n\n  /**\n   */\n  get layouthint(): LayoutHintCollection {\n    return this._layouthint;\n  }\n}\n\nexport default ContentConfigurationResults;\n"],"file":"ContentConfigurationResults.js"}

package/lib/models/contentconfiguration/__tests__/ContentConfigurationResults.spec.js.flow

@@ -33,14 +33,14 @@ describe("ContentConfigurationResults", () => {
   });
 
   it("can handle configuration with description object", () => {
-    const rawText =
+    const message =
       "<p>The property value is ${EstimatedPropertyValue} and my personal deposit is ${MortgageDeposit}. The mortgage is a repayment mortgage for a term of ${MortgageTermInYears} years. The rate type is ${InterestRateType} for a period of ${PeriodOfInterestRate}.</p>";
 
     const contributions = {
       label: "Total cost of mortgage",
       description: {
         id: "CalculatorResults.TotalCostOfMortgage.introText",
-        rawText,
+        message,
       },
       layouthint: ["render-description:TotalCostOfMortgage"],
       attributes: ["TotalCostOfMortgage"],
@@ -59,7 +59,7 @@ describe("ContentConfigurationResults", () => {
     );
 
     expect(contentConfigurationResults.label).toBe("Total cost of mortgage");
-    expect(contentConfigurationResults.description).toBe(rawText);
+    expect(contentConfigurationResults.description).toBe(message);
     expect(contentConfigurationResults.attributes).toStrictEqual([
       "TotalCostOfMortgage",
     ]);
@@ -87,15 +87,15 @@ describe("ContentConfigurationResults", () => {
   });
 
   it("can handle configuration with description string", () => {
-    const rawText =
+    const message =
       "<p>The property value is ${EstimatedPropertyValue} and my personal deposit is ${MortgageDeposit}. The mortgage is a repayment mortgage for a term of ${MortgageTermInYears} years. The rate type is ${InterestRateType} for a period of ${PeriodOfInterestRate}.</p>";
 
     const contentConfigurationResults = new ContentConfigurationResults({
       label: "Total cost of mortgage",
-      description: rawText,
+      description: message,
     });
 
     expect(contentConfigurationResults.label).toBe("Total cost of mortgage");
-    expect(contentConfigurationResults.description).toBe(rawText);
+    expect(contentConfigurationResults.description).toBe(message);
   });
 });

package/lib/models/form/FormObjectModel.js

@@ -386,9 +386,15 @@ var FormObjectModel = /*#__PURE__*/function (_BaseModel) {
   }, {
     key: "introText",
     get: function get() {
-      var _this$contributions$i, _this$contributions$i2;
+      var _this$data$content, _this$contributions$i, _this$contributions$i2;
 
-      return (_this$contributions$i = (_this$contributions$i2 = this.contributions.introText) === null || _this$contributions$i2 === void 0 ? void 0 : _this$contributions$i2.rawText) !== null && _this$contributions$i !== void 0 ? _this$contributions$i : this.contributions.introText;
+      if ((_this$data$content = this.data.content) !== null && _this$data$content !== void 0 && _this$data$content.text) {
+        var _this$data$content$te;
+
+        return (_this$data$content$te = this.data.content.text.message) !== null && _this$data$content$te !== void 0 ? _this$data$content$te : this.data.content.text;
+      }
+
+      return (_this$contributions$i = (_this$contributions$i2 = this.contributions.introText) === null || _this$contributions$i2 === void 0 ? void 0 : _this$contributions$i2.message) !== null && _this$contributions$i !== void 0 ? _this$contributions$i : this.contributions.introText;
     }
     /**
      * Get assistent of form object

package/lib/models/form/FormObjectModel.js.flow

@@ -295,8 +295,12 @@ export default class FormObjectModel extends BaseModel {
    * Get introText of form object
    */
   get introText(): string {
+    if (this.data.content?.text) {
+      return this.data.content.text.message ?? this.data.content.text;
+    }
+
     return (
-      this.contributions.introText?.rawText ?? this.contributions.introText
+      this.contributions.introText?.message ?? this.contributions.introText
     );
   }