@beinformed/ui 1.63.13 → 1.64.0

package/src/models/filters/BaseFilterModel.js

@@ -1,7 +1,10 @@
 // @flow
 import BaseModel from "../base/BaseModel";
 import createAttribute from "../attributes/_createAttribute";
-import { PARAMETER_SEPARATOR } from "../../constants/Constants";
+import {
+  PARAMETER_SEPARATOR,
+  PARAMETER_TYPES,
+} from "../../constants/Constants";
 
 import type { AttributeType, FilterType, ModelOptions } from "../types";
 import { IllegalStateException } from "../../exceptions";
@@ -44,6 +47,19 @@ export default class BaseFilterModel extends BaseModel {
       : "string";
   }
 
+  /**
+   * Returns the parameter type, when the filter can only be used in  a POST request the type is 'bodyParameter', else 'queryParameter'.
+   */
+  get parameterType(): $Values<typeof PARAMETER_TYPES> {
+    const parameterType = this.getContribution("parameterType");
+    switch (parameterType) {
+      case "bodyParameter":
+        return PARAMETER_TYPES.BODY;
+      default:
+        return PARAMETER_TYPES.QUERY;
+    }
+  }
+
   /**
    * Create attribute through the attribute factory. Create type based on filter key without the filter suffix
    */
@@ -177,6 +193,13 @@ export default class BaseFilterModel extends BaseModel {
     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
    */
@@ -233,4 +256,10 @@ export default class BaseFilterModel extends BaseModel {
   get assistantMessage(): string | null {
     return this.getContribution("assistant");
   }
+
+  /**
+   */
+  get formdata(): { [string]: any } | null {
+    return this.attribute.formdata ?? null;
+  }
 }

package/src/models/filters/FilterCollection.js

@@ -9,6 +9,7 @@ import CompositeAttributeModel from "../attributes/CompositeAttributeModel";
 import FilterModel from "../filters/FilterModel";
 
 import type { AttributeType, FilterType, ModelOptions } from "../types";
+import { PARAMETER_TYPES } from "../../constants";
 
 /**
  * Contains a collection of filters
@@ -189,4 +190,19 @@ export default class FilterCollection extends BaseCollection<FilterType> {
   hasActiveFilters(): boolean {
     return this.collection.some((filter) => filter.isActive());
   }
+
+  /**
+   */
+  get formdata(): { [string]: any } | null {
+    let data = {};
+    this.filter(
+      (f) => f.parameterType === PARAMETER_TYPES.BODY && f.hasValue(),
+    ).forEach((f) => {
+      data = {
+        ...data,
+        ...f.formdata,
+      };
+    });
+    return data;
+  }
 }

package/src/models/filters/StringFilterModel.js

@@ -156,4 +156,12 @@ export default class StringFilterModel extends FilterModel {
       (this.isIBAN() || this.isZipcode() || this.isBSN())
     );
   }
+
+  /**
+   */
+  get formdata(): { [string]: any } | null {
+    return {
+      [this.param]: this.value,
+    };
+  }
 }

package/src/models/href/ListHref.js

@@ -1,5 +1,6 @@
 // @flow
 import Href from "./Href";
+import { PARAMETER_TYPES } from "../../constants/Constants";
 
 import type FilterCollection from "../filters/FilterCollection";
 import type ListModel from "../list/ListModel";
@@ -133,14 +134,16 @@ export default class ListHref extends Href {
       return;
     }
 
-    filters.forEach((filter) => {
-      filter.params.forEach((param) => {
-        if (param.value != null) {
-          this.setParameter(param.name, param.value, this.prefix);
-        } else {
-          this.removeParameter(param.name, this.prefix);
-        }
+    filters
+      .filter((filter) => filter.parameterType === PARAMETER_TYPES.QUERY)
+      .forEach((filter) => {
+        filter.params.forEach((param) => {
+          if (param.value != null) {
+            this.setParameter(param.name, param.value, this.prefix);
+          } else {
+            this.removeParameter(param.name, this.prefix);
+          }
+        });
       });
-    });
   }
 }

package/src/models/list/ListModel.js

@@ -12,6 +12,8 @@ import ListItemModel from "../list/ListItemModel";
 import PagingModel from "../paging/PagingModel";
 import ResourceModel from "../base/ResourceModel";
 import SortingModel from "../sorting/SortingModel";
+import { HTTP_METHODS, PARAMETER_TYPES } from "../../constants";
+
 import {
   CASEVIEW_LINK,
   HIDE_WHEN_EMPTY,
@@ -33,7 +35,6 @@ export default class ListModel extends ResourceModel {
   _actionCollection: ActionCollection;
   _listItemCollection: ListItemCollection;
   _grouping: GroupingModel;
-  _selfhref: ListHref;
 
   /**
    */
@@ -91,6 +92,16 @@ export default class ListModel extends ResourceModel {
     this.detail = models.find((childModel) => childModel.type === "ListDetail");
   }
 
+  /**
+   */
+  get requestMethod(): $Keys<typeof HTTP_METHODS> {
+    const mustPost = this.filterCollection.some(
+      (filter) =>
+        filter.parameterType === PARAMETER_TYPES.BODY && filter.hasValue(),
+    );
+    return mustPost ? HTTP_METHODS.POST : HTTP_METHODS.GET;
+  }
+
   /**
    * Getting the label of the list
    */
@@ -159,8 +170,6 @@ export default class ListModel extends ResourceModel {
 
       this._detail = detail;
     }
-
-    this.setSelfHref();
   }
 
   /**
@@ -335,7 +344,7 @@ export default class ListModel extends ResourceModel {
   /**
    * Sets self href from links collection
    */
-  setSelfHref(): ListHref {
+  getSelfHref(): ListHref {
     const selfLink = this.links ? this.links.getLinkByKey("self") : null;
 
     if (selfLink !== null) {
@@ -349,10 +358,7 @@ export default class ListModel extends ResourceModel {
    * Getting the self link of this list
    */
   get selfhref(): ListHref {
-    if (!this._selfhref) {
-      this._selfhref = this.setSelfHref();
-    }
-    return this._selfhref;
+    return this.getSelfHref();
   }
 
   /**
@@ -435,4 +441,10 @@ export default class ListModel extends ResourceModel {
 
     return null;
   }
+
+  /**
+   */
+  get formdata(): string {
+    return JSON.stringify(this.filterCollection.formdata);
+  }
 }

package/src/models/paging/PagesizeModel.js

@@ -41,4 +41,10 @@ export default class PagesizeModel {
   get options(): Array<number> {
     return this._options;
   }
+
+  /**
+   */
+  get querystring(): string {
+    return `${this.name}=${this.value}`;
+  }
 }

package/src/models/paging/PagingModel.js

@@ -91,4 +91,15 @@ export default class PagingModel {
   get pagesize(): PagesizeModel {
     return this._pagesize;
   }
+
+  /**
+   */
+  get querystring(): string {
+    const qs = [];
+    if (this.pagesize) {
+      qs.push(this.pagesize.querystring);
+    }
+    qs.push(`${this.name}=${this.page}`);
+    return qs.join("&");
+  }
 }

package/src/redux/actions/SignIn.js

@@ -3,9 +3,10 @@ import Cache from "../../utils/browser/Cache";
 import Authenticate from "../../modularui/Authenticate";
 import { getApplication } from "../_modularui/ModularUISelectors";
 
+import { handleError } from "./Error";
 import { reloadApplication } from "./Application";
-
 import { startProgress, finishProgress } from "./ProgressIndicator";
+
 import { push } from "../_router/RouterActions";
 import { CHANGEPASSWORD_PATH } from "../../constants/Constants";
 
@@ -97,6 +98,6 @@ export const login =
         }
 
         dispatch(loginFailed(error.id));
-        return dispatch(finishProgress());
+        return dispatch(handleError(error));
       });
   };