@beinformed/ui 1.37.0 → 1.39.0

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.39.0](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.38.0...v1.39.0) (2023-12-04)
+
+
+### Features
+
+* **nullable:** revert nullable property handling ([902850e](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/902850eec199c61350d5f46f112abe3122b4c6cb))
+
+## [1.38.0](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.37.0...v1.38.0) (2023-11-23)
+
+
+### Features
+
+* **nullabel:** consider nullable property on attribute to indicate a mandatory attribute ([f0ec2eb](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/f0ec2eb497e622d1adf9fb94b8fb7f87ae02d2db))
+
 ## [1.37.0](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.36.1...v1.37.0) (2023-11-08)
 
 

package/esm/models/attributes/AttributeSetModel.js

@@ -72,18 +72,19 @@ export default class AttributeSetModel extends BaseModel {
    * Retrieve child {@code AttributeSetModel}s
    */
   getChildAttributeSets() {
+    if (!this.contributions.objects) {
+      return [];
+    }
     const childAttributeSets = [];
-    if (this.contributions.objects) {
-      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 _entriesInstanceProperty(_context2 = this.data[key]).call(_context2)) {
-              var _context2;
-              childAttributeSets.push(this.createChildAttributeSetModel(key, dataObject, i));
-            }
-          } else {
-            childAttributeSets.push(this.createChildAttributeSetModel(key, this.data[key]));
+    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 _entriesInstanceProperty(_context2 = this.data[key]).call(_context2)) {
+            var _context2;
+            childAttributeSets.push(this.createChildAttributeSetModel(key, dataObject, i));
           }
+        } else {
+          childAttributeSets.push(this.createChildAttributeSetModel(key, this.data[key]));
         }
       }
     }

package/esm/models/attributes/AttributeSetModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"AttributeSetModel.js","names":["has","BaseModel","AttributeCollection","AttributeSetModel","constructor","_context","key","arguments","length","undefined","data","contributions","_defineProperty","attributeContributions","attributes","_filterInstanceProperty","call","contribution","contributionKey","_Object$keys","_attributeCollection","_key","label","attributeCollection","collection","createChildAttributeSetModel","dataObject","index","dynamicschema","objects","getChildAttributeSets","childAttributeSets","Array","isArray","i","_entriesInstanceProperty","_context2","push"],"sources":["../../../src/models/attributes/AttributeSetModel.js"],"sourcesContent":["// @flow\nimport { has } from \"../../utils/helpers/objects\";\n\nimport BaseModel from \"../base/BaseModel\";\nimport AttributeCollection from \"./AttributeCollection\";\n\n/**\n */\nexport default class AttributeSetModel extends BaseModel {\n  _key: string;\n  _attributeCollection: AttributeCollection;\n\n  /**\n   */\n  constructor(key: string = \"\", data: Object = {}, contributions: Object = {}) {\n    super(data, contributions);\n\n    const attributeContributions = this.contributions.attributes\n      ? this.contributions.attributes.filter((contribution) => {\n          const [contributionKey] = Object.keys(contribution);\n          return has(this.data, contributionKey);\n        })\n      : [];\n\n    this._attributeCollection = new AttributeCollection(\n      this.data,\n      attributeContributions,\n      true,\n    );\n\n    this._key = key;\n  }\n\n  /**\n   */\n  get key(): string {\n    return this._key;\n  }\n\n  /**\n   */\n  set key(key: string) {\n    this._key = key;\n  }\n\n  /**\n   */\n  get label(): ?string {\n    return this.contributions.label;\n  }\n\n  /**\n   * Retrieve attribute collection\n   */\n  get attributeCollection(): AttributeCollection {\n    return this._attributeCollection;\n  }\n\n  /**\n   * Set the attributes with a new AttributeCollection\n   */\n  set attributeCollection(collection: AttributeCollection) {\n    this._attributeCollection = collection;\n  }\n\n  /**\n   */\n  createChildAttributeSetModel(\n    key: string,\n    dataObject: Object,\n    index?: number,\n  ): AttributeSetModel {\n    return new AttributeSetModel(\n      index ? `${key}-${index + 1}` : key,\n      {\n        ...dataObject,\n        dynamicschema: this.data.dynamicschema,\n      },\n      this.contributions.objects[key],\n    );\n  }\n\n  /**\n   * Retrieve child {@code AttributeSetModel}s\n   */\n  getChildAttributeSets(): Array<AttributeSetModel> {\n    const childAttributeSets = [];\n\n    if (this.contributions.objects) {\n      for (const key of Object.keys(this.contributions.objects)) {\n        if (key in this.data) {\n          if (Array.isArray(this.data[key])) {\n            for (const [i, dataObject] of this.data[key].entries()) {\n              childAttributeSets.push(\n                this.createChildAttributeSetModel(key, dataObject, i),\n              );\n            }\n          } else {\n            childAttributeSets.push(\n              this.createChildAttributeSetModel(key, this.data[key]),\n            );\n          }\n        }\n      }\n    }\n\n    return childAttributeSets;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"AttributeSetModel.js","names":["has","BaseModel","AttributeCollection","AttributeSetModel","constructor","_context","key","arguments","length","undefined","data","contributions","_defineProperty","attributeContributions","attributes","_filterInstanceProperty","call","contribution","contributionKey","_Object$keys","_attributeCollection","_key","label","attributeCollection","collection","createChildAttributeSetModel","dataObject","index","dynamicschema","objects","getChildAttributeSets","childAttributeSets","Array","isArray","i","_entriesInstanceProperty","_context2","push"],"sources":["../../../src/models/attributes/AttributeSetModel.js"],"sourcesContent":["// @flow\nimport { has } from \"../../utils/helpers/objects\";\n\nimport BaseModel from \"../base/BaseModel\";\nimport AttributeCollection from \"./AttributeCollection\";\n\n/**\n */\nexport default class AttributeSetModel extends BaseModel {\n  _key: string;\n  _attributeCollection: AttributeCollection;\n\n  /**\n   */\n  constructor(key: string = \"\", data: Object = {}, contributions: Object = {}) {\n    super(data, contributions);\n\n    const attributeContributions = this.contributions.attributes\n      ? this.contributions.attributes.filter((contribution) => {\n          const [contributionKey] = Object.keys(contribution);\n          return has(this.data, contributionKey);\n        })\n      : [];\n\n    this._attributeCollection = new AttributeCollection(\n      this.data,\n      attributeContributions,\n      true,\n    );\n\n    this._key = key;\n  }\n\n  /**\n   */\n  get key(): string {\n    return this._key;\n  }\n\n  /**\n   */\n  set key(key: string) {\n    this._key = key;\n  }\n\n  /**\n   */\n  get label(): ?string {\n    return this.contributions.label;\n  }\n\n  /**\n   * Retrieve attribute collection\n   */\n  get attributeCollection(): AttributeCollection {\n    return this._attributeCollection;\n  }\n\n  /**\n   * Set the attributes with a new AttributeCollection\n   */\n  set attributeCollection(collection: AttributeCollection) {\n    this._attributeCollection = collection;\n  }\n\n  /**\n   */\n  createChildAttributeSetModel(\n    key: string,\n    dataObject: Object,\n    index?: number,\n  ): AttributeSetModel {\n    return new AttributeSetModel(\n      index ? `${key}-${index + 1}` : key,\n      {\n        ...dataObject,\n        dynamicschema: this.data.dynamicschema,\n      },\n      this.contributions.objects[key],\n    );\n  }\n\n  /**\n   * Retrieve child {@code AttributeSetModel}s\n   */\n  getChildAttributeSets(): Array<AttributeSetModel> {\n    if (!this.contributions.objects) {\n      return [];\n    }\n\n    const childAttributeSets = [];\n    for (const key of Object.keys(this.contributions.objects)) {\n      if (key in this.data) {\n        if (Array.isArray(this.data[key])) {\n          for (const [i, dataObject] of this.data[key].entries()) {\n            childAttributeSets.push(\n              this.createChildAttributeSetModel(key, dataObject, i),\n            );\n          }\n        } else {\n          childAttributeSets.push(\n            this.createChildAttributeSetModel(key, this.data[key]),\n          );\n        }\n      }\n    }\n    return childAttributeSets;\n  }\n}\n"],"mappings":"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"}

package/lib/models/attributes/AttributeSetModel.js

@@ -78,18 +78,19 @@ class AttributeSetModel extends _BaseModel.default {
    * Retrieve child {@code AttributeSetModel}s
    */
   getChildAttributeSets() {
+    if (!this.contributions.objects) {
+      return [];
+    }
     const childAttributeSets = [];
-    if (this.contributions.objects) {
-      for (const key of (0, _keys.default)(this.contributions.objects)) {
-        if (key in this.data) {
-          if (Array.isArray(this.data[key])) {
-            for (const [i, dataObject] of (0, _entries.default)(_context2 = this.data[key]).call(_context2)) {
-              var _context2;
-              childAttributeSets.push(this.createChildAttributeSetModel(key, dataObject, i));
-            }
-          } else {
-            childAttributeSets.push(this.createChildAttributeSetModel(key, this.data[key]));
+    for (const key of (0, _keys.default)(this.contributions.objects)) {
+      if (key in this.data) {
+        if (Array.isArray(this.data[key])) {
+          for (const [i, dataObject] of (0, _entries.default)(_context2 = this.data[key]).call(_context2)) {
+            var _context2;
+            childAttributeSets.push(this.createChildAttributeSetModel(key, dataObject, i));
           }
+        } else {
+          childAttributeSets.push(this.createChildAttributeSetModel(key, this.data[key]));
         }
       }
     }

package/lib/models/attributes/AttributeSetModel.js.flow

@@ -84,26 +84,26 @@ export default class AttributeSetModel extends BaseModel {
    * Retrieve child {@code AttributeSetModel}s
    */
   getChildAttributeSets(): Array<AttributeSetModel> {
-    const childAttributeSets = [];
+    if (!this.contributions.objects) {
+      return [];
+    }
 
-    if (this.contributions.objects) {
-      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 {
+    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, this.data[key]),
+              this.createChildAttributeSetModel(key, dataObject, i),
             );
           }
+        } else {
+          childAttributeSets.push(
+            this.createChildAttributeSetModel(key, this.data[key]),
+          );
         }
       }
     }
-
     return childAttributeSets;
   }
 }

package/lib/models/attributes/AttributeSetModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"AttributeSetModel.js","names":["_objects","require","_BaseModel","_interopRequireDefault","_AttributeCollection","AttributeSetModel","BaseModel","constructor","_context","key","arguments","length","undefined","data","contributions","_defineProperty2","default","attributeContributions","attributes","_filter","call","contribution","contributionKey","_keys","has","_attributeCollection","AttributeCollection","_key","label","attributeCollection","collection","createChildAttributeSetModel","dataObject","index","dynamicschema","objects","getChildAttributeSets","childAttributeSets","Array","isArray","i","_entries","_context2","push","exports"],"sources":["../../../src/models/attributes/AttributeSetModel.js"],"sourcesContent":["// @flow\nimport { has } from \"../../utils/helpers/objects\";\n\nimport BaseModel from \"../base/BaseModel\";\nimport AttributeCollection from \"./AttributeCollection\";\n\n/**\n */\nexport default class AttributeSetModel extends BaseModel {\n  _key: string;\n  _attributeCollection: AttributeCollection;\n\n  /**\n   */\n  constructor(key: string = \"\", data: Object = {}, contributions: Object = {}) {\n    super(data, contributions);\n\n    const attributeContributions = this.contributions.attributes\n      ? this.contributions.attributes.filter((contribution) => {\n          const [contributionKey] = Object.keys(contribution);\n          return has(this.data, contributionKey);\n        })\n      : [];\n\n    this._attributeCollection = new AttributeCollection(\n      this.data,\n      attributeContributions,\n      true,\n    );\n\n    this._key = key;\n  }\n\n  /**\n   */\n  get key(): string {\n    return this._key;\n  }\n\n  /**\n   */\n  set key(key: string) {\n    this._key = key;\n  }\n\n  /**\n   */\n  get label(): ?string {\n    return this.contributions.label;\n  }\n\n  /**\n   * Retrieve attribute collection\n   */\n  get attributeCollection(): AttributeCollection {\n    return this._attributeCollection;\n  }\n\n  /**\n   * Set the attributes with a new AttributeCollection\n   */\n  set attributeCollection(collection: AttributeCollection) {\n    this._attributeCollection = collection;\n  }\n\n  /**\n   */\n  createChildAttributeSetModel(\n    key: string,\n    dataObject: Object,\n    index?: number,\n  ): AttributeSetModel {\n    return new AttributeSetModel(\n      index ? `${key}-${index + 1}` : key,\n      {\n        ...dataObject,\n        dynamicschema: this.data.dynamicschema,\n      },\n      this.contributions.objects[key],\n    );\n  }\n\n  /**\n   * Retrieve child {@code AttributeSetModel}s\n   */\n  getChildAttributeSets(): Array<AttributeSetModel> {\n    const childAttributeSets = [];\n\n    if (this.contributions.objects) {\n      for (const key of Object.keys(this.contributions.objects)) {\n        if (key in this.data) {\n          if (Array.isArray(this.data[key])) {\n            for (const [i, dataObject] of this.data[key].entries()) {\n              childAttributeSets.push(\n                this.createChildAttributeSetModel(key, dataObject, i),\n              );\n            }\n          } else {\n            childAttributeSets.push(\n              this.createChildAttributeSetModel(key, this.data[key]),\n            );\n          }\n        }\n      }\n    }\n\n    return childAttributeSets;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"AttributeSetModel.js","names":["_objects","require","_BaseModel","_interopRequireDefault","_AttributeCollection","AttributeSetModel","BaseModel","constructor","_context","key","arguments","length","undefined","data","contributions","_defineProperty2","default","attributeContributions","attributes","_filter","call","contribution","contributionKey","_keys","has","_attributeCollection","AttributeCollection","_key","label","attributeCollection","collection","createChildAttributeSetModel","dataObject","index","dynamicschema","objects","getChildAttributeSets","childAttributeSets","Array","isArray","i","_entries","_context2","push","exports"],"sources":["../../../src/models/attributes/AttributeSetModel.js"],"sourcesContent":["// @flow\nimport { has } from \"../../utils/helpers/objects\";\n\nimport BaseModel from \"../base/BaseModel\";\nimport AttributeCollection from \"./AttributeCollection\";\n\n/**\n */\nexport default class AttributeSetModel extends BaseModel {\n  _key: string;\n  _attributeCollection: AttributeCollection;\n\n  /**\n   */\n  constructor(key: string = \"\", data: Object = {}, contributions: Object = {}) {\n    super(data, contributions);\n\n    const attributeContributions = this.contributions.attributes\n      ? this.contributions.attributes.filter((contribution) => {\n          const [contributionKey] = Object.keys(contribution);\n          return has(this.data, contributionKey);\n        })\n      : [];\n\n    this._attributeCollection = new AttributeCollection(\n      this.data,\n      attributeContributions,\n      true,\n    );\n\n    this._key = key;\n  }\n\n  /**\n   */\n  get key(): string {\n    return this._key;\n  }\n\n  /**\n   */\n  set key(key: string) {\n    this._key = key;\n  }\n\n  /**\n   */\n  get label(): ?string {\n    return this.contributions.label;\n  }\n\n  /**\n   * Retrieve attribute collection\n   */\n  get attributeCollection(): AttributeCollection {\n    return this._attributeCollection;\n  }\n\n  /**\n   * Set the attributes with a new AttributeCollection\n   */\n  set attributeCollection(collection: AttributeCollection) {\n    this._attributeCollection = collection;\n  }\n\n  /**\n   */\n  createChildAttributeSetModel(\n    key: string,\n    dataObject: Object,\n    index?: number,\n  ): AttributeSetModel {\n    return new AttributeSetModel(\n      index ? `${key}-${index + 1}` : key,\n      {\n        ...dataObject,\n        dynamicschema: this.data.dynamicschema,\n      },\n      this.contributions.objects[key],\n    );\n  }\n\n  /**\n   * Retrieve child {@code AttributeSetModel}s\n   */\n  getChildAttributeSets(): Array<AttributeSetModel> {\n    if (!this.contributions.objects) {\n      return [];\n    }\n\n    const childAttributeSets = [];\n    for (const key of Object.keys(this.contributions.objects)) {\n      if (key in this.data) {\n        if (Array.isArray(this.data[key])) {\n          for (const [i, dataObject] of this.data[key].entries()) {\n            childAttributeSets.push(\n              this.createChildAttributeSetModel(key, dataObject, i),\n            );\n          }\n        } else {\n          childAttributeSets.push(\n            this.createChildAttributeSetModel(key, this.data[key]),\n          );\n        }\n      }\n    }\n    return childAttributeSets;\n  }\n}\n"],"mappings":"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"}

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

@@ -257,4 +257,18 @@ 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, layouthint: ["mandatory"] },
+    );
+    expect(attribute.mandatory).toBe(true);
+  });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.37.0",
+  "version": "1.39.0",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -82,7 +82,7 @@
     "styled-components": "^5.0.0"
   },
   "dependencies": {
-    "@babel/runtime-corejs3": "^7.23.2",
+    "@babel/runtime-corejs3": "^7.23.4",
     "big.js": "^6.2.1",
     "date-fns": "^2.30.0",
     "deepmerge": "^4.3.1",
@@ -98,19 +98,19 @@
     "setimmediate": "^1.0.5"
   },
   "devDependencies": {
-    "@babel/cli": "^7.23.0",
-    "@babel/core": "^7.23.2",
-    "@babel/eslint-parser": "^7.22.15",
+    "@babel/cli": "^7.23.4",
+    "@babel/core": "^7.23.3",
+    "@babel/eslint-parser": "^7.23.3",
     "@babel/eslint-plugin": "^7.22.10",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.23.2",
-    "@babel/preset-env": "^7.23.2",
-    "@babel/preset-flow": "^7.22.15",
-    "@babel/preset-react": "^7.22.15",
-    "@commitlint/cli": "^18.2.0",
-    "@commitlint/config-conventional": "^18.1.0",
-    "@testing-library/react": "^14.1.0",
+    "@babel/plugin-transform-runtime": "^7.23.4",
+    "@babel/preset-env": "^7.23.3",
+    "@babel/preset-flow": "^7.23.3",
+    "@babel/preset-react": "^7.23.3",
+    "@commitlint/cli": "^18.4.3",
+    "@commitlint/config-conventional": "^18.4.3",
+    "@testing-library/react": "^14.1.2",
     "auditjs": "^4.0.41",
     "babel-jest": "^29.7.0",
     "babel-plugin-styled-components": "^2.1.4",
@@ -118,13 +118,13 @@
     "commit-and-tag-version": "^12.0.0",
     "cross-env": "^7.0.3",
     "documentation": "^14.0.2",
-    "eslint": "^8.53.0",
+    "eslint": "^8.54.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-ft-flow": "^3.0.1",
     "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-jest": "^27.6.0",
-    "eslint-plugin-jsdoc": "^46.8.2",
+    "eslint-plugin-jsdoc": "^46.9.0",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.5.0",
     "eslint-plugin-you-dont-need-lodash-underscore": "^6.13.0",
@@ -141,7 +141,7 @@
     "jscodeshift": "^0.15.1",
     "lint-staged": "^13.2.3",
     "polished": "^4.0.0",
-    "prettier": "^3.0.3",
+    "prettier": "^3.1.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-helmet-async": "^1.0.0",

package/src/models/attributes/AttributeSetModel.js

@@ -84,26 +84,26 @@ export default class AttributeSetModel extends BaseModel {
    * Retrieve child {@code AttributeSetModel}s
    */
   getChildAttributeSets(): Array<AttributeSetModel> {
-    const childAttributeSets = [];
+    if (!this.contributions.objects) {
+      return [];
+    }
 
-    if (this.contributions.objects) {
-      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 {
+    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, this.data[key]),
+              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,18 @@ 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, layouthint: ["mandatory"] },
+    );
+    expect(attribute.mandatory).toBe(true);
+  });
 });