@beinformed/ui 1.9.0-beta.4 → 1.9.0-beta.9

package/src/models/attributes/AttributeModel.js

@@ -14,12 +14,11 @@ import ConceptDetailModel from "../concepts/ConceptDetailModel";
 
 import { MANDATORY, DISABLED } from "../../constants/LayoutHints";
 import {
-  ALL_CONTENT_IN_DATA_SETTING,
   ATTRIBUTE_WIDTH,
   TIMEVERSION_FILTER_NAME,
 } from "../../constants/Constants";
 
-import { getSetting } from "../../constants/Settings";
+import { getSetting, hasAllContentInData } from "../../constants/Settings";
 
 import {
   IllegalArgumentException,
@@ -952,7 +951,7 @@ export default class AttributeModel extends BaseModel {
    * Indicates if content comes from the data service
    */
   get hasContentFromData(): boolean {
-    return getSetting(ALL_CONTENT_IN_DATA_SETTING, true);
+    return hasAllContentInData();
   }
 
   /**

package/src/models/attributes/ChoiceAttributeOptionModel.js

@@ -4,21 +4,18 @@ import ChoiceAttributeOptionCollection from "./ChoiceAttributeOptionCollection";
 
 import { DateUtil } from "../../utils/datetime/DateTimeUtil";
 import { has } from "../../utils/helpers/objects";
-import {
-  ALL_CONTENT_IN_DATA_SETTING,
-  TIMEVERSION_FILTER_NAME,
-} from "../../constants/Constants";
+import { TIMEVERSION_FILTER_NAME } from "../../constants/Constants";
 import { TITLE } from "../../constants/LayoutHints";
+import { hasAllContentInData } from "../../constants/Settings";
 
 import LinkCollection from "../links/LinkCollection";
 import AttributeCollection from "./AttributeCollection";
 import ConceptDetailModel from "../concepts/ConceptDetailModel";
+import AttributeContent from "./AttributeContent";
 
 import type { ModularUIModel } from "../types";
 import type ListItemModel from "../list/ListItemModel";
 import type LinkModel from "../links/LinkModel";
-import { getSetting } from "../../constants";
-import AttributeContent from "./AttributeContent";
 
 /**
  */
@@ -358,7 +355,7 @@ class ChoiceAttributeOptionModel extends BaseModel {
    * Indicates if content comes from the data service
    */
   get hasContentFromData(): boolean {
-    return getSetting(ALL_CONTENT_IN_DATA_SETTING, true);
+    return hasAllContentInData();
   }
 
   /**

package/src/models/attributes/HelptextAttributeModel.js

@@ -26,6 +26,16 @@ export default class HelptextAttributeModel extends LabelAttributeModel {
    * Get helptext text
    */
   get text(): string | null {
-    return this.getContribution("text");
+    const dataText = this.getData("value");
+    if (dataText) {
+      return dataText.message;
+    }
+
+    const contributionText = this.getContribution("text");
+    if (contributionText) {
+      return contributionText.message ?? contributionText;
+    }
+
+    return null;
   }
 }

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

@@ -2,10 +2,15 @@ import AttributeContent from "../AttributeContent";
 import SectionModel from "../../content/SectionModel";
 
 const json = {
-  label: "Blaastest geslaagd",
+  header: {
+    label: "Blaastest geslaagd",
+    description: {
+      message: "Dit is de beschrijving",
+    },
+  },
   elements: [
     {
-      propertiesElement: {
+      propertyElement: {
         label: "Properties",
         id: "properties",
         properties: [
@@ -18,7 +23,7 @@ const json = {
       },
     },
     {
-      propertiesElement: {
+      propertyElement: {
         label: "Second Properties",
         id: "secondProperties",
         properties: [
@@ -38,7 +43,7 @@ const json = {
           {
             type: "Description",
             label: "Description",
-            text: "Dit is een text fragment",
+            text: { message: "Dit is een text fragment" },
           },
         ],
       },
@@ -147,6 +152,7 @@ describe("AttributeContent", () => {
   it("Handles basic content elements", () => {
     const content = new AttributeContent(json);
     expect(content.label).toBe("Blaastest geslaagd");
+    expect(content.description).toBe("Dit is de beschrijving");
     expect(content.properties).toHaveLength(2);
     expect(content.textfragments).toHaveLength(1);
     expect(content.sections).toHaveLength(1);
@@ -218,6 +224,6 @@ describe("AttributeContent", () => {
   it("can retrieve all content", () => {
     const content = new AttributeContent(json);
 
-    expect(content.all).toHaveLength(4);
+    expect(content.elements).toHaveLength(4);
   });
 });

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

@@ -384,4 +384,160 @@ describe("attributeDataHelper", () => {
       content: null,
     });
   });
+
+  it("can handle classification result list detail", () => {
+    const data = {
+      key: "results",
+      dynamicschema: {
+        "results.Sanctions": [
+          {
+            code: "DrivingBan",
+            label: "Driving ban",
+            _links: {
+              concept: {
+                href: "/concepts/_Context/Police incident decisions/Models/Sanctions/Sanctions.bixml/DrivingBan",
+              },
+            },
+            content: {
+              elements: [
+                {
+                  propertyElement: {
+                    id: "3d38501d",
+                    label: "Property: Abbreviation",
+                    properties: {
+                      type: "Abbreviation",
+                      label: "Abbreviation",
+                      value: "DB",
+                    },
+                  },
+                },
+              ],
+            },
+          },
+          {
+            code: "PoliceReport",
+            label: "Police report",
+            _links: {
+              concept: {
+                href: "/concepts/_Context/Police incident decisions/Models/Sanctions/Sanctions.bixml/PoliceReport",
+              },
+            },
+            content: {
+              elements: [
+                {
+                  propertyElement: {
+                    id: "3d38501d",
+                    label: "Property: Abbreviation",
+                    properties: {
+                      type: "Abbreviation",
+                      label: "Abbreviation",
+                      value: "PR",
+                    },
+                  },
+                },
+              ],
+            },
+          },
+          {
+            code: "RevocateLicense",
+            label: "Revocate license",
+            _links: {
+              concept: {
+                href: "/concepts/_Context/Police incident decisions/Models/Sanctions/Sanctions.bixml/RevocateLicense",
+              },
+            },
+            content: {
+              elements: [
+                {
+                  propertyElement: {
+                    id: "6c4e8b69",
+                    label: "Property: Abbreviation",
+                    properties: {
+                      type: "Abbreviation",
+                      label: "Abbreviation",
+                      value: "RL",
+                    },
+                  },
+                },
+              ],
+            },
+          },
+        ],
+      },
+      results: { Sanctions: ["DrivingBan", "PoliceReport"] },
+    };
+    const key = "results";
+    const childrenKeys = [{ key: "Sanctions", children: [] }];
+
+    const dataHelper = new AttributeDataHelper(data, key, childrenKeys);
+    const dataHelperData = dataHelper.getData();
+
+    expect(dataHelperData.content).toBeNull();
+    expect(dataHelperData.dynamicschemaId).toBe("results");
+    expect(dataHelperData.key).toBe("results");
+    expect(dataHelperData.value).toStrictEqual({
+      Sanctions: ["DrivingBan", "PoliceReport"],
+    });
+    expect(dataHelperData.children).toHaveLength(1);
+
+    const firstChild = dataHelperData.children[0];
+    expect(firstChild.dynamicschemaId).toBe("results.Sanctions");
+    expect(firstChild.key).toBe("Sanctions");
+    expect(firstChild.value).toStrictEqual(["DrivingBan", "PoliceReport"]);
+    expect(firstChild.content).toBeNull();
+
+    expect(firstChild.dynamicschema).toHaveLength(3);
+    const firstDynamicSchema = firstChild.dynamicschema[0];
+
+    expect(firstDynamicSchema.code).toBe("DrivingBan");
+    expect(firstDynamicSchema.label).toBe("Driving ban");
+    expect(firstDynamicSchema.content.elements).toHaveLength(1);
+  });
+
+  it("can handle decision result list detail", () => {
+    const data = {
+      key: "results",
+      content: {
+        InvestigationNecessary: {
+          elements: [
+            {
+              textFragmentElement: {
+                label: "Text fragment: Description",
+                textfragments: [
+                  {
+                    type: "Description",
+                    label: "Description",
+                    text: "Text fragment for investigation necessary",
+                  },
+                ],
+                "layout-hint": ["full"],
+              },
+            },
+          ],
+        },
+      },
+      results: { InvestigationNecessary: true },
+    };
+    const key = "results";
+    const childrenKeys = [{ key: "InvestigationNecessary", children: [] }];
+
+    const dataHelper = new AttributeDataHelper(data, key, childrenKeys);
+    const dataHelperData = dataHelper.getData();
+
+    expect(dataHelperData.content).toBeNull();
+    expect(dataHelperData.dynamicschemaId).toBe("results");
+    expect(dataHelperData.key).toBe("results");
+    expect(dataHelperData.value).toStrictEqual({
+      InvestigationNecessary: true,
+    });
+    expect(dataHelperData.children).toHaveLength(1);
+
+    const firstChild = dataHelperData.children[0];
+    expect(firstChild.dynamicschemaId).toBe("results.InvestigationNecessary");
+    expect(firstChild.key).toBe("InvestigationNecessary");
+    expect(firstChild.value).toBe(true);
+    expect(firstChild.content.elements).toHaveLength(1);
+
+    expect(firstChild.dynamicschema).toBeUndefined();
+  });
 });

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

@@ -1,7 +1,7 @@
 import HelptextAttributeModel from "../HelptextAttributeModel";
 
 describe("helptextAttributeModel", () => {
-  it("should be able to create an empty HelptextAttribute object", () => {
+  it("should be able to create a HelptextAttribute object", () => {
     const attribute = new HelptextAttributeModel();
 
     expect(attribute).toBeInstanceOf(HelptextAttributeModel);
@@ -15,4 +15,42 @@ describe("helptextAttributeModel", () => {
 
     expect(attributeWithText.text).toBe("Example helptext text");
   });
+
+  it("should be able to handle content in data", () => {
+    const attributeWithText = new HelptextAttributeModel(
+      {
+        key: "CarDetails",
+        value: {
+          id: "CarDetails.text",
+          properties: {
+            PersonPrivateCar: "Ferrari GTO",
+            PersonLessFavoriteCars: "Mercedes",
+            PersonFavoriteCars: "BMW 5 Series, Fiat Panda",
+          },
+          message:
+            "<p>Currently the person drives in a Ferrari GTO, although his favorite cars are BMW 5 Series, Fiat Panda. Less favorite cars of the person are Mercedes.</p>",
+        },
+        static: true,
+        dynamicschemaId: "CarDetails",
+        isResult: false,
+        children: [],
+        content: null,
+      },
+      {
+        type: "string",
+        label: "Car details",
+        mandatory: false,
+        readonly: true,
+        text: {
+          id: "CarDetails.text",
+          rawText:
+            "<p>Currently the person drives in a ${PersonPrivateCar}, although his favorite cars are ${PersonFavoriteCars}. Less favorite cars of the person are ${PersonLessFavoriteCars}.</p>",
+        },
+      }
+    );
+
+    expect(attributeWithText.text).toBe(
+      "<p>Currently the person drives in a Ferrari GTO, although his favorite cars are BMW 5 Series, Fiat Panda. Less favorite cars of the person are Mercedes.</p>"
+    );
+  });
 });

package/src/models/content/SectionModel.js

@@ -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/src/models/content/SubSectionModel.js

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

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

@@ -19,7 +19,7 @@
             {
               "elementid": "UitslagBlaastestType",
               "content": {
-                "label": "Uitslag blaastest label",
+                "header": { "label": "Uitslag blaastest label" },
                 "elements": [
                   {
                     "contentElement": {
@@ -56,7 +56,7 @@
                     }
                   },
                   {
-                    "propertiesElement": {
+                    "propertyElement": {
                       "label": "Properties",
                       "id": "properties",
                       "properties": [
@@ -93,7 +93,7 @@
                         }
                       },
                       {
-                        "propertiesElement": {
+                        "propertyElement": {
                           "label": "Properties",
                           "id": "properties",
                           "properties": [
@@ -143,7 +143,7 @@
                         }
                       },
                       {
-                        "propertiesElement": {
+                        "propertyElement": {
                           "label": "Properties",
                           "id": "properties",
                           "properties": [
@@ -180,7 +180,7 @@
                         }
                       },
                       {
-                        "propertiesElement": {
+                        "propertyElement": {
                           "label": "Properties",
                           "id": "properties",
                           "properties": [
@@ -217,7 +217,7 @@
                         }
                       },
                       {
-                        "propertiesElement": {
+                        "propertyElement": {
                           "label": "Properties",
                           "id": "properties",
                           "properties": [

package/src/models/list/ListDetailModel.js

@@ -157,6 +157,7 @@ export default class ListDetailModel extends DetailModel {
         {
           key: "results",
           dynamicschema: this.data.dynamicschema,
+          content: this.data.content?.results,
           ...this.data.resultSection,
         },
         this.contributions.resultSection.results
@@ -194,6 +195,7 @@ export default class ListDetailModel extends DetailModel {
         {
           key: "givenAnswers",
           dynamicschema: this.data.dynamicschema,
+          content: this.data.content?.givenAnswers,
           ...this.data.resultSection,
         },
         filteredContributions

package/src/models/types.js

@@ -176,13 +176,17 @@ export type FilesizeConstraintsType = {
 };
 
 export type PropertyData = { type: string, label: string, value: string };
-export type TextFragmentData = { type: string, label: string, text: string };
+export type TextFragmentData = {
+  type: string,
+  label: string,
+  text: string | { id?: string, message: string, properties?: Object },
+};
 export type SectionData = {
   id: string,
   type: string,
   label?: string,
   number?: string,
-  body: string,
+  body: string | { id?: string, message: string, properties?: Object },
   _links: { self: { href: string } },
   childSections: Array<SectionData>,
   subSections: Array<SectionData>,
@@ -208,10 +212,6 @@ export type ContentElement = {
     sections: Array<SectionData>,
   },
 };
-export type ContentData = {
-  label: string | null,
-  elements: Array<PropertiesElement | TextFragmentElement | ContentElement>,
-};
 
 type ContentElementMapped = {
   contentElement: {
@@ -219,6 +219,15 @@ type ContentElementMapped = {
     sections: Array<SectionModel>,
   },
 };
+
 export type ContentAll = Array<
   PropertiesElement | TextFragmentElement | ContentElementMapped
 >;
+
+export type ContentData = {
+  header: {
+    label?: string,
+    description?: { id?: string, message: string, properties?: Object },
+  },
+  elements: Array<PropertiesElement | TextFragmentElement | ContentElement>,
+};