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

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,7 +2,12 @@ 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: [
     {
       propertyElement: {
@@ -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__/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/form/__tests__/FormWithContentData.json

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

package/src/models/types.js

@@ -212,10 +212,6 @@ export type ContentElement = {
     sections: Array<SectionData>,
   },
 };
-export type ContentData = {
-  label: string | null,
-  elements: Array<PropertiesElement | TextFragmentElement | ContentElement>,
-};
 
 type ContentElementMapped = {
   contentElement: {
@@ -223,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>,
+};