@beinformed/ui 1.65.6 → 1.65.8

package/src/models/filters/StringFilterModel.js

@@ -1,12 +1,12 @@
 // @flow
 
-import type { AttributeType, ModelOptions } from "../types";
+import type { AttributeType, IFilter, ModelOptions } from "../types";
 import FilterModel from "./FilterModel";
 
 /**
  * StringFilterModel can handle string filters with multiple setting
  */
-export default class StringFilterModel extends FilterModel {
+export default class StringFilterModel extends FilterModel implements IFilter {
   _isValid: boolean = true;
   _value: string | null;
   _inputvalue: string;

package/src/models/links/LinkModel.js

@@ -6,9 +6,10 @@ import BaseModel from "../base/BaseModel";
 import Href from "../href/Href";
 import LinkCollection from "../links/LinkCollection";
 import { INITIAL_FILTER } from "../../constants/LayoutHints";
+import Parameter from "../parameter/Parameter";
+import { HTTP_METHODS } from "../../constants";
 
 import type { ModelOptions, ModularUIModel } from "../types";
-import Parameter from "../parameter/Parameter";
 
 /**
  * Defines a Link. For instance below example of a link to the tab 'books'
@@ -23,6 +24,7 @@ class LinkModel extends BaseModel {
   _isCacheable: boolean;
   _icon: string;
   _targetModel: ?Class<ModularUIModel>;
+  _method: $Keys<typeof HTTP_METHODS>;
 
   /**
    * Create a Link
@@ -36,6 +38,7 @@ class LinkModel extends BaseModel {
 
     this.createHref(modelOptions);
 
+    this._method = HTTP_METHODS.GET;
     this._isCacheable = false;
   }
 
@@ -121,6 +124,20 @@ class LinkModel extends BaseModel {
     this._href = href;
   }
 
+  /**
+   * Indicate how this link must be called, GET by default
+   */
+  get method(): $Keys<typeof HTTP_METHODS> {
+    return this._method;
+  }
+
+  /**
+   * Set http method for this link
+   */
+  set method(method: $Keys<typeof HTTP_METHODS>) {
+    this._method = method;
+  }
+
   /**
    * Getting the label of the link
    */

package/src/models/list/ListModel.js

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

package/src/models/search/CaseSearchModel.js

@@ -2,7 +2,7 @@
 import ListModel from "../list/ListModel";
 
 import type { ModularUIResponse } from "../../modularui";
-import type { FilterType } from "../types";
+import type { IFilter } from "../types";
 
 /**
  * Case search model
@@ -32,7 +32,7 @@ export default class CaseSearchModel extends ListModel {
   /**
    * Retrieve quick search filters
    */
-  getQuickSearchFilters(): Array<FilterType> {
+  getQuickSearchFilters(): Array<IFilter> {
     return this.filterCollection
       ? this.filterCollection.filter((filter) => filter.isQuickSearch())
       : [];

package/src/models/types.js

@@ -25,10 +25,6 @@ import type SectionModel from "./content/SectionModel";
 import type ContentTOCModel from "./content/ContentTOCModel";
 import type ContentTypeModel from "./content/ContentTypeModel";
 import type DetailModel from "./detail/DetailModel";
-import type AssignmentFilterModel from "./filters/AssignmentFilterModel";
-import type FilterModel from "./filters/FilterModel";
-import type RangeFilterModel from "./filters/RangeFilterModel";
-import type ConceptIndexFilterModel from "./filters/ConceptIndexFilterModel";
 import type FormModel from "./form/FormModel";
 import type ListDetailModel from "./list/ListDetailModel";
 import type ListModel from "./list/ListModel";
@@ -45,6 +41,7 @@ import type AttributeCollection from "./attributes/AttributeCollection";
 import type AttributeModel from "./attributes/AttributeModel";
 import type LayoutHintCollection from "./layouthint/LayoutHintCollection";
 import type ErrorResponse from "./error/ErrorResponse";
+import { PARAMETER_TYPES } from "../constants";
 
 export type ModularUIModel =
   | ApplicationModel
@@ -90,12 +87,6 @@ export type RangeChildAttributeType =
   | NumberAttributeModel
   | DatetimeAttributeModel;
 
-export type FilterType =
-  | AssignmentFilterModel
-  | FilterModel
-  | RangeFilterModel
-  | ConceptIndexFilterModel;
-
 export type FormErrorAnchor = {
   id: string,
   properties?: {
@@ -135,6 +126,33 @@ export type textfragmentJSON = {
   type: string,
 };
 
+export interface IFilter {
+  +type: string;
+  +parameterType: $Values<typeof PARAMETER_TYPES>;
+  +isMultiple: boolean;
+  context: Object;
+  +contextid: string;
+  +contextLabel: string;
+  listkey: string;
+  +label: string;
+  +key: string;
+  +name: string;
+  +param: string;
+  +params: Array<{ name: string, value: ?string }>;
+  isQuickSearch(): boolean;
+  +assistantMessage: string | null;
+  +value: string | { [string]: string } | null;
+  +inputvalue: string | { [string]: string };
+  hasValue(): boolean;
+  reset(): IFilter;
+  update(attribute: AttributeType, value: string): void;
+  isActive(): boolean;
+  +isValid: boolean;
+  +readonlyvalue: string | { [string]: string };
+  +formdata: { [string]: any } | null;
+  clone(): IFilter;
+}
+
 export interface IConstraintModel {
   +id: string;
   +defaultMessage: string;

package/src/react-server/serverUtil.js

@@ -22,9 +22,9 @@ import {
 
 import { getEnabledLocales } from "../constants/Settings";
 
-import { IllegalArgumentException } from "../exceptions";
+import IllegalArgumentException from "../exceptions/IllegalArgumentException";
 
-import { initModels } from "../redux";
+import { initModels } from "../redux/_modularui/ModularUIActions";
 import { getLocale } from "../redux/selectors/i18n";
 
 import ModularUIRequest from "../modularui/ModularUIRequest";