@beinformed/ui 1.43.7 → 1.44.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.43.7",
+  "version": "1.44.0",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",

package/src/models/attributes/AttributeModel.js

@@ -554,13 +554,6 @@ export default class AttributeModel
     this._isResult = isResult;
   }
 
-  /**
-   *
-   */
-  get isAvatar(): boolean {
-    return this.contributions?.optionType === "user" ?? false;
-  }
-
   /**
    * Getting the display and input format of a attribute
    */

package/src/models/attributes/ChoiceAttributeModel.js

@@ -71,6 +71,12 @@ export default class ChoiceAttributeModel extends AttributeModel {
     return "choice";
   }
 
+  /**
+   */
+  get optionType(): string {
+    return this.contributions?.optionType ?? "generic";
+  }
+
   /**
    */
   getInitialChildModelLinks(): Array<LinkModel> {
@@ -122,16 +128,6 @@ export default class ChoiceAttributeModel extends AttributeModel {
     return this.contributions.lookupList?.label ?? "";
   }
 
-  /**
-   *
-   */
-  get avatarLink(): LinkModel | null {
-    return (
-      this.options.collection.find((option) => option.code === this.value)
-        ?.avatarLink || null
-    );
-  }
-
   /**
    * Retrieve reference date of attribute which can be used as entryDate for content
    */

package/src/models/attributes/ChoiceAttributeOptionCollection.js

@@ -114,6 +114,7 @@ class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttribute
         {
           ...optionContributions,
           count: this.getOptionCount(optionCode, data.options),
+          optionType: contributions.optionType ?? "generic",
         },
         referenceDate,
       );

package/src/models/attributes/ChoiceAttributeOptionModel.js

@@ -32,6 +32,7 @@ class ChoiceAttributeOptionModel
   _links: LinkCollection;
   _attributeCollection: AttributeCollection;
   _content: AttributeContent;
+  _isUser: boolean = false;
 
   /**
    */
@@ -56,6 +57,8 @@ class ChoiceAttributeOptionModel
     this._links = new LinkCollection(this.contributions._links);
 
     this._content = new AttributeContent(option.content);
+
+    this._isUser = option.optionType === "user";
   }
 
   /**
@@ -381,6 +384,12 @@ class ChoiceAttributeOptionModel
   get content(): AttributeContent {
     return this._content;
   }
+
+  /**
+   */
+  get isUser(): boolean {
+    return this._isUser;
+  }
 }
 
 export default ChoiceAttributeOptionModel;

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

@@ -677,4 +677,31 @@ describe("choiceAttributeModel", () => {
       "answer-option-key": "book-label",
     });
   });
+
+  it("sets isUser on options where attribute has optionType user", () => {
+    const data = {
+      key: "Users",
+      value: [],
+    };
+
+    const contributions = {
+      label: "Users",
+      type: "choice",
+      optionType: "user",
+      options: [
+        {
+          code: "user1",
+          label: "User 1",
+        },
+        {
+          code: "user2",
+          label: "User 2",
+        },
+      ],
+    };
+
+    const attribute = new ChoiceAttributeModel(data, contributions);
+
+    expect(attribute.options.first.isUser).toBe(true);
+  });
 });

package/src/models/detail/DetailModel.js

@@ -196,30 +196,22 @@ export default class DetailModel extends ResourceModel {
    * Getting the attribute that has as layout hint 'avatar-for-title'
    */
   get avatarForTitleAttribute(): ?AttributeType {
-    const avatarAttributes = this._attributeCollection.all.filter((attribute) =>
-      attribute.layouthint.hasExact(AVATAR),
+    return this._attributeCollection.find(
+      (attribute) =>
+        attribute.layouthint.hasExact(AVATAR_IN_TITLE) &&
+        attribute.layouthint.hasExact(AVATAR),
     );
-
-    const avatarForTitleAttribute = avatarAttributes.find((attribute) =>
-      attribute.layouthint.hasExact(AVATAR_IN_TITLE),
-    );
-
-    return avatarForTitleAttribute || null;
   }
 
   /**
    * Getting the attribute that has as layout hint 'title'
    */
   get titleAttribute(): ?AttributeType {
-    const nonAvatarAttributes = this._attributeCollection.all.filter(
-      (attribute) => !attribute.layouthint.hasExact(AVATAR),
+    return this._attributeCollection.find(
+      (attribute) =>
+        attribute.layouthint.has(TITLE) &&
+        !attribute.layouthint.hasExact(AVATAR),
     );
-
-    const titleAttribute = nonAvatarAttributes.find((attribute) =>
-      attribute.layouthint.has(TITLE),
-    );
-
-    return titleAttribute || null;
   }
 
   /**

package/src/models/user/UserModel.js

@@ -31,7 +31,7 @@ export default class UserModel extends ResourceModel {
   /**
    * Retrieve username of user
    */
-  get avatar(): string {
+  get avatar(): string | null {
     return this.data.Avatar;
   }