@beinformed/ui 1.65.2 → 1.65.4

package/esm/models/filters/AssignmentFilterModel.js

@@ -1,6 +1,7 @@
 import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
 import BaseFilterModel from "../filters/BaseFilterModel";
 import { IllegalStateException } from "../../exceptions";
+import createAttribute from "../attributes/_createAttribute";
 /**
  * Assignment filter consists of two filters: assignment type and user filter
  */
@@ -23,25 +24,12 @@ export default class AssignmentFilterModel extends BaseFilterModel {
     return this.data.name;
   }
 
-  /**
-   * Getting key of the list these filters apply to
-   */
-  get listkey() {
-    return this._listKey;
-  }
-
-  /**
-   * Set key of list this filter belongs to
-   */
-  set listkey(key) {
-    this._listKey = key;
-  }
-
   /**
    */
   get contextid() {
     return this.getContribution("contextid", "");
   }
+
   /**
    * Creates an assignmenttype model when assignmenttype json is present
    */
@@ -58,10 +46,11 @@ export default class AssignmentFilterModel extends BaseFilterModel {
     }
     const assignmentTypeContributions = {
       ...this.contributions[key],
+      type: "choice",
       enumerated: true,
       optionMode: assignmentTypeData._links ? "lookup" : "static"
     };
-    return this.createAttribute("choice", assignmentTypeData.name || assignmentTypeData.param, assignmentTypeData, assignmentTypeContributions);
+    return createAttribute(assignmentTypeData.name || assignmentTypeData.param, assignmentTypeData, assignmentTypeContributions, this.modelOptions);
   }
 
   /**
@@ -77,9 +66,11 @@ export default class AssignmentFilterModel extends BaseFilterModel {
     }
     const userContributions = {
       ...this.contributions[key],
+      type: "choice",
+      enumerated: true,
       optionMode: userData._links ? "lookup" : "static"
     };
-    return this.createAttribute("choice", userData.name || userData.param, userData, userContributions);
+    return createAttribute(userData.name || userData.param, userData, userContributions, this.modelOptions);
   }
 
   /**
@@ -100,16 +91,38 @@ export default class AssignmentFilterModel extends BaseFilterModel {
    * Getting the parameters of this filter
    */
   get params() {
-    if (this.assignmenttype && this.user) {
-      return [{
-        name: this.assignmenttype.name,
-        value: this.assignmenttype.value
-      }, {
-        name: this.user.name,
-        value: this.user.value
-      }];
-    }
-    return [];
+    return [{
+      name: this.assignmenttype.name,
+      value: this.assignmenttype.value
+    }, {
+      name: this.user.name,
+      value: this.user.value
+    }];
+  }
+
+  /**
+   */
+  get value() {
+    return {
+      [this.assignmenttype.name]: this.assignmenttype.value,
+      [this.user.name]: this.user.value
+    };
+  }
+
+  /**
+   */
+  get inputvalue() {
+    return {
+      [this.assignmenttype.name]: this.assignmenttype.inputvalue,
+      [this.user.name]: this.user.inputvalue
+    };
+  }
+
+  /**
+   * Indicates if the filter has a value.
+   */
+  hasValue() {
+    return this.assignmenttype.value !== null && this.assignmenttype.value !== "" || this.user.value !== null && this.user.value !== "";
   }
 
   /**
@@ -149,5 +162,20 @@ export default class AssignmentFilterModel extends BaseFilterModel {
   get isValid() {
     return this.assignmenttype != null && this.assignmenttype.isValid && this.user != null && this.user.isValid;
   }
+
+  /**
+   */
+  get readonlyvalue() {
+    return {
+      [this.assignmenttype.name]: this.assignmenttype.readonlyvalue,
+      [this.user.name]: this.user.readonlyvalue
+    };
+  }
+
+  /**
+   */
+  get formdata() {
+    return this.value;
+  }
 }
 //# sourceMappingURL=AssignmentFilterModel.js.map

package/esm/models/filters/AssignmentFilterModel.js.flow

@@ -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;
+  }
 }

package/esm/models/filters/AssignmentFilterModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"AssignmentFilterModel.js","names":["BaseFilterModel","IllegalStateException","AssignmentFilterModel","constructor","data","contributions","modelOptions","_defineProperty","_assignmenttype","createAssignmentTypeModel","_user","createUserModel","key","name","listkey","_listKey","contextid","getContribution","assignmentTypeData","dynamicschema","assignmentTypeContributions","enumerated","optionMode","_links","createAttribute","param","userData","userContributions","assignmenttype","user","params","value","reset","update","attribute","isActive","initvalue","isValid"],"sources":["../../../src/models/filters/AssignmentFilterModel.js"],"sourcesContent":["// @flow\nimport BaseFilterModel from \"../filters/BaseFilterModel\";\n\nimport type { AttributeType, ModelOptions } from \"../types\";\nimport { IllegalStateException } from \"../../exceptions\";\n/**\n * Assignment filter consists of two filters: assignment type and user filter\n */\nexport default class AssignmentFilterModel extends BaseFilterModel {\n  _listKey: string;\n  _assignmenttype: ?AttributeType;\n  _user: ?AttributeType;\n\n  /**\n   * Construct an assignment filter\n   */\n  constructor(\n    data: Object,\n    contributions: Object,\n    modelOptions?: ModelOptions,\n  ) {\n    super(data, contributions, modelOptions);\n\n    this._assignmenttype = this.createAssignmentTypeModel();\n    this._user = this.createUserModel();\n  }\n\n  /**\n   */\n  get key(): ?string {\n    return this.data.name;\n  }\n\n  /**\n   * Getting key of the list these filters apply to\n   */\n  get listkey(): string {\n    return this._listKey;\n  }\n\n  /**\n   * Set key of list this filter belongs to\n   */\n  set listkey(key: string) {\n    this._listKey = key;\n  }\n\n  /**\n   */\n  get contextid(): string {\n    return this.getContribution(\"contextid\", \"\");\n  }\n  /**\n   * Creates an assignmenttype model when assignmenttype json is present\n   */\n  createAssignmentTypeModel(): ?AttributeType {\n    const key = `${this.contextid}ASSIGNMENTTYPE`;\n    const assignmentTypeData = this.data[key];\n\n    if (typeof assignmentTypeData === \"undefined\") {\n      throw new IllegalStateException(\n        `Missing assignment type data for ${key}`,\n      );\n    }\n\n    if (this.data.dynamicschema && this.data.dynamicschema[key]) {\n      assignmentTypeData.dynamicschema = {\n        [key]: this.data.dynamicschema[key],\n      };\n    }\n\n    const assignmentTypeContributions = {\n      ...this.contributions[key],\n      enumerated: true,\n      optionMode: assignmentTypeData._links ? \"lookup\" : \"static\",\n    };\n\n    return this.createAttribute(\n      \"choice\",\n      assignmentTypeData.name || assignmentTypeData.param,\n      assignmentTypeData,\n      assignmentTypeContributions,\n    );\n  }\n\n  /**\n   * Creates an assignmenttype model when userkey json is present\n   */\n  createUserModel(): ?AttributeType {\n    const key = `${this.contextid}USERKEY`;\n    const userData = this.data[key];\n\n    if (this.data.dynamicschema && this.data.dynamicschema[key]) {\n      userData.dynamicschema = {\n        [key]: this.data.dynamicschema[key],\n      };\n    }\n\n    const userContributions = {\n      ...this.contributions[key],\n      optionMode: userData._links ? \"lookup\" : \"static\",\n    };\n\n    return this.createAttribute(\n      \"choice\",\n      userData.name || userData.param,\n      userData,\n      userContributions,\n    );\n  }\n\n  /**\n   * The assignment filter consists of two part. This method return the assignment type attribute\n   */\n  get assignmenttype(): ?AttributeType {\n    return this._assignmenttype;\n  }\n\n  /**\n   * The assignment filter consists of two part. This method return the user identifier attribute\n   */\n  get user(): ?AttributeType {\n    return this._user;\n  }\n\n  /**\n   * Getting the parameters of this filter\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    if (this.assignmenttype && this.user) {\n      return [\n        {\n          name: this.assignmenttype.name,\n          value: this.assignmenttype.value,\n        },\n        {\n          name: this.user.name,\n          value: this.user.value,\n        },\n      ];\n    }\n\n    return [];\n  }\n\n  /**\n   * Reset the values within the filter\n   */\n  reset(): AssignmentFilterModel {\n    if (this.assignmenttype) {\n      this.assignmenttype.reset();\n    }\n    if (this.user) {\n      this.user.reset();\n    }\n\n    return this;\n  }\n\n  /**\n   * Update this filter\n   */\n  update(attribute: AttributeType, value: string) {\n    if (this.user != null && this.user.key === attribute.key) {\n      this.user.update(value);\n    } else if (\n      this.assignmenttype != null &&\n      this.assignmenttype.key === attribute.key\n    ) {\n      this.assignmenttype.update(value);\n    }\n  }\n\n  /**\n   * Inidiates if filter is active\n   */\n  isActive(): boolean {\n    return (\n      (this.assignmenttype != null && this.assignmenttype.initvalue !== null) ||\n      (this.user != null && this.user.initvalue !== null)\n    );\n  }\n\n  /**\n   * Inidiates if filter is valid\n   */\n  get isValid(): boolean {\n    return (\n      this.assignmenttype != null &&\n      this.assignmenttype.isValid &&\n      this.user != null &&\n      this.user.isValid\n    );\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"AssignmentFilterModel.js","names":["BaseFilterModel","IllegalStateException","createAttribute","AssignmentFilterModel","constructor","data","contributions","modelOptions","_defineProperty","_assignmenttype","createAssignmentTypeModel","_user","createUserModel","key","name","contextid","getContribution","assignmentTypeData","dynamicschema","assignmentTypeContributions","type","enumerated","optionMode","_links","param","userData","userContributions","assignmenttype","user","params","value","inputvalue","hasValue","reset","update","attribute","isActive","initvalue","isValid","readonlyvalue","formdata"],"sources":["../../../src/models/filters/AssignmentFilterModel.js"],"sourcesContent":["// @flow\nimport BaseFilterModel from \"../filters/BaseFilterModel\";\n\nimport type { AttributeType, ModelOptions } from \"../types\";\nimport { IllegalStateException } from \"../../exceptions\";\nimport createAttribute from \"../attributes/_createAttribute\";\n/**\n * Assignment filter consists of two filters: assignment type and user filter\n */\nexport default class AssignmentFilterModel extends BaseFilterModel {\n  _listKey: string;\n  _assignmenttype: AttributeType;\n  _user: AttributeType;\n\n  /**\n   * Construct an assignment filter\n   */\n  constructor(\n    data: Object,\n    contributions: Object,\n    modelOptions?: ModelOptions,\n  ) {\n    super(data, contributions, modelOptions);\n\n    this._assignmenttype = this.createAssignmentTypeModel();\n    this._user = this.createUserModel();\n  }\n\n  /**\n   */\n  get key(): ?string {\n    return this.data.name;\n  }\n\n  /**\n   */\n  get contextid(): string {\n    return this.getContribution(\"contextid\", \"\");\n  }\n\n  /**\n   * Creates an assignmenttype model when assignmenttype json is present\n   */\n  createAssignmentTypeModel(): AttributeType {\n    const key = `${this.contextid}ASSIGNMENTTYPE`;\n    const assignmentTypeData = this.data[key];\n\n    if (typeof assignmentTypeData === \"undefined\") {\n      throw new IllegalStateException(\n        `Missing assignment type data for ${key}`,\n      );\n    }\n\n    if (this.data.dynamicschema && this.data.dynamicschema[key]) {\n      assignmentTypeData.dynamicschema = {\n        [key]: this.data.dynamicschema[key],\n      };\n    }\n\n    const assignmentTypeContributions = {\n      ...this.contributions[key],\n      type: \"choice\",\n      enumerated: true,\n      optionMode: assignmentTypeData._links ? \"lookup\" : \"static\",\n    };\n\n    return createAttribute(\n      assignmentTypeData.name || assignmentTypeData.param,\n      assignmentTypeData,\n      assignmentTypeContributions,\n      this.modelOptions,\n    );\n  }\n\n  /**\n   * Creates an assignmenttype model when userkey json is present\n   */\n  createUserModel(): AttributeType {\n    const key = `${this.contextid}USERKEY`;\n    const userData = this.data[key];\n\n    if (this.data.dynamicschema && this.data.dynamicschema[key]) {\n      userData.dynamicschema = {\n        [key]: this.data.dynamicschema[key],\n      };\n    }\n\n    const userContributions = {\n      ...this.contributions[key],\n      type: \"choice\",\n      enumerated: true,\n      optionMode: userData._links ? \"lookup\" : \"static\",\n    };\n\n    return createAttribute(\n      userData.name || userData.param,\n      userData,\n      userContributions,\n      this.modelOptions,\n    );\n  }\n\n  /**\n   * The assignment filter consists of two part. This method return the assignment type attribute\n   */\n  get assignmenttype(): AttributeType {\n    return this._assignmenttype;\n  }\n\n  /**\n   * The assignment filter consists of two part. This method return the user identifier attribute\n   */\n  get user(): AttributeType {\n    return this._user;\n  }\n\n  /**\n   * Getting the parameters of this filter\n   */\n  get params(): Array<{ name: string, value: ?string }> {\n    return [\n      {\n        name: this.assignmenttype.name,\n        value: this.assignmenttype.value,\n      },\n      {\n        name: this.user.name,\n        value: this.user.value,\n      },\n    ];\n  }\n\n  /**\n   */\n  get value(): { [string]: any } {\n    return {\n      [this.assignmenttype.name]: this.assignmenttype.value,\n      [this.user.name]: this.user.value,\n    };\n  }\n\n  /**\n   */\n  get inputvalue(): { [string]: any } {\n    return {\n      [this.assignmenttype.name]: this.assignmenttype.inputvalue,\n      [this.user.name]: this.user.inputvalue,\n    };\n  }\n\n  /**\n   * Indicates if the filter has a value.\n   */\n  hasValue(): boolean {\n    return (\n      (this.assignmenttype.value !== null &&\n        this.assignmenttype.value !== \"\") ||\n      (this.user.value !== null && this.user.value !== \"\")\n    );\n  }\n\n  /**\n   * Reset the values within the filter\n   */\n  reset(): AssignmentFilterModel {\n    if (this.assignmenttype) {\n      this.assignmenttype.reset();\n    }\n    if (this.user) {\n      this.user.reset();\n    }\n\n    return this;\n  }\n\n  /**\n   * Update this filter\n   */\n  update(attribute: AttributeType, value: string) {\n    if (this.user != null && this.user.key === attribute.key) {\n      this.user.update(value);\n    } else if (\n      this.assignmenttype != null &&\n      this.assignmenttype.key === attribute.key\n    ) {\n      this.assignmenttype.update(value);\n    }\n  }\n\n  /**\n   * Inidiates if filter is active\n   */\n  isActive(): boolean {\n    return (\n      (this.assignmenttype != null && this.assignmenttype.initvalue !== null) ||\n      (this.user != null && this.user.initvalue !== null)\n    );\n  }\n\n  /**\n   * Inidiates if filter is valid\n   */\n  get isValid(): boolean {\n    return (\n      this.assignmenttype != null &&\n      this.assignmenttype.isValid &&\n      this.user != null &&\n      this.user.isValid\n    );\n  }\n\n  /**\n   */\n  get readonlyvalue(): { [string]: string } {\n    return {\n      [this.assignmenttype.name]: this.assignmenttype.readonlyvalue,\n      [this.user.name]: this.user.readonlyvalue,\n    };\n  }\n\n  /**\n   */\n  get formdata(): { [string]: any } | null {\n    return this.value;\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/esm/models/filters/BaseFilterModel.js

@@ -1,9 +1,6 @@
 import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
 import BaseModel from "../base/BaseModel";
-import createAttribute from "../attributes/_createAttribute";
 import { PARAMETER_SEPARATOR, PARAMETER_TYPES } from "../../constants/Constants";
-import { IllegalStateException } from "../../exceptions";
-
 /**
  * Base class for filters
  */
@@ -12,10 +9,8 @@ export default class BaseFilterModel extends BaseModel {
    */
   constructor(data, contributions, modelOptions) {
     super(data, contributions, modelOptions);
-    _defineProperty(this, "_attribute", null);
     _defineProperty(this, "_context", void 0);
     _defineProperty(this, "_listKey", void 0);
-    this._attribute = this.createAttribute(this.type, this.param, this.data, this.contributions);
     if (this.contributions.listKey) {
       this.listkey = this.contributions.listKey;
     }
@@ -41,19 +36,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, param, data, contributions) {
-    if (type === "assignment") {
-      return null;
-    }
-    return createAttribute(param, data, {
-      ...contributions,
-      type: type
-    }, this.modelOptions);
-  }
-
   /**
    * Inidiates if filter is multiplechoice
    */
@@ -120,69 +102,6 @@ export default class BaseFilterModel extends BaseModel {
     return this.data.param ?? this.data.name;
   }
 
-  /**
-   * Get attribute of filter
-   */
-  get attribute() {
-    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() {
-    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);
-    }
-  }
-
   /**
    * Inidicates if filter is a quick search filter
    */
@@ -190,40 +109,11 @@ export default class BaseFilterModel extends BaseModel {
     return this.contributions.quicksearch === true;
   }
 
-  /**
-   * Inidiates if filter is active
-   */
-  isActive() {
-    return this.attribute !== null && this.attribute.initvalue !== null;
-  }
-
-  /**
-   * Inidiates if filter is valid
-   */
-  get isValid() {
-    return this.attribute !== null && this.attribute.isValid;
-  }
-
-  /**
-   */
-  get readonlyvalue() {
-    if (this.attribute) {
-      return this.attribute.readonlyvalue;
-    }
-    return "";
-  }
-
   /**
    * Get assistant message
    */
   get assistantMessage() {
     return this.getContribution("assistant");
   }
-
-  /**
-   */
-  get formdata() {
-    return this.attribute.formdata ?? null;
-  }
 }
 //# sourceMappingURL=BaseFilterModel.js.map

package/esm/models/filters/BaseFilterModel.js.flow

@@ -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;
-  }
 }