@beinformed/ui 1.36.1 → 1.38.0

package/src/models/attributes/AttributeModel.js

@@ -102,7 +102,9 @@ export default class AttributeModel
     this._isResult = this.getData("isResult", false);
 
     this._mandatory =
-      this.layouthint.has(MANDATORY) || this.contributions.mandatory;
+      this.layouthint.has(MANDATORY) ||
+      this.contributions.mandatory ||
+      this.contributions.nullable === false; // nullable must be explicitly false to make this mandatory
 
     this._links = new LinkCollection(
       this.data._links,

package/src/models/attributes/AttributeSetModel.js

@@ -62,4 +62,48 @@ export default class AttributeSetModel extends BaseModel {
   set attributeCollection(collection: AttributeCollection) {
     this._attributeCollection = collection;
   }
+
+  /**
+   */
+  createChildAttributeSetModel(
+    key: string,
+    dataObject: Object,
+    index?: number,
+  ): AttributeSetModel {
+    return new AttributeSetModel(
+      index ? `${key}-${index + 1}` : key,
+      {
+        ...dataObject,
+        dynamicschema: this.data.dynamicschema,
+      },
+      this.contributions.objects[key],
+    );
+  }
+
+  /**
+   * Retrieve child {@code AttributeSetModel}s
+   */
+  getChildAttributeSets(): Array<AttributeSetModel> {
+    if (!this.contributions.objects) {
+      return [];
+    }
+
+    const childAttributeSets = [];
+    for (const key of Object.keys(this.contributions.objects)) {
+      if (key in this.data) {
+        if (Array.isArray(this.data[key])) {
+          for (const [i, dataObject] of this.data[key].entries()) {
+            childAttributeSets.push(
+              this.createChildAttributeSetModel(key, dataObject, i),
+            );
+          }
+        } else {
+          childAttributeSets.push(
+            this.createChildAttributeSetModel(key, this.data[key]),
+          );
+        }
+      }
+    }
+    return childAttributeSets;
+  }
 }

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

@@ -257,4 +257,21 @@ describe("attributeModel", () => {
     expect(attribute.concept).toBeInstanceOf(ConceptDetailModel);
     expect(attribute.concept.type).toBe("ConceptDetail");
   });
+
+  it("indicates correct mandatory", () => {
+    let attribute = new AttributeModel({}, { mandatory: true });
+    expect(attribute.mandatory).toBe(true);
+
+    attribute = new AttributeModel({}, { mandatory: false });
+    expect(attribute.mandatory).toBe(false);
+
+    attribute = new AttributeModel({}, { mandatory: false, nullable: false });
+    expect(attribute.mandatory).toBe(true);
+
+    attribute = new AttributeModel(
+      {},
+      { mandatory: false, layouthint: ["mandatory"] },
+    );
+    expect(attribute.mandatory).toBe(true);
+  });
 });

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

@@ -0,0 +1,88 @@
+import ListDetailModel from "../ListDetailModel";
+
+import Href from "../../href/Href";
+
+import mockDetail from "./hierarchy.json";
+import mockDetailContributions from "./hierarchyContributions.json";
+
+describe("listDetailModel", () => {
+  describe("Event details", () => {
+    it("should be able to create a detail from a hierarchical modular UI json structure", () => {
+      const detail = new ListDetailModel({
+        request: {
+          href: new Href(
+            "/service-operation/service-operation/44/history/127",
+            "EventListPanelDetail",
+          ),
+        },
+        key: "event",
+        data: mockDetail.event,
+        contributions: mockDetailContributions.event,
+      });
+
+      expect(detail).toBeInstanceOf(ListDetailModel);
+
+      expect(detail.key).toBe("event");
+
+      expect(detail.id).toBe(127);
+
+      const selfLink = new Href(
+        "/service-operation/service-operation/44/history/127",
+        "EventListPanelDetail",
+      );
+
+      expect(detail.selfhref).toStrictEqual(selfLink);
+
+      expect(detail.attributeCollection.size).toBe(3);
+
+      expect(detail.hasEventData).toBe(true);
+
+      expect(detail.eventdata).toHaveLength(6);
+
+      expect(detail.eventdata[0].label).toBe("Company");
+      expect(detail.eventdata[0].getChildAttributeSets()).toHaveLength(3);
+
+      expect(detail.eventdata[0].getChildAttributeSets()[0].label).toBe(
+        "Company contact details",
+      );
+      expect(detail.eventdata[0].getChildAttributeSets()[1].label).toBe(
+        "Company contact details",
+      );
+      expect(detail.eventdata[0].getChildAttributeSets()[2].label).toBe("CEO");
+
+      expect(
+        detail.eventdata[0].getChildAttributeSets()[1].getChildAttributeSets(),
+      ).toHaveLength(0);
+      expect(
+        detail.eventdata[0].getChildAttributeSets()[2].getChildAttributeSets(),
+      ).toHaveLength(1);
+
+      expect(
+        detail.eventdata[0]
+          .getChildAttributeSets()[2]
+          .getChildAttributeSets()[0].label,
+      ).toBe("CEO Business location");
+      expect(
+        detail.eventdata[0]
+          .getChildAttributeSets()[2]
+          .getChildAttributeSets()[0]
+          .getChildAttributeSets(),
+      ).toHaveLength(2);
+
+      expect(
+        detail.eventdata[0]
+          .getChildAttributeSets()[2]
+          .getChildAttributeSets()[0]
+          .getChildAttributeSets()[1]
+          .attributeCollection.getAttributeByKey("CEOBLC_Type").label,
+      ).toBe("Type");
+      expect(
+        detail.eventdata[0]
+          .getChildAttributeSets()[2]
+          .getChildAttributeSets()[0]
+          .getChildAttributeSets()[1]
+          .attributeCollection.getAttributeByKey("CEOBLC_Type").value,
+      ).toBe("Email");
+    });
+  });
+});

package/src/models/list/__tests__/hierarchy.json

@@ -0,0 +1,185 @@
+{
+  "event": {
+    "_links": {
+      "self": {
+        "href": "/service-operation/service-operation/44/history/127"
+      },
+      "api_doc": {
+        "href": "/api-docs/v3/service-operation/service-operation/(case-id)/history/(history-record-id)?id=HierarchicalInputAndOutputWithRootSingletonAndRepeat"
+      },
+      "contributions": {
+        "href": "/contributions/service-operation/service-operation/(case-id)/history/(history-record-id)?id=HierarchicalInputAndOutputWithRootSingletonAndRepeat"
+      }
+    },
+    "dynamicschema": {
+      "EventType": [
+        {
+          "code": "HierarchicalInputAndOutputWithRootSingletonAndRepeat",
+          "label": "Hierarchical input and output with root singleton and repeat"
+        }
+      ],
+      "User": [
+        {
+          "code": "2",
+          "label": "Arnold"
+        }
+      ]
+    },
+    "_id": 127,
+    "EventType": "HierarchicalInputAndOutputWithRootSingletonAndRepeat",
+    "CreationDateTime": "2023-11-08T10:06:55.845",
+    "User": "2",
+    "eventdata": {
+      "Company": {
+        "Company_Name": "Be Informed",
+        "CompanyContactDetails": [
+          {
+            "Company_Type": "Mobile",
+            "Company_Value": "+49 309 289 5500"
+          },
+          {
+            "Company_Type": "Email",
+            "Company_Value": "info@beinformed.com"
+          }
+        ],
+        "CEO": {
+          "CEO_Name": "René Louter",
+          "CEOBusinessLocation": {
+            "CEOBL_Address": "Laan van Westenenk, Room 2.1, Apeldoorn",
+            "CEOBusinessLocationContactDetails": [
+              {
+                "CEOBLC_Type": "Mobile",
+                "CEOBLC_Value": "+49 309 289 5503"
+              },
+              {
+                "CEOBLC_Type": "Email",
+                "CEOBLC_Value": "r.louter@beinformed.com"
+              }
+            ]
+          }
+        }
+      },
+      "Employee": [
+        {
+          "Employee_Name": "Jesper",
+          "DurationTemporaryEmploymentContract": {
+            "DurationContract": {
+              "StartDate": "2023-06-21",
+              "EndDate": "2024-06-21"
+            }
+          },
+          "EmployeeBusinessLocation": {
+            "EmployeeBL_Address": "Laan van Westenenk, Floor 3, Apeldoorn",
+            "EmployeeBusinessLocationContactDetails": [
+              {
+                "EmployeeBLC_Type": "Mobile",
+                "EmployeeBLC_Value": "+49 308 888 4321"
+              },
+              {
+                "EmployeeBLC_Type": "Email",
+                "EmployeeBLC_Value": "jesper@beinformed.com"
+              }
+            ]
+          }
+        },
+        {
+          "Employee_Name": "Harold",
+          "DurationTemporaryEmploymentContract": {
+            "DurationContract": {
+              "StartDate": "2023-06-21",
+              "EndDate": "2023-12-21"
+            }
+          },
+          "EmployeeBusinessLocation": {
+            "EmployeeBL_Address": "Laan van Westenenk, Floor 3, Apeldoorn",
+            "EmployeeBusinessLocationContactDetails": [
+              {
+                "EmployeeBLC_Type": "Mobile",
+                "EmployeeBLC_Value": "+49 309 289 5510"
+              },
+              {
+                "EmployeeBLC_Type": "Email",
+                "EmployeeBLC_Value": "harold@beinformed.com"
+              }
+            ]
+          }
+        }
+      ],
+      "Company_result": {
+        "Company_Name": "Be Informed",
+        "CompanyContactDetails": [
+          {
+            "Company_Type": "Mobile",
+            "Company_Value": "+49 309 289 5500"
+          },
+          {
+            "Company_Type": "Email",
+            "Company_Value": "info@beinformed.com"
+          }
+        ],
+        "CEO": {
+          "CEO_Name": "René Louter",
+          "CEOBusinessLocation": {
+            "CEOBL_Address": "Laan van Westenenk, Room 2.1, Apeldoorn",
+            "CEOBusinessLocationContactDetails": [
+              {
+                "CEOBLC_Type": "Mobile",
+                "CEOBLC_Value": "+49 309 289 5503"
+              },
+              {
+                "CEOBLC_Type": "Email",
+                "CEOBLC_Value": "r.louter@beinformed.com"
+              }
+            ]
+          }
+        }
+      },
+      "Employee_result": [
+        {
+          "Employee_Name": "Jesper",
+          "DurationTemporaryEmploymentContract": {
+            "DurationContract": {
+              "StartDate": "2023-06-21",
+              "EndDate": "2024-06-21"
+            }
+          },
+          "EmployeeBusinessLocation": {
+            "EmployeeBL_Address": "Laan van Westenenk, Floor 3, Apeldoorn",
+            "EmployeeBusinessLocationContactDetails": [
+              {
+                "EmployeeBLC_Type": "Mobile",
+                "EmployeeBLC_Value": "+49 308 888 4321"
+              },
+              {
+                "EmployeeBLC_Type": "Email",
+                "EmployeeBLC_Value": "jesper@beinformed.com"
+              }
+            ]
+          }
+        },
+        {
+          "Employee_Name": "Harold",
+          "DurationTemporaryEmploymentContract": {
+            "DurationContract": {
+              "StartDate": "2023-06-21",
+              "EndDate": "2023-12-21"
+            }
+          },
+          "EmployeeBusinessLocation": {
+            "EmployeeBL_Address": "Laan van Westenenk, Floor 3, Apeldoorn",
+            "EmployeeBusinessLocationContactDetails": [
+              {
+                "EmployeeBLC_Type": "Mobile",
+                "EmployeeBLC_Value": "+49 309 289 5510"
+              },
+              {
+                "EmployeeBLC_Type": "Email",
+                "EmployeeBLC_Value": "harold@beinformed.com"
+              }
+            ]
+          }
+        }
+      ]
+    }
+  }
+}