@beinformed/ui 1.9.0-beta.9 → 1.9.3

package/src/models/concepts/__mock__/conceptdetail_data.json

@@ -1,9 +1,9 @@
 {
   "concept": {
-    "_id": "StaandehoudingScSt",
+    "_id": "DurationDrivingBan",
     "_links": {
       "self": {
-        "href": "/concepts/Incident/Business design/Business scenario/Scenario incident.bixml/StaandehoudingScSt"
+        "href": "/concepts/_Models and content/Police incident handling/Models/Sanctions/Driving ban/Duration driving ban.bixml/DurationDrivingBan"
       },
       "api_doc": {
         "href": "/api-docs/v3/concepts/(knowledge-model-identifier)/(concept-identifier)"
@@ -12,51 +12,151 @@
         "href": "/contributions/concepts/(knowledge-model-identifier)/(concept-identifier)"
       },
       "concepttype": {
-        "href": "/concepttypes/Library/KMTs/Business scenarios.bixml/ScenarioStep"
+        "href": "/concepttypes/Library/KMTs/Products.bixml/Calculation"
       }
     },
     "filter": {
       "entryDate": {
         "param": "entryDate",
         "name": "entryDate",
-        "value": "2020-11-20"
+        "value": "2021-09-23"
       }
     },
-    "conceptLabel": "Staandehouding",
+    "conceptLabel": "Duration driving ban",
+    "formula": "IF (NoviceDriver) (NUMBER)DurationDrivingBanNoviceDriver ELSE IF\n(ExperiencedDriver) (NUMBER)DurationDrivingBanExperiencedDriver ENDIF ENDIF",
     "taxonomyType": "default",
+    "sourceReferences": [
+      {
+        "label": "Duration driving ban",
+        "type": "DescriptionFormalSourceSubsection",
+        "sourceLabel": "Duration driving ban (formal source, subsections)",
+        "_links": {
+          "self": {
+            "href": "/content/_Models and content/Police incident handling/Content/Driving ban/Subsections/Duration driving ban.formalsource/Introduction#DurationDrivingBan"
+          },
+          "content": {
+            "href": "/content/_Models and content/Police incident handling/Content/Driving ban/Subsections/Duration driving ban.formalsource"
+          }
+        }
+      },
+      {
+        "label": "Duration driving ban",
+        "type": "DescriptionTextileSource",
+        "sourceLabel": "Duration driving ban (textile source)",
+        "_links": {
+          "self": {
+            "href": "/content/_Models and content/Police incident handling/Content/Driving ban/Duration driving ban.textilesource/duration"
+          },
+          "content": {
+            "href": "/content/_Models and content/Police incident handling/Content/Driving ban/Duration driving ban.textilesource"
+          }
+        }
+      }
+    ],
+    "properties": [
+      {
+        "value": "DDB",
+        "type": "Abbreviation"
+      }
+    ],
+    "labels": [
+      {
+        "type": "ResultLabel",
+        "value": "Duration of driving ban (in months)"
+      }
+    ],
+    "textFragments": [
+      {
+        "type": "Description",
+        "id": "DurationDrivingBan.tv852.Description",
+        "text": "Text fragment for duration driving ban"
+      }
+    ],
     "relations": [
       {
-        "relationLabel": "performed by",
-        "relationType": "performedBy",
+        "relationLabel": "depends on",
+        "relationType": "depends_on",
+        "relationDirection": "outgoing",
+        "concept": {
+          "_links": {
+            "self": {
+              "href": "/concepts/_Models and content/Police incident handling/Models/Sanctions/Driver.bixml/NoviceDriver"
+            },
+            "concepttype": {
+              "href": "/concepttypes/Library/KMTs/Products.bixml/Class"
+            }
+          },
+          "conceptLabel": "Novice driver",
+          "_id": "NoviceDriver"
+        }
+      },
+      {
+        "relationLabel": "depends on",
+        "relationType": "depends_on",
+        "relationDirection": "outgoing",
+        "concept": {
+          "_links": {
+            "self": {
+              "href": "/concepts/_Models and content/Police incident handling/Models/Sanctions/Driver.bixml/ExperiencedDriver"
+            },
+            "concepttype": {
+              "href": "/concepttypes/Library/KMTs/Products.bixml/Class"
+            }
+          },
+          "conceptLabel": "Experienced driver",
+          "_id": "ExperiencedDriver"
+        }
+      },
+      {
+        "relationLabel": "depends on",
+        "relationType": "depends_on",
+        "relationDirection": "outgoing",
+        "concept": {
+          "_links": {
+            "self": {
+              "href": "/concepts/_Models and content/Police incident handling/Models/Sanctions/Driving ban/Duration driving ban.bixml/DurationDrivingBanNoviceDriver"
+            },
+            "concepttype": {
+              "href": "/concepttypes/Library/KMTs/Products.bixml/Ground"
+            }
+          },
+          "conceptLabel": "Duration driving ban novice driver",
+          "_id": "DurationDrivingBanNoviceDriver"
+        }
+      },
+      {
+        "relationLabel": "depends on",
+        "relationType": "depends_on",
         "relationDirection": "outgoing",
         "concept": {
           "_links": {
             "self": {
-              "href": "/concepts/Incident/Business design/Business scenario/Scenario incident.bixml/Agent"
+              "href": "/concepts/_Models and content/Police incident handling/Models/Sanctions/Driving ban/Duration driving ban.bixml/DurationDrivingBanExperiencedDriver"
             },
             "concepttype": {
-              "href": "/concepttypes/Library/KMTs/Business scenarios.bixml/Persona"
+              "href": "/concepttypes/Library/KMTs/Products.bixml/Ground"
             }
           },
-          "conceptLabel": "Agent",
-          "_id": "Agent"
+          "conceptLabel": "Duration driving ban experienced driver",
+          "_id": "DurationDrivingBanExperiencedDriver"
         }
       },
       {
-        "relationLabel": "consists of",
-        "relationType": "consistsOf",
+        "relationLabel": "required by with condition",
+        "relationType": "requiresWithCondition",
+        "relationCondition": "DurationDrivingBan >= 0",
         "relationDirection": "incoming",
         "concept": {
           "_links": {
             "self": {
-              "href": "/concepts/Incident/Business design/Business scenario/Scenario incident.bixml/ScenarioIncident"
+              "href": "/concepts/_Models and content/Police incident handling/Models/Approvals/Approved duration driving ban.bixml/ApprovedDurationDrivingBan"
             },
             "concepttype": {
-              "href": "/concepttypes/Library/KMTs/Business scenarios.bixml/BusinessScenario"
+              "href": "/concepttypes/Library/KMTs/Products.bixml/Decision"
             }
           },
-          "conceptLabel": "Scenario incident",
-          "_id": "ScenarioIncident"
+          "conceptLabel": "Approved duration driving ban",
+          "_id": "ApprovedDurationDrivingBan"
         }
       }
     ]

package/src/models/concepts/__mock__/concepttype_Calculation.json

@@ -0,0 +1,75 @@
+{
+  "concepttype": {
+    "_links": {
+      "self": {
+        "href": "/concepttypes/Library/KMTs/Products.bixml/Calculation"
+      },
+      "api_doc": {
+        "href": "/api-docs/v3/concepttypes/(knowledge-model-type-identifier)/(concept-type-identifier)"
+      },
+      "contributions": {
+        "href": "/contributions/concepttypes/(knowledge-model-type-identifier)/(concept-type-identifier)"
+      }
+    },
+    "_id": "Calculation",
+    "label": "Calculation",
+    "icon": "/resource/Library/General/Icons/Products/calculation_24x24.png",
+    "textColor": "#000000",
+    "lineColor": "#000000",
+    "backgroundColor": "#F3A60D",
+    "coreTaxonomy": "false",
+    "textFragmentTypes": [
+      { "_id": "Definition", "label": "Definition" },
+      { "_id": "Description", "label": "Description" },
+      { "_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" }
+    ],
+    "labelTypes": [
+      { "_id": "QuestionLabel", "label": "Question label" },
+      { "_id": "ResultLabel", "label": "Result label" }
+    ],
+    "propertyTypes": [
+      {
+        "_id": "PartnerService",
+        "label": "Partner Service",
+        "type": "string",
+        "mandatory": "false"
+      },
+      {
+        "_id": "Abbreviation",
+        "label": "Abbreviation",
+        "type": "string",
+        "mandatory": "false"
+      }
+    ],
+    "sectionReferenceTypes": [
+      { "_id": "crDescription", "label": "Description" },
+      {
+        "_id": "DescriptionFormalSource",
+        "label": "Description (formal source)"
+      },
+      {
+        "_id": "DescriptionFormalSourceSubsection",
+        "label": "Description (formal source, subsection)"
+      },
+      {
+        "_id": "DescriptionLocalSource",
+        "label": "Description (local source)"
+      },
+      {
+        "_id": "DescriptionTextileSource",
+        "label": "Description (textile source)"
+      },
+      { "_id": "Reference", "label": "Reference" },
+      { "_id": "Satisfies", "label": "Satisfies" }
+    ]
+  }
+}

package/src/models/concepts/__tests__/BusinessScenarioModel.spec.js

@@ -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/src/models/concepts/__tests__/ConceptDetailModel.spec.js

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

@@ -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/src/models/contentconfiguration/__tests__/ContentConfigurationResults.spec.js

@@ -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/src/models/form/FormObjectModel.js

@@ -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
     );
   }
 

package/src/models/form/__tests__/FormObjectModel.spec.js

@@ -19,7 +19,7 @@ const data = {
 const contributions = {
   repeatable: false,
   label: "Create person",
-  introText: { id: "IntroTextID", rawText: "This is introtext" },
+  introText: { id: "IntroTextID", message: "This is introtext" },
   attributes: [
     {
       Name: {
@@ -122,7 +122,7 @@ describe("formObjectModel", () => {
     const contributions2 = {
       repeatable: false,
       label: "Create person",
-      introText: { id: "IntroTextID", rawText: "This is new introtext" },
+      introText: { id: "IntroTextID", message: "This is new introtext" },
       attributes: [],
     };
 

package/src/models/form/__tests__/FormWithContentData.json

@@ -19,7 +19,8 @@
             {
               "elementid": "UitslagBlaastestType",
               "content": {
-                "header": { "label": "Uitslag blaastest label" },
+                "header": { "label": "Header label" },
+                "label": "Uitslag blaastest label",
                 "elements": [
                   {
                     "contentElement": {

package/src/models/layouthint/LayoutHintCollection.js

@@ -35,11 +35,13 @@ export default class LayoutHintCollection extends BaseCollection<string> {
   has(...hints: Array<string>): boolean {
     const hintArray = hints.length > 0 ? [...hints] : [];
 
-    return hintArray.some(
-      (hint) =>
-        this.layouthint.includes(hint) ||
-        this.layouthint.some((hint2) => hint2.startsWith(hint))
-    );
+    return hintArray
+      .flat()
+      .some(
+        (hint) =>
+          this.layouthint.includes(hint) ||
+          this.layouthint.some((hint2) => hint2.startsWith(hint))
+      );
   }
 
   /**
@@ -51,8 +53,7 @@ export default class LayoutHintCollection extends BaseCollection<string> {
    */
   hasExact(...hints: Array<string>): boolean {
     const hintArray = hints.length > 0 ? [...hints] : [];
-
-    return hintArray.some((hint) => this.layouthint.includes(hint));
+    return hintArray.flat().some((hint) => this.layouthint.includes(hint));
   }
 
   /**

package/src/models/list/ListDetailModel.js

@@ -133,6 +133,25 @@ export default class ListDetailModel extends DetailModel {
     this._contentConfiguration = configuration;
   }
 
+  /**
+   * Getting the introduction text configured on the case view
+   */
+  get introtext(): string {
+    if (this.data._text) {
+      return this.data._text.message ?? this.data._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 "";
+  }
+
   /**
    */
   setResultSection() {

package/src/models/list/ListModel.js

@@ -98,12 +98,16 @@ export default class ListModel extends ResourceModel {
    * Getting the introduction text
    */
   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 (this.contributions.text) {
+      return this.contributions.text.message ?? this.contributions.text;
+    }
 
-      return text ? text.text : "";
+    if (Array.isArray(this.contributions.texts)) {
+      return this.contributions.texts[0].text;
     }
 
     return "";

package/src/models/list/__tests__/ListDetailModel.spec.js

@@ -27,4 +27,68 @@ describe("listDetailModel", () => {
       "Highly Inappropriate Tales for Young People"
     );
   });
+
+  it("should be able to handle different kind of introtext", () => {
+    const listdetailOldStructure = new ListDetailModel({
+      key: "Book",
+      data: data.Book,
+      contributions: contributions.Book,
+    });
+
+    expect(listdetailOldStructure.introtext).toBe("<p>This is introtext</p>");
+
+    const listdetailFromDataPlain = new ListDetailModel({
+      key: "Book",
+      data: {
+        _text: "<p>This is introtext</p>",
+        ...data.Book,
+      },
+      contributions: contributions.Book,
+    });
+
+    expect(listdetailFromDataPlain.introtext).toBe("<p>This is introtext</p>");
+
+    const listdetailFromDataApplicationMessage = new ListDetailModel({
+      key: "Book",
+      data: {
+        ...data.Book,
+        _text: {
+          message: "<p>This is introtext</p>",
+        },
+      },
+      contributions: contributions.Book,
+    });
+
+    expect(listdetailFromDataApplicationMessage.introtext).toBe(
+      "<p>This is introtext</p>"
+    );
+
+    const listdetailFromNewContributionsRawTextMessage = new ListDetailModel({
+      key: "Book",
+      data: data.Book,
+      contributions: {
+        ...contributions.Book,
+        text: {
+          message: "<p>This is introtext</p>",
+        },
+      },
+    });
+
+    expect(listdetailFromNewContributionsRawTextMessage.introtext).toBe(
+      "<p>This is introtext</p>"
+    );
+
+    const listdetailFromNewContributionsSimpleMessage = new ListDetailModel({
+      key: "Book",
+      data: data.Book,
+      contributions: {
+        ...contributions.Book,
+        text: "<p>This is introtext</p>",
+      },
+    });
+
+    expect(listdetailFromNewContributionsSimpleMessage.introtext).toBe(
+      "<p>This is introtext</p>"
+    );
+  });
 });