@beinformed/ui 1.13.4 → 1.13.5

package/lib/redux/_modularui/actions.js

@@ -19,6 +19,8 @@ exports.updateStatus = exports.updateModel = exports.setModel = exports.resetMod
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 
+var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
+
 var _Constants = require("../../constants/Constants");
 
 var _Href = _interopRequireDefault(require("../../models/href/Href"));
@@ -105,7 +107,8 @@ exports.updateStatus = updateStatus;
 
 var loadModelSuccessAction = function loadModelSuccessAction(key, model, modelToUpdate) {
   if (modelToUpdate) {
-    if (typeof modelToUpdate.update === "function") {
+    // $FlowFixMe[prop-missing]
+    if (typeof modelToUpdate["update"] === "function") {
       var clonedModel = modelToUpdate.clone();
       clonedModel.update(model);
       return updateModel(clonedModel);
@@ -168,18 +171,15 @@ var loadModularUI = function loadModularUI(key, href, options) {
     dispatch(updateStatus(key, _Constants.MODULARUI_STATUS.LOADING));
     dispatch((0, _ProgressIndicator.startProgress)());
     var loadModelPromise = dispatch(loadModel(key, href, options));
+    return _promise.default.resolve(loadModelPromise).then(function (response) {
+      if ((response === null || response === void 0 ? void 0 : response.type) === "FINISH_PROGRESS") {
+        dispatch(updateStatus(key, _Constants.MODULARUI_STATUS.FINISHED));
+      }
 
-    if (typeof loadModelPromise !== "function" && loadModelPromise.then) {
-      return loadModelPromise.then(function (response) {
-        if ((response === null || response === void 0 ? void 0 : response.type) === "FINISH_PROGRESS") {
-          dispatch(updateStatus(key, _Constants.MODULARUI_STATUS.FINISHED));
-        }
-
-        return dispatch((0, _ProgressIndicator.finishProgress)());
-      }).catch(function (error) {
-        return dispatch((0, _Error.handleError)(error));
-      });
-    }
+      return dispatch((0, _ProgressIndicator.finishProgress)());
+    }).catch(function (error) {
+      return dispatch((0, _Error.handleError)(error));
+    });
   };
 };
 /**

package/lib/redux/_modularui/actions.js.flow

@@ -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/lib/redux/_modularui/actions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/redux/_modularui/actions.js"],"names":["setModel","key","model","connectKey","type","payload","updateModel","removeModelByKey","resetModularUI","updateStatus","status","loadModelSuccessAction","modelToUpdate","update","clonedModel","clone","Error","loadModel","href","options","Href","method","HTTP_METHODS","GET","data","locale","childmodels","targetModel","successAction","errorAction","error","errorResponse","ErrorResponse","isChangePassword","isResourceNotFoundAfterReload","isInvalidUsername","MODULARUI_STATUS","ERROR","loadModularUI","dispatch","LOADING","loadModelPromise","then","response","FINISHED","catch","reloadModel","selfhref","isReload"],"mappings":"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","sourcesContent":["// @flow\nimport { HTTP_METHODS, MODULARUI_STATUS } from \"../../constants/Constants\";\nimport Href from \"../../models/href/Href\";\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\nimport { finishProgress, startProgress } from \"../actions/ProgressIndicator\";\nimport { handleError } from \"../actions/Error\";\n\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { Dispatch, ThunkAction } from \"../types\";\nimport type {\n  ModularUIAction,\n  SetModelAction,\n  UpdateModelAction,\n  RemoveModelByKeyAction,\n  ResetModularUIAction,\n  UpdateStatusAction,\n} from \"./types\";\nimport type { RequestBaseOptions } from \"../../utils/fetch/types\";\n\n/**\n */\nexport const setModel = (\n  key: string,\n  model: ModularUIModel\n): SetModelAction => {\n  // set key on model for later reference\n  model.connectKey = key;\n  return {\n    type: \"MODULARUI/SET\",\n    payload: {\n      key,\n      model,\n    },\n  };\n};\n\n/**\n */\nexport const updateModel = (model: ModularUIModel): UpdateModelAction => ({\n  type: \"MODULARUI/UPDATE\",\n  payload: model,\n});\n\n/**\n */\nexport const removeModelByKey = (key: string): RemoveModelByKeyAction => ({\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: key,\n});\n\n/**\n * Removes all models except the application model from the modular ui reducer\n */\nexport const resetModularUI = (): ResetModularUIAction => ({\n  type: \"MODULARUI/RESET\",\n});\n\n/**\n */\nexport const updateStatus = (\n  key: string,\n  status: $Keys<typeof MODULARUI_STATUS>\n): UpdateStatusAction => ({\n  type: \"MODULARUI/STATUS\",\n  payload: { key, status },\n});\n\n/**\n */\nconst loadModelSuccessAction = (\n  key: string,\n  model: ModularUIModel,\n  modelToUpdate\n): UpdateModelAction | SetModelAction => {\n  if (modelToUpdate) {\n    if (typeof modelToUpdate.update === \"function\") {\n      const clonedModel = modelToUpdate.clone();\n      clonedModel.update(model);\n\n      return updateModel(clonedModel);\n    }\n\n    throw new Error(\n      `loadModel action: updateModel is set as option for ${key}, but the model is missing an update methode`\n    );\n  }\n\n  return setModel(key, model);\n};\n\n/**\n */\nexport const loadModel = (\n  key: string,\n  href: Href | string,\n  options?: RequestBaseOptions\n): ModularUIAction => ({\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    href: href instanceof Href ? href : new Href(href),\n    method: options?.method ?? HTTP_METHODS.GET,\n    data: options?.data,\n    locale: options?.locale ?? \"en\",\n    childmodels: options?.childmodels,\n    targetModel: options?.targetModel,\n    /**\n     */\n    successAction: (model) =>\n      loadModelSuccessAction(key, model, options?.updateModel),\n    /**\n     */\n    errorAction: (error) => {\n      const errorResponse = new ErrorResponse(error, key);\n      if (errorResponse.isChangePassword) {\n        return {\n          type: \"NO_ACTION\",\n        };\n      } else if (\n        errorResponse.isResourceNotFoundAfterReload ||\n        errorResponse.isInvalidUsername\n      ) {\n        return removeModelByKey(key);\n      }\n\n      return updateStatus(key, MODULARUI_STATUS.ERROR);\n    },\n  },\n});\n\n/**\n */\nexport const loadModularUI =\n  (\n    key: string,\n    href: Href | string,\n    options?: RequestBaseOptions\n  ): ThunkAction =>\n  (dispatch: Dispatch) => {\n    dispatch(updateStatus(key, MODULARUI_STATUS.LOADING));\n    dispatch(startProgress());\n\n    const loadModelPromise = dispatch(loadModel(key, href, options));\n    if (typeof loadModelPromise !== \"function\" && loadModelPromise.then) {\n      return loadModelPromise\n        .then((response) => {\n          if (response?.type === \"FINISH_PROGRESS\") {\n            dispatch(updateStatus(key, MODULARUI_STATUS.FINISHED));\n          }\n\n          return dispatch(finishProgress());\n        })\n        .catch((error) => dispatch(handleError(error)));\n    }\n  };\n\n/**\n */\nexport const reloadModel = (\n  model: ModularUIModel,\n  options?: RequestBaseOptions\n): ThunkAction =>\n  loadModularUI(model.connectKey, model.selfhref, {\n    ...options,\n    isReload: true,\n  });\n"],"file":"actions.js"}
+{"version":3,"sources":["../../../src/redux/_modularui/actions.js"],"names":["setModel","key","model","connectKey","type","payload","updateModel","removeModelByKey","resetModularUI","updateStatus","status","loadModelSuccessAction","modelToUpdate","clonedModel","clone","update","Error","loadModel","href","options","Href","method","HTTP_METHODS","GET","data","locale","childmodels","targetModel","successAction","errorAction","error","errorResponse","ErrorResponse","isChangePassword","isResourceNotFoundAfterReload","isInvalidUsername","MODULARUI_STATUS","ERROR","loadModularUI","dispatch","LOADING","loadModelPromise","resolve","then","response","FINISHED","catch","reloadModel","selfhref","isReload"],"mappings":"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","sourcesContent":["// @flow\nimport { HTTP_METHODS, MODULARUI_STATUS } from \"../../constants/Constants\";\nimport Href from \"../../models/href/Href\";\nimport ErrorResponse from \"../../models/error/ErrorResponse\";\nimport { finishProgress, startProgress } from \"../actions/ProgressIndicator\";\nimport { handleError } from \"../actions/Error\";\n\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { Dispatch, ThunkAction } from \"../types\";\nimport type {\n  ModularUIAction,\n  SetModelAction,\n  UpdateModelAction,\n  RemoveModelByKeyAction,\n  ResetModularUIAction,\n  UpdateStatusAction,\n} from \"./types\";\nimport type { RequestBaseOptions } from \"../../utils/fetch/types\";\n\n/**\n */\nexport const setModel = (\n  key: string,\n  model: ModularUIModel\n): SetModelAction => {\n  // set key on model for later reference\n  model.connectKey = key;\n  return {\n    type: \"MODULARUI/SET\",\n    payload: {\n      key,\n      model,\n    },\n  };\n};\n\n/**\n */\nexport const updateModel = (model: ModularUIModel): UpdateModelAction => ({\n  type: \"MODULARUI/UPDATE\",\n  payload: model,\n});\n\n/**\n */\nexport const removeModelByKey = (key: string): RemoveModelByKeyAction => ({\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: key,\n});\n\n/**\n * Removes all models except the application model from the modular ui reducer\n */\nexport const resetModularUI = (): ResetModularUIAction => ({\n  type: \"MODULARUI/RESET\",\n});\n\n/**\n */\nexport const updateStatus = (\n  key: string,\n  status: $Keys<typeof MODULARUI_STATUS>\n): UpdateStatusAction => ({\n  type: \"MODULARUI/STATUS\",\n  payload: { key, status },\n});\n\n/**\n */\nconst loadModelSuccessAction = (\n  key: string,\n  model: ModularUIModel,\n  modelToUpdate\n): UpdateModelAction | SetModelAction => {\n  if (modelToUpdate) {\n    // $FlowFixMe[prop-missing]\n    if (typeof modelToUpdate[\"update\"] === \"function\") {\n      const clonedModel = modelToUpdate.clone();\n      clonedModel.update(model);\n\n      return updateModel(clonedModel);\n    }\n\n    throw new Error(\n      `loadModel action: updateModel is set as option for ${key}, but the model is missing an update methode`\n    );\n  }\n\n  return setModel(key, model);\n};\n\n/**\n */\nexport const loadModel = (\n  key: string,\n  href: Href | string,\n  options?: RequestBaseOptions\n): ModularUIAction => ({\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    href: href instanceof Href ? href : new Href(href),\n    method: options?.method ?? HTTP_METHODS.GET,\n    data: options?.data,\n    locale: options?.locale ?? \"en\",\n    childmodels: options?.childmodels,\n    targetModel: options?.targetModel,\n    /**\n     */\n    successAction: (model) =>\n      loadModelSuccessAction(key, model, options?.updateModel),\n    /**\n     */\n    errorAction: (error) => {\n      const errorResponse = new ErrorResponse(error, key);\n      if (errorResponse.isChangePassword) {\n        return {\n          type: \"NO_ACTION\",\n        };\n      } else if (\n        errorResponse.isResourceNotFoundAfterReload ||\n        errorResponse.isInvalidUsername\n      ) {\n        return removeModelByKey(key);\n      }\n\n      return updateStatus(key, MODULARUI_STATUS.ERROR);\n    },\n  },\n});\n\n/**\n */\nexport const loadModularUI =\n  (\n    key: string,\n    href: Href | string,\n    options?: RequestBaseOptions\n  ): ThunkAction =>\n  (dispatch: Dispatch) => {\n    dispatch(updateStatus(key, MODULARUI_STATUS.LOADING));\n    dispatch(startProgress());\n\n    const loadModelPromise = dispatch(loadModel(key, href, options));\n\n    return Promise.resolve(loadModelPromise)\n      .then((response) => {\n        if (response?.type === \"FINISH_PROGRESS\") {\n          dispatch(updateStatus(key, MODULARUI_STATUS.FINISHED));\n        }\n\n        return dispatch(finishProgress());\n      })\n      .catch((error) => dispatch(handleError(error)));\n  };\n\n/**\n */\nexport const reloadModel = (\n  model: ModularUIModel,\n  options?: RequestBaseOptions\n): ThunkAction =>\n  loadModularUI(model.connectKey, model.selfhref, {\n    ...options,\n    isReload: true,\n  });\n"],"file":"actions.js"}

package/lib/redux/_modularui/reducer.js

@@ -121,8 +121,7 @@ var removeKey = function removeKey(modelKey, state) {
 
   // eslint-disable-next-line no-unused-vars
   var _ = state[modelKey],
-      newState = (0, _objectWithoutProperties2.default)(state, (0, _map.default)(_context2 = [modelKey]).call(_context2, _toPropertyKey)); // $FlowExpectedError[incompatible-return]
-
+      newState = (0, _objectWithoutProperties2.default)(state, (0, _map.default)(_context2 = [modelKey]).call(_context2, _toPropertyKey));
   return newState;
 };
 /**

package/lib/redux/_modularui/reducer.js.flow

@@ -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/lib/redux/_modularui/reducer.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/redux/_modularui/reducer.js"],"names":["updateStatus","state","key","status","MODULARUI_STATUS","LOADING","lastModification","Date","now","setModel","model","IllegalArgumentException","getModelKey","connectKey","updateModel","modelKey","Error","removeKey","_","newState","resetModularUI","ApplicationModel","initialState","ModularUIReducer","action","type","payload"],"mappings":"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","sourcesContent":["// @flow\nimport { IllegalArgumentException } from \"../../exceptions\";\nimport { MODULARUI_STATUS } from \"../../constants/Constants\";\nimport { ApplicationModel } from \"../../models\";\n\nimport type { Reducer } from \"redux\";\nimport type { ReduxAction } from \"../types\";\nimport type { ModularUIState } from \"./types\";\n\n/**\n */\nconst updateStatus = (state, { key, status }) => {\n  // model should always be available when status is not loading\n  if (status !== MODULARUI_STATUS.LOADING && !state[key]) {\n    return state;\n  }\n\n  return {\n    ...state,\n    [key]: {\n      ...state[key],\n      status,\n      lastModification: Date.now(),\n    },\n  };\n};\n\n/**\n */\nconst setModel = (state, { key, model }) => {\n  if (!state[key]) {\n    return state;\n  }\n\n  if (model) {\n    return {\n      ...state,\n      [key]: {\n        ...state[key],\n        model,\n        lastModification: Date.now(),\n      },\n    };\n  }\n\n  throw new IllegalArgumentException(\"No model for setModel\");\n};\n\n/**\n */\nconst getModelKey = (state, model) =>\n  Object.keys(state).find((key) => {\n    const connectKey = state[key]?.model?.connectKey ?? \"\";\n    return connectKey === model.connectKey;\n  });\n\n/**\n */\nconst updateModel = (state, model) => {\n  const modelKey = getModelKey(state, model);\n\n  if (modelKey) {\n    return setModel(state, { key: modelKey, model });\n  }\n\n  throw new Error(\n    `ModularUIReducer: Cannot update model with key ${model.connectKey}`\n  );\n};\n\n/**\n */\nconst removeKey = (modelKey: string, state: ModularUIState): ModularUIState => {\n  // eslint-disable-next-line no-unused-vars\n  const { [modelKey]: _, ...newState } = state;\n\n  // $FlowExpectedError[incompatible-return]\n  return newState;\n};\n\n/**\n * Remove all but application models\n */\nconst resetModularUI = (state: ModularUIState) => {\n  const newState = {};\n\n  for (const key in state) {\n    if (state[key].model instanceof ApplicationModel) {\n      newState[key] = { ...state[key] };\n    }\n  }\n\n  return newState;\n};\n\nconst initialState: ModularUIState = {};\n\n/**\n * Modular UI Reducer\n */\nexport const ModularUIReducer: Reducer<ModularUIState, ReduxAction> = (\n  state = initialState,\n  action\n) => {\n  if (!action) {\n    return state;\n  }\n\n  switch (action.type) {\n    case \"MODULARUI/RESET\":\n      return resetModularUI(state);\n\n    case \"MODULARUI/STATUS\":\n      return updateStatus(state, action.payload);\n\n    case \"MODULARUI/SET\":\n      return setModel(state, action.payload);\n\n    case \"MODULARUI/UPDATE\":\n      return updateModel(state, action.payload);\n\n    case \"MODULARUI/REMOVE_KEY\":\n      return removeKey(action.payload, state);\n\n    default:\n      return state;\n  }\n};\n"],"file":"reducer.js"}
+{"version":3,"sources":["../../../src/redux/_modularui/reducer.js"],"names":["updateStatus","state","key","status","MODULARUI_STATUS","LOADING","lastModification","Date","now","setModel","model","IllegalArgumentException","getModelKey","connectKey","updateModel","modelKey","Error","removeKey","_","newState","resetModularUI","ApplicationModel","initialState","ModularUIReducer","action","type","payload"],"mappings":"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","sourcesContent":["// @flow\nimport { IllegalArgumentException } from \"../../exceptions\";\nimport { MODULARUI_STATUS } from \"../../constants/Constants\";\nimport { ApplicationModel } from \"../../models\";\n\nimport type { Reducer } from \"redux\";\nimport type { ReduxAction } from \"../types\";\nimport type { ModularUIState } from \"./types\";\n\n/**\n */\nconst updateStatus = (state, { key, status }) => {\n  // model should always be available when status is not loading\n  if (status !== MODULARUI_STATUS.LOADING && !state[key]) {\n    return state;\n  }\n\n  return {\n    ...state,\n    [key]: {\n      ...state[key],\n      status,\n      lastModification: Date.now(),\n    },\n  };\n};\n\n/**\n */\nconst setModel = (state, { key, model }) => {\n  if (!state[key]) {\n    return state;\n  }\n\n  if (model) {\n    return {\n      ...state,\n      [key]: {\n        ...state[key],\n        model,\n        lastModification: Date.now(),\n      },\n    };\n  }\n\n  throw new IllegalArgumentException(\"No model for setModel\");\n};\n\n/**\n */\nconst getModelKey = (state, model) =>\n  Object.keys(state).find((key) => {\n    const connectKey = state[key]?.model?.connectKey ?? \"\";\n    return connectKey === model.connectKey;\n  });\n\n/**\n */\nconst updateModel = (state, model) => {\n  const modelKey = getModelKey(state, model);\n\n  if (modelKey) {\n    return setModel(state, { key: modelKey, model });\n  }\n\n  throw new Error(\n    `ModularUIReducer: Cannot update model with key ${model.connectKey}`\n  );\n};\n\n/**\n */\nconst removeKey = (modelKey: string, state: ModularUIState): ModularUIState => {\n  // eslint-disable-next-line no-unused-vars\n  const { [modelKey]: _, ...newState } = state;\n\n  return newState;\n};\n\n/**\n * Remove all but application models\n */\nconst resetModularUI = (state: ModularUIState) => {\n  const newState = {};\n\n  for (const key in state) {\n    if (state[key].model instanceof ApplicationModel) {\n      newState[key] = { ...state[key] };\n    }\n  }\n\n  return newState;\n};\n\nconst initialState: ModularUIState = {};\n\n/**\n * Modular UI Reducer\n */\nexport const ModularUIReducer: Reducer<ModularUIState, ReduxAction> = (\n  state = initialState,\n  action\n) => {\n  if (!action) {\n    return state;\n  }\n\n  switch (action.type) {\n    case \"MODULARUI/RESET\":\n      return resetModularUI(state);\n\n    case \"MODULARUI/STATUS\":\n      return updateStatus(state, action.payload);\n\n    case \"MODULARUI/SET\":\n      return setModel(state, action.payload);\n\n    case \"MODULARUI/UPDATE\":\n      return updateModel(state, action.payload);\n\n    case \"MODULARUI/REMOVE_KEY\":\n      return removeKey(action.payload, state);\n\n    default:\n      return state;\n  }\n};\n"],"file":"reducer.js"}

package/lib/redux/actions/SignIn.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.loginSuccess = exports.loginFailed = exports.login = exports.changePassword = void 0;
 
+var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
+
 var _Cache = _interopRequireDefault(require("../../utils/browser/Cache"));
 
 var _Authenticate = _interopRequireDefault(require("../../modularui/Authenticate"));
@@ -81,16 +83,11 @@ var login = function login(username, password) {
     }).catch(function (error) {
       if (error.id === "Error.ChangePasswordRequired") {
         var dispatchedReloadApplication = dispatch((0, _Application.reloadApplication)());
+        return _promise.default.resolve(dispatchedReloadApplication).then(function () {
+          _Cache.default.addItem("auth", true);
 
-        if (typeof dispatchedReloadApplication !== "function" && dispatchedReloadApplication.then) {
-          dispatchedReloadApplication.then(function () {
-            _Cache.default.addItem("auth", true);
-
-            return dispatch(changePassword());
-          }).then(function () {
-            return dispatch((0, _ProgressIndicator.finishProgress)());
-          });
-        }
+          return dispatch(changePassword());
+        });
       }
 
       dispatch(loginFailed(error.id));

package/lib/redux/actions/SignIn.js.flow

@@ -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/lib/redux/actions/SignIn.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/redux/actions/SignIn.js"],"names":["loginFailed","errorMessage","type","payload","loginSuccess","changePassword","dispatch","getState","isModal","router","location","state","modal","locationFrom","from","CHANGEPASSWORD_PATH","login","username","password","Authenticate","then","Cache","addItem","catch","error","id","dispatchedReloadApplication"],"mappings":";;;;;;;;;AACA;;AACA;;AAEA;;AAEA;;AACA;;AACA;;AAQA;AACA;AACA;AACO,IAAMA,WAAW,GAAG,SAAdA,WAAc,CAACC,YAAD;AAAA,SAA8C;AACvEC,IAAAA,IAAI,EAAE,sBADiE;AAEvEC,IAAAA,OAAO,EAAEF;AAF8D,GAA9C;AAAA,CAApB;AAKP;AACA;AACA;;;;;AACO,IAAMG,YAAY,GAAG,SAAfA,YAAe;AAAA,SAA2B;AACrDF,IAAAA,IAAI,EAAE;AAD+C,GAA3B;AAAA,CAArB;AAIP;AACA;AACA;;;;;AACO,IAAMG,cAAc,GAAG,SAAjBA,cAAiB;AAAA,SAAmB,UAACC,QAAD,EAAWC,QAAX,EAAwB;AAAA;;AACvED,IAAAA,QAAQ,CAAC;AACPJ,MAAAA,IAAI,EAAE;AADC,KAAD,CAAR;AAIA,QAAMM,OAAO,4BAAGD,QAAQ,GAAGE,MAAX,CAAkBC,QAArB,oFAAG,sBAA4BC,KAA/B,2DAAG,uBAAmCC,KAAnD;AACA,QAAMC,YAAY,6BAAGN,QAAQ,GAAGE,MAAX,CAAkBC,QAArB,qFAAG,uBAA4BC,KAA/B,2DAAG,uBAAmCG,IAAxD;AACA,WAAOR,QAAQ,CACb,mBAAKS,8BAAL,EAA0B;AACxBD,MAAAA,IAAI,EAAED,YAAY,GAAGA,YAAH,GAAkBN,QAAQ,GAAGE,MAAX,CAAkBC,QAD9B;AAExBE,MAAAA,KAAK,EAAEJ;AAFiB,KAA1B,CADa,CAAf;AAMD,GAb6B;AAAA,CAAvB;AAeP;AACA;;;;;AACO,IAAMQ,KAAK,GAChB,SADWA,KACX,CAACC,QAAD,EAAmBC,QAAnB;AAAA,SACA,UAACZ,QAAD,EAAc;AACZA,IAAAA,QAAQ,CAAC,uCAAD,CAAR;AAEA,WAAO,IAAIa,qBAAJ,GACJH,KADI,CACEC,QADF,EACYC,QADZ,EAEJE,IAFI,CAEC;AAAA,aAAMd,QAAQ,CAAC,qCAAD,CAAd;AAAA,KAFD,EAGJc,IAHI,CAGC,YAAM;AACVC,qBAAMC,OAAN,CAAc,MAAd,EAAsB,IAAtB;;AACAhB,MAAAA,QAAQ,CAACF,YAAY,EAAb,CAAR;AAEA,aAAOE,QAAQ,CAAC,wCAAD,CAAf;AACD,KARI,EASJiB,KATI,CASE,UAACC,KAAD,EAAW;AAChB,UAAIA,KAAK,CAACC,EAAN,KAAa,8BAAjB,EAAiD;AAC/C,YAAMC,2BAA2B,GAAGpB,QAAQ,CAAC,qCAAD,CAA5C;;AACA,YACE,OAAOoB,2BAAP,KAAuC,UAAvC,IACAA,2BAA2B,CAACN,IAF9B,EAGE;AACAM,UAAAA,2BAA2B,CACxBN,IADH,CACQ,YAAM;AACVC,2BAAMC,OAAN,CAAc,MAAd,EAAsB,IAAtB;;AACA,mBAAOhB,QAAQ,CAACD,cAAc,EAAf,CAAf;AACD,WAJH,EAKGe,IALH,CAKQ;AAAA,mBAAMd,QAAQ,CAAC,wCAAD,CAAd;AAAA,WALR;AAMD;AACF;;AAEDA,MAAAA,QAAQ,CAACN,WAAW,CAACwB,KAAK,CAACC,EAAP,CAAZ,CAAR;AACA,aAAOnB,QAAQ,CAAC,wCAAD,CAAf;AACD,KA3BI,CAAP;AA4BD,GAhCD;AAAA,CADK","sourcesContent":["// @flow\nimport Cache from \"../../utils/browser/Cache\";\nimport Authenticate from \"../../modularui/Authenticate\";\n\nimport { reloadApplication } from \"./Application\";\n\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\nimport { push } from \"../_router/actions\";\nimport { CHANGEPASSWORD_PATH } from \"../../constants/Constants\";\n\nimport type {\n  LoginFailedAction,\n  LoginSuccessAction,\n  ThunkAction,\n} from \"../types\";\n\n/**\n * Send login failed action\n */\nexport const loginFailed = (errorMessage: string): LoginFailedAction => ({\n  type: \"AUTHENTICATION_ERROR\",\n  payload: errorMessage,\n});\n\n/**\n * Send login success action\n */\nexport const loginSuccess = (): LoginSuccessAction => ({\n  type: \"AUTHENTICATION_SUCCESS\",\n});\n\n/**\n * Send change password action\n */\nexport const changePassword = (): ThunkAction => (dispatch, getState) => {\n  dispatch({\n    type: \"CHANGE_PASSWORD\",\n  });\n\n  const isModal = getState().router.location?.state?.modal;\n  const locationFrom = getState().router.location?.state?.from;\n  return dispatch(\n    push(CHANGEPASSWORD_PATH, {\n      from: locationFrom ? locationFrom : getState().router.location,\n      modal: isModal,\n    })\n  );\n};\n\n/**\n */\nexport const login =\n  (username: string, password: string): ThunkAction =>\n  (dispatch) => {\n    dispatch(startProgress());\n\n    return new Authenticate()\n      .login(username, password)\n      .then(() => dispatch(reloadApplication()))\n      .then(() => {\n        Cache.addItem(\"auth\", true);\n        dispatch(loginSuccess());\n\n        return dispatch(finishProgress());\n      })\n      .catch((error) => {\n        if (error.id === \"Error.ChangePasswordRequired\") {\n          const dispatchedReloadApplication = dispatch(reloadApplication());\n          if (\n            typeof dispatchedReloadApplication !== \"function\" &&\n            dispatchedReloadApplication.then\n          ) {\n            dispatchedReloadApplication\n              .then(() => {\n                Cache.addItem(\"auth\", true);\n                return dispatch(changePassword());\n              })\n              .then(() => dispatch(finishProgress()));\n          }\n        }\n\n        dispatch(loginFailed(error.id));\n        return dispatch(finishProgress());\n      });\n  };\n"],"file":"SignIn.js"}
+{"version":3,"sources":["../../../src/redux/actions/SignIn.js"],"names":["loginFailed","errorMessage","type","payload","loginSuccess","changePassword","dispatch","getState","isModal","router","location","state","modal","locationFrom","from","CHANGEPASSWORD_PATH","login","username","password","Authenticate","then","Cache","addItem","catch","error","id","dispatchedReloadApplication","resolve"],"mappings":";;;;;;;;;;;AACA;;AACA;;AAEA;;AAEA;;AACA;;AACA;;AAQA;AACA;AACA;AACO,IAAMA,WAAW,GAAG,SAAdA,WAAc,CAACC,YAAD;AAAA,SAA8C;AACvEC,IAAAA,IAAI,EAAE,sBADiE;AAEvEC,IAAAA,OAAO,EAAEF;AAF8D,GAA9C;AAAA,CAApB;AAKP;AACA;AACA;;;;;AACO,IAAMG,YAAY,GAAG,SAAfA,YAAe;AAAA,SAA2B;AACrDF,IAAAA,IAAI,EAAE;AAD+C,GAA3B;AAAA,CAArB;AAIP;AACA;AACA;;;;;AACO,IAAMG,cAAc,GAAG,SAAjBA,cAAiB;AAAA,SAAmB,UAACC,QAAD,EAAWC,QAAX,EAAwB;AAAA;;AACvED,IAAAA,QAAQ,CAAC;AACPJ,MAAAA,IAAI,EAAE;AADC,KAAD,CAAR;AAIA,QAAMM,OAAO,4BAAGD,QAAQ,GAAGE,MAAX,CAAkBC,QAArB,oFAAG,sBAA4BC,KAA/B,2DAAG,uBAAmCC,KAAnD;AACA,QAAMC,YAAY,6BAAGN,QAAQ,GAAGE,MAAX,CAAkBC,QAArB,qFAAG,uBAA4BC,KAA/B,2DAAG,uBAAmCG,IAAxD;AACA,WAAOR,QAAQ,CACb,mBAAKS,8BAAL,EAA0B;AACxBD,MAAAA,IAAI,EAAED,YAAY,GAAGA,YAAH,GAAkBN,QAAQ,GAAGE,MAAX,CAAkBC,QAD9B;AAExBE,MAAAA,KAAK,EAAEJ;AAFiB,KAA1B,CADa,CAAf;AAMD,GAb6B;AAAA,CAAvB;AAeP;AACA;;;;;AACO,IAAMQ,KAAK,GAChB,SADWA,KACX,CAACC,QAAD,EAAmBC,QAAnB;AAAA,SACA,UAACZ,QAAD,EAAc;AACZA,IAAAA,QAAQ,CAAC,uCAAD,CAAR;AAEA,WAAO,IAAIa,qBAAJ,GACJH,KADI,CACEC,QADF,EACYC,QADZ,EAEJE,IAFI,CAEC;AAAA,aAAMd,QAAQ,CAAC,qCAAD,CAAd;AAAA,KAFD,EAGJc,IAHI,CAGC,YAAM;AACVC,qBAAMC,OAAN,CAAc,MAAd,EAAsB,IAAtB;;AACAhB,MAAAA,QAAQ,CAACF,YAAY,EAAb,CAAR;AAEA,aAAOE,QAAQ,CAAC,wCAAD,CAAf;AACD,KARI,EASJiB,KATI,CASE,UAACC,KAAD,EAAW;AAChB,UAAIA,KAAK,CAACC,EAAN,KAAa,8BAAjB,EAAiD;AAC/C,YAAMC,2BAA2B,GAAGpB,QAAQ,CAAC,qCAAD,CAA5C;AAEA,eAAO,iBAAQqB,OAAR,CAAgBD,2BAAhB,EAA6CN,IAA7C,CAAkD,YAAM;AAC7DC,yBAAMC,OAAN,CAAc,MAAd,EAAsB,IAAtB;;AACA,iBAAOhB,QAAQ,CAACD,cAAc,EAAf,CAAf;AACD,SAHM,CAAP;AAID;;AAEDC,MAAAA,QAAQ,CAACN,WAAW,CAACwB,KAAK,CAACC,EAAP,CAAZ,CAAR;AACA,aAAOnB,QAAQ,CAAC,wCAAD,CAAf;AACD,KArBI,CAAP;AAsBD,GA1BD;AAAA,CADK","sourcesContent":["// @flow\nimport Cache from \"../../utils/browser/Cache\";\nimport Authenticate from \"../../modularui/Authenticate\";\n\nimport { reloadApplication } from \"./Application\";\n\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\nimport { push } from \"../_router/actions\";\nimport { CHANGEPASSWORD_PATH } from \"../../constants/Constants\";\n\nimport type {\n  LoginFailedAction,\n  LoginSuccessAction,\n  ThunkAction,\n} from \"../types\";\n\n/**\n * Send login failed action\n */\nexport const loginFailed = (errorMessage: string): LoginFailedAction => ({\n  type: \"AUTHENTICATION_ERROR\",\n  payload: errorMessage,\n});\n\n/**\n * Send login success action\n */\nexport const loginSuccess = (): LoginSuccessAction => ({\n  type: \"AUTHENTICATION_SUCCESS\",\n});\n\n/**\n * Send change password action\n */\nexport const changePassword = (): ThunkAction => (dispatch, getState) => {\n  dispatch({\n    type: \"CHANGE_PASSWORD\",\n  });\n\n  const isModal = getState().router.location?.state?.modal;\n  const locationFrom = getState().router.location?.state?.from;\n  return dispatch(\n    push(CHANGEPASSWORD_PATH, {\n      from: locationFrom ? locationFrom : getState().router.location,\n      modal: isModal,\n    })\n  );\n};\n\n/**\n */\nexport const login =\n  (username: string, password: string): ThunkAction =>\n  (dispatch) => {\n    dispatch(startProgress());\n\n    return new Authenticate()\n      .login(username, password)\n      .then(() => dispatch(reloadApplication()))\n      .then(() => {\n        Cache.addItem(\"auth\", true);\n        dispatch(loginSuccess());\n\n        return dispatch(finishProgress());\n      })\n      .catch((error) => {\n        if (error.id === \"Error.ChangePasswordRequired\") {\n          const dispatchedReloadApplication = dispatch(reloadApplication());\n\n          return Promise.resolve(dispatchedReloadApplication).then(() => {\n            Cache.addItem(\"auth\", true);\n            return dispatch(changePassword());\n          });\n        }\n\n        dispatch(loginFailed(error.id));\n        return dispatch(finishProgress());\n      });\n  };\n"],"file":"SignIn.js"}

package/lib/redux/actions/__tests__/Application.spec.js.flow

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

package/lib/redux/actions/__tests__/CustomErrorResponseHandler.spec.js.flow

@@ -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/lib/utils/fetch/__tests__/xhr.spec.js.flow

@@ -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/lib/utils/helpers/objects.js

@@ -11,10 +11,12 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/ty
 
 var _has2 = _interopRequireDefault(require("lodash/has"));
 
+var _isPlainObject2 = _interopRequireDefault(require("lodash/isPlainObject"));
+
 /**
  */
 var isPlainObject = function isPlainObject(value) {
-  return Object.prototype.toString.call(value) === "[object Object]";
+  return (0, _isPlainObject2.default)(value);
 };
 /**
  */

package/lib/utils/helpers/objects.js.flow

@@ -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);
 
 /**
  */

package/lib/utils/helpers/objects.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/utils/helpers/objects.js"],"names":["isPlainObject","value","Object","prototype","toString","call","has","obj","propName","get","path","defaultValue","String","split","reduce","acc","v"],"mappings":";;;;;;;;;;;AACA;;AAEA;AACA;AACO,IAAMA,aAAa,GAAG,SAAhBA,aAAgB,CAACC,KAAD;AAAA,SAC3BC,MAAM,CAACC,SAAP,CAAiBC,QAAjB,CAA0BC,IAA1B,CAA+BJ,KAA/B,MAA0C,iBADf;AAAA,CAAtB;AAGP;AACA;;;;;AACO,IAAMK,GAAG,GAAG,SAANA,GAAM,CAACC,GAAD,EAAWC,QAAX,EAAyC;AAC1D,MAAI,CAACR,aAAa,CAACO,GAAD,CAAlB,EAAyB;AACvB,WAAO,KAAP;AACD;;AAED,SAAO,mBAAKA,GAAL,EAAUC,QAAV,CAAP;AACD,CANM;AAQP;AACA;AACA;AACA;;;;;AACO,IAAMC,GAAG,GAAG,SAANA,GAAM,CAACF,GAAD,EAAeG,IAAf,EAA6BC,YAA7B;AAAA,SACjBC,MAAM,CAACF,IAAD,CAAN,CACGG,KADH,CACS,GADT,EAEGC,MAFH,CAEU,UAACC,GAAD,EAAMC,CAAN,EAAY;AAClB,QAAI,sBAAOD,GAAP,MAAe,QAAnB,EAA6B;AAAA;;AAC3B,uBAAOA,GAAG,CAACC,CAAD,CAAV,2CAAiBL,YAAjB;AACD;;AACD,WAAOA,YAAP;AACD,GAPH,EAOKJ,GAPL,CADiB;AAAA,CAAZ","sourcesContent":["// @flow\nimport _has from \"lodash/has\";\n\n/**\n */\nexport const isPlainObject = (value: any): boolean =>\n  Object.prototype.toString.call(value) === \"[object Object]\";\n\n/**\n */\nexport const has = (obj: any, propName: string): boolean => {\n  if (!isPlainObject(obj)) {\n    return false;\n  }\n\n  return _has(obj, propName);\n};\n\n/**\n * Retrieve property of an object\n * When path is only one deep better use optional chaining\n */\nexport const get = (obj: { ... }, path: string, defaultValue?: any): any =>\n  String(path)\n    .split(\".\")\n    .reduce((acc, v) => {\n      if (typeof acc === \"object\") {\n        return acc[v] ?? defaultValue;\n      }\n      return defaultValue;\n    }, obj);\n"],"file":"objects.js"}
+{"version":3,"sources":["../../../src/utils/helpers/objects.js"],"names":["isPlainObject","value","has","obj","propName","get","path","defaultValue","String","split","reduce","acc","v"],"mappings":";;;;;;;;;;;AACA;;AACA;;AAEA;AACA;AACO,IAAMA,aAAa,GAAG,SAAhBA,aAAgB,CAACC,KAAD;AAAA,SAAyB,6BAAeA,KAAf,CAAzB;AAAA,CAAtB;AAEP;AACA;;;;;AACO,IAAMC,GAAG,GAAG,SAANA,GAAM,CAACC,GAAD,EAAWC,QAAX,EAAyC;AAC1D,MAAI,CAACJ,aAAa,CAACG,GAAD,CAAlB,EAAyB;AACvB,WAAO,KAAP;AACD;;AAED,SAAO,mBAAKA,GAAL,EAAUC,QAAV,CAAP;AACD,CANM;AAQP;AACA;AACA;AACA;;;;;AACO,IAAMC,GAAG,GAAG,SAANA,GAAM,CAACF,GAAD,EAAeG,IAAf,EAA6BC,YAA7B;AAAA,SACjBC,MAAM,CAACF,IAAD,CAAN,CACGG,KADH,CACS,GADT,EAEGC,MAFH,CAEU,UAACC,GAAD,EAAMC,CAAN,EAAY;AAClB,QAAI,sBAAOD,GAAP,MAAe,QAAnB,EAA6B;AAAA;;AAC3B,uBAAOA,GAAG,CAACC,CAAD,CAAV,2CAAiBL,YAAjB;AACD;;AACD,WAAOA,YAAP;AACD,GAPH,EAOKJ,GAPL,CADiB;AAAA,CAAZ","sourcesContent":["// @flow\nimport _has from \"lodash/has\";\nimport _isPlainObject from \"lodash/isPlainObject\";\n\n/**\n */\nexport const isPlainObject = (value: any): boolean => _isPlainObject(value);\n\n/**\n */\nexport const has = (obj: any, propName: string): boolean => {\n  if (!isPlainObject(obj)) {\n    return false;\n  }\n\n  return _has(obj, propName);\n};\n\n/**\n * Retrieve property of an object\n * When path is only one deep better use optional chaining\n */\nexport const get = (obj: { ... }, path: string, defaultValue?: any): any =>\n  String(path)\n    .split(\".\")\n    .reduce((acc, v) => {\n      if (typeof acc === \"object\") {\n        return acc[v] ?? defaultValue;\n      }\n      return defaultValue;\n    }, obj);\n"],"file":"objects.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.13.4",
+  "version": "1.13.5",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -78,7 +78,7 @@
     "styled-components": "^5.2.0"
   },
   "dependencies": {
-    "@babel/runtime-corejs3": "^7.17.0",
+    "@babel/runtime-corejs3": "^7.17.2",
     "big.js": "^6.1.1",
     "date-fns": "^2.28.0",
     "deepmerge": "^4.2.2",
@@ -96,7 +96,7 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.17.0",
-    "@babel/core": "^7.17.0",
+    "@babel/core": "^7.17.2",
     "@babel/eslint-parser": "^7.17.0",
     "@babel/eslint-plugin": "^7.16.5",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
@@ -107,8 +107,8 @@
     "@commitlint/cli": "^16.1.0",
     "@commitlint/config-conventional": "^16.0.0",
     "@testing-library/react-hooks": "^7.0.2",
-    "auditjs": "^4.0.35",
-    "babel-jest": "^27.4.6",
+    "auditjs": "^4.0.36",
+    "babel-jest": "^27.5.1",
     "babel-plugin-styled-components": "^2.0.2",
     "cherry-pick": "^0.5.0",
     "cross-env": "^7.0.3",
@@ -116,19 +116,19 @@
     "eslint": "^8.8.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-babel": "^5.3.1",
-    "eslint-plugin-flowtype": "^8.0.3",
+    "eslint-plugin-ft-flow": "^2.0.1",
     "eslint-plugin-import": "^2.25.4",
     "eslint-plugin-jest": "^26.0.0",
     "eslint-plugin-jsdoc": "^37.7.1",
     "eslint-plugin-react": "^7.28.0",
     "eslint-plugin-react-hooks": "^4.3.0",
-    "flow-bin": "0.152.0",
+    "flow-bin": "^0.171.0",
     "flow-copy-source": "^2.0.9",
     "flow-typed": "^3.6.1",
     "glob": "^7.2.0",
     "history": "^4.0.0",
     "husky": "^7.0.4",
-    "jest": "^27.4.7",
+    "jest": "^27.5.1",
     "jest-junit": "^13.0.0",
     "jest-sonar-reporter": "^2.0.0",
     "jscodeshift": "^0.13.1",

package/src/hooks/__tests__/useAuthentication.spec.js

@@ -72,6 +72,7 @@ describe("authentication hooks", () => {
           href: new Href("/", "Application"),
         }),
       }),
+      { type: "FINISH_PROGRESS" },
       { type: "AUTHENTICATION_SUCCESS" },
       { type: "FINISH_PROGRESS" },
     ]);

package/src/models/attributes/AttributeContent.js

@@ -62,7 +62,7 @@ class AttributeContent {
     if (this._content?.elements) {
       return this._content.elements?.map((element) => {
         if ("propertyElement" in element) {
-          // $FlowIssue
+          // $FlowIssue[prop-missing]
           const { label, layouthint, properties } = element.propertyElement;
 
           return {
@@ -76,7 +76,7 @@ class AttributeContent {
 
         if ("textFragmentElement" in element) {
           const { label, layouthint, textfragments } =
-            // $FlowIssue
+            // $FlowIssue[prop-missing]
             element.textFragmentElement;
           return {
             textFragmentElement: {
@@ -91,7 +91,7 @@ class AttributeContent {
         }
 
         if ("contentElement" in element) {
-          // $FlowIssue
+          // $FlowIssue[prop-missing]
           const { label, layouthint, sections } = element.contentElement;
           return {
             contentElement: {

package/src/models/attributes/AttributeModel.js

@@ -26,7 +26,12 @@ import {
 } from "../../exceptions";
 
 import type { MessageParameters } from "../../i18n/types";
-import type { AttributeType, FormErrorAnchor, ModularUIModel } from "../types";
+import type {
+  AttributeType,
+  FormErrorAnchor,
+  IModelWithChildModels,
+  ModularUIModel,
+} from "../types";
 import type LinkModel from "../links/LinkModel";
 import type ContentConfiguration from "../contentconfiguration/ContentConfiguration";
 import type ContentConfigurationElements from "../contentconfiguration/ContentConfigurationElements";
@@ -37,7 +42,10 @@ import AttributeContent from "./AttributeContent";
 /**
  * Attribute model, base model for all kind of attributes
  */
-export default class AttributeModel extends BaseModel {
+export default class AttributeModel
+  extends BaseModel
+  implements IModelWithChildModels
+{
   _label: string;
   _lastModification: number = 0;
 

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/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/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 = [];