@beinformed/ui 1.65.3 → 1.65.5

package/src/models/filters/BaseFilterModel.js

@@ -1,19 +1,17 @@
 // @flow
 import BaseModel from "../base/BaseModel";
-import createAttribute from "../attributes/_createAttribute";
+
 import {
   PARAMETER_SEPARATOR,
   PARAMETER_TYPES,
 } from "../../constants/Constants";
 
-import type { AttributeType, FilterType, ModelOptions } from "../types";
-import { IllegalStateException } from "../../exceptions";
+import type { ModelOptions } from "../types";
 
 /**
  * Base class for filters
  */
 export default class BaseFilterModel extends BaseModel {
-  _attribute: AttributeType | null = null;
   _context: Object;
   _listKey: string;
 
@@ -26,13 +24,6 @@ export default class BaseFilterModel extends BaseModel {
   ) {
     super(data, contributions, modelOptions);
 
-    this._attribute = this.createAttribute(
-      this.type,
-      this.param,
-      this.data,
-      this.contributions,
-    );
-
     if (this.contributions.listKey) {
       this.listkey = this.contributions.listKey;
     }
@@ -60,30 +51,6 @@ export default class BaseFilterModel extends BaseModel {
     }
   }
 
-  /**
-   * Create attribute through the attribute factory. Create type based on filter key without the filter suffix
-   */
-  createAttribute(
-    type: string,
-    param: string,
-    data: Object,
-    contributions: Object,
-  ): AttributeType | null {
-    if (type === "assignment") {
-      return null;
-    }
-
-    return createAttribute(
-      param,
-      data,
-      {
-        ...contributions,
-        type: type,
-      },
-      this.modelOptions,
-    );
-  }
-
   /**
    * Inidiates if filter is multiplechoice
    */
@@ -151,75 +118,6 @@ export default class BaseFilterModel extends BaseModel {
     return this.data.param ?? this.data.name;
   }
 
-  /**
-   * Get attribute of filter
-   */
-  get attribute(): AttributeType {
-    if (!this._attribute) {
-      throw new IllegalStateException(
-        `Missing filter attribute on filter model: ${this.label}`,
-      );
-    }
-    return this._attribute;
-  }
-
-  /**
-   * Retrieve the parameters with it's value for this filter
-   */
-  get params(): Array<{ name: string, value: ?string }> {
-    if (!this.param) {
-      return [];
-    }
-
-    return [
-      {
-        name: this.param,
-        value: this.attribute?.value,
-      },
-    ];
-  }
-
-  /**
-   * Getting the value of the filter
-   */
-  get value(): string | null {
-    return this.attribute?.value;
-  }
-
-  /**
-   * Getting the inputvalue of the filter
-   */
-  get inputvalue(): string {
-    return this.attribute?.inputvalue;
-  }
-
-  /**
-   * Indicates if the filter has a value.
-   */
-  hasValue(): boolean {
-    return this.value !== null && this.value !== "";
-  }
-
-  /**
-   * Reset the value of this filter to undefined
-   */
-  reset(): FilterType {
-    if (this.attribute) {
-      this.attribute.reset();
-    }
-
-    return this;
-  }
-
-  /**
-   * Update this filter with input name and value
-   */
-  update(attribute: AttributeType, value: string) {
-    if (this.attribute) {
-      this.attribute.update(value);
-    }
-  }
-
   /**
    * Inidicates if filter is a quick search filter
    */
@@ -227,39 +125,10 @@ export default class BaseFilterModel extends BaseModel {
     return this.contributions.quicksearch === true;
   }
 
-  /**
-   * Inidiates if filter is active
-   */
-  isActive(): boolean {
-    return this.attribute !== null && this.attribute.initvalue !== null;
-  }
-
-  /**
-   * Inidiates if filter is valid
-   */
-  get isValid(): boolean {
-    return this.attribute !== null && this.attribute.isValid;
-  }
-
-  /**
-   */
-  get readonlyvalue(): string {
-    if (this.attribute) {
-      return this.attribute.readonlyvalue;
-    }
-    return "";
-  }
-
   /**
    * Get assistant message
    */
   get assistantMessage(): string | null {
     return this.getContribution("assistant");
   }
-
-  /**
-   */
-  get formdata(): { [string]: any } | null {
-    return this.attribute.formdata ?? null;
-  }
 }

package/src/models/filters/ConceptIndexFilterModel.js

@@ -1,5 +1,5 @@
 // @flow
-import BaseFilterModel from "../filters/BaseFilterModel";
+import FilterModel from "../filters/FilterModel";
 import ChoiceAttributeModel from "../attributes/ChoiceAttributeModel";
 
 import type { ModelOptions } from "../types";
@@ -7,7 +7,7 @@ import type { ModelOptions } from "../types";
 /**
  * The concept index model is a special filter used to index all first concept label letters in de modelcatalog.
  */
-export default class ConceptIndexFilterModel extends BaseFilterModel {
+export default class ConceptIndexFilterModel extends FilterModel {
   /**
    * Construct a filter
    */

package/src/models/filters/FilterModel.js

@@ -1,6 +1,151 @@
 // @flow
 import BaseFilterModel from "../filters/BaseFilterModel";
+import createAttribute from "../attributes/_createAttribute";
+import { IllegalStateException } from "../../exceptions";
+
+import type { AttributeType, FilterType, ModelOptions } from "../types";
 
 /**
  */
-export default class FilterModel extends BaseFilterModel {}
+export default class FilterModel extends BaseFilterModel {
+  _attribute: AttributeType | null = null;
+
+  /**
+   */
+  constructor(
+    data: Object,
+    contributions: Object,
+    modelOptions?: ModelOptions,
+  ) {
+    super(data, contributions, modelOptions);
+
+    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: string,
+    param: string,
+    data: Object,
+    contributions: Object,
+  ): AttributeType | null {
+    if (type === "assignment") {
+      return null;
+    }
+
+    return createAttribute(
+      param,
+      data,
+      {
+        ...contributions,
+        type: type,
+      },
+      this.modelOptions,
+    );
+  }
+
+  /**
+   * Get attribute of filter
+   */
+  get attribute(): AttributeType {
+    if (!this._attribute) {
+      throw new IllegalStateException(
+        `Missing filter attribute on filter model: ${this.label}`,
+      );
+    }
+    return this._attribute;
+  }
+
+  /**
+   * Retrieve the parameters with it's value for this filter
+   */
+  get params(): Array<{ name: string, value: ?string }> {
+    if (!this.param) {
+      return [];
+    }
+
+    return [
+      {
+        name: this.param,
+        value: this.attribute?.value,
+      },
+    ];
+  }
+
+  /**
+   * Getting the value of the filter
+   */
+  get value(): string | null {
+    return this.attribute?.value;
+  }
+
+  /**
+   * Getting the inputvalue of the filter
+   */
+  get inputvalue(): string {
+    return this.attribute?.inputvalue;
+  }
+
+  /**
+   * Indicates if the filter has a value.
+   */
+  hasValue(): boolean {
+    return this.value !== null && this.value !== "";
+  }
+
+  /**
+   * Reset the value of this filter to undefined
+   */
+  reset(): FilterType {
+    if (this.attribute) {
+      this.attribute.reset();
+    }
+
+    return this;
+  }
+
+  /**
+   * Update this filter with input name and value
+   */
+  update(attribute: AttributeType, value: string) {
+    if (this.attribute) {
+      this.attribute.update(value);
+    }
+  }
+
+  /**
+   * Inidiates if filter is active
+   */
+  isActive(): boolean {
+    return this.attribute?.initvalue !== null;
+  }
+
+  /**
+   * Inidiates if filter is valid
+   */
+  get isValid(): boolean {
+    return this.attribute?.isValid || true;
+  }
+
+  /**
+   */
+  get readonlyvalue(): string {
+    if (this.attribute) {
+      return this.attribute.readonlyvalue;
+    }
+    return "";
+  }
+
+  /**
+   */
+  get formdata(): { [string]: any } | null {
+    return this.attribute.formdata ?? null;
+  }
+}

package/src/models/filters/RangeFilterModel.js

@@ -1,5 +1,5 @@
 // @flow
-import BaseFilterModel from "../filters/BaseFilterModel";
+import FilterModel from "../filters/FilterModel";
 
 import CompositeAttributeModel from "../attributes/CompositeAttributeModel";
 import type { AttributeType } from "../types";
@@ -7,7 +7,7 @@ import type { AttributeType } from "../types";
 /**
  * Range filter, for instance a date range filter or a number range filter
  */
-export default class RangeFilterModel extends BaseFilterModel {
+export default class RangeFilterModel extends FilterModel {
   /**
    */
   update(attribute: AttributeType, value: string) {

package/src/models/types.js

@@ -41,7 +41,6 @@ import type UserModel from "./user/UserModel";
 import type UserServicesModel from "./user/UserServicesModel";
 import type LinkModel from "./links/LinkModel";
 import type LookupOptionsModel from "./lookup/LookupOptionsModel";
-import type BaseFilterModel from "./filters/BaseFilterModel";
 import type AttributeCollection from "./attributes/AttributeCollection";
 import type AttributeModel from "./attributes/AttributeModel";
 import type LayoutHintCollection from "./layouthint/LayoutHintCollection";
@@ -92,9 +91,8 @@ export type RangeChildAttributeType =
   | DatetimeAttributeModel;
 
 export type FilterType =
-  | BaseFilterModel
-  | FilterModel
   | AssignmentFilterModel
+  | FilterModel
   | RangeFilterModel
   | ConceptIndexFilterModel;