@beinformed/ui 1.65.2 → 1.65.4

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/href/Href.js

@@ -281,7 +281,7 @@ class Href {
    * Remove a parameter from the parameter collection
    */
   removeParameter(name: string, prefix: ?string, value: ?string): Href {
-    if (value !== undefined) {
+    if (value != undefined) {
       const valueToRemove = value;
 
       this._parameters = this._parameters.map((param) => {

package/src/models/list/ListModel.js

@@ -20,7 +20,7 @@ import {
   SHOW_ONE_RESULT_AS_DETAIL,
 } from "../../constants/LayoutHints";
 
-import type { ModularUIModel } from "../types";
+import type { ModularUIModel, FilterType } from "../types";
 import type LinkModel from "../links/LinkModel";
 
 /**
@@ -288,8 +288,12 @@ export default class ListModel extends ResourceModel {
   /**
    * Set filterCollection
    */
-  set filterCollection(filterCollection: FilterCollection) {
-    this._filterCollection = filterCollection;
+  set filterCollection(filterCollection: FilterCollection | Array<FilterType>) {
+    if (Array.isArray(filterCollection)) {
+      this._filterCollection.collection = filterCollection;
+    } else {
+      this._filterCollection = filterCollection;
+    }
   }
 
   /**

package/src/models/sorting/SortOptionModel.js

@@ -28,6 +28,13 @@ class SortOptionModel {
     }
   }
 
+  /**
+   */
+  reset() {
+    this.selected = false;
+    this.sortorder = "desc";
+  }
+
   /**
    */
   get selected(): boolean {

package/src/models/sorting/SortingModel.js

@@ -47,6 +47,13 @@ class SortingModel extends BaseCollection<SortOptionModel> {
       .join(",");
   }
 
+  /**
+   */
+  set value(value: string) {
+    this.reset();
+    this.setSelected(value);
+  }
+
   /**
    */
   get param(): string {
@@ -61,8 +68,13 @@ class SortingModel extends BaseCollection<SortOptionModel> {
 
   /**
    */
-  setSelected(currentSort: string = "") {
-    currentSort.split(",").forEach((sortItem) => {
+  reset() {
+    this.collection.forEach((option) => option.reset());
+  }
+  /**
+   */
+  setSelected(value: string = "") {
+    value.split(",").forEach((sortItem) => {
       const [key, direction] = sortItem.split(" ");
 
       this.collection.forEach((option) => {

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;
 

package/src/redux/_modularui/ModularUIConnector.js

@@ -118,13 +118,15 @@ const modularUIConnector = (
       }, [dispatch, doReload, url, modelKey]);
 
       // Remove model when hoc unloads
-      useEffect(() => {
-        return () => {
+      useEffect(
+        // prettier-ignore
+        () => () => { //NOSONAR
           if (finalRemoveOnUnmount) {
             dispatch(removeModelByKey(modelKey));
           }
-        };
-      }, [dispatch, modelKey, finalRemoveOnUnmount]);
+        },
+        [dispatch, modelKey, finalRemoveOnUnmount],
+      );
 
       // Create new properties object to inject modularui properties to own props
       const locale = useLocale();