@beinformed/ui 1.9.0-beta.1 → 1.9.0-beta.13

package/lib/models/attributes/__tests__/AttributeContent.spec.js.flow

@@ -2,111 +2,148 @@ import AttributeContent from "../AttributeContent";
 import SectionModel from "../../content/SectionModel";
 
 const json = {
-  label: "Blaastest geslaagd",
-  properties: [
-    {
-      key: "Gemiddelde",
-      label: "Gemiddelde",
-      value: "80%",
+  header: {
+    label: "Blaastest geslaagd",
+    description: {
+      message: "Dit is de beschrijving",
     },
-  ],
-  textfragments: [
+  },
+  elements: [
     {
-      type: "Description",
-      label: "Description",
-      text: "Dit is een text fragment",
+      propertyElement: {
+        label: "Properties",
+        id: "properties",
+        properties: [
+          {
+            type: "Gemiddelde",
+            label: "Gemiddelde",
+            value: "80%",
+          },
+        ],
+      },
     },
-  ],
-  sections: [
     {
-      id: "Alert",
-      type: "Reference",
-      label: "Alert",
-      number: "1",
-      body: "<p>The limit of 0.5 per mille has been exceeded.</p>",
-      _links: {
-        self: {
-          href: "/content/_Context/Police incident decisions/Content/Breath analysis/Breathalyzer test.formalsource/Alert",
-        },
-      },
-      childSections: [
-        {
-          id: "pass",
-          label: "Pass",
-          body: "<p>Nog een sectie voor optie Pass.</p>",
-          _links: {
-            self: {
-              href: "/content/Incident/Business design/Content/Blaastest.textilesource/pass",
-            },
+      propertyElement: {
+        label: "Second Properties",
+        id: "secondProperties",
+        properties: [
+          {
+            type: "SecondGemiddelde",
+            label: "Second Gemiddelde",
+            value: "20%",
           },
-        },
-        {
-          id: "pass_alert",
-          label: "Pass / Alert",
-          body: "<p>Nog een sectie voor optie Pass / Alert.</p>",
-          _links: {
-            self: {
-              href: "/content/Incident/Business design/Content/Blaastest.textilesource/pass_alert",
-            },
+        ],
+      },
+    },
+    {
+      textFragmentElement: {
+        label: "Description",
+        id: "Description",
+        textfragments: [
+          {
+            type: "Description",
+            label: "Description",
+            text: { message: "Dit is een text fragment" },
           },
-        },
-      ],
-      subSections: [
-        {
-          id: "Pass",
-          body: "<p>De blaastest heeft geen alcohol constateerd (versie 2017)</p>",
-          _links: {
-            self: {
-              href: "/content/Incident/Business design/Content/Blaastest subsections.formalsource/BlaastestOpties#Pass",
+        ],
+      },
+    },
+    {
+      contentElement: {
+        label: "Description",
+        sections: [
+          {
+            id: "Alert",
+            type: "Reference",
+            label: "Alert",
+            number: "1",
+            body: "<p>The limit of 0.5 per mille has been exceeded.</p>",
+            _links: {
+              self: {
+                href: "/content/_Context/Police incident decisions/Content/Breath analysis/Breathalyzer test.formalsource/Alert",
+              },
             },
-          },
-          subSections: [
-            {
-              id: "PassSubSection",
-              referred: true,
-              body: "<p>Sub sub section</p>",
-              _links: {
-                self: {
-                  href: "/content/Incident/Business design/Content/Blaastest subsections.formalsource/BlaastestOpties#PassSubSection",
+            childSections: [
+              {
+                id: "pass",
+                label: "Pass",
+                body: "<p>Nog een sectie voor optie Pass.</p>",
+                _links: {
+                  self: {
+                    href: "/content/Incident/Business design/Content/Blaastest.textilesource/pass",
+                  },
                 },
               },
-              subSections: [
-                {
-                  id: "PassSubSubSection",
-                  body: "<p>Sub sub sub section</p>",
-                  _links: {
-                    self: {
-                      href: "/content/Incident/Business design/Content/Blaastest subsections.formalsource/BlaastestOpties#PassSubSubSection",
-                    },
+              {
+                id: "pass_alert",
+                label: "Pass / Alert",
+                body: "<p>Nog een sectie voor optie Pass / Alert.</p>",
+                _links: {
+                  self: {
+                    href: "/content/Incident/Business design/Content/Blaastest.textilesource/pass_alert",
                   },
-                  subSections: [
-                    {
-                      id: "PassSubSubSubSection",
-                      referred: true,
-                      body: "<p>Sub sub sub sub section</p>",
-                      _links: {
-                        self: {
-                          href: "/content/Incident/Business design/Content/Blaastest subsections.formalsource/BlaastestOpties#PassSubSubSubSection",
-                        },
+                },
+              },
+            ],
+            subSections: [
+              {
+                id: "Pass",
+                body: "<p>De blaastest heeft geen alcohol constateerd (versie 2017)</p>",
+                _links: {
+                  self: {
+                    href: "/content/Incident/Business design/Content/Blaastest subsections.formalsource/BlaastestOpties#Pass",
+                  },
+                },
+                subSections: [
+                  {
+                    id: "PassSubSection",
+                    referred: true,
+                    body: "<p>Sub sub section</p>",
+                    _links: {
+                      self: {
+                        href: "/content/Incident/Business design/Content/Blaastest subsections.formalsource/BlaastestOpties#PassSubSection",
                       },
                     },
-                  ],
+                    subSections: [
+                      {
+                        id: "PassSubSubSection",
+                        body: "<p>Sub sub sub section</p>",
+                        _links: {
+                          self: {
+                            href: "/content/Incident/Business design/Content/Blaastest subsections.formalsource/BlaastestOpties#PassSubSubSection",
+                          },
+                        },
+                        subSections: [
+                          {
+                            id: "PassSubSubSubSection",
+                            referred: true,
+                            body: "<p>Sub sub sub sub section</p>",
+                            _links: {
+                              self: {
+                                href: "/content/Incident/Business design/Content/Blaastest subsections.formalsource/BlaastestOpties#PassSubSubSubSection",
+                              },
+                            },
+                          },
+                        ],
+                      },
+                    ],
+                  },
+                ],
+              },
+              {
+                id: "PassAlert",
+                referred: true,
+                body: "<p>De limiet voor beginnende bestuurders is overschreden (0,2 promille). (versie 2017)</p>",
+                _links: {
+                  self: {
+                    href: "/content/Incident/Business design/Content/Blaastest subsections.formalsource/BlaastestOpties#PassAlert",
+                  },
                 },
-              ],
-            },
-          ],
-        },
-        {
-          id: "PassAlert",
-          referred: true,
-          body: "<p>De limiet voor beginnende bestuurders is overschreden (0,2 promille). (versie 2017)</p>",
-          _links: {
-            self: {
-              href: "/content/Incident/Business design/Content/Blaastest subsections.formalsource/BlaastestOpties#PassAlert",
-            },
+              },
+            ],
           },
-        },
-      ],
+        ],
+      },
     },
   ],
 };
@@ -115,12 +152,13 @@ describe("AttributeContent", () => {
   it("Handles basic content elements", () => {
     const content = new AttributeContent(json);
     expect(content.label).toBe("Blaastest geslaagd");
-    expect(content.properties).toHaveLength(1);
+    expect(content.description).toBe("Dit is de beschrijving");
+    expect(content.properties).toHaveLength(2);
     expect(content.textfragments).toHaveLength(1);
     expect(content.sections).toHaveLength(1);
 
     const firstProperty = content.properties[0];
-    expect(firstProperty.key).toBe("Gemiddelde");
+    expect(firstProperty.type).toBe("Gemiddelde");
     expect(firstProperty.label).toBe("Gemiddelde");
     expect(firstProperty.value).toBe("80%");
 
@@ -182,4 +220,10 @@ describe("AttributeContent", () => {
     expect(referredSections[1].id).toBe("PassSubSubSubSection");
     expect(referredSections[2].id).toBe("PassAlert");
   });
+
+  it("can retrieve all content", () => {
+    const content = new AttributeContent(json);
+
+    expect(content.elements).toHaveLength(4);
+  });
 });

package/lib/models/attributes/__tests__/AttributeDataHelper.spec.js.flow

@@ -28,12 +28,7 @@ describe("attributeDataHelper", () => {
       referenceDate: undefined,
       static: false,
       value: null,
-      content: {
-        label: null,
-        properties: null,
-        sections: null,
-        textfragments: null,
-      },
+      content: null,
     });
   });
 
@@ -116,12 +111,7 @@ describe("attributeDataHelper", () => {
           referenceDate: undefined,
           static: false,
           value: "Matilda",
-          content: {
-            label: null,
-            properties: null,
-            sections: null,
-            textfragments: null,
-          },
+          content: null,
         },
         {
           _links: {},
@@ -135,12 +125,7 @@ describe("attributeDataHelper", () => {
           referenceDate: undefined,
           static: false,
           value: "Printers united",
-          content: {
-            label: null,
-            properties: null,
-            sections: null,
-            textfragments: null,
-          },
+          content: null,
         },
         {
           _links: {},
@@ -154,12 +139,7 @@ describe("attributeDataHelper", () => {
           referenceDate: undefined,
           static: false,
           value: 5000,
-          content: {
-            label: null,
-            properties: null,
-            sections: null,
-            textfragments: null,
-          },
+          content: null,
         },
         {
           _links: {},
@@ -173,12 +153,7 @@ describe("attributeDataHelper", () => {
           referenceDate: undefined,
           static: false,
           value: "2013-01-01",
-          content: {
-            label: null,
-            properties: null,
-            sections: null,
-            textfragments: null,
-          },
+          content: null,
         },
       ],
       dynamicschema: undefined,
@@ -196,12 +171,7 @@ describe("attributeDataHelper", () => {
         Title: "Matilda",
         _id: "62",
       },
-      content: {
-        label: null,
-        properties: null,
-        sections: null,
-        textfragments: null,
-      },
+      content: null,
     });
   });
 
@@ -285,12 +255,7 @@ describe("attributeDataHelper", () => {
             referenceDate: undefined,
             static: false,
             value: "Matilda",
-            content: {
-              label: null,
-              properties: null,
-              sections: null,
-              textfragments: null,
-            },
+            content: null,
           },
           {
             _links: {},
@@ -304,12 +269,7 @@ describe("attributeDataHelper", () => {
             referenceDate: undefined,
             static: false,
             value: "Printers united",
-            content: {
-              label: null,
-              properties: null,
-              sections: null,
-              textfragments: null,
-            },
+            content: null,
           },
           {
             _links: {},
@@ -323,12 +283,7 @@ describe("attributeDataHelper", () => {
             referenceDate: undefined,
             static: false,
             value: null,
-            content: {
-              label: null,
-              properties: null,
-              sections: null,
-              textfragments: null,
-            },
+            content: null,
           },
           {
             _links: {},
@@ -342,12 +297,7 @@ describe("attributeDataHelper", () => {
             referenceDate: undefined,
             static: false,
             value: "2013-01-01",
-            content: {
-              label: null,
-              properties: null,
-              sections: null,
-              textfragments: null,
-            },
+            content: null,
           },
         ],
         [
@@ -363,12 +313,7 @@ describe("attributeDataHelper", () => {
             referenceDate: undefined,
             static: false,
             value: "The safety of objects",
-            content: {
-              label: null,
-              properties: null,
-              sections: null,
-              textfragments: null,
-            },
+            content: null,
           },
           {
             _links: {},
@@ -382,12 +327,7 @@ describe("attributeDataHelper", () => {
             referenceDate: undefined,
             static: false,
             value: "Printers united",
-            content: {
-              label: null,
-              properties: null,
-              sections: null,
-              textfragments: null,
-            },
+            content: null,
           },
           {
             _links: {},
@@ -401,12 +341,7 @@ describe("attributeDataHelper", () => {
             referenceDate: undefined,
             static: false,
             value: null,
-            content: {
-              label: null,
-              properties: null,
-              sections: null,
-              textfragments: null,
-            },
+            content: null,
           },
           {
             _links: {},
@@ -420,12 +355,7 @@ describe("attributeDataHelper", () => {
             referenceDate: undefined,
             static: false,
             value: "2014-01-01",
-            content: {
-              label: null,
-              properties: null,
-              sections: null,
-              textfragments: null,
-            },
+            content: null,
           },
         ],
       ],
@@ -451,12 +381,171 @@ describe("attributeDataHelper", () => {
           _id: "44",
         },
       ],
+      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: {
-        label: null,
-        properties: null,
-        sections: null,
-        textfragments: null,
+        InvestigationNecessary: {
+          content: {
+            header: {
+              label: "label",
+              description: "description",
+            },
+            elements: [
+              {
+                textFragmentElement: {
+                  label: "Text fragment: Description",
+                  textfragments: [
+                    {
+                      text: "Text fragment for investigation necessary",
+                    },
+                  ],
+                  layouthint: ["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.header).toStrictEqual({
+      label: "label",
+      description: "description",
     });
+    expect(firstChild.content.elements).toHaveLength(1);
+
+    expect(firstChild.dynamicschema).toBeUndefined();
   });
 });

package/lib/models/attributes/__tests__/HelptextAttributeModel.spec.js.flow

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