@beinformed/ui 1.13.1 → 1.13.5

package/src/models/attributes/BooleanAttributeModel.js

@@ -142,7 +142,10 @@ export default class BooleanAttributeModel extends AttributeModel {
    * Getting all enabled options
    */
   get selected(): Array<string> {
-    return this.options.selected.map<string>((option) => option.code);
+    // $FlowFixMe[incompatible-call]
+    return this.options.selected.map<string, ChoiceAttributeOptionModel>(
+      (option: ChoiceAttributeOptionModel) => option.code
+    );
   }
 
   /**

package/src/models/attributes/ChoiceAttributeModel.js

@@ -149,7 +149,10 @@ export default class ChoiceAttributeModel extends AttributeModel {
    * Getting all enabled options
    */
   get selected(): Array<string> {
-    return this.options.selected.map<string>((option) => option.code);
+    // $FlowFixMe[incompatible-call]
+    return this.options.selected.map<string, ChoiceAttributeOptionModel>(
+      (option: ChoiceAttributeOptionModel) => option.code
+    );
   }
 
   /**

package/src/models/attributes/ChoiceAttributeOptionCollection.js

@@ -220,7 +220,7 @@ class ChoiceAttributeOptionCollection extends ResourceCollection<ChoiceAttribute
   get selected(): Array<ChoiceAttributeOptionModel> {
     const selectedOptions = [];
 
-    this.collection.forEach((option) => {
+    this.collection.forEach((option: ChoiceAttributeOptionModel) => {
       if (option.selected && option.selected === true) {
         selectedOptions.push(option);
       }

package/src/models/attributes/ChoiceAttributeOptionModel.js

@@ -13,13 +13,16 @@ import AttributeCollection from "./AttributeCollection";
 import ConceptDetailModel from "../concepts/ConceptDetailModel";
 import AttributeContent from "./AttributeContent";
 
-import type { ModularUIModel } from "../types";
+import type { IModelWithChildModels, ModularUIModel } from "../types";
 import type ListItemModel from "../list/ListItemModel";
 import type LinkModel from "../links/LinkModel";
 
 /**
  */
-class ChoiceAttributeOptionModel extends BaseModel {
+class ChoiceAttributeOptionModel
+  extends BaseModel
+  implements IModelWithChildModels
+{
   _code: string;
   _isSelected: boolean;
   _referenceDate: ISO_DATE;

package/src/models/attributes/CompositeAttributeChildCollection.js

@@ -165,6 +165,7 @@ class CompositeAttributeChildCollection extends ResourceCollection<AttributeType
    */
   get initvalue(): any {
     if (this.first instanceof CompositeAttributeChildCollection) {
+      // $FlowFixMe[missing-type-arg]
       return this.collection.map<Array<Object>>(
         (collection) => collection.initvalue
       );
@@ -195,7 +196,6 @@ class CompositeAttributeChildCollection extends ResourceCollection<AttributeType
 
     this.collection.forEach((attribute) => {
       if (attribute.formdata !== null && !attribute.readonly) {
-        // $FlowIgnore[cannot-spread-indexer]
         children = {
           ...children,
           ...attribute.formdata,

package/src/models/attributes/CompositeAttributeModel.js

@@ -375,6 +375,7 @@ class CompositeAttributeModel extends AttributeModel {
       (this.key === otherAttribute.key &&
         this.parentKey === otherAttribute.parentKey) ||
       this.children.some(
+        //$FlowFixMe[method-unbinding]
         (child) => child.equals && child.equals(otherAttribute)
       )
     );

package/src/models/attributes/DatetimeAttributeModel.js

@@ -18,6 +18,7 @@ import DateBoundaryConstraint from "./input-constraints/DateBoundaryConstraint";
 
 import { ATTRIBUTE_WIDTH, ISO_DATE_FORMAT } from "../../constants";
 import { getSetting } from "../../constants/Settings";
+import { IGNORE_FORMAT_SETTING } from "../../constants/LayoutHints";
 
 import type { FormErrorAnchor, IConstraintModel } from "../types";
 
@@ -239,10 +240,12 @@ class DatetimeAttributeModel extends StringAttributeModel {
     }
 
     // setting for date input
-    const dateInputFormatSetting = getSetting("DATE_INPUT_FORMAT", "");
-
-    if (dateInputFormatSetting) {
-      return dateInputFormatSetting;
+    const ignoreFormatSetting = this.layouthint.has(IGNORE_FORMAT_SETTING);
+    if (!ignoreFormatSetting) {
+      const dateInputFormatSetting = getSetting("DATE_INPUT_FORMAT", "");
+      if (dateInputFormatSetting) {
+        return dateInputFormatSetting;
+      }
     }
 
     let format = this.format;

package/src/models/attributes/__tests__/StringAttributeModel.spec.js

@@ -110,6 +110,6 @@ describe("stringAttributeModel", () => {
 
     const clonedAttribute = attribute.clone();
 
-    expect(attribute === clonedAttribute).toBe(false);
+    expect(attribute).not.toBe(clonedAttribute);
   });
 });

package/src/models/base/BaseCollection.js

@@ -154,9 +154,9 @@ class BaseCollection<T> {
    */
   map<U>(
     callbackfn: (value: T, index: number, array: Array<T>) => U,
-    thisArg?: any
+    thisArg?: T
   ): Array<U> {
-    return this.collection.map<U>(callbackfn, thisArg);
+    return this.collection.map<U, ?T>(callbackfn, thisArg);
   }
 
   /**

package/src/models/base/ResourceCollection.js

@@ -16,11 +16,8 @@ class ResourceCollection<T: IModelWithChildModels> extends BaseCollection<T> {
     const initialChildModelLinks = [];
 
     this.collection.forEach((item: T) => {
-      if (
-        item &&
-        item.getInitialChildModelLinks &&
-        typeof item.getInitialChildModelLinks === "function"
-      ) {
+      // $FlowFixMe[method-unbinding]
+      if (typeof item?.getInitialChildModelLinks === "function") {
         initialChildModelLinks.push(...item.getInitialChildModelLinks());
       }
     });
@@ -33,7 +30,8 @@ class ResourceCollection<T: IModelWithChildModels> extends BaseCollection<T> {
    */
   setChildModels(models: Array<ModularUIModel>) {
     this.collection.forEach((item) => {
-      if (typeof item.setChildModels === "function") {
+      // $FlowFixMe[prop-missing]
+      if (typeof item["setChildModels"] === "function") {
         item.setChildModels(models);
       }
     });

package/src/models/base/ResourceModel.js

@@ -200,8 +200,9 @@ class ResourceModel extends BaseModel implements IModelWithChildModels {
       ...super.dehydrate(),
       key: this._key,
       locale: this._locale,
-      childModels: this._childModels.map<ModularUIModel>((childModel) =>
-        childModel.dehydrate()
+      // $FlowFixMe[missing-type-arg]
+      childModels: this._childModels.map<ModularUIModel>(
+        (childModel: ModularUIModel) => childModel.dehydrate()
       ),
     };
   }

package/src/models/base/__tests__/BaseModel.spec.js

@@ -73,13 +73,13 @@ describe("baseModel", () => {
     });
 
     const shallowClone = model.clone();
-    expect(model === shallowClone).toBe(false);
-    expect(model.data.prop === shallowClone.data.prop).toBe(true);
-    expect(model.data.prop.child === shallowClone.data.prop.child).toBe(true);
+    expect(model).not.toBe(shallowClone);
+    expect(model.data.prop).toBe(shallowClone.data.prop);
+    expect(model.data.prop.child).toBe(shallowClone.data.prop.child);
 
     const deepClone = model.clone(true);
-    expect(model === deepClone).toBe(false);
+    expect(model).not.toBe(deepClone);
     expect(model.data.prop === deepClone.data.prop).toBeFalsy();
-    expect(model.data.prop.child === deepClone.data.prop.child).toBe(true);
+    expect(model.data.prop.child).toBe(deepClone.data.prop.child);
   });
 });

package/src/models/concepts/BusinessScenarioModel.js

@@ -1,5 +1,6 @@
 // @flow
 import ConceptDetailModel from "./ConceptDetailModel";
+import ConceptTypeDetailModel from "./ConceptTypeDetailModel";
 
 import type { ModularUIResponse } from "../../modularui";
 import type { ModularUIModel } from "../types";
@@ -58,7 +59,7 @@ class BusinessScenarioModel extends ConceptDetailModel {
   setChildModels(models: Array<ModularUIModel>) {
     // $FlowExpectedError[incompatible-type]
     this.conceptType = models.find(
-      (model) => model.type === "ConceptTypeDetail"
+      (model) => model instanceof ConceptTypeDetailModel
     );
 
     const scenarioSteps = [];

package/src/models/concepts/ConceptDetailModel.js

@@ -2,6 +2,7 @@
 import ResourceModel from "../base/ResourceModel";
 import ConceptRelationCollection from "./ConceptRelationCollection";
 import SourceReferenceCollection from "./SourceReferenceCollection";
+import ConceptTypeDetailModel from "./ConceptTypeDetailModel";
 
 import { TIMEVERSION_FILTER_NAME } from "../../constants/Constants";
 
@@ -14,7 +15,6 @@ import type {
 import type { ModularUIResponse } from "../../modularui";
 import type Href from "../href/Href";
 import type LinkModel from "../links/LinkModel";
-import type ConceptTypeDetailModel from "./ConceptTypeDetailModel";
 
 /**
  * Model for concept details, available through modelcatalog
@@ -70,7 +70,7 @@ export default class ConceptDetailModel extends ResourceModel {
   setChildModels(models: Array<ModularUIModel>) {
     // $FlowExpectedError[incompatible-type]
     const conceptTypeModel: ?ConceptTypeDetailModel = models.find(
-      (model) => model.type === "ConceptTypeDetail"
+      (model) => model instanceof ConceptTypeDetailModel
     );
 
     if (conceptTypeModel) {

package/src/models/concepts/ConceptLinkModel.js

@@ -5,12 +5,15 @@ import LinkCollection from "../links/LinkCollection";
 import ConceptTypeDetailModel from "./ConceptTypeDetailModel";
 import { TIMEVERSION_FILTER_NAME } from "../../constants/Constants";
 
-import type { ModularUIModel } from "../types";
+import type { IModelWithChildModels, ModularUIModel } from "../types";
 import type Href from "../href/Href";
 /**
  * Link to a concept
  */
-export default class ConceptLinkModel extends BaseModel {
+export default class ConceptLinkModel
+  extends BaseModel
+  implements IModelWithChildModels
+{
   _links: ?LinkCollection;
   _entryDate: ?ISO_DATE;
   _conceptType: ?ConceptTypeDetailModel;

package/src/models/concepts/ConceptRelationModel.js

@@ -2,12 +2,16 @@
 import ConceptLinkModel from "./ConceptLinkModel";
 import LinkModel from "../links/LinkModel";
 
-import type { ModularUIModel, textfragmentJSON } from "../types";
+import type {
+  IModelWithChildModels,
+  ModularUIModel,
+  textfragmentJSON,
+} from "../types";
 
 /**
  * Concept relation model
  */
-export default class ConceptRelationModel {
+export default class ConceptRelationModel implements IModelWithChildModels {
   _relation: Object;
   _concept: ConceptLinkModel;
 

package/src/models/content/ContentLinkModel.js

@@ -33,6 +33,7 @@ export default class ContentLinkModel
 
   /**
    */
+  // $FlowFixMe[method-unbinding]
   getInitialChildModelLinks(): Array<LinkModel> {
     if (this.contentTypeLink) {
       this.contentTypeLink.isCacheable = true;
@@ -44,6 +45,7 @@ export default class ContentLinkModel
 
   /**
    */
+  // $FlowFixMe[method-unbinding]
   setChildModels(models: Array<ModularUIModel>) {
     if (this.contentTypeLink) {
       const href = this.contentTypeLink.href;

package/src/models/href/Href.js

@@ -4,7 +4,7 @@ import { BASE, CONTENT_PATH, HTTP_METHODS } from "../../constants/Constants";
 import Parameter from "../parameter/Parameter";
 import { IllegalArgumentException } from "../../exceptions";
 
-import type { LocationShape } from "react-router";
+import type { LocationShape, Location } from "react-router";
 
 type HrefObject = {
   _path: string,
@@ -13,6 +13,7 @@ type HrefObject = {
   _resourcetype: string,
   _method: $Keys<typeof HTTP_METHODS>,
   _state: ?{ [key: string]: any },
+  pathname: ?string,
 };
 
 export type HrefInput = Href | HrefObject | LocationShape | string;
@@ -61,7 +62,7 @@ class Href {
   /**
    */
   setFromLocationOrObject(href: LocationShape | HrefObject) {
-    if (href.pathname) {
+    if (typeof href["pathname"] === "string") {
       this.path = href.pathname;
     } else if (typeof href._path === "string") {
       this.path = href._path;
@@ -438,7 +439,7 @@ class Href {
 
   /**
    */
-  toLocation(): LocationShape {
+  toLocation(): Location {
     return {
       pathname: this.path,
       search: this.querystring.length > 0 ? `?${this.querystring}` : "",

package/src/models/types.js

@@ -149,8 +149,8 @@ export interface ILayoutHintRule {
 }
 
 export interface IModelWithChildModels {
-  +getInitialChildModelLinks: () => Array<LinkModel>;
-  +setChildModels: (models: Array<ModularUIModel>) => void;
+  getInitialChildModelLinks(): Array<LinkModel>;
+  setChildModels(models: Array<ModularUIModel>): void;
 }
 
 export type FileEntryType = {

package/src/react-server/__tests__/serverUtil.spec.js

@@ -16,6 +16,20 @@ global.preferencesProvider = {
 
 const mockStore = configureMockStore();
 
+const getExpectedLocales = () =>
+  new Locales([
+    ...availableLocales.map((locale) =>
+      locale.code === "nl"
+        ? {
+            ...locale,
+            messages: {
+              message_nl: "Dutch message",
+            },
+          }
+        : locale
+    ),
+  ]);
+
 describe("serverUtil", () => {
   it("handles setI18n", () => {
     const store = mockStore({ i18n: {} });
@@ -39,25 +53,12 @@ describe("serverUtil", () => {
       }
     );
 
-    const expectedLocales = new Locales([
-      ...availableLocales.map((locale) =>
-        locale.code === "nl"
-          ? {
-              ...locale,
-              messages: {
-                message_nl: "Dutch message",
-              },
-            }
-          : locale
-      ),
-    ]);
-
     expect(store.getActions()).toStrictEqual([
       {
         type: "SET_LOCALES",
         payload: {
           locale: "en",
-          locales: expectedLocales,
+          locales: getExpectedLocales(),
         },
       },
     ]);

package/src/react-server/renderSSRComplete.js

@@ -21,6 +21,8 @@ import type { Theme } from "../react-theme/types";
 import type { ReduxStore } from "../redux/types";
 import type Href from "../models/href/Href";
 import type { TemplateProps } from "./htmlpage";
+import type { Location } from "react-router";
+
 type Props = {
   store: ReduxStore,
   theme: Theme,
@@ -46,7 +48,6 @@ const renderSSRComplete = ({
 
   const sheet = new ServerStyleSheet();
 
-  // $FlowExpectedError[incompatible-type]
   const location: Location = requestHref.toLocation();
 
   return createSSRComplete(store, () =>

package/src/react-server/serverNoSSR.js

@@ -56,7 +56,7 @@ const serverNoSSR = ({
 
   if (theme) {
     const storedTheme = store.getState()?.preferences?.theme;
-    // $FlowFixMe
+    // $FlowFixMe[incompatible-call]
     createTheme(storedTheme, theme);
   }
 

package/src/redux/_modularui/__tests__/actions.spec.js

@@ -152,6 +152,7 @@ describe("modularui actions", () => {
           targetModel: undefined,
         }),
       },
+      { type: "FINISH_PROGRESS" },
     ]);
   });
 });

package/src/redux/_modularui/actions.js

@@ -73,7 +73,8 @@ const loadModelSuccessAction = (
   modelToUpdate
 ): UpdateModelAction | SetModelAction => {
   if (modelToUpdate) {
-    if (typeof modelToUpdate.update === "function") {
+    // $FlowFixMe[prop-missing]
+    if (typeof modelToUpdate["update"] === "function") {
       const clonedModel = modelToUpdate.clone();
       clonedModel.update(model);
 
@@ -140,17 +141,16 @@ export const loadModularUI =
     dispatch(startProgress());
 
     const loadModelPromise = dispatch(loadModel(key, href, options));
-    if (typeof loadModelPromise !== "function" && loadModelPromise.then) {
-      return loadModelPromise
-        .then((response) => {
-          if (response?.type === "FINISH_PROGRESS") {
-            dispatch(updateStatus(key, MODULARUI_STATUS.FINISHED));
-          }
-
-          return dispatch(finishProgress());
-        })
-        .catch((error) => dispatch(handleError(error)));
-    }
+
+    return Promise.resolve(loadModelPromise)
+      .then((response) => {
+        if (response?.type === "FINISH_PROGRESS") {
+          dispatch(updateStatus(key, MODULARUI_STATUS.FINISHED));
+        }
+
+        return dispatch(finishProgress());
+      })
+      .catch((error) => dispatch(handleError(error)));
   };
 
 /**

package/src/redux/_modularui/reducer.js

@@ -74,7 +74,6 @@ const removeKey = (modelKey: string, state: ModularUIState): ModularUIState => {
   // eslint-disable-next-line no-unused-vars
   const { [modelKey]: _, ...newState } = state;
 
-  // $FlowExpectedError[incompatible-return]
   return newState;
 };
 

package/src/redux/actions/SignIn.js

@@ -66,17 +66,11 @@ export const login =
       .catch((error) => {
         if (error.id === "Error.ChangePasswordRequired") {
           const dispatchedReloadApplication = dispatch(reloadApplication());
-          if (
-            typeof dispatchedReloadApplication !== "function" &&
-            dispatchedReloadApplication.then
-          ) {
-            dispatchedReloadApplication
-              .then(() => {
-                Cache.addItem("auth", true);
-                return dispatch(changePassword());
-              })
-              .then(() => dispatch(finishProgress()));
-          }
+
+          return Promise.resolve(dispatchedReloadApplication).then(() => {
+            Cache.addItem("auth", true);
+            return dispatch(changePassword());
+          });
         }
 
         dispatch(loginFailed(error.id));

package/src/redux/actions/__tests__/Application.spec.js

@@ -27,6 +27,7 @@ describe("application actions", () => {
           href: new Href("/", "Application"),
         }),
       }),
+      { type: "FINISH_PROGRESS" },
     ]);
   });
 

package/src/redux/actions/__tests__/CustomErrorResponseHandler.spec.js

@@ -27,6 +27,7 @@ describe("custom error response handling", () => {
     const store = mockStore({});
 
     setCustomErrorResponseHandler((error) => {
+      // eslint-disable-next-line jest/no-conditional-in-test
       if (error.isRemoteServiceException) {
         return {
           type: "REMOTE_SERVICE_EXCEPTION",
@@ -50,6 +51,7 @@ describe("custom error response handling", () => {
     const store = mockStore({});
 
     setCustomErrorResponseHandler((error, defaultHandler) => (dispatch) => {
+      // eslint-disable-next-line jest/no-conditional-in-test
       if (error.isRemoteServiceException) {
         dispatch({
           type: "REMOTE_SERVICE_EXCEPTION",

package/src/utils/fetch/__tests__/xhr.spec.js

@@ -156,6 +156,7 @@ describe("xhr", () => {
         onProgress: ({ type, loaded, total, lengthComputable }) => {
           events.push({ type, loaded, total, lengthComputable });
 
+          // eslint-disable-next-line jest/no-conditional-in-test
           if (type === "loadend") {
             resolve(events);
           }

package/src/utils/fetch/xhr.js

@@ -15,6 +15,8 @@ import Cache from "../browser/Cache";
 
 import { HTTP_METHODS } from "../../constants/Constants";
 
+import { getSetting } from "../../constants/Settings";
+
 import type { RequestOptions } from "./types";
 
 const NETWORK_ERROR_CODE = 0;
@@ -116,7 +118,7 @@ class XHR {
   /**
    */
   get timeout() {
-    return this.options.timeout || 300000;
+    return this.options.timeout || getSetting("XHR_TIMEOUT_MS", 300000);
   }
 
   /**

package/src/utils/helpers/objects.js

@@ -1,10 +1,10 @@
 // @flow
 import _has from "lodash/has";
+import _isPlainObject from "lodash/isPlainObject";
 
 /**
  */
-export const isPlainObject = (value: any): boolean =>
-  Object.prototype.toString.call(value) === "[object Object]";
+export const isPlainObject = (value: any): boolean => _isPlainObject(value);
 
 /**
  */