@beinformed/ui 1.50.2 → 1.50.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.50.4](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.50.3...v1.50.4) (2024-07-23)
+
+
+### Bug Fixes
+
+* **boolean-attribute:** handle null value on update method ([3631691](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/36316917499988f2bc52ed810adf4dbe2a305afa))
+
+## [1.50.3](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.50.2...v1.50.3) (2024-07-22)
+
+
+### Bug Fixes
+
+* **connector:** patch updateModel fetch property to updateHandler for modularui connector ([f4cb62d](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/f4cb62dc77d1504ae0e7bfc454146768c5100091))
+
 ## [1.50.2](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.50.1...v1.50.2) (2024-07-17)
 
 

package/esm/models/attributes/BooleanAttributeModel.js

@@ -222,12 +222,12 @@ export default class BooleanAttributeModel extends AttributeModel {
       return this;
     }
     this.updateLastModification();
-    let values;
+    let values = [];
     if (Array.isArray(value)) {
       values = value;
     } else if (typeof value === "string" && this.isMultiple) {
       values = value.split(",");
-    } else {
+    } else if (value != null) {
       values = [value.toString()];
     }
     values.forEach(val => {

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

@@ -1 +1 @@
-{"version":3,"file":"BooleanAttributeModel.js","names":["AttributeModel","DateUtil","ChoiceAttributeOptionCollection","ContentConfigurationElements","ChoiceAttributeOptionModel","RENDER_SECTION_LABEL","ATTRIBUTE_WIDTH","BooleanAttributeModel","constructor","attribute","attributeContributions","_defineProperty","_referenceDate","getData","now","_options","create","referenceDate","isApplicableModel","contributions","type","date","options","choicetype","_context","_findInstanceProperty","call","hint","layouthint","has","isMultiple","isTree","hasContentConfiguration","_hasContentConfiguration","contentConfiguration","_context2","content","optionElements","optionElementConfig","_mapInstanceProperty","optionElement","contentElement","selected","_context3","option","code","readonlyvalue","_context4","label","join","initvalue","Array","isArray","_initvalue","length","getValue","_context5","hasValue","getInputValue","toggleOption","_context6","_includesInstanceProperty","disableOption","enableOption","deselectAll","select","inputvalue","deselect","reset","mergeAttribute","oldAttribute","readonly","concept","isValid","update","value","updateLastModification","values","split","toString","forEach","val","some","updateByAttribute","otherAttribute","console","error","getFormData","inError","name","readonlyWidth","hasAlternativeLabel","SMALL","EXTRA_SMALL"],"sources":["../../../src/models/attributes/BooleanAttributeModel.js"],"sourcesContent":["// @flow\nimport AttributeModel from \"./AttributeModel\";\n\nimport { DateUtil } from \"../../utils/datetime/DateTimeUtil\";\n\nimport ChoiceAttributeOptionCollection from \"./ChoiceAttributeOptionCollection\";\nimport ContentConfigurationElements from \"../contentconfiguration/ContentConfigurationElements\";\nimport ChoiceAttributeOptionModel from \"./ChoiceAttributeOptionModel\";\n\nimport { RENDER_SECTION_LABEL } from \"../../constants/LayoutHints\";\nimport { ATTRIBUTE_WIDTH } from \"../../constants\";\n\nimport type { AttributeType } from \"../types\";\n\n/**\n * Model for a boolean attribute\n */\nexport default class BooleanAttributeModel extends AttributeModel {\n  _referenceDate: string;\n  _options: ChoiceAttributeOptionCollection;\n  _hasContentConfiguration: boolean = false;\n\n  /**\n   */\n  constructor(attribute: Object, attributeContributions: Object) {\n    super(attribute, attributeContributions);\n\n    this._referenceDate = this.getData(\"referenceDate\", DateUtil.now());\n    this._options = ChoiceAttributeOptionCollection.create(\n      attribute,\n      attributeContributions,\n      this.referenceDate,\n    );\n  }\n\n  /**\n   */\n  static isApplicableModel(contributions: Object): boolean {\n    return contributions.type === \"boolean\";\n  }\n\n  /**\n   */\n  get type(): string {\n    return \"boolean\";\n  }\n\n  /**\n   * Retrieve reference date of attribute which can be used as entryDate for content\n   */\n  get referenceDate(): string {\n    return this._referenceDate;\n  }\n\n  /**\n   * Set reference date for concepts and content\n   */\n  set referenceDate(date: string) {\n    this._referenceDate = date;\n\n    this.options.referenceDate = date;\n  }\n\n  /**\n   * Getting the type of choice filter. For instance checkbox, radiobutton, combobox.\n   */\n  get choicetype(): \"checkbox\" | \"radiobutton\" | \"combobox\" | \"toggle\" {\n    return (\n      [\"checkbox\", \"radiobutton\", \"combobox\", \"toggle\"].find((hint) =>\n        this.layouthint.has(hint),\n      ) || \"radiobutton\"\n    );\n  }\n\n  /**\n   * Can multiple options be selected\n   */\n  get isMultiple(): boolean {\n    return false;\n  }\n\n  /**\n   * Check if options need to be rendered as tree\n   */\n  get isTree(): boolean {\n    return false;\n  }\n\n  /**\n   */\n  set hasContentConfiguration(hasContentConfiguration: boolean) {\n    this._hasContentConfiguration =\n      this.contentConfiguration !== null || hasContentConfiguration;\n  }\n\n  /**\n   */\n  get hasContentConfiguration(): boolean {\n    return this._hasContentConfiguration;\n  }\n\n  /**\n   * Get content configuration configured on the attribute.\n   * Only applicable for taxonomy element and knowledge codemaps,\n   * content configuration for instrument questions is available on the form object\n   */\n  get contentConfiguration(): ContentConfigurationElements | null {\n    if (\n      !this.contributions.content ||\n      !this.contributions.content.optionElements\n    ) {\n      return null;\n    }\n\n    // Add RENDER_SECTION_LABEL to all content configuration to make sure the label of a section is always rendered on taxonomy and knowlege codemaps\n    const optionElementConfig = this.contributions.content.optionElements.map(\n      (optionElement) => {\n        if (\"contentElement\" in optionElement) {\n          return {\n            contentElement: {\n              ...optionElement.contentElement,\n              layouthint: [RENDER_SECTION_LABEL],\n            },\n          };\n        }\n\n        return optionElement;\n      },\n    );\n\n    return new ContentConfigurationElements(optionElementConfig);\n  }\n\n  /**\n   * Retrieve available choice options\n   */\n  get options(): ChoiceAttributeOptionCollection {\n    return this._options;\n  }\n\n  /**\n   * Getting all enabled options\n   */\n  get selected(): Array<string> {\n    // $FlowFixMe[incompatible-call]\n    return this.options.selected.map<string, ChoiceAttributeOptionModel>(\n      (option: ChoiceAttributeOptionModel) => option.code,\n    );\n  }\n\n  /**\n   * Flatten options and filter out the options that are not selected\n   */\n  get readonlyvalue(): string {\n    return this.options.selected.map((option) => option.label).join(\", \");\n  }\n\n  /**\n   */\n  get initvalue(): any {\n    if (Array.isArray(this._initvalue) && this._initvalue.length === 0) {\n      return null;\n    }\n\n    return this._initvalue;\n  }\n\n  /**\n   * Retrieve list of selected options, joined with comma\n   */\n  getValue(): string | null {\n    return this.options.selected.length > 0\n      ? this.options.selected.map((option) => option.code).join(\",\")\n      : null;\n  }\n\n  /**\n   */\n  hasValue(): boolean {\n    return this.options.selected.length > 0;\n  }\n\n  /**\n   * Get input value of attribute\n   */\n  getInputValue(): string {\n    return this.selected.join(\",\");\n  }\n\n  /**\n   * Setting an option selected or unselected based on the current state\n   */\n  toggleOption(code: string) {\n    if (this.selected.includes(code)) {\n      this.disableOption(code);\n    } else {\n      this.enableOption(code);\n    }\n  }\n\n  /**\n   * Enable a option\n   */\n  enableOption(code: string) {\n    this.options.deselectAll();\n    this.options.select(code);\n    this.inputvalue = this.getInputValue();\n  }\n\n  /**\n   * Disable a option\n   */\n  disableOption(code: string) {\n    this.options.deselect(code);\n    this.inputvalue = this.getInputValue();\n  }\n\n  /**\n   * Reset boolean attribute to unselected list\n   */\n  reset() {\n    this.options.deselectAll();\n  }\n\n  /**\n   */\n  mergeAttribute(oldAttribute: AttributeType) {\n    // when attribute is readonly, don't merge the options no modifications necessary\n    if (!this.readonly && oldAttribute instanceof BooleanAttributeModel) {\n      this.concept = oldAttribute.concept;\n      this.options.deselectAll();\n\n      if (oldAttribute.isValid && oldAttribute.inputvalue !== null) {\n        this.update(oldAttribute.inputvalue);\n      }\n    }\n  }\n\n  /**\n   * Update attribute by name and value\n   */\n  update(value: any): BooleanAttributeModel {\n    if (this.readonly) {\n      return this;\n    }\n\n    this.updateLastModification();\n\n    let values;\n\n    if (Array.isArray(value)) {\n      values = value;\n    } else if (typeof value === \"string\" && this.isMultiple) {\n      values = value.split(\",\");\n    } else {\n      values = [value.toString()];\n    }\n\n    values.forEach((val) => {\n      if (val instanceof ChoiceAttributeOptionModel) {\n        this.toggleOption(val.code);\n      } else if (\n        typeof val === \"string\" &&\n        this.options.some((option) => option.code.toString() === val)\n      ) {\n        this.toggleOption(val);\n      }\n    });\n\n    return this;\n  }\n\n  /**\n   */\n  updateByAttribute(otherAttribute: AttributeType): void {\n    this.reset();\n    if (otherAttribute instanceof BooleanAttributeModel) {\n      this.update(otherAttribute.value);\n    } else {\n      console.error(\n        `update of boolean attribute with ${otherAttribute.type} not supported`,\n      );\n    }\n  }\n\n  /**\n   */\n  getFormData(): { [string]: boolean | null } | null {\n    if (this.inError()) {\n      return null;\n    }\n\n    if (!this.hasValue()) {\n      // no value for checkbox and toggle is same as a false value\n      if (this.choicetype === \"checkbox\" || this.choicetype === \"toggle\") {\n        return { [this.name]: false };\n      }\n\n      return { [this.name]: null };\n    }\n\n    return { [this.name]: this.value === \"true\" };\n  }\n\n  /**\n   */\n  get readonlyWidth(): $Keys<typeof ATTRIBUTE_WIDTH> {\n    if (this.options.some((option) => option.hasAlternativeLabel)) {\n      return ATTRIBUTE_WIDTH.SMALL;\n    }\n\n    return ATTRIBUTE_WIDTH.EXTRA_SMALL;\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"BooleanAttributeModel.js","names":["AttributeModel","DateUtil","ChoiceAttributeOptionCollection","ContentConfigurationElements","ChoiceAttributeOptionModel","RENDER_SECTION_LABEL","ATTRIBUTE_WIDTH","BooleanAttributeModel","constructor","attribute","attributeContributions","_defineProperty","_referenceDate","getData","now","_options","create","referenceDate","isApplicableModel","contributions","type","date","options","choicetype","_context","_findInstanceProperty","call","hint","layouthint","has","isMultiple","isTree","hasContentConfiguration","_hasContentConfiguration","contentConfiguration","_context2","content","optionElements","optionElementConfig","_mapInstanceProperty","optionElement","contentElement","selected","_context3","option","code","readonlyvalue","_context4","label","join","initvalue","Array","isArray","_initvalue","length","getValue","_context5","hasValue","getInputValue","toggleOption","_context6","_includesInstanceProperty","disableOption","enableOption","deselectAll","select","inputvalue","deselect","reset","mergeAttribute","oldAttribute","readonly","concept","isValid","update","value","updateLastModification","values","split","toString","forEach","val","some","updateByAttribute","otherAttribute","console","error","getFormData","inError","name","readonlyWidth","hasAlternativeLabel","SMALL","EXTRA_SMALL"],"sources":["../../../src/models/attributes/BooleanAttributeModel.js"],"sourcesContent":["// @flow\nimport AttributeModel from \"./AttributeModel\";\n\nimport { DateUtil } from \"../../utils/datetime/DateTimeUtil\";\n\nimport ChoiceAttributeOptionCollection from \"./ChoiceAttributeOptionCollection\";\nimport ContentConfigurationElements from \"../contentconfiguration/ContentConfigurationElements\";\nimport ChoiceAttributeOptionModel from \"./ChoiceAttributeOptionModel\";\n\nimport { RENDER_SECTION_LABEL } from \"../../constants/LayoutHints\";\nimport { ATTRIBUTE_WIDTH } from \"../../constants\";\n\nimport type { AttributeType } from \"../types\";\n\n/**\n * Model for a boolean attribute\n */\nexport default class BooleanAttributeModel extends AttributeModel {\n  _referenceDate: string;\n  _options: ChoiceAttributeOptionCollection;\n  _hasContentConfiguration: boolean = false;\n\n  /**\n   */\n  constructor(attribute: Object, attributeContributions: Object) {\n    super(attribute, attributeContributions);\n\n    this._referenceDate = this.getData(\"referenceDate\", DateUtil.now());\n    this._options = ChoiceAttributeOptionCollection.create(\n      attribute,\n      attributeContributions,\n      this.referenceDate,\n    );\n  }\n\n  /**\n   */\n  static isApplicableModel(contributions: Object): boolean {\n    return contributions.type === \"boolean\";\n  }\n\n  /**\n   */\n  get type(): string {\n    return \"boolean\";\n  }\n\n  /**\n   * Retrieve reference date of attribute which can be used as entryDate for content\n   */\n  get referenceDate(): string {\n    return this._referenceDate;\n  }\n\n  /**\n   * Set reference date for concepts and content\n   */\n  set referenceDate(date: string) {\n    this._referenceDate = date;\n\n    this.options.referenceDate = date;\n  }\n\n  /**\n   * Getting the type of choice filter. For instance checkbox, radiobutton, combobox.\n   */\n  get choicetype(): \"checkbox\" | \"radiobutton\" | \"combobox\" | \"toggle\" {\n    return (\n      [\"checkbox\", \"radiobutton\", \"combobox\", \"toggle\"].find((hint) =>\n        this.layouthint.has(hint),\n      ) || \"radiobutton\"\n    );\n  }\n\n  /**\n   * Can multiple options be selected\n   */\n  get isMultiple(): boolean {\n    return false;\n  }\n\n  /**\n   * Check if options need to be rendered as tree\n   */\n  get isTree(): boolean {\n    return false;\n  }\n\n  /**\n   */\n  set hasContentConfiguration(hasContentConfiguration: boolean) {\n    this._hasContentConfiguration =\n      this.contentConfiguration !== null || hasContentConfiguration;\n  }\n\n  /**\n   */\n  get hasContentConfiguration(): boolean {\n    return this._hasContentConfiguration;\n  }\n\n  /**\n   * Get content configuration configured on the attribute.\n   * Only applicable for taxonomy element and knowledge codemaps,\n   * content configuration for instrument questions is available on the form object\n   */\n  get contentConfiguration(): ContentConfigurationElements | null {\n    if (\n      !this.contributions.content ||\n      !this.contributions.content.optionElements\n    ) {\n      return null;\n    }\n\n    // Add RENDER_SECTION_LABEL to all content configuration to make sure the label of a section is always rendered on taxonomy and knowlege codemaps\n    const optionElementConfig = this.contributions.content.optionElements.map(\n      (optionElement) => {\n        if (\"contentElement\" in optionElement) {\n          return {\n            contentElement: {\n              ...optionElement.contentElement,\n              layouthint: [RENDER_SECTION_LABEL],\n            },\n          };\n        }\n\n        return optionElement;\n      },\n    );\n\n    return new ContentConfigurationElements(optionElementConfig);\n  }\n\n  /**\n   * Retrieve available choice options\n   */\n  get options(): ChoiceAttributeOptionCollection {\n    return this._options;\n  }\n\n  /**\n   * Getting all enabled options\n   */\n  get selected(): Array<string> {\n    // $FlowFixMe[incompatible-call]\n    return this.options.selected.map<string, ChoiceAttributeOptionModel>(\n      (option: ChoiceAttributeOptionModel) => option.code,\n    );\n  }\n\n  /**\n   * Flatten options and filter out the options that are not selected\n   */\n  get readonlyvalue(): string {\n    return this.options.selected.map((option) => option.label).join(\", \");\n  }\n\n  /**\n   */\n  get initvalue(): any {\n    if (Array.isArray(this._initvalue) && this._initvalue.length === 0) {\n      return null;\n    }\n\n    return this._initvalue;\n  }\n\n  /**\n   * Retrieve list of selected options, joined with comma\n   */\n  getValue(): string | null {\n    return this.options.selected.length > 0\n      ? this.options.selected.map((option) => option.code).join(\",\")\n      : null;\n  }\n\n  /**\n   */\n  hasValue(): boolean {\n    return this.options.selected.length > 0;\n  }\n\n  /**\n   * Get input value of attribute\n   */\n  getInputValue(): string {\n    return this.selected.join(\",\");\n  }\n\n  /**\n   * Setting an option selected or unselected based on the current state\n   */\n  toggleOption(code: string) {\n    if (this.selected.includes(code)) {\n      this.disableOption(code);\n    } else {\n      this.enableOption(code);\n    }\n  }\n\n  /**\n   * Enable a option\n   */\n  enableOption(code: string) {\n    this.options.deselectAll();\n    this.options.select(code);\n    this.inputvalue = this.getInputValue();\n  }\n\n  /**\n   * Disable a option\n   */\n  disableOption(code: string) {\n    this.options.deselect(code);\n    this.inputvalue = this.getInputValue();\n  }\n\n  /**\n   * Reset boolean attribute to unselected list\n   */\n  reset() {\n    this.options.deselectAll();\n  }\n\n  /**\n   */\n  mergeAttribute(oldAttribute: AttributeType) {\n    // when attribute is readonly, don't merge the options no modifications necessary\n    if (!this.readonly && oldAttribute instanceof BooleanAttributeModel) {\n      this.concept = oldAttribute.concept;\n      this.options.deselectAll();\n\n      if (oldAttribute.isValid && oldAttribute.inputvalue !== null) {\n        this.update(oldAttribute.inputvalue);\n      }\n    }\n  }\n\n  /**\n   * Update attribute by name and value\n   */\n  update(value: any): BooleanAttributeModel {\n    if (this.readonly) {\n      return this;\n    }\n\n    this.updateLastModification();\n\n    let values = [];\n\n    if (Array.isArray(value)) {\n      values = value;\n    } else if (typeof value === \"string\" && this.isMultiple) {\n      values = value.split(\",\");\n    } else if (value != null) {\n      values = [value.toString()];\n    }\n\n    values.forEach((val) => {\n      if (val instanceof ChoiceAttributeOptionModel) {\n        this.toggleOption(val.code);\n      } else if (\n        typeof val === \"string\" &&\n        this.options.some((option) => option.code.toString() === val)\n      ) {\n        this.toggleOption(val);\n      }\n    });\n\n    return this;\n  }\n\n  /**\n   */\n  updateByAttribute(otherAttribute: AttributeType): void {\n    this.reset();\n    if (otherAttribute instanceof BooleanAttributeModel) {\n      this.update(otherAttribute.value);\n    } else {\n      console.error(\n        `update of boolean attribute with ${otherAttribute.type} not supported`,\n      );\n    }\n  }\n\n  /**\n   */\n  getFormData(): { [string]: boolean | null } | null {\n    if (this.inError()) {\n      return null;\n    }\n\n    if (!this.hasValue()) {\n      // no value for checkbox and toggle is same as a false value\n      if (this.choicetype === \"checkbox\" || this.choicetype === \"toggle\") {\n        return { [this.name]: false };\n      }\n\n      return { [this.name]: null };\n    }\n\n    return { [this.name]: this.value === \"true\" };\n  }\n\n  /**\n   */\n  get readonlyWidth(): $Keys<typeof ATTRIBUTE_WIDTH> {\n    if (this.options.some((option) => option.hasAlternativeLabel)) {\n      return ATTRIBUTE_WIDTH.SMALL;\n    }\n\n    return ATTRIBUTE_WIDTH.EXTRA_SMALL;\n  }\n}\n"],"mappings":";;;;AACA,OAAOA,cAAc,MAAM,kBAAkB;AAE7C,SAASC,QAAQ,QAAQ,mCAAmC;AAE5D,OAAOC,+BAA+B,MAAM,mCAAmC;AAC/E,OAAOC,4BAA4B,MAAM,sDAAsD;AAC/F,OAAOC,0BAA0B,MAAM,8BAA8B;AAErE,SAASC,oBAAoB,QAAQ,6BAA6B;AAClE,SAASC,eAAe,QAAQ,iBAAiB;AAIjD;AACA;AACA;AACA,eAAe,MAAMC,qBAAqB,SAASP,cAAc,CAAC;EAKhE;AACF;EACEQ,WAAWA,CAACC,SAAiB,EAAEC,sBAA8B,EAAE;IAC7D,KAAK,CAACD,SAAS,EAAEC,sBAAsB,CAAC;IAACC,eAAA;IAAAA,eAAA;IAAAA,eAAA,mCALP,KAAK;IAOvC,IAAI,CAACC,cAAc,GAAG,IAAI,CAACC,OAAO,CAAC,eAAe,EAAEZ,QAAQ,CAACa,GAAG,CAAC,CAAC,CAAC;IACnE,IAAI,CAACC,QAAQ,GAAGb,+BAA+B,CAACc,MAAM,CACpDP,SAAS,EACTC,sBAAsB,EACtB,IAAI,CAACO,aACP,CAAC;EACH;;EAEA;AACF;EACE,OAAOC,iBAAiBA,CAACC,aAAqB,EAAW;IACvD,OAAOA,aAAa,CAACC,IAAI,KAAK,SAAS;EACzC;;EAEA;AACF;EACE,IAAIA,IAAIA,CAAA,EAAW;IACjB,OAAO,SAAS;EAClB;;EAEA;AACF;AACA;EACE,IAAIH,aAAaA,CAAA,EAAW;IAC1B,OAAO,IAAI,CAACL,cAAc;EAC5B;;EAEA;AACF;AACA;EACE,IAAIK,aAAaA,CAACI,IAAY,EAAE;IAC9B,IAAI,CAACT,cAAc,GAAGS,IAAI;IAE1B,IAAI,CAACC,OAAO,CAACL,aAAa,GAAGI,IAAI;EACnC;;EAEA;AACF;AACA;EACE,IAAIE,UAAUA,CAAA,EAAuD;IAAA,IAAAC,QAAA;IACnE,OACEC,qBAAA,CAAAD,QAAA,IAAC,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAAE,IAAA,CAAAF,QAAA,EAAOG,IAAI,IAC1D,IAAI,CAACC,UAAU,CAACC,GAAG,CAACF,IAAI,CAC1B,CAAC,IAAI,aAAa;EAEtB;;EAEA;AACF;AACA;EACE,IAAIG,UAAUA,CAAA,EAAY;IACxB,OAAO,KAAK;EACd;;EAEA;AACF;AACA;EACE,IAAIC,MAAMA,CAAA,EAAY;IACpB,OAAO,KAAK;EACd;;EAEA;AACF;EACE,IAAIC,uBAAuBA,CAACA,uBAAgC,EAAE;IAC5D,IAAI,CAACC,wBAAwB,GAC3B,IAAI,CAACC,oBAAoB,KAAK,IAAI,IAAIF,uBAAuB;EACjE;;EAEA;AACF;EACE,IAAIA,uBAAuBA,CAAA,EAAY;IACrC,OAAO,IAAI,CAACC,wBAAwB;EACtC;;EAEA;AACF;AACA;AACA;AACA;EACE,IAAIC,oBAAoBA,CAAA,EAAwC;IAAA,IAAAC,SAAA;IAC9D,IACE,CAAC,IAAI,CAAChB,aAAa,CAACiB,OAAO,IAC3B,CAAC,IAAI,CAACjB,aAAa,CAACiB,OAAO,CAACC,cAAc,EAC1C;MACA,OAAO,IAAI;IACb;;IAEA;IACA,MAAMC,mBAAmB,GAAGC,oBAAA,CAAAJ,SAAA,OAAI,CAAChB,aAAa,CAACiB,OAAO,CAACC,cAAc,EAAAX,IAAA,CAAAS,SAAA,EAClEK,aAAa,IAAK;MACjB,IAAI,gBAAgB,IAAIA,aAAa,EAAE;QACrC,OAAO;UACLC,cAAc,EAAE;YACd,GAAGD,aAAa,CAACC,cAAc;YAC/Bb,UAAU,EAAE,CAACvB,oBAAoB;UACnC;QACF,CAAC;MACH;MAEA,OAAOmC,aAAa;IACtB,CACF,CAAC;IAED,OAAO,IAAIrC,4BAA4B,CAACmC,mBAAmB,CAAC;EAC9D;;EAEA;AACF;AACA;EACE,IAAIhB,OAAOA,CAAA,EAAoC;IAC7C,OAAO,IAAI,CAACP,QAAQ;EACtB;;EAEA;AACF;AACA;EACE,IAAI2B,QAAQA,CAAA,EAAkB;IAAA,IAAAC,SAAA;IAC5B;IACA,OAAOJ,oBAAA,CAAAI,SAAA,OAAI,CAACrB,OAAO,CAACoB,QAAQ,EAAAhB,IAAA,CAAAiB,SAAA,EACzBC,MAAkC,IAAKA,MAAM,CAACC,IACjD,CAAC;EACH;;EAEA;AACF;AACA;EACE,IAAIC,aAAaA,CAAA,EAAW;IAAA,IAAAC,SAAA;IAC1B,OAAOR,oBAAA,CAAAQ,SAAA,OAAI,CAACzB,OAAO,CAACoB,QAAQ,EAAAhB,IAAA,CAAAqB,SAAA,EAAMH,MAAM,IAAKA,MAAM,CAACI,KAAK,CAAC,CAACC,IAAI,CAAC,IAAI,CAAC;EACvE;;EAEA;AACF;EACE,IAAIC,SAASA,CAAA,EAAQ;IACnB,IAAIC,KAAK,CAACC,OAAO,CAAC,IAAI,CAACC,UAAU,CAAC,IAAI,IAAI,CAACA,UAAU,CAACC,MAAM,KAAK,CAAC,EAAE;MAClE,OAAO,IAAI;IACb;IAEA,OAAO,IAAI,CAACD,UAAU;EACxB;;EAEA;AACF;AACA;EACEE,QAAQA,CAAA,EAAkB;IAAA,IAAAC,SAAA;IACxB,OAAO,IAAI,CAAClC,OAAO,CAACoB,QAAQ,CAACY,MAAM,GAAG,CAAC,GACnCf,oBAAA,CAAAiB,SAAA,OAAI,CAAClC,OAAO,CAACoB,QAAQ,EAAAhB,IAAA,CAAA8B,SAAA,EAAMZ,MAAM,IAAKA,MAAM,CAACC,IAAI,CAAC,CAACI,IAAI,CAAC,GAAG,CAAC,GAC5D,IAAI;EACV;;EAEA;AACF;EACEQ,QAAQA,CAAA,EAAY;IAClB,OAAO,IAAI,CAACnC,OAAO,CAACoB,QAAQ,CAACY,MAAM,GAAG,CAAC;EACzC;;EAEA;AACF;AACA;EACEI,aAAaA,CAAA,EAAW;IACtB,OAAO,IAAI,CAAChB,QAAQ,CAACO,IAAI,CAAC,GAAG,CAAC;EAChC;;EAEA;AACF;AACA;EACEU,YAAYA,CAACd,IAAY,EAAE;IAAA,IAAAe,SAAA;IACzB,IAAIC,yBAAA,CAAAD,SAAA,OAAI,CAAClB,QAAQ,EAAAhB,IAAA,CAAAkC,SAAA,EAAUf,IAAI,CAAC,EAAE;MAChC,IAAI,CAACiB,aAAa,CAACjB,IAAI,CAAC;IAC1B,CAAC,MAAM;MACL,IAAI,CAACkB,YAAY,CAAClB,IAAI,CAAC;IACzB;EACF;;EAEA;AACF;AACA;EACEkB,YAAYA,CAAClB,IAAY,EAAE;IACzB,IAAI,CAACvB,OAAO,CAAC0C,WAAW,CAAC,CAAC;IAC1B,IAAI,CAAC1C,OAAO,CAAC2C,MAAM,CAACpB,IAAI,CAAC;IACzB,IAAI,CAACqB,UAAU,GAAG,IAAI,CAACR,aAAa,CAAC,CAAC;EACxC;;EAEA;AACF;AACA;EACEI,aAAaA,CAACjB,IAAY,EAAE;IAC1B,IAAI,CAACvB,OAAO,CAAC6C,QAAQ,CAACtB,IAAI,CAAC;IAC3B,IAAI,CAACqB,UAAU,GAAG,IAAI,CAACR,aAAa,CAAC,CAAC;EACxC;;EAEA;AACF;AACA;EACEU,KAAKA,CAAA,EAAG;IACN,IAAI,CAAC9C,OAAO,CAAC0C,WAAW,CAAC,CAAC;EAC5B;;EAEA;AACF;EACEK,cAAcA,CAACC,YAA2B,EAAE;IAC1C;IACA,IAAI,CAAC,IAAI,CAACC,QAAQ,IAAID,YAAY,YAAY/D,qBAAqB,EAAE;MACnE,IAAI,CAACiE,OAAO,GAAGF,YAAY,CAACE,OAAO;MACnC,IAAI,CAAClD,OAAO,CAAC0C,WAAW,CAAC,CAAC;MAE1B,IAAIM,YAAY,CAACG,OAAO,IAAIH,YAAY,CAACJ,UAAU,KAAK,IAAI,EAAE;QAC5D,IAAI,CAACQ,MAAM,CAACJ,YAAY,CAACJ,UAAU,CAAC;MACtC;IACF;EACF;;EAEA;AACF;AACA;EACEQ,MAAMA,CAACC,KAAU,EAAyB;IACxC,IAAI,IAAI,CAACJ,QAAQ,EAAE;MACjB,OAAO,IAAI;IACb;IAEA,IAAI,CAACK,sBAAsB,CAAC,CAAC;IAE7B,IAAIC,MAAM,GAAG,EAAE;IAEf,IAAI1B,KAAK,CAACC,OAAO,CAACuB,KAAK,CAAC,EAAE;MACxBE,MAAM,GAAGF,KAAK;IAChB,CAAC,MAAM,IAAI,OAAOA,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC7C,UAAU,EAAE;MACvD+C,MAAM,GAAGF,KAAK,CAACG,KAAK,CAAC,GAAG,CAAC;IAC3B,CAAC,MAAM,IAAIH,KAAK,IAAI,IAAI,EAAE;MACxBE,MAAM,GAAG,CAACF,KAAK,CAACI,QAAQ,CAAC,CAAC,CAAC;IAC7B;IAEAF,MAAM,CAACG,OAAO,CAAEC,GAAG,IAAK;MACtB,IAAIA,GAAG,YAAY7E,0BAA0B,EAAE;QAC7C,IAAI,CAACuD,YAAY,CAACsB,GAAG,CAACpC,IAAI,CAAC;MAC7B,CAAC,MAAM,IACL,OAAOoC,GAAG,KAAK,QAAQ,IACvB,IAAI,CAAC3D,OAAO,CAAC4D,IAAI,CAAEtC,MAAM,IAAKA,MAAM,CAACC,IAAI,CAACkC,QAAQ,CAAC,CAAC,KAAKE,GAAG,CAAC,EAC7D;QACA,IAAI,CAACtB,YAAY,CAACsB,GAAG,CAAC;MACxB;IACF,CAAC,CAAC;IAEF,OAAO,IAAI;EACb;;EAEA;AACF;EACEE,iBAAiBA,CAACC,cAA6B,EAAQ;IACrD,IAAI,CAAChB,KAAK,CAAC,CAAC;IACZ,IAAIgB,cAAc,YAAY7E,qBAAqB,EAAE;MACnD,IAAI,CAACmE,MAAM,CAACU,cAAc,CAACT,KAAK,CAAC;IACnC,CAAC,MAAM;MACLU,OAAO,CAACC,KAAK,CACX,oCAAoCF,cAAc,CAAChE,IAAI,gBACzD,CAAC;IACH;EACF;;EAEA;AACF;EACEmE,WAAWA,CAAA,EAAwC;IACjD,IAAI,IAAI,CAACC,OAAO,CAAC,CAAC,EAAE;MAClB,OAAO,IAAI;IACb;IAEA,IAAI,CAAC,IAAI,CAAC/B,QAAQ,CAAC,CAAC,EAAE;MACpB;MACA,IAAI,IAAI,CAAClC,UAAU,KAAK,UAAU,IAAI,IAAI,CAACA,UAAU,KAAK,QAAQ,EAAE;QAClE,OAAO;UAAE,CAAC,IAAI,CAACkE,IAAI,GAAG;QAAM,CAAC;MAC/B;MAEA,OAAO;QAAE,CAAC,IAAI,CAACA,IAAI,GAAG;MAAK,CAAC;IAC9B;IAEA,OAAO;MAAE,CAAC,IAAI,CAACA,IAAI,GAAG,IAAI,CAACd,KAAK,KAAK;IAAO,CAAC;EAC/C;;EAEA;AACF;EACE,IAAIe,aAAaA,CAAA,EAAkC;IACjD,IAAI,IAAI,CAACpE,OAAO,CAAC4D,IAAI,CAAEtC,MAAM,IAAKA,MAAM,CAAC+C,mBAAmB,CAAC,EAAE;MAC7D,OAAOrF,eAAe,CAACsF,KAAK;IAC9B;IAEA,OAAOtF,eAAe,CAACuF,WAAW;EACpC;AACF","ignoreList":[]}

package/esm/redux/_modularui/ModularUIConnector.js

@@ -7,7 +7,26 @@ import { getDisplayName } from "../../react/utils";
 import { useUrl, useReload } from "./ModularUIUtils";
 import { useModularUI } from "../../hooks/useModularUI";
 import { useLocale } from "../../hooks/useI18n";
+import FormModel from "../../models/form/FormModel";
 import { jsx as _jsx } from "react/jsx-runtime";
+const patchUpdateModelOption = oldOptions => {
+  if ("updateModel" in oldOptions && oldOptions.updateModel instanceof FormModel) {
+    return {
+      ...oldOptions,
+      updateHandler: newModel => {
+        if (newModel instanceof FormModel) {
+          // $FLowFixMe
+          const clonedModel = oldOptions.updateModel.clone();
+          clonedModel.update(newModel);
+          return clonedModel;
+        }
+        return newModel;
+      }
+    };
+  }
+  return oldOptions;
+};
+
 /**
  */
 const modularUIConnector = function (name, resource) {
@@ -42,7 +61,7 @@ const modularUIConnector = function (name, resource) {
       // Provide connected models with a fetchModularUI method to be able
       // to run the loadModularUI action from a handler / callback in the component
       const handleFetch = (href, fetchOptions) => {
-        dispatch(loadModularUI(modelKey, href, fetchOptions));
+        dispatch(loadModularUI(modelKey, href, patchUpdateModelOption(fetchOptions)));
       };
 
       // Check if current model needs a reload
@@ -51,7 +70,7 @@ const modularUIConnector = function (name, resource) {
       useEffect(() => {
         if (doReload) {
           dispatch(loadModularUI(modelKey, url, {
-            ...otherOptions,
+            ...patchUpdateModelOption(otherOptions),
             isReload: true
           }));
         }

package/esm/redux/_modularui/ModularUIConnector.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModularUIConnector.js","names":["useEffect","useDispatch","useLocation","loadModularUI","reloadModel","removeModelByKey","Href","getDisplayName","useUrl","useReload","useModularUI","useLocale","jsx","_jsx","modularUIConnector","name","resource","options","arguments","length","undefined","propName","removeOnUnmount","otherOptions","Component","WrappedComponent","props","dispatch","location","url","displayName","contextId","modelEntry","modelKey","model","connectKey","handleManualReload","reloadOptions","handleFetch","href","fetchOptions","reload","state","doReload","isReload","locale","newProps","status","lastModification","hasModel","Boolean","fetchModularUI"],"sources":["../../../src/redux/_modularui/ModularUIConnector.js"],"sourcesContent":["// @flow\nimport { useEffect } from \"react\";\nimport { useDispatch } from \"react-redux\";\nimport { useLocation } from \"react-router\";\n\nimport {\n  loadModularUI,\n  reloadModel,\n  removeModelByKey,\n} from \"./ModularUIActions\";\n\nimport Href from \"../../models/href/Href\";\nimport { getDisplayName } from \"../../react/utils\";\n\nimport { useUrl, useReload } from \"./ModularUIUtils\";\nimport { useModularUI } from \"../../hooks/useModularUI\";\nimport { useLocale } from \"../../hooks/useI18n\";\n\nimport type { ComponentType, Node } from \"react\";\nimport type { Location } from \"react-router\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { ModularUIOptions } from \"./types\";\n\nexport type InjectedProps = {\n  +modelKey: string,\n  +location: Location,\n  +status: string | null,\n  +lastModification: number | null,\n  +hasModel: boolean,\n  +locale: string,\n  +fetchModularUI: (href: string | Href, fetchOptions: Object) => void,\n  +reloadModel: (model: ModularUIModel, options: Object) => void,\n  +data?: ?ModularUIModel,\n};\n\n/**\n */\nconst modularUIConnector = (\n  name: string,\n  resource: string | Function,\n  options: ModularUIOptions = { propName: \"data\", removeOnUnmount: false },\n): ((Component: ComponentType<any>) => (props: any) => Node) => {\n  const {\n    propName = \"data\",\n    removeOnUnmount = false,\n    ...otherOptions\n  } = options;\n\n  return (Component: ComponentType<any>) => {\n    const WrappedComponent = (props: any) => {\n      const dispatch = useDispatch();\n      const location = useLocation();\n\n      const url = useUrl(resource, { location, ...props });\n      const displayName = getDisplayName(Component, name, props.contextId);\n\n      // Load the model through the useModUI hook\n      const modelEntry = useModularUI(displayName, url, otherOptions);\n      const modelKey = modelEntry?.model?.connectKey;\n\n      // handle manual reload of model\n      const handleManualReload = (\n        model: ModularUIModel,\n        reloadOptions?: Object,\n      ) => {\n        dispatch(reloadModel(model, reloadOptions));\n      };\n\n      // Provide connected models with a fetchModularUI method to be able\n      // to run the loadModularUI action from a handler / callback in the component\n      const handleFetch = (href: string | Href, fetchOptions: Object) => {\n        dispatch(loadModularUI(modelKey, href, fetchOptions));\n      };\n\n      // Check if current model needs a reload\n      const reload = location?.state?.reload ?? 0;\n      const doReload = useReload(modelEntry, reload);\n      useEffect(() => {\n        if (doReload) {\n          dispatch(\n            loadModularUI(modelKey, url, { ...otherOptions, isReload: true }),\n          );\n        }\n      }, [dispatch, doReload, url, modelKey]);\n\n      // Remove model when hoc unloads\n      useEffect(() => {\n        return () => {\n          if (removeOnUnmount) {\n            dispatch(removeModelByKey(modelKey));\n          }\n        };\n      }, [dispatch, modelKey]);\n\n      // Create new properties object to inject modularui properties to own props\n      const locale = useLocale();\n      const newProps: InjectedProps = {\n        modelKey,\n        [propName]: modelEntry ? modelEntry.model : null,\n        location,\n        status: modelEntry ? modelEntry.status : null,\n        lastModification: modelEntry ? modelEntry.lastModification : null,\n        hasModel: Boolean(modelEntry),\n        locale,\n        fetchModularUI: handleFetch,\n        reloadModel: handleManualReload,\n      };\n\n      return <Component {...props} {...newProps} />;\n    };\n\n    WrappedComponent.displayName = `BI.modularui(${getDisplayName(\n      WrappedComponent,\n      name,\n    )}`;\n\n    return WrappedComponent;\n  };\n};\n\nexport default modularUIConnector;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ModularUIConnector.js","names":["useEffect","useDispatch","useLocation","loadModularUI","reloadModel","removeModelByKey","Href","getDisplayName","useUrl","useReload","useModularUI","useLocale","FormModel","jsx","_jsx","patchUpdateModelOption","oldOptions","updateModel","updateHandler","newModel","clonedModel","clone","update","modularUIConnector","name","resource","options","arguments","length","undefined","propName","removeOnUnmount","otherOptions","Component","WrappedComponent","props","dispatch","location","url","displayName","contextId","modelEntry","modelKey","model","connectKey","handleManualReload","reloadOptions","handleFetch","href","fetchOptions","reload","state","doReload","isReload","locale","newProps","status","lastModification","hasModel","Boolean","fetchModularUI"],"sources":["../../../src/redux/_modularui/ModularUIConnector.js"],"sourcesContent":["// @flow\nimport { useEffect } from \"react\";\nimport { useDispatch } from \"react-redux\";\nimport { useLocation } from \"react-router\";\n\nimport {\n  loadModularUI,\n  reloadModel,\n  removeModelByKey,\n} from \"./ModularUIActions\";\n\nimport Href from \"../../models/href/Href\";\nimport { getDisplayName } from \"../../react/utils\";\n\nimport { useUrl, useReload } from \"./ModularUIUtils\";\nimport { useModularUI } from \"../../hooks/useModularUI\";\nimport { useLocale } from \"../../hooks/useI18n\";\n\nimport type { ComponentType, Node } from \"react\";\nimport type { Location } from \"react-router\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { ModularUIOptions } from \"./types\";\nimport FormModel from \"../../models/form/FormModel\";\n\nexport type InjectedProps = {\n  +modelKey: string,\n  +location: Location,\n  +status: string | null,\n  +lastModification: number | null,\n  +hasModel: boolean,\n  +locale: string,\n  +fetchModularUI: (href: string | Href, fetchOptions: Object) => void,\n  +reloadModel: (model: ModularUIModel, options: Object) => void,\n  +data?: ?ModularUIModel,\n};\n\nconst patchUpdateModelOption = (oldOptions: Object) => {\n  if (\n    \"updateModel\" in oldOptions &&\n    oldOptions.updateModel instanceof FormModel\n  ) {\n    return {\n      ...oldOptions,\n      updateHandler: (newModel: ModularUIModel): ModularUIModel => {\n        if (newModel instanceof FormModel) {\n          // $FLowFixMe\n          const clonedModel: FormModel = oldOptions.updateModel.clone();\n          clonedModel.update(newModel);\n          return clonedModel;\n        }\n        return newModel;\n      },\n    };\n  }\n\n  return oldOptions;\n};\n\n/**\n */\nconst modularUIConnector = (\n  name: string,\n  resource: string | Function,\n  options: ModularUIOptions = { propName: \"data\", removeOnUnmount: false },\n): ((Component: ComponentType<any>) => (props: any) => Node) => {\n  const {\n    propName = \"data\",\n    removeOnUnmount = false,\n    ...otherOptions\n  } = options;\n\n  return (Component: ComponentType<any>) => {\n    const WrappedComponent = (props: any) => {\n      const dispatch = useDispatch();\n      const location = useLocation();\n\n      const url = useUrl(resource, { location, ...props });\n      const displayName = getDisplayName(Component, name, props.contextId);\n\n      // Load the model through the useModUI hook\n      const modelEntry = useModularUI(displayName, url, otherOptions);\n      const modelKey = modelEntry?.model?.connectKey;\n\n      // handle manual reload of model\n      const handleManualReload = (\n        model: ModularUIModel,\n        reloadOptions?: Object,\n      ) => {\n        dispatch(reloadModel(model, reloadOptions));\n      };\n\n      // Provide connected models with a fetchModularUI method to be able\n      // to run the loadModularUI action from a handler / callback in the component\n      const handleFetch = (href: string | Href, fetchOptions: Object) => {\n        dispatch(\n          loadModularUI(modelKey, href, patchUpdateModelOption(fetchOptions)),\n        );\n      };\n\n      // Check if current model needs a reload\n      const reload = location?.state?.reload ?? 0;\n      const doReload = useReload(modelEntry, reload);\n      useEffect(() => {\n        if (doReload) {\n          dispatch(\n            loadModularUI(modelKey, url, {\n              ...patchUpdateModelOption(otherOptions),\n              isReload: true,\n            }),\n          );\n        }\n      }, [dispatch, doReload, url, modelKey]);\n\n      // Remove model when hoc unloads\n      useEffect(() => {\n        return () => {\n          if (removeOnUnmount) {\n            dispatch(removeModelByKey(modelKey));\n          }\n        };\n      }, [dispatch, modelKey]);\n\n      // Create new properties object to inject modularui properties to own props\n      const locale = useLocale();\n      const newProps: InjectedProps = {\n        modelKey,\n        [propName]: modelEntry ? modelEntry.model : null,\n        location,\n        status: modelEntry ? modelEntry.status : null,\n        lastModification: modelEntry ? modelEntry.lastModification : null,\n        hasModel: Boolean(modelEntry),\n        locale,\n        fetchModularUI: handleFetch,\n        reloadModel: handleManualReload,\n      };\n\n      return <Component {...props} {...newProps} />;\n    };\n\n    WrappedComponent.displayName = `BI.modularui(${getDisplayName(\n      WrappedComponent,\n      name,\n    )}`;\n\n    return WrappedComponent;\n  };\n};\n\nexport default modularUIConnector;\n"],"mappings":"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","ignoreList":[]}

package/lib/models/attributes/BooleanAttributeModel.js

@@ -229,12 +229,12 @@ class BooleanAttributeModel extends _AttributeModel.default {
       return this;
     }
     this.updateLastModification();
-    let values;
+    let values = [];
     if (Array.isArray(value)) {
       values = value;
     } else if (typeof value === "string" && this.isMultiple) {
       values = value.split(",");
-    } else {
+    } else if (value != null) {
       values = [value.toString()];
     }
     values.forEach(val => {

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

@@ -246,13 +246,13 @@ export default class BooleanAttributeModel extends AttributeModel {
 
     this.updateLastModification();
 
-    let values;
+    let values = [];
 
     if (Array.isArray(value)) {
       values = value;
     } else if (typeof value === "string" && this.isMultiple) {
       values = value.split(",");
-    } else {
+    } else if (value != null) {
       values = [value.toString()];
     }
 

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

@@ -1 +1 @@
-{"version":3,"file":"BooleanAttributeModel.js","names":["_AttributeModel","_interopRequireDefault","require","_DateTimeUtil","_ChoiceAttributeOptionCollection","_ContentConfigurationElements","_ChoiceAttributeOptionModel","_LayoutHints","_constants","BooleanAttributeModel","AttributeModel","constructor","attribute","attributeContributions","_defineProperty2","default","_referenceDate","getData","DateUtil","now","_options","ChoiceAttributeOptionCollection","create","referenceDate","isApplicableModel","contributions","type","date","options","choicetype","_context","_find","call","hint","layouthint","has","isMultiple","isTree","hasContentConfiguration","_hasContentConfiguration","contentConfiguration","_context2","content","optionElements","optionElementConfig","_map","optionElement","contentElement","RENDER_SECTION_LABEL","ContentConfigurationElements","selected","_context3","option","code","readonlyvalue","_context4","label","join","initvalue","Array","isArray","_initvalue","length","getValue","_context5","hasValue","getInputValue","toggleOption","_context6","_includes","disableOption","enableOption","deselectAll","select","inputvalue","deselect","reset","mergeAttribute","oldAttribute","readonly","concept","isValid","update","value","updateLastModification","values","split","toString","forEach","val","ChoiceAttributeOptionModel","some","updateByAttribute","otherAttribute","console","error","getFormData","inError","name","readonlyWidth","hasAlternativeLabel","ATTRIBUTE_WIDTH","SMALL","EXTRA_SMALL","exports"],"sources":["../../../src/models/attributes/BooleanAttributeModel.js"],"sourcesContent":["// @flow\nimport AttributeModel from \"./AttributeModel\";\n\nimport { DateUtil } from \"../../utils/datetime/DateTimeUtil\";\n\nimport ChoiceAttributeOptionCollection from \"./ChoiceAttributeOptionCollection\";\nimport ContentConfigurationElements from \"../contentconfiguration/ContentConfigurationElements\";\nimport ChoiceAttributeOptionModel from \"./ChoiceAttributeOptionModel\";\n\nimport { RENDER_SECTION_LABEL } from \"../../constants/LayoutHints\";\nimport { ATTRIBUTE_WIDTH } from \"../../constants\";\n\nimport type { AttributeType } from \"../types\";\n\n/**\n * Model for a boolean attribute\n */\nexport default class BooleanAttributeModel extends AttributeModel {\n  _referenceDate: string;\n  _options: ChoiceAttributeOptionCollection;\n  _hasContentConfiguration: boolean = false;\n\n  /**\n   */\n  constructor(attribute: Object, attributeContributions: Object) {\n    super(attribute, attributeContributions);\n\n    this._referenceDate = this.getData(\"referenceDate\", DateUtil.now());\n    this._options = ChoiceAttributeOptionCollection.create(\n      attribute,\n      attributeContributions,\n      this.referenceDate,\n    );\n  }\n\n  /**\n   */\n  static isApplicableModel(contributions: Object): boolean {\n    return contributions.type === \"boolean\";\n  }\n\n  /**\n   */\n  get type(): string {\n    return \"boolean\";\n  }\n\n  /**\n   * Retrieve reference date of attribute which can be used as entryDate for content\n   */\n  get referenceDate(): string {\n    return this._referenceDate;\n  }\n\n  /**\n   * Set reference date for concepts and content\n   */\n  set referenceDate(date: string) {\n    this._referenceDate = date;\n\n    this.options.referenceDate = date;\n  }\n\n  /**\n   * Getting the type of choice filter. For instance checkbox, radiobutton, combobox.\n   */\n  get choicetype(): \"checkbox\" | \"radiobutton\" | \"combobox\" | \"toggle\" {\n    return (\n      [\"checkbox\", \"radiobutton\", \"combobox\", \"toggle\"].find((hint) =>\n        this.layouthint.has(hint),\n      ) || \"radiobutton\"\n    );\n  }\n\n  /**\n   * Can multiple options be selected\n   */\n  get isMultiple(): boolean {\n    return false;\n  }\n\n  /**\n   * Check if options need to be rendered as tree\n   */\n  get isTree(): boolean {\n    return false;\n  }\n\n  /**\n   */\n  set hasContentConfiguration(hasContentConfiguration: boolean) {\n    this._hasContentConfiguration =\n      this.contentConfiguration !== null || hasContentConfiguration;\n  }\n\n  /**\n   */\n  get hasContentConfiguration(): boolean {\n    return this._hasContentConfiguration;\n  }\n\n  /**\n   * Get content configuration configured on the attribute.\n   * Only applicable for taxonomy element and knowledge codemaps,\n   * content configuration for instrument questions is available on the form object\n   */\n  get contentConfiguration(): ContentConfigurationElements | null {\n    if (\n      !this.contributions.content ||\n      !this.contributions.content.optionElements\n    ) {\n      return null;\n    }\n\n    // Add RENDER_SECTION_LABEL to all content configuration to make sure the label of a section is always rendered on taxonomy and knowlege codemaps\n    const optionElementConfig = this.contributions.content.optionElements.map(\n      (optionElement) => {\n        if (\"contentElement\" in optionElement) {\n          return {\n            contentElement: {\n              ...optionElement.contentElement,\n              layouthint: [RENDER_SECTION_LABEL],\n            },\n          };\n        }\n\n        return optionElement;\n      },\n    );\n\n    return new ContentConfigurationElements(optionElementConfig);\n  }\n\n  /**\n   * Retrieve available choice options\n   */\n  get options(): ChoiceAttributeOptionCollection {\n    return this._options;\n  }\n\n  /**\n   * Getting all enabled options\n   */\n  get selected(): Array<string> {\n    // $FlowFixMe[incompatible-call]\n    return this.options.selected.map<string, ChoiceAttributeOptionModel>(\n      (option: ChoiceAttributeOptionModel) => option.code,\n    );\n  }\n\n  /**\n   * Flatten options and filter out the options that are not selected\n   */\n  get readonlyvalue(): string {\n    return this.options.selected.map((option) => option.label).join(\", \");\n  }\n\n  /**\n   */\n  get initvalue(): any {\n    if (Array.isArray(this._initvalue) && this._initvalue.length === 0) {\n      return null;\n    }\n\n    return this._initvalue;\n  }\n\n  /**\n   * Retrieve list of selected options, joined with comma\n   */\n  getValue(): string | null {\n    return this.options.selected.length > 0\n      ? this.options.selected.map((option) => option.code).join(\",\")\n      : null;\n  }\n\n  /**\n   */\n  hasValue(): boolean {\n    return this.options.selected.length > 0;\n  }\n\n  /**\n   * Get input value of attribute\n   */\n  getInputValue(): string {\n    return this.selected.join(\",\");\n  }\n\n  /**\n   * Setting an option selected or unselected based on the current state\n   */\n  toggleOption(code: string) {\n    if (this.selected.includes(code)) {\n      this.disableOption(code);\n    } else {\n      this.enableOption(code);\n    }\n  }\n\n  /**\n   * Enable a option\n   */\n  enableOption(code: string) {\n    this.options.deselectAll();\n    this.options.select(code);\n    this.inputvalue = this.getInputValue();\n  }\n\n  /**\n   * Disable a option\n   */\n  disableOption(code: string) {\n    this.options.deselect(code);\n    this.inputvalue = this.getInputValue();\n  }\n\n  /**\n   * Reset boolean attribute to unselected list\n   */\n  reset() {\n    this.options.deselectAll();\n  }\n\n  /**\n   */\n  mergeAttribute(oldAttribute: AttributeType) {\n    // when attribute is readonly, don't merge the options no modifications necessary\n    if (!this.readonly && oldAttribute instanceof BooleanAttributeModel) {\n      this.concept = oldAttribute.concept;\n      this.options.deselectAll();\n\n      if (oldAttribute.isValid && oldAttribute.inputvalue !== null) {\n        this.update(oldAttribute.inputvalue);\n      }\n    }\n  }\n\n  /**\n   * Update attribute by name and value\n   */\n  update(value: any): BooleanAttributeModel {\n    if (this.readonly) {\n      return this;\n    }\n\n    this.updateLastModification();\n\n    let values;\n\n    if (Array.isArray(value)) {\n      values = value;\n    } else if (typeof value === \"string\" && this.isMultiple) {\n      values = value.split(\",\");\n    } else {\n      values = [value.toString()];\n    }\n\n    values.forEach((val) => {\n      if (val instanceof ChoiceAttributeOptionModel) {\n        this.toggleOption(val.code);\n      } else if (\n        typeof val === \"string\" &&\n        this.options.some((option) => option.code.toString() === val)\n      ) {\n        this.toggleOption(val);\n      }\n    });\n\n    return this;\n  }\n\n  /**\n   */\n  updateByAttribute(otherAttribute: AttributeType): void {\n    this.reset();\n    if (otherAttribute instanceof BooleanAttributeModel) {\n      this.update(otherAttribute.value);\n    } else {\n      console.error(\n        `update of boolean attribute with ${otherAttribute.type} not supported`,\n      );\n    }\n  }\n\n  /**\n   */\n  getFormData(): { [string]: boolean | null } | null {\n    if (this.inError()) {\n      return null;\n    }\n\n    if (!this.hasValue()) {\n      // no value for checkbox and toggle is same as a false value\n      if (this.choicetype === \"checkbox\" || this.choicetype === \"toggle\") {\n        return { [this.name]: false };\n      }\n\n      return { [this.name]: null };\n    }\n\n    return { [this.name]: this.value === \"true\" };\n  }\n\n  /**\n   */\n  get readonlyWidth(): $Keys<typeof ATTRIBUTE_WIDTH> {\n    if (this.options.some((option) => option.hasAlternativeLabel)) {\n      return ATTRIBUTE_WIDTH.SMALL;\n    }\n\n    return ATTRIBUTE_WIDTH.EXTRA_SMALL;\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"BooleanAttributeModel.js","names":["_AttributeModel","_interopRequireDefault","require","_DateTimeUtil","_ChoiceAttributeOptionCollection","_ContentConfigurationElements","_ChoiceAttributeOptionModel","_LayoutHints","_constants","BooleanAttributeModel","AttributeModel","constructor","attribute","attributeContributions","_defineProperty2","default","_referenceDate","getData","DateUtil","now","_options","ChoiceAttributeOptionCollection","create","referenceDate","isApplicableModel","contributions","type","date","options","choicetype","_context","_find","call","hint","layouthint","has","isMultiple","isTree","hasContentConfiguration","_hasContentConfiguration","contentConfiguration","_context2","content","optionElements","optionElementConfig","_map","optionElement","contentElement","RENDER_SECTION_LABEL","ContentConfigurationElements","selected","_context3","option","code","readonlyvalue","_context4","label","join","initvalue","Array","isArray","_initvalue","length","getValue","_context5","hasValue","getInputValue","toggleOption","_context6","_includes","disableOption","enableOption","deselectAll","select","inputvalue","deselect","reset","mergeAttribute","oldAttribute","readonly","concept","isValid","update","value","updateLastModification","values","split","toString","forEach","val","ChoiceAttributeOptionModel","some","updateByAttribute","otherAttribute","console","error","getFormData","inError","name","readonlyWidth","hasAlternativeLabel","ATTRIBUTE_WIDTH","SMALL","EXTRA_SMALL","exports"],"sources":["../../../src/models/attributes/BooleanAttributeModel.js"],"sourcesContent":["// @flow\nimport AttributeModel from \"./AttributeModel\";\n\nimport { DateUtil } from \"../../utils/datetime/DateTimeUtil\";\n\nimport ChoiceAttributeOptionCollection from \"./ChoiceAttributeOptionCollection\";\nimport ContentConfigurationElements from \"../contentconfiguration/ContentConfigurationElements\";\nimport ChoiceAttributeOptionModel from \"./ChoiceAttributeOptionModel\";\n\nimport { RENDER_SECTION_LABEL } from \"../../constants/LayoutHints\";\nimport { ATTRIBUTE_WIDTH } from \"../../constants\";\n\nimport type { AttributeType } from \"../types\";\n\n/**\n * Model for a boolean attribute\n */\nexport default class BooleanAttributeModel extends AttributeModel {\n  _referenceDate: string;\n  _options: ChoiceAttributeOptionCollection;\n  _hasContentConfiguration: boolean = false;\n\n  /**\n   */\n  constructor(attribute: Object, attributeContributions: Object) {\n    super(attribute, attributeContributions);\n\n    this._referenceDate = this.getData(\"referenceDate\", DateUtil.now());\n    this._options = ChoiceAttributeOptionCollection.create(\n      attribute,\n      attributeContributions,\n      this.referenceDate,\n    );\n  }\n\n  /**\n   */\n  static isApplicableModel(contributions: Object): boolean {\n    return contributions.type === \"boolean\";\n  }\n\n  /**\n   */\n  get type(): string {\n    return \"boolean\";\n  }\n\n  /**\n   * Retrieve reference date of attribute which can be used as entryDate for content\n   */\n  get referenceDate(): string {\n    return this._referenceDate;\n  }\n\n  /**\n   * Set reference date for concepts and content\n   */\n  set referenceDate(date: string) {\n    this._referenceDate = date;\n\n    this.options.referenceDate = date;\n  }\n\n  /**\n   * Getting the type of choice filter. For instance checkbox, radiobutton, combobox.\n   */\n  get choicetype(): \"checkbox\" | \"radiobutton\" | \"combobox\" | \"toggle\" {\n    return (\n      [\"checkbox\", \"radiobutton\", \"combobox\", \"toggle\"].find((hint) =>\n        this.layouthint.has(hint),\n      ) || \"radiobutton\"\n    );\n  }\n\n  /**\n   * Can multiple options be selected\n   */\n  get isMultiple(): boolean {\n    return false;\n  }\n\n  /**\n   * Check if options need to be rendered as tree\n   */\n  get isTree(): boolean {\n    return false;\n  }\n\n  /**\n   */\n  set hasContentConfiguration(hasContentConfiguration: boolean) {\n    this._hasContentConfiguration =\n      this.contentConfiguration !== null || hasContentConfiguration;\n  }\n\n  /**\n   */\n  get hasContentConfiguration(): boolean {\n    return this._hasContentConfiguration;\n  }\n\n  /**\n   * Get content configuration configured on the attribute.\n   * Only applicable for taxonomy element and knowledge codemaps,\n   * content configuration for instrument questions is available on the form object\n   */\n  get contentConfiguration(): ContentConfigurationElements | null {\n    if (\n      !this.contributions.content ||\n      !this.contributions.content.optionElements\n    ) {\n      return null;\n    }\n\n    // Add RENDER_SECTION_LABEL to all content configuration to make sure the label of a section is always rendered on taxonomy and knowlege codemaps\n    const optionElementConfig = this.contributions.content.optionElements.map(\n      (optionElement) => {\n        if (\"contentElement\" in optionElement) {\n          return {\n            contentElement: {\n              ...optionElement.contentElement,\n              layouthint: [RENDER_SECTION_LABEL],\n            },\n          };\n        }\n\n        return optionElement;\n      },\n    );\n\n    return new ContentConfigurationElements(optionElementConfig);\n  }\n\n  /**\n   * Retrieve available choice options\n   */\n  get options(): ChoiceAttributeOptionCollection {\n    return this._options;\n  }\n\n  /**\n   * Getting all enabled options\n   */\n  get selected(): Array<string> {\n    // $FlowFixMe[incompatible-call]\n    return this.options.selected.map<string, ChoiceAttributeOptionModel>(\n      (option: ChoiceAttributeOptionModel) => option.code,\n    );\n  }\n\n  /**\n   * Flatten options and filter out the options that are not selected\n   */\n  get readonlyvalue(): string {\n    return this.options.selected.map((option) => option.label).join(\", \");\n  }\n\n  /**\n   */\n  get initvalue(): any {\n    if (Array.isArray(this._initvalue) && this._initvalue.length === 0) {\n      return null;\n    }\n\n    return this._initvalue;\n  }\n\n  /**\n   * Retrieve list of selected options, joined with comma\n   */\n  getValue(): string | null {\n    return this.options.selected.length > 0\n      ? this.options.selected.map((option) => option.code).join(\",\")\n      : null;\n  }\n\n  /**\n   */\n  hasValue(): boolean {\n    return this.options.selected.length > 0;\n  }\n\n  /**\n   * Get input value of attribute\n   */\n  getInputValue(): string {\n    return this.selected.join(\",\");\n  }\n\n  /**\n   * Setting an option selected or unselected based on the current state\n   */\n  toggleOption(code: string) {\n    if (this.selected.includes(code)) {\n      this.disableOption(code);\n    } else {\n      this.enableOption(code);\n    }\n  }\n\n  /**\n   * Enable a option\n   */\n  enableOption(code: string) {\n    this.options.deselectAll();\n    this.options.select(code);\n    this.inputvalue = this.getInputValue();\n  }\n\n  /**\n   * Disable a option\n   */\n  disableOption(code: string) {\n    this.options.deselect(code);\n    this.inputvalue = this.getInputValue();\n  }\n\n  /**\n   * Reset boolean attribute to unselected list\n   */\n  reset() {\n    this.options.deselectAll();\n  }\n\n  /**\n   */\n  mergeAttribute(oldAttribute: AttributeType) {\n    // when attribute is readonly, don't merge the options no modifications necessary\n    if (!this.readonly && oldAttribute instanceof BooleanAttributeModel) {\n      this.concept = oldAttribute.concept;\n      this.options.deselectAll();\n\n      if (oldAttribute.isValid && oldAttribute.inputvalue !== null) {\n        this.update(oldAttribute.inputvalue);\n      }\n    }\n  }\n\n  /**\n   * Update attribute by name and value\n   */\n  update(value: any): BooleanAttributeModel {\n    if (this.readonly) {\n      return this;\n    }\n\n    this.updateLastModification();\n\n    let values = [];\n\n    if (Array.isArray(value)) {\n      values = value;\n    } else if (typeof value === \"string\" && this.isMultiple) {\n      values = value.split(\",\");\n    } else if (value != null) {\n      values = [value.toString()];\n    }\n\n    values.forEach((val) => {\n      if (val instanceof ChoiceAttributeOptionModel) {\n        this.toggleOption(val.code);\n      } else if (\n        typeof val === \"string\" &&\n        this.options.some((option) => option.code.toString() === val)\n      ) {\n        this.toggleOption(val);\n      }\n    });\n\n    return this;\n  }\n\n  /**\n   */\n  updateByAttribute(otherAttribute: AttributeType): void {\n    this.reset();\n    if (otherAttribute instanceof BooleanAttributeModel) {\n      this.update(otherAttribute.value);\n    } else {\n      console.error(\n        `update of boolean attribute with ${otherAttribute.type} not supported`,\n      );\n    }\n  }\n\n  /**\n   */\n  getFormData(): { [string]: boolean | null } | null {\n    if (this.inError()) {\n      return null;\n    }\n\n    if (!this.hasValue()) {\n      // no value for checkbox and toggle is same as a false value\n      if (this.choicetype === \"checkbox\" || this.choicetype === \"toggle\") {\n        return { [this.name]: false };\n      }\n\n      return { [this.name]: null };\n    }\n\n    return { [this.name]: this.value === \"true\" };\n  }\n\n  /**\n   */\n  get readonlyWidth(): $Keys<typeof ATTRIBUTE_WIDTH> {\n    if (this.options.some((option) => option.hasAlternativeLabel)) {\n      return ATTRIBUTE_WIDTH.SMALL;\n    }\n\n    return ATTRIBUTE_WIDTH.EXTRA_SMALL;\n  }\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -59,6 +59,14 @@ describe("booleanAttributeModel", () => {
     expect(attribute.inputvalue).toBe("false");
 
     expect(attribute.getFormData()).toStrictEqual({ boolean: false });
+
+    attribute.enableOption("true");
+    attribute.update(null);
+    expect(attribute.inputvalue).toBe("true");
+
+    attribute.update("false");
+    attribute.update(null);
+    expect(attribute.inputvalue).toBe("false");
   });
 
   it("handles update empty string", () => {

package/lib/redux/_modularui/ModularUIConnector.js

@@ -14,7 +14,26 @@ var _utils = require("../../react/utils");
 var _ModularUIUtils = require("./ModularUIUtils");
 var _useModularUI = require("../../hooks/useModularUI");
 var _useI18n = require("../../hooks/useI18n");
+var _FormModel = _interopRequireDefault(require("../../models/form/FormModel"));
 var _jsxRuntime = require("react/jsx-runtime");
+const patchUpdateModelOption = oldOptions => {
+  if ("updateModel" in oldOptions && oldOptions.updateModel instanceof _FormModel.default) {
+    return {
+      ...oldOptions,
+      updateHandler: newModel => {
+        if (newModel instanceof _FormModel.default) {
+          // $FLowFixMe
+          const clonedModel = oldOptions.updateModel.clone();
+          clonedModel.update(newModel);
+          return clonedModel;
+        }
+        return newModel;
+      }
+    };
+  }
+  return oldOptions;
+};
+
 /**
  */
 const modularUIConnector = function (name, resource) {
@@ -49,7 +68,7 @@ const modularUIConnector = function (name, resource) {
       // Provide connected models with a fetchModularUI method to be able
       // to run the loadModularUI action from a handler / callback in the component
       const handleFetch = (href, fetchOptions) => {
-        dispatch((0, _ModularUIActions.loadModularUI)(modelKey, href, fetchOptions));
+        dispatch((0, _ModularUIActions.loadModularUI)(modelKey, href, patchUpdateModelOption(fetchOptions)));
       };
 
       // Check if current model needs a reload
@@ -58,7 +77,7 @@ const modularUIConnector = function (name, resource) {
       (0, _react.useEffect)(() => {
         if (doReload) {
           dispatch((0, _ModularUIActions.loadModularUI)(modelKey, url, {
-            ...otherOptions,
+            ...patchUpdateModelOption(otherOptions),
             isReload: true
           }));
         }

package/lib/redux/_modularui/ModularUIConnector.js.flow

@@ -20,6 +20,7 @@ import type { ComponentType, Node } from "react";
 import type { Location } from "react-router";
 import type { ModularUIModel } from "../../models/types";
 import type { ModularUIOptions } from "./types";
+import FormModel from "../../models/form/FormModel";
 
 export type InjectedProps = {
   +modelKey: string,
@@ -33,6 +34,28 @@ export type InjectedProps = {
   +data?: ?ModularUIModel,
 };
 
+const patchUpdateModelOption = (oldOptions: Object) => {
+  if (
+    "updateModel" in oldOptions &&
+    oldOptions.updateModel instanceof FormModel
+  ) {
+    return {
+      ...oldOptions,
+      updateHandler: (newModel: ModularUIModel): ModularUIModel => {
+        if (newModel instanceof FormModel) {
+          // $FLowFixMe
+          const clonedModel: FormModel = oldOptions.updateModel.clone();
+          clonedModel.update(newModel);
+          return clonedModel;
+        }
+        return newModel;
+      },
+    };
+  }
+
+  return oldOptions;
+};
+
 /**
  */
 const modularUIConnector = (
@@ -69,7 +92,9 @@ const modularUIConnector = (
       // Provide connected models with a fetchModularUI method to be able
       // to run the loadModularUI action from a handler / callback in the component
       const handleFetch = (href: string | Href, fetchOptions: Object) => {
-        dispatch(loadModularUI(modelKey, href, fetchOptions));
+        dispatch(
+          loadModularUI(modelKey, href, patchUpdateModelOption(fetchOptions)),
+        );
       };
 
       // Check if current model needs a reload
@@ -78,7 +103,10 @@ const modularUIConnector = (
       useEffect(() => {
         if (doReload) {
           dispatch(
-            loadModularUI(modelKey, url, { ...otherOptions, isReload: true }),
+            loadModularUI(modelKey, url, {
+              ...patchUpdateModelOption(otherOptions),
+              isReload: true,
+            }),
           );
         }
       }, [dispatch, doReload, url, modelKey]);

package/lib/redux/_modularui/ModularUIConnector.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModularUIConnector.js","names":["_react","require","_reactRedux","_reactRouter","_ModularUIActions","_Href","_interopRequireDefault","_utils","_ModularUIUtils","_useModularUI","_useI18n","_jsxRuntime","modularUIConnector","name","resource","options","arguments","length","undefined","propName","removeOnUnmount","otherOptions","Component","WrappedComponent","props","dispatch","useDispatch","location","useLocation","url","useUrl","displayName","getDisplayName","contextId","modelEntry","useModularUI","modelKey","model","connectKey","handleManualReload","reloadOptions","reloadModel","handleFetch","href","fetchOptions","loadModularUI","reload","state","doReload","useReload","useEffect","isReload","removeModelByKey","locale","useLocale","newProps","status","lastModification","hasModel","Boolean","fetchModularUI","jsx","_default","exports","default"],"sources":["../../../src/redux/_modularui/ModularUIConnector.js"],"sourcesContent":["// @flow\nimport { useEffect } from \"react\";\nimport { useDispatch } from \"react-redux\";\nimport { useLocation } from \"react-router\";\n\nimport {\n  loadModularUI,\n  reloadModel,\n  removeModelByKey,\n} from \"./ModularUIActions\";\n\nimport Href from \"../../models/href/Href\";\nimport { getDisplayName } from \"../../react/utils\";\n\nimport { useUrl, useReload } from \"./ModularUIUtils\";\nimport { useModularUI } from \"../../hooks/useModularUI\";\nimport { useLocale } from \"../../hooks/useI18n\";\n\nimport type { ComponentType, Node } from \"react\";\nimport type { Location } from \"react-router\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { ModularUIOptions } from \"./types\";\n\nexport type InjectedProps = {\n  +modelKey: string,\n  +location: Location,\n  +status: string | null,\n  +lastModification: number | null,\n  +hasModel: boolean,\n  +locale: string,\n  +fetchModularUI: (href: string | Href, fetchOptions: Object) => void,\n  +reloadModel: (model: ModularUIModel, options: Object) => void,\n  +data?: ?ModularUIModel,\n};\n\n/**\n */\nconst modularUIConnector = (\n  name: string,\n  resource: string | Function,\n  options: ModularUIOptions = { propName: \"data\", removeOnUnmount: false },\n): ((Component: ComponentType<any>) => (props: any) => Node) => {\n  const {\n    propName = \"data\",\n    removeOnUnmount = false,\n    ...otherOptions\n  } = options;\n\n  return (Component: ComponentType<any>) => {\n    const WrappedComponent = (props: any) => {\n      const dispatch = useDispatch();\n      const location = useLocation();\n\n      const url = useUrl(resource, { location, ...props });\n      const displayName = getDisplayName(Component, name, props.contextId);\n\n      // Load the model through the useModUI hook\n      const modelEntry = useModularUI(displayName, url, otherOptions);\n      const modelKey = modelEntry?.model?.connectKey;\n\n      // handle manual reload of model\n      const handleManualReload = (\n        model: ModularUIModel,\n        reloadOptions?: Object,\n      ) => {\n        dispatch(reloadModel(model, reloadOptions));\n      };\n\n      // Provide connected models with a fetchModularUI method to be able\n      // to run the loadModularUI action from a handler / callback in the component\n      const handleFetch = (href: string | Href, fetchOptions: Object) => {\n        dispatch(loadModularUI(modelKey, href, fetchOptions));\n      };\n\n      // Check if current model needs a reload\n      const reload = location?.state?.reload ?? 0;\n      const doReload = useReload(modelEntry, reload);\n      useEffect(() => {\n        if (doReload) {\n          dispatch(\n            loadModularUI(modelKey, url, { ...otherOptions, isReload: true }),\n          );\n        }\n      }, [dispatch, doReload, url, modelKey]);\n\n      // Remove model when hoc unloads\n      useEffect(() => {\n        return () => {\n          if (removeOnUnmount) {\n            dispatch(removeModelByKey(modelKey));\n          }\n        };\n      }, [dispatch, modelKey]);\n\n      // Create new properties object to inject modularui properties to own props\n      const locale = useLocale();\n      const newProps: InjectedProps = {\n        modelKey,\n        [propName]: modelEntry ? modelEntry.model : null,\n        location,\n        status: modelEntry ? modelEntry.status : null,\n        lastModification: modelEntry ? modelEntry.lastModification : null,\n        hasModel: Boolean(modelEntry),\n        locale,\n        fetchModularUI: handleFetch,\n        reloadModel: handleManualReload,\n      };\n\n      return <Component {...props} {...newProps} />;\n    };\n\n    WrappedComponent.displayName = `BI.modularui(${getDisplayName(\n      WrappedComponent,\n      name,\n    )}`;\n\n    return WrappedComponent;\n  };\n};\n\nexport default modularUIConnector;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ModularUIConnector.js","names":["_react","require","_reactRedux","_reactRouter","_ModularUIActions","_Href","_interopRequireDefault","_utils","_ModularUIUtils","_useModularUI","_useI18n","_FormModel","_jsxRuntime","patchUpdateModelOption","oldOptions","updateModel","FormModel","updateHandler","newModel","clonedModel","clone","update","modularUIConnector","name","resource","options","arguments","length","undefined","propName","removeOnUnmount","otherOptions","Component","WrappedComponent","props","dispatch","useDispatch","location","useLocation","url","useUrl","displayName","getDisplayName","contextId","modelEntry","useModularUI","modelKey","model","connectKey","handleManualReload","reloadOptions","reloadModel","handleFetch","href","fetchOptions","loadModularUI","reload","state","doReload","useReload","useEffect","isReload","removeModelByKey","locale","useLocale","newProps","status","lastModification","hasModel","Boolean","fetchModularUI","jsx","_default","exports","default"],"sources":["../../../src/redux/_modularui/ModularUIConnector.js"],"sourcesContent":["// @flow\nimport { useEffect } from \"react\";\nimport { useDispatch } from \"react-redux\";\nimport { useLocation } from \"react-router\";\n\nimport {\n  loadModularUI,\n  reloadModel,\n  removeModelByKey,\n} from \"./ModularUIActions\";\n\nimport Href from \"../../models/href/Href\";\nimport { getDisplayName } from \"../../react/utils\";\n\nimport { useUrl, useReload } from \"./ModularUIUtils\";\nimport { useModularUI } from \"../../hooks/useModularUI\";\nimport { useLocale } from \"../../hooks/useI18n\";\n\nimport type { ComponentType, Node } from \"react\";\nimport type { Location } from \"react-router\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { ModularUIOptions } from \"./types\";\nimport FormModel from \"../../models/form/FormModel\";\n\nexport type InjectedProps = {\n  +modelKey: string,\n  +location: Location,\n  +status: string | null,\n  +lastModification: number | null,\n  +hasModel: boolean,\n  +locale: string,\n  +fetchModularUI: (href: string | Href, fetchOptions: Object) => void,\n  +reloadModel: (model: ModularUIModel, options: Object) => void,\n  +data?: ?ModularUIModel,\n};\n\nconst patchUpdateModelOption = (oldOptions: Object) => {\n  if (\n    \"updateModel\" in oldOptions &&\n    oldOptions.updateModel instanceof FormModel\n  ) {\n    return {\n      ...oldOptions,\n      updateHandler: (newModel: ModularUIModel): ModularUIModel => {\n        if (newModel instanceof FormModel) {\n          // $FLowFixMe\n          const clonedModel: FormModel = oldOptions.updateModel.clone();\n          clonedModel.update(newModel);\n          return clonedModel;\n        }\n        return newModel;\n      },\n    };\n  }\n\n  return oldOptions;\n};\n\n/**\n */\nconst modularUIConnector = (\n  name: string,\n  resource: string | Function,\n  options: ModularUIOptions = { propName: \"data\", removeOnUnmount: false },\n): ((Component: ComponentType<any>) => (props: any) => Node) => {\n  const {\n    propName = \"data\",\n    removeOnUnmount = false,\n    ...otherOptions\n  } = options;\n\n  return (Component: ComponentType<any>) => {\n    const WrappedComponent = (props: any) => {\n      const dispatch = useDispatch();\n      const location = useLocation();\n\n      const url = useUrl(resource, { location, ...props });\n      const displayName = getDisplayName(Component, name, props.contextId);\n\n      // Load the model through the useModUI hook\n      const modelEntry = useModularUI(displayName, url, otherOptions);\n      const modelKey = modelEntry?.model?.connectKey;\n\n      // handle manual reload of model\n      const handleManualReload = (\n        model: ModularUIModel,\n        reloadOptions?: Object,\n      ) => {\n        dispatch(reloadModel(model, reloadOptions));\n      };\n\n      // Provide connected models with a fetchModularUI method to be able\n      // to run the loadModularUI action from a handler / callback in the component\n      const handleFetch = (href: string | Href, fetchOptions: Object) => {\n        dispatch(\n          loadModularUI(modelKey, href, patchUpdateModelOption(fetchOptions)),\n        );\n      };\n\n      // Check if current model needs a reload\n      const reload = location?.state?.reload ?? 0;\n      const doReload = useReload(modelEntry, reload);\n      useEffect(() => {\n        if (doReload) {\n          dispatch(\n            loadModularUI(modelKey, url, {\n              ...patchUpdateModelOption(otherOptions),\n              isReload: true,\n            }),\n          );\n        }\n      }, [dispatch, doReload, url, modelKey]);\n\n      // Remove model when hoc unloads\n      useEffect(() => {\n        return () => {\n          if (removeOnUnmount) {\n            dispatch(removeModelByKey(modelKey));\n          }\n        };\n      }, [dispatch, modelKey]);\n\n      // Create new properties object to inject modularui properties to own props\n      const locale = useLocale();\n      const newProps: InjectedProps = {\n        modelKey,\n        [propName]: modelEntry ? modelEntry.model : null,\n        location,\n        status: modelEntry ? modelEntry.status : null,\n        lastModification: modelEntry ? modelEntry.lastModification : null,\n        hasModel: Boolean(modelEntry),\n        locale,\n        fetchModularUI: handleFetch,\n        reloadModel: handleManualReload,\n      };\n\n      return <Component {...props} {...newProps} />;\n    };\n\n    WrappedComponent.displayName = `BI.modularui(${getDisplayName(\n      WrappedComponent,\n      name,\n    )}`;\n\n    return WrappedComponent;\n  };\n};\n\nexport default modularUIConnector;\n"],"mappings":"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","ignoreList":[]}

package/package.json

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

package/src/models/attributes/BooleanAttributeModel.js

@@ -246,13 +246,13 @@ export default class BooleanAttributeModel extends AttributeModel {
 
     this.updateLastModification();
 
-    let values;
+    let values = [];
 
     if (Array.isArray(value)) {
       values = value;
     } else if (typeof value === "string" && this.isMultiple) {
       values = value.split(",");
-    } else {
+    } else if (value != null) {
       values = [value.toString()];
     }
 

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

@@ -59,6 +59,14 @@ describe("booleanAttributeModel", () => {
     expect(attribute.inputvalue).toBe("false");
 
     expect(attribute.getFormData()).toStrictEqual({ boolean: false });
+
+    attribute.enableOption("true");
+    attribute.update(null);
+    expect(attribute.inputvalue).toBe("true");
+
+    attribute.update("false");
+    attribute.update(null);
+    expect(attribute.inputvalue).toBe("false");
   });
 
   it("handles update empty string", () => {

package/src/redux/_modularui/ModularUIConnector.js

@@ -20,6 +20,7 @@ import type { ComponentType, Node } from "react";
 import type { Location } from "react-router";
 import type { ModularUIModel } from "../../models/types";
 import type { ModularUIOptions } from "./types";
+import FormModel from "../../models/form/FormModel";
 
 export type InjectedProps = {
   +modelKey: string,
@@ -33,6 +34,28 @@ export type InjectedProps = {
   +data?: ?ModularUIModel,
 };
 
+const patchUpdateModelOption = (oldOptions: Object) => {
+  if (
+    "updateModel" in oldOptions &&
+    oldOptions.updateModel instanceof FormModel
+  ) {
+    return {
+      ...oldOptions,
+      updateHandler: (newModel: ModularUIModel): ModularUIModel => {
+        if (newModel instanceof FormModel) {
+          // $FLowFixMe
+          const clonedModel: FormModel = oldOptions.updateModel.clone();
+          clonedModel.update(newModel);
+          return clonedModel;
+        }
+        return newModel;
+      },
+    };
+  }
+
+  return oldOptions;
+};
+
 /**
  */
 const modularUIConnector = (
@@ -69,7 +92,9 @@ const modularUIConnector = (
       // Provide connected models with a fetchModularUI method to be able
       // to run the loadModularUI action from a handler / callback in the component
       const handleFetch = (href: string | Href, fetchOptions: Object) => {
-        dispatch(loadModularUI(modelKey, href, fetchOptions));
+        dispatch(
+          loadModularUI(modelKey, href, patchUpdateModelOption(fetchOptions)),
+        );
       };
 
       // Check if current model needs a reload
@@ -78,7 +103,10 @@ const modularUIConnector = (
       useEffect(() => {
         if (doReload) {
           dispatch(
-            loadModularUI(modelKey, url, { ...otherOptions, isReload: true }),
+            loadModularUI(modelKey, url, {
+              ...patchUpdateModelOption(otherOptions),
+              isReload: true,
+            }),
           );
         }
       }, [dispatch, doReload, url, modelKey]);