@beinformed/ui 1.22.1 → 1.23.1

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.23.1](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.23.0...v1.23.1) (2022-09-26)
+
+
+### Bug Fixes
+
+* **DependentAttribute:** DependentAttribute extended to work with empty and not empty attribute value ([9cf3864](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/9cf38644e032b0cfea0e8a8561baa2ca7aa9eb49))
+
+## [1.23.0](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.22.1...v1.23.0) (2022-09-22)
+
+
+### Features
+
+* **DependentAttribute:** DependentAttribute extended to work with empty and not empty attribute value ([73473cf](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/73473cff35ca5c7974a3800df5e49bdb1a9031ea))
+
 ### [1.22.1](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.22.0...v1.22.1) (2022-09-07)
 
 ## [1.22.0](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.21.7...v1.22.0) (2022-09-05)

package/esm/models/attributes/layouthint-rules/DependentAttribute.js

@@ -12,6 +12,8 @@ const EQUALS = "equals";
 const INCLUDES = "includes";
 const NOT_EQUALS = "notEquals";
 const NOT_INCLUDES = "notIncludes";
+const NOT_IS_EMPTY = "notIsEmpty";
+const IS_EMPTY = "isEmpty";
 const SHOW = "show";
 const HIDE = "hide";
 /**
@@ -52,20 +54,21 @@ class DependentAttribute extends BaseLayoutHintRule {
 
 
   static initHint(hint) {
-    var _context3, _context4, _context5, _context6;
+    var _context3, _context4, _context5, _context6, _context7, _context8, _context9, _context10;
 
     const rule = this.getRuleInstance();
 
-    const OPERATORS = _concatInstanceProperty(_context3 = _concatInstanceProperty(_context4 = "".concat(EQUALS, "|").concat(INCLUDES, "|")).call(_context4, NOT_EQUALS, "|")).call(_context3, NOT_INCLUDES);
+    const OPERATORS = _concatInstanceProperty(_context3 = _concatInstanceProperty(_context4 = _concatInstanceProperty(_context5 = _concatInstanceProperty(_context6 = "".concat(EQUALS, "|").concat(INCLUDES, "|")).call(_context6, NOT_EQUALS, "|")).call(_context5, NOT_INCLUDES, "|")).call(_context4, NOT_IS_EMPTY, "|")).call(_context3, IS_EMPTY);
 
-    const regex = new RegExp(_concatInstanceProperty(_context5 = _concatInstanceProperty(_context6 = "".concat(DEPENDENT_ATTRIBUTE, "\\s?(\\S*)\\swhen ")).call(_context6, DEPENDENT_ATTRIBUTE_CONTROL, ":\\s?(.*?)\\s*(")).call(_context5, OPERATORS, ")\\s(.*)"), "i");
-    const result = hint.match(regex);
+    const regex = new RegExp(_concatInstanceProperty(_context7 = _concatInstanceProperty(_context8 = "".concat(DEPENDENT_ATTRIBUTE, "\\s?(\\S*)\\swhen ")).call(_context8, DEPENDENT_ATTRIBUTE_CONTROL, ":\\s?(.*?)\\s*(")).call(_context7, OPERATORS, ")\\s(.*)"), "i");
+    const isEmpyNotIsEmptRegex = new RegExp(_concatInstanceProperty(_context9 = _concatInstanceProperty(_context10 = "".concat(DEPENDENT_ATTRIBUTE, "\\s?(\\S*)\\swhen ")).call(_context10, DEPENDENT_ATTRIBUTE_CONTROL, ":\\s?(.*?)\\s*(")).call(_context9, OPERATORS, ")"), "i");
+    const result = hint.match(regex) ? hint.match(regex) : hint.match(isEmpyNotIsEmptRegex);
 
     if (result) {
       rule.action = result[1];
       rule.control = result[2];
       rule.operator = result[3];
-      rule.options = result[4];
+      rule.options = !result[4] ? "" : result[4];
     } else {
       throw new ConfigurationException("No dependent information found on layout hint: ".concat(hint));
     }
@@ -126,9 +129,9 @@ class DependentAttribute extends BaseLayoutHintRule {
 
 
   set options(options) {
-    var _context7;
+    var _context11;
 
-    this._options = _mapInstanceProperty(_context7 = options.split("|")).call(_context7, option => _trimInstanceProperty(option).call(option));
+    this._options = _mapInstanceProperty(_context11 = options.split("|")).call(_context11, option => _trimInstanceProperty(option).call(option));
   }
   /**
    */
@@ -137,9 +140,9 @@ class DependentAttribute extends BaseLayoutHintRule {
   processEqualsOptions(controlAttribute) {
     if (controlAttribute instanceof ChoiceAttributeModel || controlAttribute instanceof BooleanAttributeModel) {
       return this.options.every(option => {
-        var _context8;
+        var _context12;
 
-        return _includesInstanceProperty(_context8 = controlAttribute.selected).call(_context8, option);
+        return _includesInstanceProperty(_context12 = controlAttribute.selected).call(_context12, option);
       });
     }
 
@@ -152,9 +155,9 @@ class DependentAttribute extends BaseLayoutHintRule {
   processIncludesOptions(controlAttribute) {
     if (controlAttribute instanceof ChoiceAttributeModel) {
       return this.options.some(option => {
-        var _context9;
+        var _context13;
 
-        return _includesInstanceProperty(_context9 = controlAttribute.selected).call(_context9, option);
+        return _includesInstanceProperty(_context13 = controlAttribute.selected).call(_context13, option);
       });
     }
 
@@ -178,6 +181,12 @@ class DependentAttribute extends BaseLayoutHintRule {
       case NOT_INCLUDES:
         return !this.processIncludesOptions(controlAttribute);
 
+      case NOT_IS_EMPTY:
+        return (controlAttribute === null || controlAttribute === void 0 ? void 0 : controlAttribute.selected.length) !== 0;
+
+      case IS_EMPTY:
+        return (controlAttribute === null || controlAttribute === void 0 ? void 0 : controlAttribute.selected.length) === 0;
+
       default:
         throw new ConfigurationException("Unsupported operator for dependent question: ".concat(this.operator));
     }
@@ -187,9 +196,9 @@ class DependentAttribute extends BaseLayoutHintRule {
 
 
   getControlAttribute(attributes) {
-    var _context10, _context11;
+    var _context14, _context15;
 
-    const attribute = attributes.getAttributeByLayoutHint(_concatInstanceProperty(_context10 = "".concat(DEPENDENT_ATTRIBUTE_CONTROL, ":")).call(_context10, this.control), _concatInstanceProperty(_context11 = "".concat(DEPENDENT_ATTRIBUTE_CONTROL, ": ")).call(_context11, this.control));
+    const attribute = attributes.getAttributeByLayoutHint(_concatInstanceProperty(_context14 = "".concat(DEPENDENT_ATTRIBUTE_CONTROL, ":")).call(_context14, this.control), _concatInstanceProperty(_context15 = "".concat(DEPENDENT_ATTRIBUTE_CONTROL, ": ")).call(_context15, this.control));
 
     if (attribute instanceof ChoiceAttributeModel || attribute instanceof BooleanAttributeModel) {
       return attribute;
@@ -222,9 +231,9 @@ class DependentAttribute extends BaseLayoutHintRule {
     } else if (this.action === HIDE) {
       attribute.isHidden = result;
     } else {
-      var _context12;
+      var _context16;
 
-      throw new ConfigurationException(_concatInstanceProperty(_context12 = "Unsupported action ".concat(this.action, " for dependent question on attribute: ")).call(_context12, attribute.label));
+      throw new ConfigurationException(_concatInstanceProperty(_context16 = "Unsupported action ".concat(this.action, " for dependent question on attribute: ")).call(_context16, attribute.label));
     }
   }
 

package/esm/models/attributes/layouthint-rules/DependentAttribute.js.map

@@ -1 +1 @@
-{"version":3,"file":"DependentAttribute.js","names":["BaseLayoutHintRule","DEPENDENT_ATTRIBUTE_CONTROL","DEPENDENT_ATTRIBUTE","ChoiceAttributeModel","BooleanAttributeModel","ConfigurationException","EQUALS","INCLUDES","NOT_EQUALS","NOT_INCLUDES","SHOW","HIDE","DependentAttribute","isApplicableForHint","hint","regex","RegExp","test","getRuleInstance","initHint","rule","OPERATORS","result","match","action","control","operator","options","_action","_control","_operator","_options","split","option","processEqualsOptions","controlAttribute","every","selected","processIncludesOptions","some","handleOperator","getControlAttribute","attributes","attribute","getAttributeByLayoutHint","process","processLayoutHintRules","isHidden","hide","label"],"sources":["../../../../src/models/attributes/layouthint-rules/DependentAttribute.js"],"sourcesContent":["// @flow\nimport BaseLayoutHintRule from \"./BaseLayoutHintRule\";\n\nimport {\n  DEPENDENT_ATTRIBUTE_CONTROL,\n  DEPENDENT_ATTRIBUTE,\n} from \"../../../constants\";\n\nimport ChoiceAttributeModel from \"../ChoiceAttributeModel\";\nimport BooleanAttributeModel from \"../BooleanAttributeModel\";\n\nimport { ConfigurationException } from \"../../../exceptions\";\n\nimport type AttributeCollection from \"../AttributeCollection\";\nimport type AttributeModel from \"../AttributeModel\";\n\nconst EQUALS = \"equals\";\nconst INCLUDES = \"includes\";\nconst NOT_EQUALS = \"notEquals\";\nconst NOT_INCLUDES = \"notIncludes\";\n\nconst SHOW = \"show\";\nconst HIDE = \"hide\";\n\n/**\n * Depending attributes hint logic\n */\nclass DependentAttribute extends BaseLayoutHintRule {\n  _action: string;\n  _control: string;\n  _operator: string;\n  _options: Array<string>;\n\n  /**\n   */\n  static checkHintApplicability: boolean = true;\n\n  /**\n   */\n  static isApplicableForHint(hint: string): boolean {\n    const regex = new RegExp(\n      `^${DEPENDENT_ATTRIBUTE}\\\\s?(${SHOW}|${HIDE})`,\n      \"i\"\n    );\n\n    return regex.test(hint);\n  }\n\n  /**\n   * Used on initHint to create an instance of this rule\n   */\n  static getRuleInstance(): DependentAttribute {\n    return new DependentAttribute();\n  }\n\n  /**\n   */\n  static initHint(hint: string): any {\n    const rule = this.getRuleInstance();\n\n    const OPERATORS = `${EQUALS}|${INCLUDES}|${NOT_EQUALS}|${NOT_INCLUDES}`;\n    const regex = new RegExp(\n      `${DEPENDENT_ATTRIBUTE}\\\\s?(\\\\S*)\\\\swhen ${DEPENDENT_ATTRIBUTE_CONTROL}:\\\\s?(.*?)\\\\s*(${OPERATORS})\\\\s(.*)`,\n      \"i\"\n    );\n\n    const result = hint.match(regex);\n    if (result) {\n      rule.action = result[1];\n      rule.control = result[2];\n      rule.operator = result[3];\n      rule.options = result[4];\n    } else {\n      throw new ConfigurationException(\n        `No dependent information found on layout hint: ${hint}`\n      );\n    }\n\n    return rule;\n  }\n\n  /**\n   */\n  get action(): string {\n    return this._action;\n  }\n\n  /**\n   */\n  set action(action: string) {\n    this._action = action;\n  }\n\n  /**\n   */\n  get control(): string {\n    return this._control;\n  }\n\n  /**\n   */\n  set control(control: string) {\n    this._control = control;\n  }\n\n  /**\n   */\n  get operator(): string {\n    return this._operator;\n  }\n\n  /**\n   */\n  set operator(operator: string) {\n    this._operator = operator;\n  }\n\n  /**\n   */\n  get options(): Array<string> {\n    return this._options;\n  }\n\n  /**\n   */\n  set options(options: string): void {\n    this._options = options.split(\"|\").map((option) => option.trim());\n  }\n\n  /**\n   */\n  processEqualsOptions(\n    controlAttribute: ChoiceAttributeModel | BooleanAttributeModel\n  ): boolean {\n    if (\n      controlAttribute instanceof ChoiceAttributeModel ||\n      controlAttribute instanceof BooleanAttributeModel\n    ) {\n      return this.options.every((option) =>\n        controlAttribute.selected.includes(option)\n      );\n    }\n\n    throw new ConfigurationException(\n      \"Dependent control in combination with equals operator must be a choice, string or number attribute\"\n    );\n  }\n\n  /**\n   */\n  processIncludesOptions(\n    controlAttribute: ChoiceAttributeModel | BooleanAttributeModel\n  ): boolean {\n    if (controlAttribute instanceof ChoiceAttributeModel) {\n      return this.options.some((option) =>\n        controlAttribute.selected.includes(option)\n      );\n    }\n\n    throw new ConfigurationException(\n      \"Dependent control in combination with includes operator must be a choice attribute\"\n    );\n  }\n\n  /**\n   */\n  handleOperator(\n    controlAttribute: ChoiceAttributeModel | BooleanAttributeModel\n  ): boolean {\n    switch (this.operator) {\n      case EQUALS:\n        return this.processEqualsOptions(controlAttribute);\n      case INCLUDES:\n        return this.processIncludesOptions(controlAttribute);\n      case NOT_EQUALS:\n        return !this.processEqualsOptions(controlAttribute);\n      case NOT_INCLUDES:\n        return !this.processIncludesOptions(controlAttribute);\n      default:\n        throw new ConfigurationException(\n          `Unsupported operator for dependent question: ${this.operator}`\n        );\n    }\n  }\n\n  /**\n   */\n  getControlAttribute(\n    attributes: AttributeCollection\n  ): ChoiceAttributeModel | BooleanAttributeModel | null {\n    const attribute = attributes.getAttributeByLayoutHint(\n      `${DEPENDENT_ATTRIBUTE_CONTROL}:${this.control}`,\n      `${DEPENDENT_ATTRIBUTE_CONTROL}: ${this.control}`\n    );\n\n    if (\n      attribute instanceof ChoiceAttributeModel ||\n      attribute instanceof BooleanAttributeModel\n    ) {\n      return attribute;\n    }\n\n    return null;\n  }\n\n  /**\n   */\n  process(attribute: AttributeModel, attributes: AttributeCollection) {\n    const controlAttribute = this.getControlAttribute(attributes);\n    if (!controlAttribute) {\n      return;\n    }\n\n    controlAttribute.processLayoutHintRules(attributes);\n    if (controlAttribute.isHidden) {\n      attribute.hide();\n      return;\n    }\n\n    const result = this.handleOperator(controlAttribute);\n    if (this.action === SHOW) {\n      attribute.isHidden = !result;\n    } else if (this.action === HIDE) {\n      attribute.isHidden = result;\n    } else {\n      throw new ConfigurationException(\n        `Unsupported action ${this.action} for dependent question on attribute: ${attribute.label}`\n      );\n    }\n  }\n}\n\nexport default DependentAttribute;\n"],"mappings":";;;;;AACA,OAAOA,kBAAP,MAA+B,sBAA/B;AAEA,SACEC,2BADF,EAEEC,mBAFF,QAGO,oBAHP;AAKA,OAAOC,oBAAP,MAAiC,yBAAjC;AACA,OAAOC,qBAAP,MAAkC,0BAAlC;AAEA,SAASC,sBAAT,QAAuC,qBAAvC;AAKA,MAAMC,MAAM,GAAG,QAAf;AACA,MAAMC,QAAQ,GAAG,UAAjB;AACA,MAAMC,UAAU,GAAG,WAAnB;AACA,MAAMC,YAAY,GAAG,aAArB;AAEA,MAAMC,IAAI,GAAG,MAAb;AACA,MAAMC,IAAI,GAAG,MAAb;AAEA;AACA;AACA;;AACA,MAAMC,kBAAN,SAAiCZ,kBAAjC,CAAoD;EAAA;IAAA;;IAAA;;IAAA;;IAAA;;IAAA;EAAA;;EAUlD;AACF;EAC4B,OAAnBa,mBAAmB,CAACC,IAAD,EAAwB;IAAA;;IAChD,MAAMC,KAAK,GAAG,IAAIC,MAAJ,mFACRd,mBADQ,4BACmBQ,IADnB,uBAC2BC,IAD3B,QAEZ,GAFY,CAAd;IAKA,OAAOI,KAAK,CAACE,IAAN,CAAWH,IAAX,CAAP;EACD;EAED;AACF;AACA;;;EACwB,OAAfI,eAAe,GAAuB;IAC3C,OAAO,IAAIN,kBAAJ,EAAP;EACD;EAED;AACF;;;EACiB,OAARO,QAAQ,CAACL,IAAD,EAAoB;IAAA;;IACjC,MAAMM,IAAI,GAAG,KAAKF,eAAL,EAAb;;IAEA,MAAMG,SAAS,qFAAMf,MAAN,cAAgBC,QAAhB,wBAA4BC,UAA5B,wBAA0CC,YAA1C,CAAf;;IACA,MAAMM,KAAK,GAAG,IAAIC,MAAJ,mFACTd,mBADS,yCAC+BD,2BAD/B,sCAC4EoB,SAD5E,eAEZ,GAFY,CAAd;IAKA,MAAMC,MAAM,GAAGR,IAAI,CAACS,KAAL,CAAWR,KAAX,CAAf;;IACA,IAAIO,MAAJ,EAAY;MACVF,IAAI,CAACI,MAAL,GAAcF,MAAM,CAAC,CAAD,CAApB;MACAF,IAAI,CAACK,OAAL,GAAeH,MAAM,CAAC,CAAD,CAArB;MACAF,IAAI,CAACM,QAAL,GAAgBJ,MAAM,CAAC,CAAD,CAAtB;MACAF,IAAI,CAACO,OAAL,GAAeL,MAAM,CAAC,CAAD,CAArB;IACD,CALD,MAKO;MACL,MAAM,IAAIjB,sBAAJ,0DAC8CS,IAD9C,EAAN;IAGD;;IAED,OAAOM,IAAP;EACD;EAED;AACF;;;EACY,IAANI,MAAM,GAAW;IACnB,OAAO,KAAKI,OAAZ;EACD;EAED;AACF;;;EACY,IAANJ,MAAM,CAACA,MAAD,EAAiB;IACzB,KAAKI,OAAL,GAAeJ,MAAf;EACD;EAED;AACF;;;EACa,IAAPC,OAAO,GAAW;IACpB,OAAO,KAAKI,QAAZ;EACD;EAED;AACF;;;EACa,IAAPJ,OAAO,CAACA,OAAD,EAAkB;IAC3B,KAAKI,QAAL,GAAgBJ,OAAhB;EACD;EAED;AACF;;;EACc,IAARC,QAAQ,GAAW;IACrB,OAAO,KAAKI,SAAZ;EACD;EAED;AACF;;;EACc,IAARJ,QAAQ,CAACA,QAAD,EAAmB;IAC7B,KAAKI,SAAL,GAAiBJ,QAAjB;EACD;EAED;AACF;;;EACa,IAAPC,OAAO,GAAkB;IAC3B,OAAO,KAAKI,QAAZ;EACD;EAED;AACF;;;EACa,IAAPJ,OAAO,CAACA,OAAD,EAAwB;IAAA;;IACjC,KAAKI,QAAL,GAAgB,iCAAAJ,OAAO,CAACK,KAAR,CAAc,GAAd,mBAAwBC,MAAD,IAAY,sBAAAA,MAAM,MAAN,CAAAA,MAAM,CAAzC,CAAhB;EACD;EAED;AACF;;;EACEC,oBAAoB,CAClBC,gBADkB,EAET;IACT,IACEA,gBAAgB,YAAYhC,oBAA5B,IACAgC,gBAAgB,YAAY/B,qBAF9B,EAGE;MACA,OAAO,KAAKuB,OAAL,CAAaS,KAAb,CAAoBH,MAAD;QAAA;;QAAA,OACxB,sCAAAE,gBAAgB,CAACE,QAAjB,kBAAmCJ,MAAnC,CADwB;MAAA,CAAnB,CAAP;IAGD;;IAED,MAAM,IAAI5B,sBAAJ,CACJ,oGADI,CAAN;EAGD;EAED;AACF;;;EACEiC,sBAAsB,CACpBH,gBADoB,EAEX;IACT,IAAIA,gBAAgB,YAAYhC,oBAAhC,EAAsD;MACpD,OAAO,KAAKwB,OAAL,CAAaY,IAAb,CAAmBN,MAAD;QAAA;;QAAA,OACvB,sCAAAE,gBAAgB,CAACE,QAAjB,kBAAmCJ,MAAnC,CADuB;MAAA,CAAlB,CAAP;IAGD;;IAED,MAAM,IAAI5B,sBAAJ,CACJ,oFADI,CAAN;EAGD;EAED;AACF;;;EACEmC,cAAc,CACZL,gBADY,EAEH;IACT,QAAQ,KAAKT,QAAb;MACE,KAAKpB,MAAL;QACE,OAAO,KAAK4B,oBAAL,CAA0BC,gBAA1B,CAAP;;MACF,KAAK5B,QAAL;QACE,OAAO,KAAK+B,sBAAL,CAA4BH,gBAA5B,CAAP;;MACF,KAAK3B,UAAL;QACE,OAAO,CAAC,KAAK0B,oBAAL,CAA0BC,gBAA1B,CAAR;;MACF,KAAK1B,YAAL;QACE,OAAO,CAAC,KAAK6B,sBAAL,CAA4BH,gBAA5B,CAAR;;MACF;QACE,MAAM,IAAI9B,sBAAJ,wDAC4C,KAAKqB,QADjD,EAAN;IAVJ;EAcD;EAED;AACF;;;EACEe,mBAAmB,CACjBC,UADiB,EAEoC;IAAA;;IACrD,MAAMC,SAAS,GAAGD,UAAU,CAACE,wBAAX,gDACb3C,2BADa,yBACkB,KAAKwB,OADvB,kDAEbxB,2BAFa,0BAEmB,KAAKwB,OAFxB,EAAlB;;IAKA,IACEkB,SAAS,YAAYxC,oBAArB,IACAwC,SAAS,YAAYvC,qBAFvB,EAGE;MACA,OAAOuC,SAAP;IACD;;IAED,OAAO,IAAP;EACD;EAED;AACF;;;EACEE,OAAO,CAACF,SAAD,EAA4BD,UAA5B,EAA6D;IAClE,MAAMP,gBAAgB,GAAG,KAAKM,mBAAL,CAAyBC,UAAzB,CAAzB;;IACA,IAAI,CAACP,gBAAL,EAAuB;MACrB;IACD;;IAEDA,gBAAgB,CAACW,sBAAjB,CAAwCJ,UAAxC;;IACA,IAAIP,gBAAgB,CAACY,QAArB,EAA+B;MAC7BJ,SAAS,CAACK,IAAV;MACA;IACD;;IAED,MAAM1B,MAAM,GAAG,KAAKkB,cAAL,CAAoBL,gBAApB,CAAf;;IACA,IAAI,KAAKX,MAAL,KAAgBd,IAApB,EAA0B;MACxBiC,SAAS,CAACI,QAAV,GAAqB,CAACzB,MAAtB;IACD,CAFD,MAEO,IAAI,KAAKE,MAAL,KAAgBb,IAApB,EAA0B;MAC/BgC,SAAS,CAACI,QAAV,GAAqBzB,MAArB;IACD,CAFM,MAEA;MAAA;;MACL,MAAM,IAAIjB,sBAAJ,mEACkB,KAAKmB,MADvB,8DACsEmB,SAAS,CAACM,KADhF,EAAN;IAGD;EACF;;AA1MiD;;gBAA9CrC,kB,4BAQqC,I;;AAqM3C,eAAeA,kBAAf"}
+{"version":3,"file":"DependentAttribute.js","names":["BaseLayoutHintRule","DEPENDENT_ATTRIBUTE_CONTROL","DEPENDENT_ATTRIBUTE","ChoiceAttributeModel","BooleanAttributeModel","ConfigurationException","EQUALS","INCLUDES","NOT_EQUALS","NOT_INCLUDES","NOT_IS_EMPTY","IS_EMPTY","SHOW","HIDE","DependentAttribute","isApplicableForHint","hint","regex","RegExp","test","getRuleInstance","initHint","rule","OPERATORS","isEmpyNotIsEmptRegex","result","match","action","control","operator","options","_action","_control","_operator","_options","split","option","processEqualsOptions","controlAttribute","every","selected","processIncludesOptions","some","handleOperator","length","getControlAttribute","attributes","attribute","getAttributeByLayoutHint","process","processLayoutHintRules","isHidden","hide","label"],"sources":["../../../../src/models/attributes/layouthint-rules/DependentAttribute.js"],"sourcesContent":["// @flow\nimport BaseLayoutHintRule from \"./BaseLayoutHintRule\";\n\nimport {\n  DEPENDENT_ATTRIBUTE_CONTROL,\n  DEPENDENT_ATTRIBUTE,\n} from \"../../../constants\";\n\nimport ChoiceAttributeModel from \"../ChoiceAttributeModel\";\nimport BooleanAttributeModel from \"../BooleanAttributeModel\";\n\nimport { ConfigurationException } from \"../../../exceptions\";\n\nimport type AttributeCollection from \"../AttributeCollection\";\nimport type AttributeModel from \"../AttributeModel\";\n\nconst EQUALS = \"equals\";\nconst INCLUDES = \"includes\";\nconst NOT_EQUALS = \"notEquals\";\nconst NOT_INCLUDES = \"notIncludes\";\nconst NOT_IS_EMPTY = \"notIsEmpty\";\nconst IS_EMPTY = \"isEmpty\";\n\nconst SHOW = \"show\";\nconst HIDE = \"hide\";\n\n/**\n * Depending attributes hint logic\n */\nclass DependentAttribute extends BaseLayoutHintRule {\n  _action: string;\n  _control: string;\n  _operator: string;\n  _options: Array<string>;\n\n  /**\n   */\n  static checkHintApplicability: boolean = true;\n\n  /**\n   */\n  static isApplicableForHint(hint: string): boolean {\n    const regex = new RegExp(\n      `^${DEPENDENT_ATTRIBUTE}\\\\s?(${SHOW}|${HIDE})`,\n      \"i\"\n    );\n\n    return regex.test(hint);\n  }\n\n  /**\n   * Used on initHint to create an instance of this rule\n   */\n  static getRuleInstance(): DependentAttribute {\n    return new DependentAttribute();\n  }\n\n  /**\n   */\n  static initHint(hint: string): any {\n    const rule = this.getRuleInstance();\n\n    const OPERATORS = `${EQUALS}|${INCLUDES}|${NOT_EQUALS}|${NOT_INCLUDES}|${NOT_IS_EMPTY}|${IS_EMPTY}`;\n    const regex = new RegExp(\n      `${DEPENDENT_ATTRIBUTE}\\\\s?(\\\\S*)\\\\swhen ${DEPENDENT_ATTRIBUTE_CONTROL}:\\\\s?(.*?)\\\\s*(${OPERATORS})\\\\s(.*)`,\n      \"i\"\n    );\n    const isEmpyNotIsEmptRegex = new RegExp(\n      `${DEPENDENT_ATTRIBUTE}\\\\s?(\\\\S*)\\\\swhen ${DEPENDENT_ATTRIBUTE_CONTROL}:\\\\s?(.*?)\\\\s*(${OPERATORS})`,\n      \"i\"\n    );\n\n    const result = hint.match(regex)\n      ? hint.match(regex)\n      : hint.match(isEmpyNotIsEmptRegex);\n\n    if (result) {\n      rule.action = result[1];\n      rule.control = result[2];\n      rule.operator = result[3];\n      rule.options = !result[4] ? \"\" : result[4];\n    } else {\n      throw new ConfigurationException(\n        `No dependent information found on layout hint: ${hint}`\n      );\n    }\n\n    return rule;\n  }\n\n  /**\n   */\n  get action(): string {\n    return this._action;\n  }\n\n  /**\n   */\n  set action(action: string) {\n    this._action = action;\n  }\n\n  /**\n   */\n  get control(): string {\n    return this._control;\n  }\n\n  /**\n   */\n  set control(control: string) {\n    this._control = control;\n  }\n\n  /**\n   */\n  get operator(): string {\n    return this._operator;\n  }\n\n  /**\n   */\n  set operator(operator: string) {\n    this._operator = operator;\n  }\n\n  /**\n   */\n  get options(): Array<string> {\n    return this._options;\n  }\n\n  /**\n   */\n  set options(options: string): void {\n    this._options = options.split(\"|\").map((option) => option.trim());\n  }\n\n  /**\n   */\n  processEqualsOptions(\n    controlAttribute: ChoiceAttributeModel | BooleanAttributeModel\n  ): boolean {\n    if (\n      controlAttribute instanceof ChoiceAttributeModel ||\n      controlAttribute instanceof BooleanAttributeModel\n    ) {\n      return this.options.every((option) =>\n        controlAttribute.selected.includes(option)\n      );\n    }\n\n    throw new ConfigurationException(\n      \"Dependent control in combination with equals operator must be a choice, string or number attribute\"\n    );\n  }\n\n  /**\n   */\n  processIncludesOptions(\n    controlAttribute: ChoiceAttributeModel | BooleanAttributeModel\n  ): boolean {\n    if (controlAttribute instanceof ChoiceAttributeModel) {\n      return this.options.some((option) =>\n        controlAttribute.selected.includes(option)\n      );\n    }\n\n    throw new ConfigurationException(\n      \"Dependent control in combination with includes operator must be a choice attribute\"\n    );\n  }\n\n  /**\n   */\n  handleOperator(\n    controlAttribute: ChoiceAttributeModel | BooleanAttributeModel\n  ): boolean {\n    switch (this.operator) {\n      case EQUALS:\n        return this.processEqualsOptions(controlAttribute);\n      case INCLUDES:\n        return this.processIncludesOptions(controlAttribute);\n      case NOT_EQUALS:\n        return !this.processEqualsOptions(controlAttribute);\n      case NOT_INCLUDES:\n        return !this.processIncludesOptions(controlAttribute);\n      case NOT_IS_EMPTY:\n        return controlAttribute?.selected.length !== 0;\n      case IS_EMPTY:\n        return controlAttribute?.selected.length === 0;\n      default:\n        throw new ConfigurationException(\n          `Unsupported operator for dependent question: ${this.operator}`\n        );\n    }\n  }\n\n  /**\n   */\n  getControlAttribute(\n    attributes: AttributeCollection\n  ): ChoiceAttributeModel | BooleanAttributeModel | null {\n    const attribute = attributes.getAttributeByLayoutHint(\n      `${DEPENDENT_ATTRIBUTE_CONTROL}:${this.control}`,\n      `${DEPENDENT_ATTRIBUTE_CONTROL}: ${this.control}`\n    );\n\n    if (\n      attribute instanceof ChoiceAttributeModel ||\n      attribute instanceof BooleanAttributeModel\n    ) {\n      return attribute;\n    }\n\n    return null;\n  }\n\n  /**\n   */\n  process(attribute: AttributeModel, attributes: AttributeCollection) {\n    const controlAttribute = this.getControlAttribute(attributes);\n    if (!controlAttribute) {\n      return;\n    }\n\n    controlAttribute.processLayoutHintRules(attributes);\n    if (controlAttribute.isHidden) {\n      attribute.hide();\n      return;\n    }\n\n    const result = this.handleOperator(controlAttribute);\n    if (this.action === SHOW) {\n      attribute.isHidden = !result;\n    } else if (this.action === HIDE) {\n      attribute.isHidden = result;\n    } else {\n      throw new ConfigurationException(\n        `Unsupported action ${this.action} for dependent question on attribute: ${attribute.label}`\n      );\n    }\n  }\n}\n\nexport default DependentAttribute;\n"],"mappings":"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"}

package/lib/models/attributes/layouthint-rules/DependentAttribute.js

@@ -31,6 +31,8 @@ const EQUALS = "equals";
 const INCLUDES = "includes";
 const NOT_EQUALS = "notEquals";
 const NOT_INCLUDES = "notIncludes";
+const NOT_IS_EMPTY = "notIsEmpty";
+const IS_EMPTY = "isEmpty";
 const SHOW = "show";
 const HIDE = "hide";
 /**
@@ -67,18 +69,19 @@ class DependentAttribute extends _BaseLayoutHintRule.default {
 
 
   static initHint(hint) {
-    var _context3, _context4, _context5, _context6;
+    var _context3, _context4, _context5, _context6, _context7, _context8, _context9, _context10;
 
     const rule = this.getRuleInstance();
-    const OPERATORS = (0, _concat.default)(_context3 = (0, _concat.default)(_context4 = "".concat(EQUALS, "|").concat(INCLUDES, "|")).call(_context4, NOT_EQUALS, "|")).call(_context3, NOT_INCLUDES);
-    const regex = new RegExp((0, _concat.default)(_context5 = (0, _concat.default)(_context6 = "".concat(_constants.DEPENDENT_ATTRIBUTE, "\\s?(\\S*)\\swhen ")).call(_context6, _constants.DEPENDENT_ATTRIBUTE_CONTROL, ":\\s?(.*?)\\s*(")).call(_context5, OPERATORS, ")\\s(.*)"), "i");
-    const result = hint.match(regex);
+    const OPERATORS = (0, _concat.default)(_context3 = (0, _concat.default)(_context4 = (0, _concat.default)(_context5 = (0, _concat.default)(_context6 = "".concat(EQUALS, "|").concat(INCLUDES, "|")).call(_context6, NOT_EQUALS, "|")).call(_context5, NOT_INCLUDES, "|")).call(_context4, NOT_IS_EMPTY, "|")).call(_context3, IS_EMPTY);
+    const regex = new RegExp((0, _concat.default)(_context7 = (0, _concat.default)(_context8 = "".concat(_constants.DEPENDENT_ATTRIBUTE, "\\s?(\\S*)\\swhen ")).call(_context8, _constants.DEPENDENT_ATTRIBUTE_CONTROL, ":\\s?(.*?)\\s*(")).call(_context7, OPERATORS, ")\\s(.*)"), "i");
+    const isEmpyNotIsEmptRegex = new RegExp((0, _concat.default)(_context9 = (0, _concat.default)(_context10 = "".concat(_constants.DEPENDENT_ATTRIBUTE, "\\s?(\\S*)\\swhen ")).call(_context10, _constants.DEPENDENT_ATTRIBUTE_CONTROL, ":\\s?(.*?)\\s*(")).call(_context9, OPERATORS, ")"), "i");
+    const result = hint.match(regex) ? hint.match(regex) : hint.match(isEmpyNotIsEmptRegex);
 
     if (result) {
       rule.action = result[1];
       rule.control = result[2];
       rule.operator = result[3];
-      rule.options = result[4];
+      rule.options = !result[4] ? "" : result[4];
     } else {
       throw new _exceptions.ConfigurationException("No dependent information found on layout hint: ".concat(hint));
     }
@@ -139,9 +142,9 @@ class DependentAttribute extends _BaseLayoutHintRule.default {
 
 
   set options(options) {
-    var _context7;
+    var _context11;
 
-    this._options = (0, _map.default)(_context7 = options.split("|")).call(_context7, option => (0, _trim.default)(option).call(option));
+    this._options = (0, _map.default)(_context11 = options.split("|")).call(_context11, option => (0, _trim.default)(option).call(option));
   }
   /**
    */
@@ -150,9 +153,9 @@ class DependentAttribute extends _BaseLayoutHintRule.default {
   processEqualsOptions(controlAttribute) {
     if (controlAttribute instanceof _ChoiceAttributeModel.default || controlAttribute instanceof _BooleanAttributeModel.default) {
       return this.options.every(option => {
-        var _context8;
+        var _context12;
 
-        return (0, _includes.default)(_context8 = controlAttribute.selected).call(_context8, option);
+        return (0, _includes.default)(_context12 = controlAttribute.selected).call(_context12, option);
       });
     }
 
@@ -165,9 +168,9 @@ class DependentAttribute extends _BaseLayoutHintRule.default {
   processIncludesOptions(controlAttribute) {
     if (controlAttribute instanceof _ChoiceAttributeModel.default) {
       return this.options.some(option => {
-        var _context9;
+        var _context13;
 
-        return (0, _includes.default)(_context9 = controlAttribute.selected).call(_context9, option);
+        return (0, _includes.default)(_context13 = controlAttribute.selected).call(_context13, option);
       });
     }
 
@@ -191,6 +194,12 @@ class DependentAttribute extends _BaseLayoutHintRule.default {
       case NOT_INCLUDES:
         return !this.processIncludesOptions(controlAttribute);
 
+      case NOT_IS_EMPTY:
+        return (controlAttribute === null || controlAttribute === void 0 ? void 0 : controlAttribute.selected.length) !== 0;
+
+      case IS_EMPTY:
+        return (controlAttribute === null || controlAttribute === void 0 ? void 0 : controlAttribute.selected.length) === 0;
+
       default:
         throw new _exceptions.ConfigurationException("Unsupported operator for dependent question: ".concat(this.operator));
     }
@@ -200,9 +209,9 @@ class DependentAttribute extends _BaseLayoutHintRule.default {
 
 
   getControlAttribute(attributes) {
-    var _context10, _context11;
+    var _context14, _context15;
 
-    const attribute = attributes.getAttributeByLayoutHint((0, _concat.default)(_context10 = "".concat(_constants.DEPENDENT_ATTRIBUTE_CONTROL, ":")).call(_context10, this.control), (0, _concat.default)(_context11 = "".concat(_constants.DEPENDENT_ATTRIBUTE_CONTROL, ": ")).call(_context11, this.control));
+    const attribute = attributes.getAttributeByLayoutHint((0, _concat.default)(_context14 = "".concat(_constants.DEPENDENT_ATTRIBUTE_CONTROL, ":")).call(_context14, this.control), (0, _concat.default)(_context15 = "".concat(_constants.DEPENDENT_ATTRIBUTE_CONTROL, ": ")).call(_context15, this.control));
 
     if (attribute instanceof _ChoiceAttributeModel.default || attribute instanceof _BooleanAttributeModel.default) {
       return attribute;
@@ -235,9 +244,9 @@ class DependentAttribute extends _BaseLayoutHintRule.default {
     } else if (this.action === HIDE) {
       attribute.isHidden = result;
     } else {
-      var _context12;
+      var _context16;
 
-      throw new _exceptions.ConfigurationException((0, _concat.default)(_context12 = "Unsupported action ".concat(this.action, " for dependent question on attribute: ")).call(_context12, attribute.label));
+      throw new _exceptions.ConfigurationException((0, _concat.default)(_context16 = "Unsupported action ".concat(this.action, " for dependent question on attribute: ")).call(_context16, attribute.label));
     }
   }
 

package/lib/models/attributes/layouthint-rules/DependentAttribute.js.flow

@@ -18,6 +18,8 @@ const EQUALS = "equals";
 const INCLUDES = "includes";
 const NOT_EQUALS = "notEquals";
 const NOT_INCLUDES = "notIncludes";
+const NOT_IS_EMPTY = "notIsEmpty";
+const IS_EMPTY = "isEmpty";
 
 const SHOW = "show";
 const HIDE = "hide";
@@ -58,18 +60,25 @@ class DependentAttribute extends BaseLayoutHintRule {
   static initHint(hint: string): any {
     const rule = this.getRuleInstance();
 
-    const OPERATORS = `${EQUALS}|${INCLUDES}|${NOT_EQUALS}|${NOT_INCLUDES}`;
+    const OPERATORS = `${EQUALS}|${INCLUDES}|${NOT_EQUALS}|${NOT_INCLUDES}|${NOT_IS_EMPTY}|${IS_EMPTY}`;
     const regex = new RegExp(
       `${DEPENDENT_ATTRIBUTE}\\s?(\\S*)\\swhen ${DEPENDENT_ATTRIBUTE_CONTROL}:\\s?(.*?)\\s*(${OPERATORS})\\s(.*)`,
       "i"
     );
+    const isEmpyNotIsEmptRegex = new RegExp(
+      `${DEPENDENT_ATTRIBUTE}\\s?(\\S*)\\swhen ${DEPENDENT_ATTRIBUTE_CONTROL}:\\s?(.*?)\\s*(${OPERATORS})`,
+      "i"
+    );
+
+    const result = hint.match(regex)
+      ? hint.match(regex)
+      : hint.match(isEmpyNotIsEmptRegex);
 
-    const result = hint.match(regex);
     if (result) {
       rule.action = result[1];
       rule.control = result[2];
       rule.operator = result[3];
-      rule.options = result[4];
+      rule.options = !result[4] ? "" : result[4];
     } else {
       throw new ConfigurationException(
         `No dependent information found on layout hint: ${hint}`
@@ -176,6 +185,10 @@ class DependentAttribute extends BaseLayoutHintRule {
         return !this.processEqualsOptions(controlAttribute);
       case NOT_INCLUDES:
         return !this.processIncludesOptions(controlAttribute);
+      case NOT_IS_EMPTY:
+        return controlAttribute?.selected.length !== 0;
+      case IS_EMPTY:
+        return controlAttribute?.selected.length === 0;
       default:
         throw new ConfigurationException(
           `Unsupported operator for dependent question: ${this.operator}`

package/lib/models/attributes/layouthint-rules/DependentAttribute.js.map

@@ -1 +1 @@
-{"version":3,"file":"DependentAttribute.js","names":["EQUALS","INCLUDES","NOT_EQUALS","NOT_INCLUDES","SHOW","HIDE","DependentAttribute","BaseLayoutHintRule","isApplicableForHint","hint","regex","RegExp","DEPENDENT_ATTRIBUTE","test","getRuleInstance","initHint","rule","OPERATORS","DEPENDENT_ATTRIBUTE_CONTROL","result","match","action","control","operator","options","ConfigurationException","_action","_control","_operator","_options","split","option","processEqualsOptions","controlAttribute","ChoiceAttributeModel","BooleanAttributeModel","every","selected","processIncludesOptions","some","handleOperator","getControlAttribute","attributes","attribute","getAttributeByLayoutHint","process","processLayoutHintRules","isHidden","hide","label"],"sources":["../../../../src/models/attributes/layouthint-rules/DependentAttribute.js"],"sourcesContent":["// @flow\nimport BaseLayoutHintRule from \"./BaseLayoutHintRule\";\n\nimport {\n  DEPENDENT_ATTRIBUTE_CONTROL,\n  DEPENDENT_ATTRIBUTE,\n} from \"../../../constants\";\n\nimport ChoiceAttributeModel from \"../ChoiceAttributeModel\";\nimport BooleanAttributeModel from \"../BooleanAttributeModel\";\n\nimport { ConfigurationException } from \"../../../exceptions\";\n\nimport type AttributeCollection from \"../AttributeCollection\";\nimport type AttributeModel from \"../AttributeModel\";\n\nconst EQUALS = \"equals\";\nconst INCLUDES = \"includes\";\nconst NOT_EQUALS = \"notEquals\";\nconst NOT_INCLUDES = \"notIncludes\";\n\nconst SHOW = \"show\";\nconst HIDE = \"hide\";\n\n/**\n * Depending attributes hint logic\n */\nclass DependentAttribute extends BaseLayoutHintRule {\n  _action: string;\n  _control: string;\n  _operator: string;\n  _options: Array<string>;\n\n  /**\n   */\n  static checkHintApplicability: boolean = true;\n\n  /**\n   */\n  static isApplicableForHint(hint: string): boolean {\n    const regex = new RegExp(\n      `^${DEPENDENT_ATTRIBUTE}\\\\s?(${SHOW}|${HIDE})`,\n      \"i\"\n    );\n\n    return regex.test(hint);\n  }\n\n  /**\n   * Used on initHint to create an instance of this rule\n   */\n  static getRuleInstance(): DependentAttribute {\n    return new DependentAttribute();\n  }\n\n  /**\n   */\n  static initHint(hint: string): any {\n    const rule = this.getRuleInstance();\n\n    const OPERATORS = `${EQUALS}|${INCLUDES}|${NOT_EQUALS}|${NOT_INCLUDES}`;\n    const regex = new RegExp(\n      `${DEPENDENT_ATTRIBUTE}\\\\s?(\\\\S*)\\\\swhen ${DEPENDENT_ATTRIBUTE_CONTROL}:\\\\s?(.*?)\\\\s*(${OPERATORS})\\\\s(.*)`,\n      \"i\"\n    );\n\n    const result = hint.match(regex);\n    if (result) {\n      rule.action = result[1];\n      rule.control = result[2];\n      rule.operator = result[3];\n      rule.options = result[4];\n    } else {\n      throw new ConfigurationException(\n        `No dependent information found on layout hint: ${hint}`\n      );\n    }\n\n    return rule;\n  }\n\n  /**\n   */\n  get action(): string {\n    return this._action;\n  }\n\n  /**\n   */\n  set action(action: string) {\n    this._action = action;\n  }\n\n  /**\n   */\n  get control(): string {\n    return this._control;\n  }\n\n  /**\n   */\n  set control(control: string) {\n    this._control = control;\n  }\n\n  /**\n   */\n  get operator(): string {\n    return this._operator;\n  }\n\n  /**\n   */\n  set operator(operator: string) {\n    this._operator = operator;\n  }\n\n  /**\n   */\n  get options(): Array<string> {\n    return this._options;\n  }\n\n  /**\n   */\n  set options(options: string): void {\n    this._options = options.split(\"|\").map((option) => option.trim());\n  }\n\n  /**\n   */\n  processEqualsOptions(\n    controlAttribute: ChoiceAttributeModel | BooleanAttributeModel\n  ): boolean {\n    if (\n      controlAttribute instanceof ChoiceAttributeModel ||\n      controlAttribute instanceof BooleanAttributeModel\n    ) {\n      return this.options.every((option) =>\n        controlAttribute.selected.includes(option)\n      );\n    }\n\n    throw new ConfigurationException(\n      \"Dependent control in combination with equals operator must be a choice, string or number attribute\"\n    );\n  }\n\n  /**\n   */\n  processIncludesOptions(\n    controlAttribute: ChoiceAttributeModel | BooleanAttributeModel\n  ): boolean {\n    if (controlAttribute instanceof ChoiceAttributeModel) {\n      return this.options.some((option) =>\n        controlAttribute.selected.includes(option)\n      );\n    }\n\n    throw new ConfigurationException(\n      \"Dependent control in combination with includes operator must be a choice attribute\"\n    );\n  }\n\n  /**\n   */\n  handleOperator(\n    controlAttribute: ChoiceAttributeModel | BooleanAttributeModel\n  ): boolean {\n    switch (this.operator) {\n      case EQUALS:\n        return this.processEqualsOptions(controlAttribute);\n      case INCLUDES:\n        return this.processIncludesOptions(controlAttribute);\n      case NOT_EQUALS:\n        return !this.processEqualsOptions(controlAttribute);\n      case NOT_INCLUDES:\n        return !this.processIncludesOptions(controlAttribute);\n      default:\n        throw new ConfigurationException(\n          `Unsupported operator for dependent question: ${this.operator}`\n        );\n    }\n  }\n\n  /**\n   */\n  getControlAttribute(\n    attributes: AttributeCollection\n  ): ChoiceAttributeModel | BooleanAttributeModel | null {\n    const attribute = attributes.getAttributeByLayoutHint(\n      `${DEPENDENT_ATTRIBUTE_CONTROL}:${this.control}`,\n      `${DEPENDENT_ATTRIBUTE_CONTROL}: ${this.control}`\n    );\n\n    if (\n      attribute instanceof ChoiceAttributeModel ||\n      attribute instanceof BooleanAttributeModel\n    ) {\n      return attribute;\n    }\n\n    return null;\n  }\n\n  /**\n   */\n  process(attribute: AttributeModel, attributes: AttributeCollection) {\n    const controlAttribute = this.getControlAttribute(attributes);\n    if (!controlAttribute) {\n      return;\n    }\n\n    controlAttribute.processLayoutHintRules(attributes);\n    if (controlAttribute.isHidden) {\n      attribute.hide();\n      return;\n    }\n\n    const result = this.handleOperator(controlAttribute);\n    if (this.action === SHOW) {\n      attribute.isHidden = !result;\n    } else if (this.action === HIDE) {\n      attribute.isHidden = result;\n    } else {\n      throw new ConfigurationException(\n        `Unsupported action ${this.action} for dependent question on attribute: ${attribute.label}`\n      );\n    }\n  }\n}\n\nexport default DependentAttribute;\n"],"mappings":";;;;;;;;;;;;;;;;;;;AACA;;AAEA;;AAKA;;AACA;;AAEA;;AAKA,MAAMA,MAAM,GAAG,QAAf;AACA,MAAMC,QAAQ,GAAG,UAAjB;AACA,MAAMC,UAAU,GAAG,WAAnB;AACA,MAAMC,YAAY,GAAG,aAArB;AAEA,MAAMC,IAAI,GAAG,MAAb;AACA,MAAMC,IAAI,GAAG,MAAb;AAEA;AACA;AACA;;AACA,MAAMC,kBAAN,SAAiCC,2BAAjC,CAAoD;EAAA;IAAA;IAAA;IAAA;IAAA;IAAA;EAAA;;EAUlD;AACF;EAC4B,OAAnBC,mBAAmB,CAACC,IAAD,EAAwB;IAAA;;IAChD,MAAMC,KAAK,GAAG,IAAIC,MAAJ,6EACRC,8BADQ,4BACmBR,IADnB,uBAC2BC,IAD3B,QAEZ,GAFY,CAAd;IAKA,OAAOK,KAAK,CAACG,IAAN,CAAWJ,IAAX,CAAP;EACD;EAED;AACF;AACA;;;EACwB,OAAfK,eAAe,GAAuB;IAC3C,OAAO,IAAIR,kBAAJ,EAAP;EACD;EAED;AACF;;;EACiB,OAARS,QAAQ,CAACN,IAAD,EAAoB;IAAA;;IACjC,MAAMO,IAAI,GAAG,KAAKF,eAAL,EAAb;IAEA,MAAMG,SAAS,+EAAMjB,MAAN,cAAgBC,QAAhB,wBAA4BC,UAA5B,wBAA0CC,YAA1C,CAAf;IACA,MAAMO,KAAK,GAAG,IAAIC,MAAJ,6EACTC,8BADS,yCAC+BM,sCAD/B,sCAC4ED,SAD5E,eAEZ,GAFY,CAAd;IAKA,MAAME,MAAM,GAAGV,IAAI,CAACW,KAAL,CAAWV,KAAX,CAAf;;IACA,IAAIS,MAAJ,EAAY;MACVH,IAAI,CAACK,MAAL,GAAcF,MAAM,CAAC,CAAD,CAApB;MACAH,IAAI,CAACM,OAAL,GAAeH,MAAM,CAAC,CAAD,CAArB;MACAH,IAAI,CAACO,QAAL,GAAgBJ,MAAM,CAAC,CAAD,CAAtB;MACAH,IAAI,CAACQ,OAAL,GAAeL,MAAM,CAAC,CAAD,CAArB;IACD,CALD,MAKO;MACL,MAAM,IAAIM,kCAAJ,0DAC8ChB,IAD9C,EAAN;IAGD;;IAED,OAAOO,IAAP;EACD;EAED;AACF;;;EACY,IAANK,MAAM,GAAW;IACnB,OAAO,KAAKK,OAAZ;EACD;EAED;AACF;;;EACY,IAANL,MAAM,CAACA,MAAD,EAAiB;IACzB,KAAKK,OAAL,GAAeL,MAAf;EACD;EAED;AACF;;;EACa,IAAPC,OAAO,GAAW;IACpB,OAAO,KAAKK,QAAZ;EACD;EAED;AACF;;;EACa,IAAPL,OAAO,CAACA,OAAD,EAAkB;IAC3B,KAAKK,QAAL,GAAgBL,OAAhB;EACD;EAED;AACF;;;EACc,IAARC,QAAQ,GAAW;IACrB,OAAO,KAAKK,SAAZ;EACD;EAED;AACF;;;EACc,IAARL,QAAQ,CAACA,QAAD,EAAmB;IAC7B,KAAKK,SAAL,GAAiBL,QAAjB;EACD;EAED;AACF;;;EACa,IAAPC,OAAO,GAAkB;IAC3B,OAAO,KAAKK,QAAZ;EACD;EAED;AACF;;;EACa,IAAPL,OAAO,CAACA,OAAD,EAAwB;IAAA;;IACjC,KAAKK,QAAL,GAAgB,8BAAAL,OAAO,CAACM,KAAR,CAAc,GAAd,mBAAwBC,MAAD,IAAY,mBAAAA,MAAM,MAAN,CAAAA,MAAM,CAAzC,CAAhB;EACD;EAED;AACF;;;EACEC,oBAAoB,CAClBC,gBADkB,EAET;IACT,IACEA,gBAAgB,YAAYC,6BAA5B,IACAD,gBAAgB,YAAYE,8BAF9B,EAGE;MACA,OAAO,KAAKX,OAAL,CAAaY,KAAb,CAAoBL,MAAD;QAAA;;QAAA,OACxB,mCAAAE,gBAAgB,CAACI,QAAjB,kBAAmCN,MAAnC,CADwB;MAAA,CAAnB,CAAP;IAGD;;IAED,MAAM,IAAIN,kCAAJ,CACJ,oGADI,CAAN;EAGD;EAED;AACF;;;EACEa,sBAAsB,CACpBL,gBADoB,EAEX;IACT,IAAIA,gBAAgB,YAAYC,6BAAhC,EAAsD;MACpD,OAAO,KAAKV,OAAL,CAAae,IAAb,CAAmBR,MAAD;QAAA;;QAAA,OACvB,mCAAAE,gBAAgB,CAACI,QAAjB,kBAAmCN,MAAnC,CADuB;MAAA,CAAlB,CAAP;IAGD;;IAED,MAAM,IAAIN,kCAAJ,CACJ,oFADI,CAAN;EAGD;EAED;AACF;;;EACEe,cAAc,CACZP,gBADY,EAEH;IACT,QAAQ,KAAKV,QAAb;MACE,KAAKvB,MAAL;QACE,OAAO,KAAKgC,oBAAL,CAA0BC,gBAA1B,CAAP;;MACF,KAAKhC,QAAL;QACE,OAAO,KAAKqC,sBAAL,CAA4BL,gBAA5B,CAAP;;MACF,KAAK/B,UAAL;QACE,OAAO,CAAC,KAAK8B,oBAAL,CAA0BC,gBAA1B,CAAR;;MACF,KAAK9B,YAAL;QACE,OAAO,CAAC,KAAKmC,sBAAL,CAA4BL,gBAA5B,CAAR;;MACF;QACE,MAAM,IAAIR,kCAAJ,wDAC4C,KAAKF,QADjD,EAAN;IAVJ;EAcD;EAED;AACF;;;EACEkB,mBAAmB,CACjBC,UADiB,EAEoC;IAAA;;IACrD,MAAMC,SAAS,GAAGD,UAAU,CAACE,wBAAX,6CACb1B,sCADa,yBACkB,KAAKI,OADvB,+CAEbJ,sCAFa,0BAEmB,KAAKI,OAFxB,EAAlB;;IAKA,IACEqB,SAAS,YAAYT,6BAArB,IACAS,SAAS,YAAYR,8BAFvB,EAGE;MACA,OAAOQ,SAAP;IACD;;IAED,OAAO,IAAP;EACD;EAED;AACF;;;EACEE,OAAO,CAACF,SAAD,EAA4BD,UAA5B,EAA6D;IAClE,MAAMT,gBAAgB,GAAG,KAAKQ,mBAAL,CAAyBC,UAAzB,CAAzB;;IACA,IAAI,CAACT,gBAAL,EAAuB;MACrB;IACD;;IAEDA,gBAAgB,CAACa,sBAAjB,CAAwCJ,UAAxC;;IACA,IAAIT,gBAAgB,CAACc,QAArB,EAA+B;MAC7BJ,SAAS,CAACK,IAAV;MACA;IACD;;IAED,MAAM7B,MAAM,GAAG,KAAKqB,cAAL,CAAoBP,gBAApB,CAAf;;IACA,IAAI,KAAKZ,MAAL,KAAgBjB,IAApB,EAA0B;MACxBuC,SAAS,CAACI,QAAV,GAAqB,CAAC5B,MAAtB;IACD,CAFD,MAEO,IAAI,KAAKE,MAAL,KAAgBhB,IAApB,EAA0B;MAC/BsC,SAAS,CAACI,QAAV,GAAqB5B,MAArB;IACD,CAFM,MAEA;MAAA;;MACL,MAAM,IAAIM,kCAAJ,gEACkB,KAAKJ,MADvB,8DACsEsB,SAAS,CAACM,KADhF,EAAN;IAGD;EACF;;AA1MiD;;8BAA9C3C,kB,4BAQqC,I;eAqM5BA,kB"}
+{"version":3,"file":"DependentAttribute.js","names":["EQUALS","INCLUDES","NOT_EQUALS","NOT_INCLUDES","NOT_IS_EMPTY","IS_EMPTY","SHOW","HIDE","DependentAttribute","BaseLayoutHintRule","isApplicableForHint","hint","regex","RegExp","DEPENDENT_ATTRIBUTE","test","getRuleInstance","initHint","rule","OPERATORS","DEPENDENT_ATTRIBUTE_CONTROL","isEmpyNotIsEmptRegex","result","match","action","control","operator","options","ConfigurationException","_action","_control","_operator","_options","split","option","processEqualsOptions","controlAttribute","ChoiceAttributeModel","BooleanAttributeModel","every","selected","processIncludesOptions","some","handleOperator","length","getControlAttribute","attributes","attribute","getAttributeByLayoutHint","process","processLayoutHintRules","isHidden","hide","label"],"sources":["../../../../src/models/attributes/layouthint-rules/DependentAttribute.js"],"sourcesContent":["// @flow\nimport BaseLayoutHintRule from \"./BaseLayoutHintRule\";\n\nimport {\n  DEPENDENT_ATTRIBUTE_CONTROL,\n  DEPENDENT_ATTRIBUTE,\n} from \"../../../constants\";\n\nimport ChoiceAttributeModel from \"../ChoiceAttributeModel\";\nimport BooleanAttributeModel from \"../BooleanAttributeModel\";\n\nimport { ConfigurationException } from \"../../../exceptions\";\n\nimport type AttributeCollection from \"../AttributeCollection\";\nimport type AttributeModel from \"../AttributeModel\";\n\nconst EQUALS = \"equals\";\nconst INCLUDES = \"includes\";\nconst NOT_EQUALS = \"notEquals\";\nconst NOT_INCLUDES = \"notIncludes\";\nconst NOT_IS_EMPTY = \"notIsEmpty\";\nconst IS_EMPTY = \"isEmpty\";\n\nconst SHOW = \"show\";\nconst HIDE = \"hide\";\n\n/**\n * Depending attributes hint logic\n */\nclass DependentAttribute extends BaseLayoutHintRule {\n  _action: string;\n  _control: string;\n  _operator: string;\n  _options: Array<string>;\n\n  /**\n   */\n  static checkHintApplicability: boolean = true;\n\n  /**\n   */\n  static isApplicableForHint(hint: string): boolean {\n    const regex = new RegExp(\n      `^${DEPENDENT_ATTRIBUTE}\\\\s?(${SHOW}|${HIDE})`,\n      \"i\"\n    );\n\n    return regex.test(hint);\n  }\n\n  /**\n   * Used on initHint to create an instance of this rule\n   */\n  static getRuleInstance(): DependentAttribute {\n    return new DependentAttribute();\n  }\n\n  /**\n   */\n  static initHint(hint: string): any {\n    const rule = this.getRuleInstance();\n\n    const OPERATORS = `${EQUALS}|${INCLUDES}|${NOT_EQUALS}|${NOT_INCLUDES}|${NOT_IS_EMPTY}|${IS_EMPTY}`;\n    const regex = new RegExp(\n      `${DEPENDENT_ATTRIBUTE}\\\\s?(\\\\S*)\\\\swhen ${DEPENDENT_ATTRIBUTE_CONTROL}:\\\\s?(.*?)\\\\s*(${OPERATORS})\\\\s(.*)`,\n      \"i\"\n    );\n    const isEmpyNotIsEmptRegex = new RegExp(\n      `${DEPENDENT_ATTRIBUTE}\\\\s?(\\\\S*)\\\\swhen ${DEPENDENT_ATTRIBUTE_CONTROL}:\\\\s?(.*?)\\\\s*(${OPERATORS})`,\n      \"i\"\n    );\n\n    const result = hint.match(regex)\n      ? hint.match(regex)\n      : hint.match(isEmpyNotIsEmptRegex);\n\n    if (result) {\n      rule.action = result[1];\n      rule.control = result[2];\n      rule.operator = result[3];\n      rule.options = !result[4] ? \"\" : result[4];\n    } else {\n      throw new ConfigurationException(\n        `No dependent information found on layout hint: ${hint}`\n      );\n    }\n\n    return rule;\n  }\n\n  /**\n   */\n  get action(): string {\n    return this._action;\n  }\n\n  /**\n   */\n  set action(action: string) {\n    this._action = action;\n  }\n\n  /**\n   */\n  get control(): string {\n    return this._control;\n  }\n\n  /**\n   */\n  set control(control: string) {\n    this._control = control;\n  }\n\n  /**\n   */\n  get operator(): string {\n    return this._operator;\n  }\n\n  /**\n   */\n  set operator(operator: string) {\n    this._operator = operator;\n  }\n\n  /**\n   */\n  get options(): Array<string> {\n    return this._options;\n  }\n\n  /**\n   */\n  set options(options: string): void {\n    this._options = options.split(\"|\").map((option) => option.trim());\n  }\n\n  /**\n   */\n  processEqualsOptions(\n    controlAttribute: ChoiceAttributeModel | BooleanAttributeModel\n  ): boolean {\n    if (\n      controlAttribute instanceof ChoiceAttributeModel ||\n      controlAttribute instanceof BooleanAttributeModel\n    ) {\n      return this.options.every((option) =>\n        controlAttribute.selected.includes(option)\n      );\n    }\n\n    throw new ConfigurationException(\n      \"Dependent control in combination with equals operator must be a choice, string or number attribute\"\n    );\n  }\n\n  /**\n   */\n  processIncludesOptions(\n    controlAttribute: ChoiceAttributeModel | BooleanAttributeModel\n  ): boolean {\n    if (controlAttribute instanceof ChoiceAttributeModel) {\n      return this.options.some((option) =>\n        controlAttribute.selected.includes(option)\n      );\n    }\n\n    throw new ConfigurationException(\n      \"Dependent control in combination with includes operator must be a choice attribute\"\n    );\n  }\n\n  /**\n   */\n  handleOperator(\n    controlAttribute: ChoiceAttributeModel | BooleanAttributeModel\n  ): boolean {\n    switch (this.operator) {\n      case EQUALS:\n        return this.processEqualsOptions(controlAttribute);\n      case INCLUDES:\n        return this.processIncludesOptions(controlAttribute);\n      case NOT_EQUALS:\n        return !this.processEqualsOptions(controlAttribute);\n      case NOT_INCLUDES:\n        return !this.processIncludesOptions(controlAttribute);\n      case NOT_IS_EMPTY:\n        return controlAttribute?.selected.length !== 0;\n      case IS_EMPTY:\n        return controlAttribute?.selected.length === 0;\n      default:\n        throw new ConfigurationException(\n          `Unsupported operator for dependent question: ${this.operator}`\n        );\n    }\n  }\n\n  /**\n   */\n  getControlAttribute(\n    attributes: AttributeCollection\n  ): ChoiceAttributeModel | BooleanAttributeModel | null {\n    const attribute = attributes.getAttributeByLayoutHint(\n      `${DEPENDENT_ATTRIBUTE_CONTROL}:${this.control}`,\n      `${DEPENDENT_ATTRIBUTE_CONTROL}: ${this.control}`\n    );\n\n    if (\n      attribute instanceof ChoiceAttributeModel ||\n      attribute instanceof BooleanAttributeModel\n    ) {\n      return attribute;\n    }\n\n    return null;\n  }\n\n  /**\n   */\n  process(attribute: AttributeModel, attributes: AttributeCollection) {\n    const controlAttribute = this.getControlAttribute(attributes);\n    if (!controlAttribute) {\n      return;\n    }\n\n    controlAttribute.processLayoutHintRules(attributes);\n    if (controlAttribute.isHidden) {\n      attribute.hide();\n      return;\n    }\n\n    const result = this.handleOperator(controlAttribute);\n    if (this.action === SHOW) {\n      attribute.isHidden = !result;\n    } else if (this.action === HIDE) {\n      attribute.isHidden = result;\n    } else {\n      throw new ConfigurationException(\n        `Unsupported action ${this.action} for dependent question on attribute: ${attribute.label}`\n      );\n    }\n  }\n}\n\nexport default DependentAttribute;\n"],"mappings":"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"}

package/package.json

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

package/src/models/attributes/layouthint-rules/DependentAttribute.js

@@ -18,6 +18,8 @@ const EQUALS = "equals";
 const INCLUDES = "includes";
 const NOT_EQUALS = "notEquals";
 const NOT_INCLUDES = "notIncludes";
+const NOT_IS_EMPTY = "notIsEmpty";
+const IS_EMPTY = "isEmpty";
 
 const SHOW = "show";
 const HIDE = "hide";
@@ -58,18 +60,25 @@ class DependentAttribute extends BaseLayoutHintRule {
   static initHint(hint: string): any {
     const rule = this.getRuleInstance();
 
-    const OPERATORS = `${EQUALS}|${INCLUDES}|${NOT_EQUALS}|${NOT_INCLUDES}`;
+    const OPERATORS = `${EQUALS}|${INCLUDES}|${NOT_EQUALS}|${NOT_INCLUDES}|${NOT_IS_EMPTY}|${IS_EMPTY}`;
     const regex = new RegExp(
       `${DEPENDENT_ATTRIBUTE}\\s?(\\S*)\\swhen ${DEPENDENT_ATTRIBUTE_CONTROL}:\\s?(.*?)\\s*(${OPERATORS})\\s(.*)`,
       "i"
     );
+    const isEmpyNotIsEmptRegex = new RegExp(
+      `${DEPENDENT_ATTRIBUTE}\\s?(\\S*)\\swhen ${DEPENDENT_ATTRIBUTE_CONTROL}:\\s?(.*?)\\s*(${OPERATORS})`,
+      "i"
+    );
+
+    const result = hint.match(regex)
+      ? hint.match(regex)
+      : hint.match(isEmpyNotIsEmptRegex);
 
-    const result = hint.match(regex);
     if (result) {
       rule.action = result[1];
       rule.control = result[2];
       rule.operator = result[3];
-      rule.options = result[4];
+      rule.options = !result[4] ? "" : result[4];
     } else {
       throw new ConfigurationException(
         `No dependent information found on layout hint: ${hint}`
@@ -176,6 +185,10 @@ class DependentAttribute extends BaseLayoutHintRule {
         return !this.processEqualsOptions(controlAttribute);
       case NOT_INCLUDES:
         return !this.processIncludesOptions(controlAttribute);
+      case NOT_IS_EMPTY:
+        return controlAttribute?.selected.length !== 0;
+      case IS_EMPTY:
+        return controlAttribute?.selected.length === 0;
       default:
         throw new ConfigurationException(
           `Unsupported operator for dependent question: ${this.operator}`