@beinformed/ui 1.65.3 → 1.65.5

package/lib/models/filters/FilterModel.js

@@ -5,9 +5,125 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 var _BaseFilterModel = _interopRequireDefault(require("../filters/BaseFilterModel"));
+var _createAttribute = _interopRequireDefault(require("../attributes/_createAttribute"));
+var _exceptions = require("../../exceptions");
 /**
  */
-class FilterModel extends _BaseFilterModel.default {}
+class FilterModel extends _BaseFilterModel.default {
+  /**
+   */
+  constructor(data, contributions, modelOptions) {
+    super(data, contributions, modelOptions);
+    (0, _defineProperty2.default)(this, "_attribute", null);
+    this._attribute = this.createAttribute(this.type, this.param, this.data, this.contributions);
+  }
+
+  /**
+   * Create attribute through the attribute factory. Create type based on filter key without the filter suffix
+   */
+  createAttribute(type, param, data, contributions) {
+    if (type === "assignment") {
+      return null;
+    }
+    return (0, _createAttribute.default)(param, data, {
+      ...contributions,
+      type: type
+    }, this.modelOptions);
+  }
+
+  /**
+   * Get attribute of filter
+   */
+  get attribute() {
+    if (!this._attribute) {
+      throw new _exceptions.IllegalStateException(`Missing filter attribute on filter model: ${this.label}`);
+    }
+    return this._attribute;
+  }
+
+  /**
+   * Retrieve the parameters with it's value for this filter
+   */
+  get params() {
+    if (!this.param) {
+      return [];
+    }
+    return [{
+      name: this.param,
+      value: this.attribute?.value
+    }];
+  }
+
+  /**
+   * Getting the value of the filter
+   */
+  get value() {
+    return this.attribute?.value;
+  }
+
+  /**
+   * Getting the inputvalue of the filter
+   */
+  get inputvalue() {
+    return this.attribute?.inputvalue;
+  }
+
+  /**
+   * Indicates if the filter has a value.
+   */
+  hasValue() {
+    return this.value !== null && this.value !== "";
+  }
+
+  /**
+   * Reset the value of this filter to undefined
+   */
+  reset() {
+    if (this.attribute) {
+      this.attribute.reset();
+    }
+    return this;
+  }
+
+  /**
+   * Update this filter with input name and value
+   */
+  update(attribute, value) {
+    if (this.attribute) {
+      this.attribute.update(value);
+    }
+  }
+
+  /**
+   * Inidiates if filter is active
+   */
+  isActive() {
+    return this.attribute?.initvalue !== null;
+  }
+
+  /**
+   * Inidiates if filter is valid
+   */
+  get isValid() {
+    return this.attribute?.isValid || true;
+  }
+
+  /**
+   */
+  get readonlyvalue() {
+    if (this.attribute) {
+      return this.attribute.readonlyvalue;
+    }
+    return "";
+  }
+
+  /**
+   */
+  get formdata() {
+    return this.attribute.formdata ?? null;
+  }
+}
 exports.default = FilterModel;
 //# sourceMappingURL=FilterModel.js.map

package/lib/models/filters/FilterModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"FilterModel.js","names":["_BaseFilterModel","_interopRequireDefault","require","FilterModel","BaseFilterModel","exports","default"],"sources":["../../../src/models/filters/FilterModel.js"],"sourcesContent":["// @flow\nimport BaseFilterModel from \"../filters/BaseFilterModel\";\n\n/**\n */\nexport default class FilterModel extends BaseFilterModel {}\n"],"mappings":";;;;;;;AACA,IAAAA,gBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA;AACA;AACe,MAAMC,WAAW,SAASC,wBAAe,CAAC;AAAEC,OAAA,CAAAC,OAAA,GAAAH,WAAA","ignoreList":[]}
+{"version":3,"file":"FilterModel.js","names":["_BaseFilterModel","_interopRequireDefault","require","_createAttribute","_exceptions","FilterModel","BaseFilterModel","constructor","data","contributions","modelOptions","_defineProperty2","default","_attribute","createAttribute","type","param","attribute","IllegalStateException","label","params","name","value","inputvalue","hasValue","reset","update","isActive","initvalue","isValid","readonlyvalue","formdata","exports"],"sources":["../../../src/models/filters/FilterModel.js"],"sourcesContent":["// @flow\nimport BaseFilterModel from \"../filters/BaseFilterModel\";\nimport createAttribute from \"../attributes/_createAttribute\";\nimport { IllegalStateException } from \"../../exceptions\";\n\nimport type { AttributeType, FilterType, ModelOptions } from \"../types\";\n\n/**\n */\nexport default class FilterModel extends BaseFilterModel {\n  _attribute: AttributeType | null = null;\n\n  /**\n   */\n  constructor(\n    data: Object,\n    contributions: Object,\n    modelOptions?: ModelOptions,\n  ) {\n    super(data, contributions, modelOptions);\n\n    this._attribute = this.createAttribute(\n      this.type,\n      this.param,\n      this.data,\n      this.contributions,\n    );\n  }\n\n  /**\n   * Create attribute through the attribute factory. Create type based on filter key without the filter suffix\n   */\n  createAttribute(\n    type: string,\n    param: string,\n    data: Object,\n    contributions: Object,\n  ): AttributeType | null {\n    if (type === \"assignment\") {\n      return null;\n    }\n\n    return createAttribute(\n      param,\n      data,\n      {\n        ...contributions,\n        type: type,\n      },\n      this.modelOptions,\n    );\n  }\n\n  /**\n   * Get attribute of filter\n   */\n  get attribute(): AttributeType {\n    if (!this._attribute) {\n      throw new IllegalStateException(\n        `Missing filter attribute on filter model: ${this.label}`,\n      );\n    }\n    return this._attribute;\n  }\n\n  /**\n   * Retrieve the parameters with it's value for this filter\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    if (!this.param) {\n      return [];\n    }\n\n    return [\n      {\n        name: this.param,\n        value: this.attribute?.value,\n      },\n    ];\n  }\n\n  /**\n   * Getting the value of the filter\n   */\n  get value(): string | null {\n    return this.attribute?.value;\n  }\n\n  /**\n   * Getting the inputvalue of the filter\n   */\n  get inputvalue(): string {\n    return this.attribute?.inputvalue;\n  }\n\n  /**\n   * Indicates if the filter has a value.\n   */\n  hasValue(): boolean {\n    return this.value !== null && this.value !== \"\";\n  }\n\n  /**\n   * Reset the value of this filter to undefined\n   */\n  reset(): FilterType {\n    if (this.attribute) {\n      this.attribute.reset();\n    }\n\n    return this;\n  }\n\n  /**\n   * Update this filter with input name and value\n   */\n  update(attribute: AttributeType, value: string) {\n    if (this.attribute) {\n      this.attribute.update(value);\n    }\n  }\n\n  /**\n   * Inidiates if filter is active\n   */\n  isActive(): boolean {\n    return this.attribute?.initvalue !== null;\n  }\n\n  /**\n   * Inidiates if filter is valid\n   */\n  get isValid(): boolean {\n    return this.attribute?.isValid || true;\n  }\n\n  /**\n   */\n  get readonlyvalue(): string {\n    if (this.attribute) {\n      return this.attribute.readonlyvalue;\n    }\n    return \"\";\n  }\n\n  /**\n   */\n  get formdata(): { [string]: any } | null {\n    return this.attribute.formdata ?? null;\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/models/filters/RangeFilterModel.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-var _BaseFilterModel = _interopRequireDefault(require("../filters/BaseFilterModel"));
+var _FilterModel = _interopRequireDefault(require("../filters/FilterModel"));
 var _CompositeAttributeModel = _interopRequireDefault(require("../attributes/CompositeAttributeModel"));
 /**
  * Range filter, for instance a date range filter or a number range filter
  */
-class RangeFilterModel extends _BaseFilterModel.default {
+class RangeFilterModel extends _FilterModel.default {
   /**
    */
   update(attribute, value) {

package/lib/models/filters/RangeFilterModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"RangeFilterModel.js","names":["_BaseFilterModel","_interopRequireDefault","require","_CompositeAttributeModel","RangeFilterModel","BaseFilterModel","update","attribute","value","CompositeAttributeModel","params","_context","_map","default","children","call","child","param","data","name","exports"],"sources":["../../../src/models/filters/RangeFilterModel.js"],"sourcesContent":["// @flow\nimport BaseFilterModel from \"../filters/BaseFilterModel\";\n\nimport CompositeAttributeModel from \"../attributes/CompositeAttributeModel\";\nimport type { AttributeType } from \"../types\";\n\n/**\n * Range filter, for instance a date range filter or a number range filter\n */\nexport default class RangeFilterModel extends BaseFilterModel {\n  /**\n   */\n  update(attribute: AttributeType, value: string) {\n    if (this.attribute instanceof CompositeAttributeModel) {\n      this.attribute.update(value, attribute);\n    } else if (this.attribute !== null) {\n      this.attribute.update(value);\n    }\n  }\n\n  /**\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    if (this.attribute instanceof CompositeAttributeModel) {\n      return this.attribute.children.map((child) => {\n        const { param } = this.data[child.name];\n        return {\n          name: param,\n          value: child.value,\n        };\n      });\n    }\n\n    return [];\n  }\n}\n"],"mappings":";;;;;;;;AACA,IAAAA,gBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,wBAAA,GAAAF,sBAAA,CAAAC,OAAA;AAGA;AACA;AACA;AACe,MAAME,gBAAgB,SAASC,wBAAe,CAAC;EAC5D;AACF;EACEC,MAAMA,CAACC,SAAwB,EAAEC,KAAa,EAAE;IAC9C,IAAI,IAAI,CAACD,SAAS,YAAYE,gCAAuB,EAAE;MACrD,IAAI,CAACF,SAAS,CAACD,MAAM,CAACE,KAAK,EAAED,SAAS,CAAC;IACzC,CAAC,MAAM,IAAI,IAAI,CAACA,SAAS,KAAK,IAAI,EAAE;MAClC,IAAI,CAACA,SAAS,CAACD,MAAM,CAACE,KAAK,CAAC;IAC9B;EACF;;EAEA;AACF;EACE,IAAIE,MAAMA,CAAA,EAA4C;IACpD,IAAI,IAAI,CAACH,SAAS,YAAYE,gCAAuB,EAAE;MAAA,IAAAE,QAAA;MACrD,OAAO,IAAAC,IAAA,CAAAC,OAAA,EAAAF,QAAA,OAAI,CAACJ,SAAS,CAACO,QAAQ,EAAAC,IAAA,CAAAJ,QAAA,EAAMK,KAAK,IAAK;QAC5C,MAAM;UAAEC;QAAM,CAAC,GAAG,IAAI,CAACC,IAAI,CAACF,KAAK,CAACG,IAAI,CAAC;QACvC,OAAO;UACLA,IAAI,EAAEF,KAAK;UACXT,KAAK,EAAEQ,KAAK,CAACR;QACf,CAAC;MACH,CAAC,CAAC;IACJ;IAEA,OAAO,EAAE;EACX;AACF;AAACY,OAAA,CAAAP,OAAA,GAAAT,gBAAA","ignoreList":[]}
+{"version":3,"file":"RangeFilterModel.js","names":["_FilterModel","_interopRequireDefault","require","_CompositeAttributeModel","RangeFilterModel","FilterModel","update","attribute","value","CompositeAttributeModel","params","_context","_map","default","children","call","child","param","data","name","exports"],"sources":["../../../src/models/filters/RangeFilterModel.js"],"sourcesContent":["// @flow\nimport FilterModel from \"../filters/FilterModel\";\n\nimport CompositeAttributeModel from \"../attributes/CompositeAttributeModel\";\nimport type { AttributeType } from \"../types\";\n\n/**\n * Range filter, for instance a date range filter or a number range filter\n */\nexport default class RangeFilterModel extends FilterModel {\n  /**\n   */\n  update(attribute: AttributeType, value: string) {\n    if (this.attribute instanceof CompositeAttributeModel) {\n      this.attribute.update(value, attribute);\n    } else if (this.attribute !== null) {\n      this.attribute.update(value);\n    }\n  }\n\n  /**\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    if (this.attribute instanceof CompositeAttributeModel) {\n      return this.attribute.children.map((child) => {\n        const { param } = this.data[child.name];\n        return {\n          name: param,\n          value: child.value,\n        };\n      });\n    }\n\n    return [];\n  }\n}\n"],"mappings":";;;;;;;;AACA,IAAAA,YAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAAC,wBAAA,GAAAF,sBAAA,CAAAC,OAAA;AAGA;AACA;AACA;AACe,MAAME,gBAAgB,SAASC,oBAAW,CAAC;EACxD;AACF;EACEC,MAAMA,CAACC,SAAwB,EAAEC,KAAa,EAAE;IAC9C,IAAI,IAAI,CAACD,SAAS,YAAYE,gCAAuB,EAAE;MACrD,IAAI,CAACF,SAAS,CAACD,MAAM,CAACE,KAAK,EAAED,SAAS,CAAC;IACzC,CAAC,MAAM,IAAI,IAAI,CAACA,SAAS,KAAK,IAAI,EAAE;MAClC,IAAI,CAACA,SAAS,CAACD,MAAM,CAACE,KAAK,CAAC;IAC9B;EACF;;EAEA;AACF;EACE,IAAIE,MAAMA,CAAA,EAA4C;IACpD,IAAI,IAAI,CAACH,SAAS,YAAYE,gCAAuB,EAAE;MAAA,IAAAE,QAAA;MACrD,OAAO,IAAAC,IAAA,CAAAC,OAAA,EAAAF,QAAA,OAAI,CAACJ,SAAS,CAACO,QAAQ,EAAAC,IAAA,CAAAJ,QAAA,EAAMK,KAAK,IAAK;QAC5C,MAAM;UAAEC;QAAM,CAAC,GAAG,IAAI,CAACC,IAAI,CAACF,KAAK,CAACG,IAAI,CAAC;QACvC,OAAO;UACLA,IAAI,EAAEF,KAAK;UACXT,KAAK,EAAEQ,KAAK,CAACR;QACf,CAAC;MACH,CAAC,CAAC;IACJ;IAEA,OAAO,EAAE;EACX;AACF;AAACY,OAAA,CAAAP,OAAA,GAAAT,gBAAA","ignoreList":[]}

package/lib/models/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../src/models/types.js"],"sourcesContent":["// @flow\nimport type ApplicationModel from \"./application/ApplicationModel\";\nimport type BooleanAttributeModel from \"./attributes/BooleanAttributeModel\";\nimport type CaptchaAttributeModel from \"./attributes/CaptchaAttributeModel\";\nimport type ChoiceAttributeModel from \"./attributes/ChoiceAttributeModel\";\nimport type CompositeAttributeModel from \"./attributes/CompositeAttributeModel\";\nimport type DatetimeAttributeModel from \"./attributes/DatetimeAttributeModel\";\nimport type HelptextAttributeModel from \"./attributes/HelptextAttributeModel\";\nimport type LabelAttributeModel from \"./attributes/LabelAttributeModel\";\nimport type MemoAttributeModel from \"./attributes/MemoAttributeModel\";\nimport type MoneyAttributeModel from \"./attributes/MoneyAttributeModel\";\nimport type NumberAttributeModel from \"./attributes/NumberAttributeModel\";\nimport type PasswordAttributeModel from \"./attributes/PasswordAttributeModel\";\nimport type StringAttributeModel from \"./attributes/StringAttributeModel\";\nimport type UploadAttributeModel from \"./attributes/UploadAttributeModel\";\nimport type XMLAttributeModel from \"./attributes/XMLAttributeModel\";\nimport type CaseViewModel from \"./caseview/CaseViewModel\";\nimport type BusinessScenarioModel from \"./concepts/BusinessScenarioModel\";\nimport type ConceptDetailModel from \"./concepts/ConceptDetailModel\";\nimport type ConceptIndexModel from \"./concepts/ConceptIndexModel\";\nimport type ConceptTypeDetailModel from \"./concepts/ConceptTypeDetailModel\";\nimport type ContentIndexModel from \"./content/ContentIndexModel\";\nimport type ContentModel from \"./content/ContentModel\";\nimport type SectionModel from \"./content/SectionModel\";\nimport type ContentTOCModel from \"./content/ContentTOCModel\";\nimport type ContentTypeModel from \"./content/ContentTypeModel\";\nimport type DetailModel from \"./detail/DetailModel\";\nimport type AssignmentFilterModel from \"./filters/AssignmentFilterModel\";\nimport type FilterModel from \"./filters/FilterModel\";\nimport type RangeFilterModel from \"./filters/RangeFilterModel\";\nimport type ConceptIndexFilterModel from \"./filters/ConceptIndexFilterModel\";\nimport type FormModel from \"./form/FormModel\";\nimport type ListDetailModel from \"./list/ListDetailModel\";\nimport type ListModel from \"./list/ListModel\";\nimport type ModelCatalogModel from \"./modelcatalog/ModelCatalogModel\";\nimport type GroupingPanelModel from \"./panels/GroupingPanelModel\";\nimport type CaseSearchModel from \"./search/CaseSearchModel\";\nimport type TabModel from \"./tab/TabModel\";\nimport type TaskGroupModel from \"./taskgroup/TaskGroupModel\";\nimport type UserModel from \"./user/UserModel\";\nimport type UserServicesModel from \"./user/UserServicesModel\";\nimport type LinkModel from \"./links/LinkModel\";\nimport type LookupOptionsModel from \"./lookup/LookupOptionsModel\";\nimport type BaseFilterModel from \"./filters/BaseFilterModel\";\nimport type AttributeCollection from \"./attributes/AttributeCollection\";\nimport type AttributeModel from \"./attributes/AttributeModel\";\nimport type LayoutHintCollection from \"./layouthint/LayoutHintCollection\";\nimport type ErrorResponse from \"./error/ErrorResponse\";\n\nexport type ModularUIModel =\n  | ApplicationModel\n  | CaseSearchModel\n  | CaseViewModel\n  | ListDetailModel\n  | DetailModel\n  | FormModel\n  | GroupingPanelModel\n  | ListModel\n  | TabModel\n  | TaskGroupModel\n  | UserModel\n  | UserServicesModel\n  | ModelCatalogModel\n  | ConceptIndexModel\n  | ConceptDetailModel\n  | BusinessScenarioModel\n  | ConceptTypeDetailModel\n  | ContentIndexModel\n  | ContentTOCModel\n  | ContentModel\n  | ContentTypeModel\n  | LookupOptionsModel;\n\nexport type AttributeType =\n  | BooleanAttributeModel\n  | CaptchaAttributeModel\n  | ChoiceAttributeModel\n  | DatetimeAttributeModel\n  | HelptextAttributeModel\n  | LabelAttributeModel\n  | MemoAttributeModel\n  | MoneyAttributeModel\n  | NumberAttributeModel\n  | PasswordAttributeModel\n  | CompositeAttributeModel\n  | StringAttributeModel\n  | UploadAttributeModel\n  | XMLAttributeModel;\n\nexport type RangeChildAttributeType =\n  | NumberAttributeModel\n  | DatetimeAttributeModel;\n\nexport type FilterType =\n  | BaseFilterModel\n  | FilterModel\n  | AssignmentFilterModel\n  | RangeFilterModel\n  | ConceptIndexFilterModel;\n\nexport type FormErrorAnchor = {\n  id: string,\n  properties?: {\n    [propertyName: string]: string | number,\n  },\n  anchor?: {\n    objectid: string,\n    elementid?: string,\n    _links?: Object,\n    index?: number,\n    \"index-identifier\"?: string,\n  },\n  layouthint: LayoutHintCollection,\n  message: string,\n  param?: {\n    name: string,\n  },\n};\n\nexport type labelsJSON = {\n  _id: string,\n  label: string,\n  value: string,\n};\n\nexport type propertyJSON = {\n  _id: string,\n  type: string,\n  mandatory: string,\n  label: string,\n  value: string,\n};\n\nexport type textfragmentJSON = {\n  label: string,\n  text: string,\n  type: string,\n};\n\nexport interface IConstraintModel {\n  +id: string;\n  +defaultMessage: string;\n  +parameters: Object;\n  +isMandatoryConstraint: boolean;\n  validate(value: any): boolean;\n  hasValidation(): boolean;\n}\n\nexport interface ILayoutHintRule {\n  process(attribute: AttributeModel, attributes: AttributeCollection): void;\n}\n\nexport interface IModelWithChildModels {\n  getInitialChildModelLinks(): Array<LinkModel>;\n  setChildModels(\n    models: Array<ModularUIModel>,\n    errors: Array<ErrorResponse>,\n  ): void;\n}\n\nexport type AuthenticationType = {\n  name: string,\n  authentication: string,\n  redirectUri?: string,\n  isPrimary: boolean,\n};\n\nexport type FileEntryType = {\n  name: string,\n  size?: number,\n  progress: number,\n  error?: string,\n  token?: string,\n};\n\nexport type FilesType = {\n  [filename: string]: FileEntryType,\n};\n\nexport type FiletypeConstraintsType = Array<{|\n  extensions: Array<string>,\n  mimeTypes: Array<string>,\n|}>;\n\nexport type FilesizeConstraintsType = {\n  fileSize: ?number,\n  maxTotalFileSize: ?number,\n  isMaxTotal: boolean,\n};\n\nexport type PropertyData = { type: string, label: string, value: string };\nexport type TextFragmentData = {\n  type: string,\n  label: string,\n  text: string | { id?: string, message: string, properties?: Object },\n};\nexport type SectionData = {\n  id: string,\n  type: string,\n  label?: string,\n  number?: string,\n  body: string | { id?: string, message: string, properties?: Object },\n  _links: { self: { href: string } },\n  childSections?: Array<SectionData>,\n  sections?: Array<SectionData>,\n  subSections: Array<SectionData>,\n};\n\nexport type PropertyElement = {\n  propertyElement: {\n    label: string,\n    layouthint: Array<string>,\n    properties: Array<PropertyData>,\n  },\n};\nexport type TextFragmentElement = {\n  textFragmentElement: {\n    label: string,\n    layouthint: Array<string>,\n    textfragments: Array<TextFragmentData>,\n  },\n};\nexport type ContentElement = {\n  contentElement: {\n    label: string,\n    layouthint: Array<string>,\n    sections: Array<SectionData>,\n  },\n};\n\nexport type PropertyElementMapped = {\n  propertyElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    properties: Array<PropertyData>,\n  },\n};\nexport type TextFragmentElementMapped = {\n  textFragmentElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    textfragments: Array<TextFragmentData>,\n  },\n};\nexport type ContentElementMapped = {\n  contentElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    sections: Array<SectionModel>,\n  },\n};\n\nexport type ContentAll = Array<\n  PropertyElementMapped | TextFragmentElementMapped | ContentElementMapped,\n>;\n\nexport type ContentData = {\n  header: {\n    label?: string,\n    description?: { id?: string, message: string, properties?: Object },\n  },\n  label?: string,\n  elements: Array<PropertyElement | TextFragmentElement | ContentElement>,\n};\n\nexport type SectionFragment = {\n  text: string,\n  startOffset: number,\n  endOffset: number,\n};\n\nexport type ModelOptions = {\n  origin?: ?string,\n  contextPath?: ?string,\n};\n"],"mappings":"","ignoreList":[]}
+{"version":3,"file":"types.js","names":[],"sources":["../../src/models/types.js"],"sourcesContent":["// @flow\nimport type ApplicationModel from \"./application/ApplicationModel\";\nimport type BooleanAttributeModel from \"./attributes/BooleanAttributeModel\";\nimport type CaptchaAttributeModel from \"./attributes/CaptchaAttributeModel\";\nimport type ChoiceAttributeModel from \"./attributes/ChoiceAttributeModel\";\nimport type CompositeAttributeModel from \"./attributes/CompositeAttributeModel\";\nimport type DatetimeAttributeModel from \"./attributes/DatetimeAttributeModel\";\nimport type HelptextAttributeModel from \"./attributes/HelptextAttributeModel\";\nimport type LabelAttributeModel from \"./attributes/LabelAttributeModel\";\nimport type MemoAttributeModel from \"./attributes/MemoAttributeModel\";\nimport type MoneyAttributeModel from \"./attributes/MoneyAttributeModel\";\nimport type NumberAttributeModel from \"./attributes/NumberAttributeModel\";\nimport type PasswordAttributeModel from \"./attributes/PasswordAttributeModel\";\nimport type StringAttributeModel from \"./attributes/StringAttributeModel\";\nimport type UploadAttributeModel from \"./attributes/UploadAttributeModel\";\nimport type XMLAttributeModel from \"./attributes/XMLAttributeModel\";\nimport type CaseViewModel from \"./caseview/CaseViewModel\";\nimport type BusinessScenarioModel from \"./concepts/BusinessScenarioModel\";\nimport type ConceptDetailModel from \"./concepts/ConceptDetailModel\";\nimport type ConceptIndexModel from \"./concepts/ConceptIndexModel\";\nimport type ConceptTypeDetailModel from \"./concepts/ConceptTypeDetailModel\";\nimport type ContentIndexModel from \"./content/ContentIndexModel\";\nimport type ContentModel from \"./content/ContentModel\";\nimport type SectionModel from \"./content/SectionModel\";\nimport type ContentTOCModel from \"./content/ContentTOCModel\";\nimport type ContentTypeModel from \"./content/ContentTypeModel\";\nimport type DetailModel from \"./detail/DetailModel\";\nimport type AssignmentFilterModel from \"./filters/AssignmentFilterModel\";\nimport type FilterModel from \"./filters/FilterModel\";\nimport type RangeFilterModel from \"./filters/RangeFilterModel\";\nimport type ConceptIndexFilterModel from \"./filters/ConceptIndexFilterModel\";\nimport type FormModel from \"./form/FormModel\";\nimport type ListDetailModel from \"./list/ListDetailModel\";\nimport type ListModel from \"./list/ListModel\";\nimport type ModelCatalogModel from \"./modelcatalog/ModelCatalogModel\";\nimport type GroupingPanelModel from \"./panels/GroupingPanelModel\";\nimport type CaseSearchModel from \"./search/CaseSearchModel\";\nimport type TabModel from \"./tab/TabModel\";\nimport type TaskGroupModel from \"./taskgroup/TaskGroupModel\";\nimport type UserModel from \"./user/UserModel\";\nimport type UserServicesModel from \"./user/UserServicesModel\";\nimport type LinkModel from \"./links/LinkModel\";\nimport type LookupOptionsModel from \"./lookup/LookupOptionsModel\";\nimport type AttributeCollection from \"./attributes/AttributeCollection\";\nimport type AttributeModel from \"./attributes/AttributeModel\";\nimport type LayoutHintCollection from \"./layouthint/LayoutHintCollection\";\nimport type ErrorResponse from \"./error/ErrorResponse\";\n\nexport type ModularUIModel =\n  | ApplicationModel\n  | CaseSearchModel\n  | CaseViewModel\n  | ListDetailModel\n  | DetailModel\n  | FormModel\n  | GroupingPanelModel\n  | ListModel\n  | TabModel\n  | TaskGroupModel\n  | UserModel\n  | UserServicesModel\n  | ModelCatalogModel\n  | ConceptIndexModel\n  | ConceptDetailModel\n  | BusinessScenarioModel\n  | ConceptTypeDetailModel\n  | ContentIndexModel\n  | ContentTOCModel\n  | ContentModel\n  | ContentTypeModel\n  | LookupOptionsModel;\n\nexport type AttributeType =\n  | BooleanAttributeModel\n  | CaptchaAttributeModel\n  | ChoiceAttributeModel\n  | DatetimeAttributeModel\n  | HelptextAttributeModel\n  | LabelAttributeModel\n  | MemoAttributeModel\n  | MoneyAttributeModel\n  | NumberAttributeModel\n  | PasswordAttributeModel\n  | CompositeAttributeModel\n  | StringAttributeModel\n  | UploadAttributeModel\n  | XMLAttributeModel;\n\nexport type RangeChildAttributeType =\n  | NumberAttributeModel\n  | DatetimeAttributeModel;\n\nexport type FilterType =\n  | AssignmentFilterModel\n  | FilterModel\n  | RangeFilterModel\n  | ConceptIndexFilterModel;\n\nexport type FormErrorAnchor = {\n  id: string,\n  properties?: {\n    [propertyName: string]: string | number,\n  },\n  anchor?: {\n    objectid: string,\n    elementid?: string,\n    _links?: Object,\n    index?: number,\n    \"index-identifier\"?: string,\n  },\n  layouthint: LayoutHintCollection,\n  message: string,\n  param?: {\n    name: string,\n  },\n};\n\nexport type labelsJSON = {\n  _id: string,\n  label: string,\n  value: string,\n};\n\nexport type propertyJSON = {\n  _id: string,\n  type: string,\n  mandatory: string,\n  label: string,\n  value: string,\n};\n\nexport type textfragmentJSON = {\n  label: string,\n  text: string,\n  type: string,\n};\n\nexport interface IConstraintModel {\n  +id: string;\n  +defaultMessage: string;\n  +parameters: Object;\n  +isMandatoryConstraint: boolean;\n  validate(value: any): boolean;\n  hasValidation(): boolean;\n}\n\nexport interface ILayoutHintRule {\n  process(attribute: AttributeModel, attributes: AttributeCollection): void;\n}\n\nexport interface IModelWithChildModels {\n  getInitialChildModelLinks(): Array<LinkModel>;\n  setChildModels(\n    models: Array<ModularUIModel>,\n    errors: Array<ErrorResponse>,\n  ): void;\n}\n\nexport type AuthenticationType = {\n  name: string,\n  authentication: string,\n  redirectUri?: string,\n  isPrimary: boolean,\n};\n\nexport type FileEntryType = {\n  name: string,\n  size?: number,\n  progress: number,\n  error?: string,\n  token?: string,\n};\n\nexport type FilesType = {\n  [filename: string]: FileEntryType,\n};\n\nexport type FiletypeConstraintsType = Array<{|\n  extensions: Array<string>,\n  mimeTypes: Array<string>,\n|}>;\n\nexport type FilesizeConstraintsType = {\n  fileSize: ?number,\n  maxTotalFileSize: ?number,\n  isMaxTotal: boolean,\n};\n\nexport type PropertyData = { type: string, label: string, value: string };\nexport type TextFragmentData = {\n  type: string,\n  label: string,\n  text: string | { id?: string, message: string, properties?: Object },\n};\nexport type SectionData = {\n  id: string,\n  type: string,\n  label?: string,\n  number?: string,\n  body: string | { id?: string, message: string, properties?: Object },\n  _links: { self: { href: string } },\n  childSections?: Array<SectionData>,\n  sections?: Array<SectionData>,\n  subSections: Array<SectionData>,\n};\n\nexport type PropertyElement = {\n  propertyElement: {\n    label: string,\n    layouthint: Array<string>,\n    properties: Array<PropertyData>,\n  },\n};\nexport type TextFragmentElement = {\n  textFragmentElement: {\n    label: string,\n    layouthint: Array<string>,\n    textfragments: Array<TextFragmentData>,\n  },\n};\nexport type ContentElement = {\n  contentElement: {\n    label: string,\n    layouthint: Array<string>,\n    sections: Array<SectionData>,\n  },\n};\n\nexport type PropertyElementMapped = {\n  propertyElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    properties: Array<PropertyData>,\n  },\n};\nexport type TextFragmentElementMapped = {\n  textFragmentElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    textfragments: Array<TextFragmentData>,\n  },\n};\nexport type ContentElementMapped = {\n  contentElement: {\n    label: string,\n    layouthint: LayoutHintCollection,\n    sections: Array<SectionModel>,\n  },\n};\n\nexport type ContentAll = Array<\n  PropertyElementMapped | TextFragmentElementMapped | ContentElementMapped,\n>;\n\nexport type ContentData = {\n  header: {\n    label?: string,\n    description?: { id?: string, message: string, properties?: Object },\n  },\n  label?: string,\n  elements: Array<PropertyElement | TextFragmentElement | ContentElement>,\n};\n\nexport type SectionFragment = {\n  text: string,\n  startOffset: number,\n  endOffset: number,\n};\n\nexport type ModelOptions = {\n  origin?: ?string,\n  contextPath?: ?string,\n};\n"],"mappings":"","ignoreList":[]}

package/package.json

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

package/src/hooks/__tests__/UseModularUIModel.spec.js

@@ -135,12 +135,10 @@ describe("modularui hooks", () => {
 
   // eslint-disable-next-line jest/expect-expect
   it("useList", () => {
-    assertTargetModel(
-      () => useList("/tab/list"),
-      "list",
-      "/tab/list",
+    assertTargetModel(() => useList("/tab/list"), "list", "/tab/list", [
       ListModel,
-    );
+      CaseSearchModel,
+    ]);
   });
 
   // eslint-disable-next-line jest/expect-expect

package/src/hooks/useList.js

@@ -5,6 +5,7 @@ import { HTTP_METHODS } from "../constants/Constants";
 import { loadModularUI } from "../redux";
 import DetailModel from "../models/detail/DetailModel";
 import ListModel from "../models/list/ListModel";
+import CaseSearchModel from "../models/search/CaseSearchModel";
 import ListDetailModel from "../models/list/ListDetailModel";
 import Href from "../models/href/Href";
 
@@ -22,8 +23,8 @@ export const useList = (
   options?: HookOptions,
 ): ListModel | null =>
   useModularUIBasic("list", href, {
-    expectedModels: ["List"],
-    targetModel: ListModel,
+    expectedModels: ["List", "CaseSearch"],
+    targetModel: [ListModel, CaseSearchModel],
     ...options,
   });
 
@@ -34,8 +35,8 @@ export const useListOrDetail = (
   options?: HookOptions,
 ): ListModel | DetailModel | null =>
   useModularUIBasic("list", href, {
-    expectedModels: ["List", "Detail"],
-    targetModel: [ListModel, DetailModel],
+    expectedModels: ["List", "CaseSearch", "Detail"],
+    targetModel: [ListModel, CaseSearchModel, DetailModel],
     ...options,
   });
 
@@ -70,7 +71,7 @@ export const useListNavigation = (): ListNavigationHook => {
         loadModularUI(list.connectKey, listHref, {
           method: HTTP_METHODS.POST,
           data: list.formdata,
-          targetModel: ListModel,
+          targetModel: [ListModel, CaseSearchModel],
         }),
       );
     } else {
@@ -78,7 +79,7 @@ export const useListNavigation = (): ListNavigationHook => {
       dispatch(
         loadModularUI(list.connectKey, listHref, {
           method: HTTP_METHODS.GET,
-          targetModel: ListModel,
+          targetModel: [ListModel, CaseSearchModel],
         }),
       );
     }

package/src/models/concepts/ConceptIndexModel.js

@@ -129,14 +129,15 @@ export default class ConceptIndexModel extends ResourceModel {
   /**
    * Retrieve modelcatalog.js of content toc
    */
-  get entryDate(): string | null {
+  get entryDate(): ISO_DATE | null {
     const timeversionFilter = this.filterCollection.getFilterByAttributeKey(
       TIMEVERSION_FILTER_NAME,
     );
-    if (timeversionFilter && timeversionFilter.attribute) {
-      return timeversionFilter.attribute.value;
-    }
 
+    const date = timeversionFilter?.value;
+    if (typeof date === "string") {
+      return date;
+    }
     return null;
   }
 

package/src/models/content/ContentIndexModel.js

@@ -6,10 +6,11 @@ import ContentLinkModel from "./ContentLinkModel";
 import Href from "../href/Href";
 import ChoiceAttributeModel from "../attributes/ChoiceAttributeModel";
 
-import type { FilterType, ModularUIModel } from "../types";
+import type { ModularUIModel } from "../types";
 import type { ModularUIResponse } from "../../modularui";
 import type LinkModel from "../links/LinkModel";
 import type ErrorResponse from "../error/ErrorResponse";
+import ConceptIndexFilterModel from "../filters/ConceptIndexFilterModel";
 
 /**
  * Get Index of concepts, to filter model catalog
@@ -109,8 +110,12 @@ export default class ContentIndexModel extends ResourceModel {
   /**
    * Get index filter
    */
-  get indexfilter(): FilterType | null {
-    return this._filterCollection.getFilterByAttributeKey("index");
+  get indexfilter(): ConceptIndexFilterModel | null {
+    const indexFilter = this._filterCollection.getFilterByAttributeKey("index");
+    if (indexFilter instanceof ConceptIndexFilterModel) {
+      return indexFilter;
+    }
+    return null;
   }
 
   /**

package/src/models/content/ContentModel.js

@@ -110,10 +110,11 @@ export default class ContentModel extends ResourceModel {
     const entryDateFilter = this.filterCollection?.getFilterByAttributeKey(
       TIMEVERSION_FILTER_NAME,
     );
-    if (entryDateFilter && entryDateFilter.attribute) {
-      return entryDateFilter.attribute.value;
-    }
 
+    const date = entryDateFilter?.value;
+    if (typeof date === "string") {
+      return date;
+    }
     return null;
   }
 

package/src/models/content/ContentTOCModel.js

@@ -220,7 +220,11 @@ export default class ContentTOCModel extends ResourceModel {
       TIMEVERSION_FILTER_NAME,
     );
 
-    return timeversionFilter?.attribute?.value ?? null;
+    const date = timeversionFilter?.value;
+    if (typeof date === "string") {
+      return date;
+    }
+    return null;
   }
 
   /**
@@ -228,6 +232,6 @@ export default class ContentTOCModel extends ResourceModel {
   get isCompleteSource(): boolean {
     const completeFilter =
       this.filterCollection.getFilterByAttributeKey("complete");
-    return completeFilter?.attribute?.value === "true";
+    return completeFilter?.value === "true";
   }
 }

package/src/models/filters/AssignmentFilterModel.js

@@ -3,13 +3,14 @@ import BaseFilterModel from "../filters/BaseFilterModel";
 
 import type { AttributeType, ModelOptions } from "../types";
 import { IllegalStateException } from "../../exceptions";
+import createAttribute from "../attributes/_createAttribute";
 /**
  * Assignment filter consists of two filters: assignment type and user filter
  */
 export default class AssignmentFilterModel extends BaseFilterModel {
   _listKey: string;
-  _assignmenttype: ?AttributeType;
-  _user: ?AttributeType;
+  _assignmenttype: AttributeType;
+  _user: AttributeType;
 
   /**
    * Construct an assignment filter
@@ -31,29 +32,16 @@ export default class AssignmentFilterModel extends BaseFilterModel {
     return this.data.name;
   }
 
-  /**
-   * Getting key of the list these filters apply to
-   */
-  get listkey(): string {
-    return this._listKey;
-  }
-
-  /**
-   * Set key of list this filter belongs to
-   */
-  set listkey(key: string) {
-    this._listKey = key;
-  }
-
   /**
    */
   get contextid(): string {
     return this.getContribution("contextid", "");
   }
+
   /**
    * Creates an assignmenttype model when assignmenttype json is present
    */
-  createAssignmentTypeModel(): ?AttributeType {
+  createAssignmentTypeModel(): AttributeType {
     const key = `${this.contextid}ASSIGNMENTTYPE`;
     const assignmentTypeData = this.data[key];
 
@@ -71,22 +59,23 @@ export default class AssignmentFilterModel extends BaseFilterModel {
 
     const assignmentTypeContributions = {
       ...this.contributions[key],
+      type: "choice",
       enumerated: true,
       optionMode: assignmentTypeData._links ? "lookup" : "static",
     };
 
-    return this.createAttribute(
-      "choice",
+    return createAttribute(
       assignmentTypeData.name || assignmentTypeData.param,
       assignmentTypeData,
       assignmentTypeContributions,
+      this.modelOptions,
     );
   }
 
   /**
    * Creates an assignmenttype model when userkey json is present
    */
-  createUserModel(): ?AttributeType {
+  createUserModel(): AttributeType {
     const key = `${this.contextid}USERKEY`;
     const userData = this.data[key];
 
@@ -98,28 +87,30 @@ export default class AssignmentFilterModel extends BaseFilterModel {
 
     const userContributions = {
       ...this.contributions[key],
+      type: "choice",
+      enumerated: true,
       optionMode: userData._links ? "lookup" : "static",
     };
 
-    return this.createAttribute(
-      "choice",
+    return createAttribute(
       userData.name || userData.param,
       userData,
       userContributions,
+      this.modelOptions,
     );
   }
 
   /**
    * The assignment filter consists of two part. This method return the assignment type attribute
    */
-  get assignmenttype(): ?AttributeType {
+  get assignmenttype(): AttributeType {
     return this._assignmenttype;
   }
 
   /**
    * The assignment filter consists of two part. This method return the user identifier attribute
    */
-  get user(): ?AttributeType {
+  get user(): AttributeType {
     return this._user;
   }
 
@@ -127,20 +118,45 @@ export default class AssignmentFilterModel extends BaseFilterModel {
    * Getting the parameters of this filter
    */
   get params(): Array<{ name: string, value: ?string }> {
-    if (this.assignmenttype && this.user) {
-      return [
-        {
-          name: this.assignmenttype.name,
-          value: this.assignmenttype.value,
-        },
-        {
-          name: this.user.name,
-          value: this.user.value,
-        },
-      ];
-    }
+    return [
+      {
+        name: this.assignmenttype.name,
+        value: this.assignmenttype.value,
+      },
+      {
+        name: this.user.name,
+        value: this.user.value,
+      },
+    ];
+  }
 
-    return [];
+  /**
+   */
+  get value(): { [string]: any } {
+    return {
+      [this.assignmenttype.name]: this.assignmenttype.value,
+      [this.user.name]: this.user.value,
+    };
+  }
+
+  /**
+   */
+  get inputvalue(): { [string]: any } {
+    return {
+      [this.assignmenttype.name]: this.assignmenttype.inputvalue,
+      [this.user.name]: this.user.inputvalue,
+    };
+  }
+
+  /**
+   * Indicates if the filter has a value.
+   */
+  hasValue(): boolean {
+    return (
+      (this.assignmenttype.value !== null &&
+        this.assignmenttype.value !== "") ||
+      (this.user.value !== null && this.user.value !== "")
+    );
   }
 
   /**
@@ -192,4 +208,19 @@ export default class AssignmentFilterModel extends BaseFilterModel {
       this.user.isValid
     );
   }
+
+  /**
+   */
+  get readonlyvalue(): { [string]: string } {
+    return {
+      [this.assignmenttype.name]: this.assignmenttype.readonlyvalue,
+      [this.user.name]: this.user.readonlyvalue,
+    };
+  }
+
+  /**
+   */
+  get formdata(): { [string]: any } | null {
+    return this.value;
+  }
 }