@beinformed/ui 1.44.2 → 1.44.4

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.44.4](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.44.3...v1.44.4) (2024-03-19)
+
+
+### Bug Fixes
+
+* **avatar:** add isUser property to lookup service response ([f59ffee](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/f59ffeea51775fe15ae8ff1176beaac07e467230))
+
+## [1.44.3](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.44.2...v1.44.3) (2024-03-19)
+
+
+### Bug Fixes
+
+* **avatar:** add isUser property to lookup attributes ([add777d](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/add777d176f3dc979af4ed35be98459cf242365b))
+
 ## [1.44.2](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.44.1...v1.44.2) (2024-03-19)
 
 

package/esm/models/lookup/LookupOptionCollection.js

@@ -12,12 +12,25 @@ class LookupOptionCollection extends ResourceCollection {
       data.options.forEach(option => {
         collection.add(new ChoiceAttributeOptionModel([], {
           ...option,
+          optionType: this.getOptionType(option, contributions),
           elementsContributions: contributions.options[0].elements
         }));
       });
     }
     return collection;
   }
+
+  /**
+   */
+  static getOptionType(option, contributions) {
+    if (contributions.optionType) {
+      return contributions.optionType;
+    }
+    if (option._links?.download?.[0].name === "avatar") {
+      return "user";
+    }
+    return "generic";
+  }
 }
 export default LookupOptionCollection;
 //# sourceMappingURL=LookupOptionCollection.js.map

package/esm/models/lookup/LookupOptionCollection.js.map

@@ -1 +1 @@
-{"version":3,"file":"LookupOptionCollection.js","names":["ResourceCollection","ChoiceAttributeOptionModel","LookupOptionCollection","create","data","contributions","collection","options","forEach","option","add","elementsContributions","elements"],"sources":["../../../src/models/lookup/LookupOptionCollection.js"],"sourcesContent":["// @flow\nimport ResourceCollection from \"../base/ResourceCollection\";\nimport ChoiceAttributeOptionModel from \"../attributes/ChoiceAttributeOptionModel\";\n\n/**\n */\nclass LookupOptionCollection extends ResourceCollection<ChoiceAttributeOptionModel> {\n  /**\n   */\n  static create(data: Object, contributions: Object): LookupOptionCollection {\n    const collection = new LookupOptionCollection();\n\n    if (data.options && contributions.options) {\n      data.options.forEach((option) => {\n        collection.add(\n          new ChoiceAttributeOptionModel([], {\n            ...option,\n            elementsContributions: contributions.options[0].elements,\n          }),\n        );\n      });\n    }\n\n    return collection;\n  }\n}\n\nexport default LookupOptionCollection;\n"],"mappings":"AACA,OAAOA,kBAAkB,MAAM,4BAA4B;AAC3D,OAAOC,0BAA0B,MAAM,0CAA0C;;AAEjF;AACA;AACA,MAAMC,sBAAsB,SAASF,kBAAkB,CAA6B;EAClF;AACF;EACE,OAAOG,MAAMA,CAACC,IAAY,EAAEC,aAAqB,EAA0B;IACzE,MAAMC,UAAU,GAAG,IAAIJ,sBAAsB,CAAC,CAAC;IAE/C,IAAIE,IAAI,CAACG,OAAO,IAAIF,aAAa,CAACE,OAAO,EAAE;MACzCH,IAAI,CAACG,OAAO,CAACC,OAAO,CAAEC,MAAM,IAAK;QAC/BH,UAAU,CAACI,GAAG,CACZ,IAAIT,0BAA0B,CAAC,EAAE,EAAE;UACjC,GAAGQ,MAAM;UACTE,qBAAqB,EAAEN,aAAa,CAACE,OAAO,CAAC,CAAC,CAAC,CAACK;QAClD,CAAC,CACH,CAAC;MACH,CAAC,CAAC;IACJ;IAEA,OAAON,UAAU;EACnB;AACF;AAEA,eAAeJ,sBAAsB","ignoreList":[]}
+{"version":3,"file":"LookupOptionCollection.js","names":["ResourceCollection","ChoiceAttributeOptionModel","LookupOptionCollection","create","data","contributions","collection","options","forEach","option","add","optionType","getOptionType","elementsContributions","elements","_links","download","name"],"sources":["../../../src/models/lookup/LookupOptionCollection.js"],"sourcesContent":["// @flow\nimport ResourceCollection from \"../base/ResourceCollection\";\nimport ChoiceAttributeOptionModel from \"../attributes/ChoiceAttributeOptionModel\";\n\n/**\n */\nclass LookupOptionCollection extends ResourceCollection<ChoiceAttributeOptionModel> {\n  /**\n   */\n  static create(data: Object, contributions: Object): LookupOptionCollection {\n    const collection = new LookupOptionCollection();\n\n    if (data.options && contributions.options) {\n      data.options.forEach((option) => {\n        collection.add(\n          new ChoiceAttributeOptionModel([], {\n            ...option,\n            optionType: this.getOptionType(option, contributions),\n            elementsContributions: contributions.options[0].elements,\n          }),\n        );\n      });\n    }\n\n    return collection;\n  }\n\n  /**\n   */\n  static getOptionType(option: Object, contributions: Object): string {\n    if (contributions.optionType) {\n      return contributions.optionType;\n    }\n    if (option._links?.download?.[0].name === \"avatar\") {\n      return \"user\";\n    }\n    return \"generic\";\n  }\n}\n\nexport default LookupOptionCollection;\n"],"mappings":"AACA,OAAOA,kBAAkB,MAAM,4BAA4B;AAC3D,OAAOC,0BAA0B,MAAM,0CAA0C;;AAEjF;AACA;AACA,MAAMC,sBAAsB,SAASF,kBAAkB,CAA6B;EAClF;AACF;EACE,OAAOG,MAAMA,CAACC,IAAY,EAAEC,aAAqB,EAA0B;IACzE,MAAMC,UAAU,GAAG,IAAIJ,sBAAsB,CAAC,CAAC;IAE/C,IAAIE,IAAI,CAACG,OAAO,IAAIF,aAAa,CAACE,OAAO,EAAE;MACzCH,IAAI,CAACG,OAAO,CAACC,OAAO,CAAEC,MAAM,IAAK;QAC/BH,UAAU,CAACI,GAAG,CACZ,IAAIT,0BAA0B,CAAC,EAAE,EAAE;UACjC,GAAGQ,MAAM;UACTE,UAAU,EAAE,IAAI,CAACC,aAAa,CAACH,MAAM,EAAEJ,aAAa,CAAC;UACrDQ,qBAAqB,EAAER,aAAa,CAACE,OAAO,CAAC,CAAC,CAAC,CAACO;QAClD,CAAC,CACH,CAAC;MACH,CAAC,CAAC;IACJ;IAEA,OAAOR,UAAU;EACnB;;EAEA;AACF;EACE,OAAOM,aAAaA,CAACH,MAAc,EAAEJ,aAAqB,EAAU;IAClE,IAAIA,aAAa,CAACM,UAAU,EAAE;MAC5B,OAAON,aAAa,CAACM,UAAU;IACjC;IACA,IAAIF,MAAM,CAACM,MAAM,EAAEC,QAAQ,GAAG,CAAC,CAAC,CAACC,IAAI,KAAK,QAAQ,EAAE;MAClD,OAAO,MAAM;IACf;IACA,OAAO,SAAS;EAClB;AACF;AAEA,eAAef,sBAAsB","ignoreList":[]}

package/lib/models/lookup/LookupOptionCollection.js

@@ -18,12 +18,25 @@ class LookupOptionCollection extends _ResourceCollection.default {
       data.options.forEach(option => {
         collection.add(new _ChoiceAttributeOptionModel.default([], {
           ...option,
+          optionType: this.getOptionType(option, contributions),
           elementsContributions: contributions.options[0].elements
         }));
       });
     }
     return collection;
   }
+
+  /**
+   */
+  static getOptionType(option, contributions) {
+    if (contributions.optionType) {
+      return contributions.optionType;
+    }
+    if (option._links?.download?.[0].name === "avatar") {
+      return "user";
+    }
+    return "generic";
+  }
 }
 var _default = exports.default = LookupOptionCollection;
 //# sourceMappingURL=LookupOptionCollection.js.map

package/lib/models/lookup/LookupOptionCollection.js.flow

@@ -15,6 +15,7 @@ class LookupOptionCollection extends ResourceCollection<ChoiceAttributeOptionMod
         collection.add(
           new ChoiceAttributeOptionModel([], {
             ...option,
+            optionType: this.getOptionType(option, contributions),
             elementsContributions: contributions.options[0].elements,
           }),
         );
@@ -23,6 +24,18 @@ class LookupOptionCollection extends ResourceCollection<ChoiceAttributeOptionMod
 
     return collection;
   }
+
+  /**
+   */
+  static getOptionType(option: Object, contributions: Object): string {
+    if (contributions.optionType) {
+      return contributions.optionType;
+    }
+    if (option._links?.download?.[0].name === "avatar") {
+      return "user";
+    }
+    return "generic";
+  }
 }
 
 export default LookupOptionCollection;

package/lib/models/lookup/LookupOptionCollection.js.map

@@ -1 +1 @@
-{"version":3,"file":"LookupOptionCollection.js","names":["_ResourceCollection","_interopRequireDefault","require","_ChoiceAttributeOptionModel","LookupOptionCollection","ResourceCollection","create","data","contributions","collection","options","forEach","option","add","ChoiceAttributeOptionModel","elementsContributions","elements","_default","exports","default"],"sources":["../../../src/models/lookup/LookupOptionCollection.js"],"sourcesContent":["// @flow\nimport ResourceCollection from \"../base/ResourceCollection\";\nimport ChoiceAttributeOptionModel from \"../attributes/ChoiceAttributeOptionModel\";\n\n/**\n */\nclass LookupOptionCollection extends ResourceCollection<ChoiceAttributeOptionModel> {\n  /**\n   */\n  static create(data: Object, contributions: Object): LookupOptionCollection {\n    const collection = new LookupOptionCollection();\n\n    if (data.options && contributions.options) {\n      data.options.forEach((option) => {\n        collection.add(\n          new ChoiceAttributeOptionModel([], {\n            ...option,\n            elementsContributions: contributions.options[0].elements,\n          }),\n        );\n      });\n    }\n\n    return collection;\n  }\n}\n\nexport default LookupOptionCollection;\n"],"mappings":";;;;;;;AACA,IAAAA,mBAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,2BAAA,GAAAF,sBAAA,CAAAC,OAAA;AAEA;AACA;AACA,MAAME,sBAAsB,SAASC,2BAAkB,CAA6B;EAClF;AACF;EACE,OAAOC,MAAMA,CAACC,IAAY,EAAEC,aAAqB,EAA0B;IACzE,MAAMC,UAAU,GAAG,IAAIL,sBAAsB,CAAC,CAAC;IAE/C,IAAIG,IAAI,CAACG,OAAO,IAAIF,aAAa,CAACE,OAAO,EAAE;MACzCH,IAAI,CAACG,OAAO,CAACC,OAAO,CAAEC,MAAM,IAAK;QAC/BH,UAAU,CAACI,GAAG,CACZ,IAAIC,mCAA0B,CAAC,EAAE,EAAE;UACjC,GAAGF,MAAM;UACTG,qBAAqB,EAAEP,aAAa,CAACE,OAAO,CAAC,CAAC,CAAC,CAACM;QAClD,CAAC,CACH,CAAC;MACH,CAAC,CAAC;IACJ;IAEA,OAAOP,UAAU;EACnB;AACF;AAAC,IAAAQ,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEcf,sBAAsB","ignoreList":[]}
+{"version":3,"file":"LookupOptionCollection.js","names":["_ResourceCollection","_interopRequireDefault","require","_ChoiceAttributeOptionModel","LookupOptionCollection","ResourceCollection","create","data","contributions","collection","options","forEach","option","add","ChoiceAttributeOptionModel","optionType","getOptionType","elementsContributions","elements","_links","download","name","_default","exports","default"],"sources":["../../../src/models/lookup/LookupOptionCollection.js"],"sourcesContent":["// @flow\nimport ResourceCollection from \"../base/ResourceCollection\";\nimport ChoiceAttributeOptionModel from \"../attributes/ChoiceAttributeOptionModel\";\n\n/**\n */\nclass LookupOptionCollection extends ResourceCollection<ChoiceAttributeOptionModel> {\n  /**\n   */\n  static create(data: Object, contributions: Object): LookupOptionCollection {\n    const collection = new LookupOptionCollection();\n\n    if (data.options && contributions.options) {\n      data.options.forEach((option) => {\n        collection.add(\n          new ChoiceAttributeOptionModel([], {\n            ...option,\n            optionType: this.getOptionType(option, contributions),\n            elementsContributions: contributions.options[0].elements,\n          }),\n        );\n      });\n    }\n\n    return collection;\n  }\n\n  /**\n   */\n  static getOptionType(option: Object, contributions: Object): string {\n    if (contributions.optionType) {\n      return contributions.optionType;\n    }\n    if (option._links?.download?.[0].name === \"avatar\") {\n      return \"user\";\n    }\n    return \"generic\";\n  }\n}\n\nexport default LookupOptionCollection;\n"],"mappings":";;;;;;;AACA,IAAAA,mBAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,2BAAA,GAAAF,sBAAA,CAAAC,OAAA;AAEA;AACA;AACA,MAAME,sBAAsB,SAASC,2BAAkB,CAA6B;EAClF;AACF;EACE,OAAOC,MAAMA,CAACC,IAAY,EAAEC,aAAqB,EAA0B;IACzE,MAAMC,UAAU,GAAG,IAAIL,sBAAsB,CAAC,CAAC;IAE/C,IAAIG,IAAI,CAACG,OAAO,IAAIF,aAAa,CAACE,OAAO,EAAE;MACzCH,IAAI,CAACG,OAAO,CAACC,OAAO,CAAEC,MAAM,IAAK;QAC/BH,UAAU,CAACI,GAAG,CACZ,IAAIC,mCAA0B,CAAC,EAAE,EAAE;UACjC,GAAGF,MAAM;UACTG,UAAU,EAAE,IAAI,CAACC,aAAa,CAACJ,MAAM,EAAEJ,aAAa,CAAC;UACrDS,qBAAqB,EAAET,aAAa,CAACE,OAAO,CAAC,CAAC,CAAC,CAACQ;QAClD,CAAC,CACH,CAAC;MACH,CAAC,CAAC;IACJ;IAEA,OAAOT,UAAU;EACnB;;EAEA;AACF;EACE,OAAOO,aAAaA,CAACJ,MAAc,EAAEJ,aAAqB,EAAU;IAClE,IAAIA,aAAa,CAACO,UAAU,EAAE;MAC5B,OAAOP,aAAa,CAACO,UAAU;IACjC;IACA,IAAIH,MAAM,CAACO,MAAM,EAAEC,QAAQ,GAAG,CAAC,CAAC,CAACC,IAAI,KAAK,QAAQ,EAAE;MAClD,OAAO,MAAM;IACf;IACA,OAAO,SAAS;EAClB;AACF;AAAC,IAAAC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEcpB,sBAAsB","ignoreList":[]}

package/lib/models/lookup/__tests__/LookupOptionCollection.js.flow

@@ -0,0 +1,80 @@
+import LookupOptionCollection from "../LookupOptionCollection";
+import ChoiceAttributeOptionModel from "../../attributes/ChoiceAttributeOptionModel";
+
+const data = {
+  _links: {
+    self: {
+      href: "/lookupOptions",
+    },
+    api_doc: {
+      href: "/api-docs/v3/lookupOptions",
+    },
+    contributions: {
+      href: "/contributions/lookupOptions",
+    },
+  },
+  options: [
+    {
+      code: "1",
+      label: "Administrator",
+    },
+    {
+      code: "19",
+      label: "Angela Turner",
+      _links: {
+        download: [
+          {
+            href: "/resources/7dbd0538-bbda-4945-90ea-5de60d4dfbcb.jpg",
+            name: "avatar",
+          },
+        ],
+      },
+    },
+  ],
+  filter: {
+    name: "labelFilter",
+    param: "labelFilter",
+    value: "a",
+  },
+};
+
+const contributions = {
+  resourcetype: "lookupOptions",
+  filter: [
+    {
+      labelFilter: {
+        type: "stringfilter",
+        label: "labelFilter",
+        multiplechoice: false,
+        operator: "contains",
+      },
+    },
+  ],
+  options: [
+    {
+      code: {
+        type: "string",
+        label: "Code",
+        displaysize: 50,
+        maxLength: 255,
+      },
+      label: {
+        type: "string",
+        label: "Label",
+        displaysize: 50,
+        maxLength: 255,
+      },
+    },
+  ],
+};
+
+describe("lookupOptionCollection spec", () => {
+  it("set option type to user when avatar link present", () => {
+    const collection = LookupOptionCollection.create(data, contributions);
+
+    expect(collection).toBeInstanceOf(LookupOptionCollection);
+    expect(collection.first).toBeInstanceOf(ChoiceAttributeOptionModel);
+    expect(collection.all[0].isUser).toBe(false);
+    expect(collection.all[1].isUser).toBe(true);
+  });
+});

package/package.json

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

package/src/models/lookup/LookupOptionCollection.js

@@ -15,6 +15,7 @@ class LookupOptionCollection extends ResourceCollection<ChoiceAttributeOptionMod
         collection.add(
           new ChoiceAttributeOptionModel([], {
             ...option,
+            optionType: this.getOptionType(option, contributions),
             elementsContributions: contributions.options[0].elements,
           }),
         );
@@ -23,6 +24,18 @@ class LookupOptionCollection extends ResourceCollection<ChoiceAttributeOptionMod
 
     return collection;
   }
+
+  /**
+   */
+  static getOptionType(option: Object, contributions: Object): string {
+    if (contributions.optionType) {
+      return contributions.optionType;
+    }
+    if (option._links?.download?.[0].name === "avatar") {
+      return "user";
+    }
+    return "generic";
+  }
 }
 
 export default LookupOptionCollection;

package/src/models/lookup/__tests__/LookupOptionCollection.js

@@ -0,0 +1,80 @@
+import LookupOptionCollection from "../LookupOptionCollection";
+import ChoiceAttributeOptionModel from "../../attributes/ChoiceAttributeOptionModel";
+
+const data = {
+  _links: {
+    self: {
+      href: "/lookupOptions",
+    },
+    api_doc: {
+      href: "/api-docs/v3/lookupOptions",
+    },
+    contributions: {
+      href: "/contributions/lookupOptions",
+    },
+  },
+  options: [
+    {
+      code: "1",
+      label: "Administrator",
+    },
+    {
+      code: "19",
+      label: "Angela Turner",
+      _links: {
+        download: [
+          {
+            href: "/resources/7dbd0538-bbda-4945-90ea-5de60d4dfbcb.jpg",
+            name: "avatar",
+          },
+        ],
+      },
+    },
+  ],
+  filter: {
+    name: "labelFilter",
+    param: "labelFilter",
+    value: "a",
+  },
+};
+
+const contributions = {
+  resourcetype: "lookupOptions",
+  filter: [
+    {
+      labelFilter: {
+        type: "stringfilter",
+        label: "labelFilter",
+        multiplechoice: false,
+        operator: "contains",
+      },
+    },
+  ],
+  options: [
+    {
+      code: {
+        type: "string",
+        label: "Code",
+        displaysize: 50,
+        maxLength: 255,
+      },
+      label: {
+        type: "string",
+        label: "Label",
+        displaysize: 50,
+        maxLength: 255,
+      },
+    },
+  ],
+};
+
+describe("lookupOptionCollection spec", () => {
+  it("set option type to user when avatar link present", () => {
+    const collection = LookupOptionCollection.create(data, contributions);
+
+    expect(collection).toBeInstanceOf(LookupOptionCollection);
+    expect(collection.first).toBeInstanceOf(ChoiceAttributeOptionModel);
+    expect(collection.all[0].isUser).toBe(false);
+    expect(collection.all[1].isUser).toBe(true);
+  });
+});