@beinformed/ui 1.25.2 → 1.25.5

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

@@ -15,7 +15,7 @@ import type {
   ResetModularUIAction,
   UpdateStatusAction,
 } from "./types";
-import type { RequestBaseOptions } from "../../utils/fetch/types";
+import type { RequestModularUIOptions } from "../../utils/fetch/types";
 
 /**
  */
@@ -90,11 +90,12 @@ const loadModelSuccessAction = (
 };
 
 /**
+ * This action is handled by the modularui middleware
  */
 export const loadModel = (
   key: string,
   href: Href | string,
-  options?: RequestBaseOptions
+  options?: RequestModularUIOptions
 ): ModularUIAction => ({
   type: "MODULARUI/FETCH",
   payload: {
@@ -104,6 +105,7 @@ export const loadModel = (
     locale: options?.locale ?? "en",
     childmodels: options?.childmodels,
     targetModel: options?.targetModel,
+    forceTargetModel: options?.forceTargetModel,
     /**
      */
     successAction: (model) =>
@@ -131,7 +133,7 @@ export const loadModularUI =
   (
     key: string,
     href: Href | string,
-    options?: RequestBaseOptions
+    options?: RequestModularUIOptions
   ): ThunkAction =>
   (dispatch: Dispatch) => {
     dispatch(updateStatus(key, MODULARUI_STATUS.LOADING));
@@ -154,7 +156,7 @@ export const loadModularUI =
  */
 export const reloadModel = (
   model: ModularUIModel,
-  options?: RequestBaseOptions
+  options?: RequestModularUIOptions
 ): ThunkAction =>
   loadModularUI(model.connectKey, model.selfhref, {
     ...options,

package/lib/redux/_modularui/ModularUIActions.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModularUIActions.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","MODULARUI_STATUS","ERROR","loadModularUI","dispatch","LOADING","startProgress","loadModelPromise","resolve","then","response","FINISHED","finishProgress","catch","handleError","reloadModel","selfhref","isReload"],"sources":["../../../src/redux/_modularui/ModularUIActions.js"],"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: ?ModularUIModel\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 (errorResponse.isResourceNotFoundAfterReload) {\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"],"mappings":"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"}
+{"version":3,"file":"ModularUIActions.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","forceTargetModel","successAction","errorAction","error","errorResponse","ErrorResponse","isChangePassword","isResourceNotFoundAfterReload","MODULARUI_STATUS","ERROR","loadModularUI","dispatch","LOADING","startProgress","loadModelPromise","resolve","then","response","FINISHED","finishProgress","catch","handleError","reloadModel","selfhref","isReload"],"sources":["../../../src/redux/_modularui/ModularUIActions.js"],"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 { RequestModularUIOptions } 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: ?ModularUIModel\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 * This action is handled by the modularui middleware\n */\nexport const loadModel = (\n  key: string,\n  href: Href | string,\n  options?: RequestModularUIOptions\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    forceTargetModel: options?.forceTargetModel,\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 (errorResponse.isResourceNotFoundAfterReload) {\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?: RequestModularUIOptions\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?: RequestModularUIOptions\n): ThunkAction =>\n  loadModularUI(model.connectKey, model.selfhref, {\n    ...options,\n    isReload: true,\n  });\n"],"mappings":"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"}

package/lib/redux/_modularui/ModularUIMiddleware.js

@@ -23,6 +23,7 @@ const createRequest = modularui => {
   });
   if (modularui.targetModel) {
     request.targetModel = modularui.targetModel;
+    request.forceTargetModel = modularui.forceTargetModel ?? false;
   }
   return request;
 };

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

@@ -16,6 +16,7 @@ import type {
 import type { ModularUIModel } from "../../models/types";
 import type Href from "../../models/href/Href";
 import type { ModularUIAction, SuccessAction, ErrorAction } from "./types";
+import type { TargetModel } from "../../modularui/types";
 
 type RequestOptions = {
   href: Href,
@@ -23,14 +24,15 @@ type RequestOptions = {
   data?: string | { [key: string]: string },
   locale: string,
   childmodels?: boolean,
-  targetModel?: Class<ModularUIModel>,
+  targetModel?: TargetModel,
+  forceTargetModel?: boolean,
   isReload?: boolean,
 };
 
 /**
  * Symbol key that carries API call info interpreted by this Redux middleware.
  */
-const createRequest = (modularui: RequestOptions) => {
+const createRequest = (modularui: RequestOptions): ModularUIRequest => {
   const request = new ModularUIRequest(modularui.href, {
     method: modularui.method || HTTP_METHODS.GET,
     data: modularui.data || {},
@@ -41,6 +43,7 @@ const createRequest = (modularui: RequestOptions) => {
 
   if (modularui.targetModel) {
     request.targetModel = modularui.targetModel;
+    request.forceTargetModel = modularui.forceTargetModel ?? false;
   }
 
   return request;

package/lib/redux/_modularui/ModularUIMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModularUIMiddleware.js","names":["createRequest","modularui","request","ModularUIRequest","href","method","HTTP_METHODS","GET","data","locale","childmodels","isReload","targetModel","responseHandler","next","dispatch","successAction","model","successResult","then","result","catch","error","handleError","Error","finishProgress","errorHandler","errorAction","err","errorResult","handleFetch","action","startProgress","requestOptions","payload","modularuiRequest","fetch","modularUIMiddleware","api","type","getState","i18n"],"sources":["../../../src/redux/_modularui/ModularUIMiddleware.js"],"sourcesContent":["// @flow\nimport ModularUIRequest from \"../../modularui/ModularUIRequest\";\nimport { HTTP_METHODS } from \"../../constants/Constants\";\n\nimport { startProgress, finishProgress } from \"../actions/ProgressIndicator\";\n\nimport { handleError } from \"../actions/Error\";\n\nimport type { Middleware, MiddlewareAPI } from \"redux\";\nimport type {\n  ReduxAction,\n  ReduxState,\n  Dispatch,\n  PossibleAction,\n} from \"../types\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type Href from \"../../models/href/Href\";\nimport type { ModularUIAction, SuccessAction, ErrorAction } from \"./types\";\n\ntype RequestOptions = {\n  href: Href,\n  method?: $Keys<typeof HTTP_METHODS>,\n  data?: string | { [key: string]: string },\n  locale: string,\n  childmodels?: boolean,\n  targetModel?: Class<ModularUIModel>,\n  isReload?: boolean,\n};\n\n/**\n * Symbol key that carries API call info interpreted by this Redux middleware.\n */\nconst createRequest = (modularui: RequestOptions) => {\n  const request = new ModularUIRequest(modularui.href, {\n    method: modularui.method || HTTP_METHODS.GET,\n    data: modularui.data || {},\n    locale: modularui.locale,\n    childmodels: modularui.childmodels ?? true,\n    isReload: modularui.isReload,\n  });\n\n  if (modularui.targetModel) {\n    request.targetModel = modularui.targetModel;\n  }\n\n  return request;\n};\n\n/**\n */\nconst responseHandler = (\n  next: Dispatch,\n  dispatch: Dispatch,\n  successAction: SuccessAction,\n  model: ModularUIModel\n) => {\n  if (successAction) {\n    const successResult = successAction(model);\n\n    if (successResult instanceof Promise) {\n      successResult\n        .then((result) => {\n          dispatch(result);\n        })\n        .catch((error) => {\n          next(handleError(error));\n        });\n    } else {\n      try {\n        dispatch(successResult);\n      } catch (error) {\n        throw new Error(\n          `Result of successResult is not a valid redux action: ${error}`\n        );\n      }\n    }\n  }\n\n  return next(finishProgress());\n};\n\n/**\n */\nconst errorHandler = (\n  next: Dispatch,\n  dispatch: Dispatch,\n  errorAction: ?ErrorAction,\n  err: any\n) => {\n  dispatch(finishProgress());\n\n  if (errorAction) {\n    const errorResult = errorAction(err);\n\n    if (errorResult instanceof Promise) {\n      errorResult.then((result) => dispatch(result));\n    } else {\n      dispatch(errorResult);\n    }\n  }\n\n  return next(handleError(err));\n};\n\n/**\n */\nconst handleFetch = (\n  action: ModularUIAction,\n  locale: string,\n  dispatch: Dispatch,\n  next: Dispatch\n) => {\n  dispatch(startProgress());\n\n  const { successAction, errorAction, ...requestOptions } = action.payload;\n  requestOptions.locale = locale;\n\n  const modularuiRequest = createRequest(requestOptions);\n\n  return modularuiRequest\n    .fetch()\n    .then((model) => responseHandler(next, dispatch, successAction, model))\n    .catch((error) => errorHandler(next, dispatch, errorAction, error));\n};\n\n/**\n */\nexport const modularUIMiddleware: Middleware<\n  ReduxState,\n  ReduxAction,\n  Dispatch\n> =\n  (api: MiddlewareAPI<ReduxState, ReduxAction, Dispatch>) =>\n  (next: Dispatch) =>\n  (action: PossibleAction) => {\n    if (action.type === \"MODULARUI/FETCH\") {\n      return handleFetch(\n        // $FlowExpectedError[incompatible-exact]\n        action,\n        api.getState().i18n.locale,\n        api.dispatch,\n        next\n      );\n    }\n\n    return next(action);\n  };\n"],"mappings":"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"}
+{"version":3,"file":"ModularUIMiddleware.js","names":["createRequest","modularui","request","ModularUIRequest","href","method","HTTP_METHODS","GET","data","locale","childmodels","isReload","targetModel","forceTargetModel","responseHandler","next","dispatch","successAction","model","successResult","then","result","catch","error","handleError","Error","finishProgress","errorHandler","errorAction","err","errorResult","handleFetch","action","startProgress","requestOptions","payload","modularuiRequest","fetch","modularUIMiddleware","api","type","getState","i18n"],"sources":["../../../src/redux/_modularui/ModularUIMiddleware.js"],"sourcesContent":["// @flow\nimport ModularUIRequest from \"../../modularui/ModularUIRequest\";\nimport { HTTP_METHODS } from \"../../constants/Constants\";\n\nimport { startProgress, finishProgress } from \"../actions/ProgressIndicator\";\n\nimport { handleError } from \"../actions/Error\";\n\nimport type { Middleware, MiddlewareAPI } from \"redux\";\nimport type {\n  ReduxAction,\n  ReduxState,\n  Dispatch,\n  PossibleAction,\n} from \"../types\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type Href from \"../../models/href/Href\";\nimport type { ModularUIAction, SuccessAction, ErrorAction } from \"./types\";\nimport type { TargetModel } from \"../../modularui/types\";\n\ntype RequestOptions = {\n  href: Href,\n  method?: $Keys<typeof HTTP_METHODS>,\n  data?: string | { [key: string]: string },\n  locale: string,\n  childmodels?: boolean,\n  targetModel?: TargetModel,\n  forceTargetModel?: boolean,\n  isReload?: boolean,\n};\n\n/**\n * Symbol key that carries API call info interpreted by this Redux middleware.\n */\nconst createRequest = (modularui: RequestOptions): ModularUIRequest => {\n  const request = new ModularUIRequest(modularui.href, {\n    method: modularui.method || HTTP_METHODS.GET,\n    data: modularui.data || {},\n    locale: modularui.locale,\n    childmodels: modularui.childmodels ?? true,\n    isReload: modularui.isReload,\n  });\n\n  if (modularui.targetModel) {\n    request.targetModel = modularui.targetModel;\n    request.forceTargetModel = modularui.forceTargetModel ?? false;\n  }\n\n  return request;\n};\n\n/**\n */\nconst responseHandler = (\n  next: Dispatch,\n  dispatch: Dispatch,\n  successAction: SuccessAction,\n  model: ModularUIModel\n) => {\n  if (successAction) {\n    const successResult = successAction(model);\n\n    if (successResult instanceof Promise) {\n      successResult\n        .then((result) => {\n          dispatch(result);\n        })\n        .catch((error) => {\n          next(handleError(error));\n        });\n    } else {\n      try {\n        dispatch(successResult);\n      } catch (error) {\n        throw new Error(\n          `Result of successResult is not a valid redux action: ${error}`\n        );\n      }\n    }\n  }\n\n  return next(finishProgress());\n};\n\n/**\n */\nconst errorHandler = (\n  next: Dispatch,\n  dispatch: Dispatch,\n  errorAction: ?ErrorAction,\n  err: any\n) => {\n  dispatch(finishProgress());\n\n  if (errorAction) {\n    const errorResult = errorAction(err);\n\n    if (errorResult instanceof Promise) {\n      errorResult.then((result) => dispatch(result));\n    } else {\n      dispatch(errorResult);\n    }\n  }\n\n  return next(handleError(err));\n};\n\n/**\n */\nconst handleFetch = (\n  action: ModularUIAction,\n  locale: string,\n  dispatch: Dispatch,\n  next: Dispatch\n) => {\n  dispatch(startProgress());\n\n  const { successAction, errorAction, ...requestOptions } = action.payload;\n  requestOptions.locale = locale;\n\n  const modularuiRequest = createRequest(requestOptions);\n\n  return modularuiRequest\n    .fetch()\n    .then((model) => responseHandler(next, dispatch, successAction, model))\n    .catch((error) => errorHandler(next, dispatch, errorAction, error));\n};\n\n/**\n */\nexport const modularUIMiddleware: Middleware<\n  ReduxState,\n  ReduxAction,\n  Dispatch\n> =\n  (api: MiddlewareAPI<ReduxState, ReduxAction, Dispatch>) =>\n  (next: Dispatch) =>\n  (action: PossibleAction) => {\n    if (action.type === \"MODULARUI/FETCH\") {\n      return handleFetch(\n        // $FlowExpectedError[incompatible-exact]\n        action,\n        api.getState().i18n.locale,\n        api.dispatch,\n        next\n      );\n    }\n\n    return next(action);\n  };\n"],"mappings":"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"}

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

@@ -7,13 +7,14 @@ import typeof {
   HTTP_METHODS,
   MODULARUI_STATUS,
 } from "../../constants/Constants";
-import type { RequestBaseOptions } from "../../utils/fetch/types";
 import type { ComponentType } from "react";
+import type { TargetModel } from "../../modularui/types";
+import type { RequestModularUIOptions } from "../../utils/fetch/types";
 
 export type ModularUIOptions = {
   propName?: string,
   removeOnUnmount?: boolean,
-  ...RequestBaseOptions,
+  ...RequestModularUIOptions,
 };
 
 export type ModelEntry = {
@@ -56,7 +57,8 @@ export type ModularUIAction = {
     data?: string | { [key: string]: string },
     locale: string,
     childmodels?: boolean,
-    targetModel?: Class<ModularUIModel>,
+    targetModel?: TargetModel,
+    forceTargetModel?: boolean,
     successAction: (
       model: ModularUIModel
     ) => UpdateModelAction | SetModelAction,

package/lib/redux/_modularui/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../../src/redux/_modularui/types.js"],"sourcesContent":["// @flow\nimport type { ModularUIModel } from \"../../models/types\";\nimport type Href from \"../../models/href/Href\";\nimport type { FetchException } from \"../../exceptions\";\nimport type { NoAction } from \"../types\";\nimport typeof {\n  HTTP_METHODS,\n  MODULARUI_STATUS,\n} from \"../../constants/Constants\";\nimport type { RequestBaseOptions } from \"../../utils/fetch/types\";\nimport type { ComponentType } from \"react\";\n\nexport type ModularUIOptions = {\n  propName?: string,\n  removeOnUnmount?: boolean,\n  ...RequestBaseOptions,\n};\n\nexport type ModelEntry = {\n  +status: string,\n  +model: ModularUIModel,\n  +lastModification: number,\n};\n\nexport type ModularUIState = {\n  [string]: ModelEntry,\n  ...\n};\n\nexport type SetModelAction = {\n  type: \"MODULARUI/SET\",\n  payload: {\n    key: string,\n    model: ?ModularUIModel,\n  },\n};\n\nexport type UpdateModelAction = {\n  type: \"MODULARUI/UPDATE\",\n  payload: ModularUIModel,\n};\n\nexport type SuccessAction = (\n  model: ModularUIModel\n) => UpdateModelAction | SetModelAction;\n\nexport type ErrorAction = (\n  error: FetchException\n) => UpdateStatusAction | RemoveModelByKeyAction | NoAction;\n\nexport type ModularUIAction = {\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    href: Href,\n    method?: $Keys<HTTP_METHODS>,\n    data?: string | { [key: string]: string },\n    locale: string,\n    childmodels?: boolean,\n    targetModel?: Class<ModularUIModel>,\n    successAction: (\n      model: ModularUIModel\n    ) => UpdateModelAction | SetModelAction,\n    errorAction?: ErrorAction,\n  },\n};\n\nexport type RemoveModelByKeyAction = {\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: string,\n};\n\nexport type ResetModularUIAction = {\n  type: \"MODULARUI/RESET\",\n};\n\nexport type UpdateStatusAction = {\n  type: \"MODULARUI/STATUS\",\n  payload: {\n    key: string,\n    status: $Keys<MODULARUI_STATUS>,\n  },\n};\n\nexport type ModularUIConnector = (\n  Component: ComponentType<any>\n) => ComponentType<any>;\n"],"mappings":""}
+{"version":3,"file":"types.js","names":[],"sources":["../../../src/redux/_modularui/types.js"],"sourcesContent":["// @flow\nimport type { ModularUIModel } from \"../../models/types\";\nimport type Href from \"../../models/href/Href\";\nimport type { FetchException } from \"../../exceptions\";\nimport type { NoAction } from \"../types\";\nimport typeof {\n  HTTP_METHODS,\n  MODULARUI_STATUS,\n} from \"../../constants/Constants\";\nimport type { ComponentType } from \"react\";\nimport type { TargetModel } from \"../../modularui/types\";\nimport type { RequestModularUIOptions } from \"../../utils/fetch/types\";\n\nexport type ModularUIOptions = {\n  propName?: string,\n  removeOnUnmount?: boolean,\n  ...RequestModularUIOptions,\n};\n\nexport type ModelEntry = {\n  +status: string,\n  +model: ModularUIModel,\n  +lastModification: number,\n};\n\nexport type ModularUIState = {\n  [string]: ModelEntry,\n  ...\n};\n\nexport type SetModelAction = {\n  type: \"MODULARUI/SET\",\n  payload: {\n    key: string,\n    model: ?ModularUIModel,\n  },\n};\n\nexport type UpdateModelAction = {\n  type: \"MODULARUI/UPDATE\",\n  payload: ModularUIModel,\n};\n\nexport type SuccessAction = (\n  model: ModularUIModel\n) => UpdateModelAction | SetModelAction;\n\nexport type ErrorAction = (\n  error: FetchException\n) => UpdateStatusAction | RemoveModelByKeyAction | NoAction;\n\nexport type ModularUIAction = {\n  type: \"MODULARUI/FETCH\",\n  payload: {\n    href: Href,\n    method?: $Keys<HTTP_METHODS>,\n    data?: string | { [key: string]: string },\n    locale: string,\n    childmodels?: boolean,\n    targetModel?: TargetModel,\n    forceTargetModel?: boolean,\n    successAction: (\n      model: ModularUIModel\n    ) => UpdateModelAction | SetModelAction,\n    errorAction?: ErrorAction,\n  },\n};\n\nexport type RemoveModelByKeyAction = {\n  type: \"MODULARUI/REMOVE_KEY\",\n  payload: string,\n};\n\nexport type ResetModularUIAction = {\n  type: \"MODULARUI/RESET\",\n};\n\nexport type UpdateStatusAction = {\n  type: \"MODULARUI/STATUS\",\n  payload: {\n    key: string,\n    status: $Keys<MODULARUI_STATUS>,\n  },\n};\n\nexport type ModularUIConnector = (\n  Component: ComponentType<any>\n) => ComponentType<any>;\n"],"mappings":""}

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

@@ -21,9 +21,9 @@ import type {
 } from "../types";
 import type Href from "../../models/href/Href";
 import type { ModularUIModel } from "../../models/types";
-import type { RequestBaseOptions } from "../../utils/fetch/types";
 import type FetchException from "../../exceptions/FetchException";
 import type { ComponentType } from "react";
+import type { RequestModularUIOptions } from "../../utils/fetch/types";
 
 type StateProps = {
   modularui: (href: Href, options: any) => ModularUIRequest,
@@ -35,7 +35,7 @@ type DispatchProps = {
   finishProgress: () => FinishProgressAction,
   reloadModel: (
     model: ModularUIModel,
-    options?: RequestBaseOptions
+    options?: RequestModularUIOptions
   ) => ThunkAction,
   handleError: (error: Error | FetchException) => ThunkAction,
 };

package/lib/redux/_modularui/withModularUI.js.map

@@ -1 +1 @@
-{"version":3,"file":"withModularUI.js","names":["modularui","createSelector","getLocale","localeCode","href","options","modularuiRequest","ModularUIRequest","locale","mapStateToProps","state","i18n","mapDispatchToProps","startProgress","finishProgress","reloadModel","handleError","withModularui","connect"],"sources":["../../../src/redux/_modularui/withModularUI.js"],"sourcesContent":["// @flow\nimport { connect } from \"react-redux\";\n\nimport { createSelector } from \"reselect\";\n\nimport ModularUIRequest from \"../../modularui/ModularUIRequest\";\n\nimport { startProgress, finishProgress } from \"../actions/ProgressIndicator\";\n\nimport { handleError } from \"../actions/Error\";\n\nimport { getLocale } from \"../selectors/i18n\";\n\nimport { reloadModel } from \"./ModularUIActions\";\n\nimport type {\n  ReduxState,\n  StartProgressAction,\n  FinishProgressAction,\n  ThunkAction,\n} from \"../types\";\nimport type Href from \"../../models/href/Href\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { RequestBaseOptions } from \"../../utils/fetch/types\";\nimport type FetchException from \"../../exceptions/FetchException\";\nimport type { ComponentType } from \"react\";\n\ntype StateProps = {\n  modularui: (href: Href, options: any) => ModularUIRequest,\n  locale: string,\n};\n\ntype DispatchProps = {\n  startProgress: () => StartProgressAction,\n  finishProgress: () => FinishProgressAction,\n  reloadModel: (\n    model: ModularUIModel,\n    options?: RequestBaseOptions\n  ) => ThunkAction,\n  handleError: (error: Error | FetchException) => ThunkAction,\n};\n\ntype Props = {\n  ...StateProps,\n  ...DispatchProps,\n};\n\nconst modularui = createSelector(\n  [getLocale],\n  (localeCode) =>\n    (href, options = {}) => {\n      const modularuiRequest = new ModularUIRequest(href, options);\n      modularuiRequest.locale = localeCode;\n      return modularuiRequest;\n    }\n);\n\n/**\n */\nconst mapStateToProps = (state: ReduxState): StateProps => ({\n  modularui: modularui(state),\n  locale: state.i18n.locale,\n});\n\nconst mapDispatchToProps: DispatchProps = {\n  startProgress,\n  finishProgress,\n  reloadModel,\n  handleError,\n};\n\n/**\n * Injects the modular ui service and the progress start and finish actions\n * This can be used to request modular ui services inside react view components\n */\nconst withModularui: ComponentType<any> = connect<\n  Props,\n  {},\n  StateProps,\n  _,\n  _,\n  _\n>(mapStateToProps, mapDispatchToProps);\n\nexport default withModularui;\n"],"mappings":";;;;;;;AACA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAkCA,MAAMA,SAAS,GAAG,IAAAC,wBAAc,EAC9B,CAACC,eAAS,CAAC,EACVC,UAAU,IACT,UAACC,IAAI,EAAmB;EAAA,IAAjBC,OAAO,uEAAG,CAAC,CAAC;EACjB,MAAMC,gBAAgB,GAAG,IAAIC,yBAAgB,CAACH,IAAI,EAAEC,OAAO,CAAC;EAC5DC,gBAAgB,CAACE,MAAM,GAAGL,UAAU;EACpC,OAAOG,gBAAgB;AACzB,CAAC,CACJ;;AAED;AACA;AACA,MAAMG,eAAe,GAAIC,KAAiB,KAAkB;EAC1DV,SAAS,EAAEA,SAAS,CAACU,KAAK,CAAC;EAC3BF,MAAM,EAAEE,KAAK,CAACC,IAAI,CAACH;AACrB,CAAC,CAAC;AAEF,MAAMI,kBAAiC,GAAG;EACxCC,aAAa,EAAbA,gCAAa;EACbC,cAAc,EAAdA,iCAAc;EACdC,WAAW,EAAXA,6BAAW;EACXC,WAAW,EAAXA;AACF,CAAC;;AAED;AACA;AACA;AACA;AACA,MAAMC,aAAiC,GAAG,IAAAC,mBAAO,EAO/CT,eAAe,EAAEG,kBAAkB,CAAC;AAAC,eAExBK,aAAa;AAAA"}
+{"version":3,"file":"withModularUI.js","names":["modularui","createSelector","getLocale","localeCode","href","options","modularuiRequest","ModularUIRequest","locale","mapStateToProps","state","i18n","mapDispatchToProps","startProgress","finishProgress","reloadModel","handleError","withModularui","connect"],"sources":["../../../src/redux/_modularui/withModularUI.js"],"sourcesContent":["// @flow\nimport { connect } from \"react-redux\";\n\nimport { createSelector } from \"reselect\";\n\nimport ModularUIRequest from \"../../modularui/ModularUIRequest\";\n\nimport { startProgress, finishProgress } from \"../actions/ProgressIndicator\";\n\nimport { handleError } from \"../actions/Error\";\n\nimport { getLocale } from \"../selectors/i18n\";\n\nimport { reloadModel } from \"./ModularUIActions\";\n\nimport type {\n  ReduxState,\n  StartProgressAction,\n  FinishProgressAction,\n  ThunkAction,\n} from \"../types\";\nimport type Href from \"../../models/href/Href\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type FetchException from \"../../exceptions/FetchException\";\nimport type { ComponentType } from \"react\";\nimport type { RequestModularUIOptions } from \"../../utils/fetch/types\";\n\ntype StateProps = {\n  modularui: (href: Href, options: any) => ModularUIRequest,\n  locale: string,\n};\n\ntype DispatchProps = {\n  startProgress: () => StartProgressAction,\n  finishProgress: () => FinishProgressAction,\n  reloadModel: (\n    model: ModularUIModel,\n    options?: RequestModularUIOptions\n  ) => ThunkAction,\n  handleError: (error: Error | FetchException) => ThunkAction,\n};\n\ntype Props = {\n  ...StateProps,\n  ...DispatchProps,\n};\n\nconst modularui = createSelector(\n  [getLocale],\n  (localeCode) =>\n    (href, options = {}) => {\n      const modularuiRequest = new ModularUIRequest(href, options);\n      modularuiRequest.locale = localeCode;\n      return modularuiRequest;\n    }\n);\n\n/**\n */\nconst mapStateToProps = (state: ReduxState): StateProps => ({\n  modularui: modularui(state),\n  locale: state.i18n.locale,\n});\n\nconst mapDispatchToProps: DispatchProps = {\n  startProgress,\n  finishProgress,\n  reloadModel,\n  handleError,\n};\n\n/**\n * Injects the modular ui service and the progress start and finish actions\n * This can be used to request modular ui services inside react view components\n */\nconst withModularui: ComponentType<any> = connect<\n  Props,\n  {},\n  StateProps,\n  _,\n  _,\n  _\n>(mapStateToProps, mapDispatchToProps);\n\nexport default withModularui;\n"],"mappings":";;;;;;;AACA;AAEA;AAEA;AAEA;AAEA;AAEA;AAEA;AAkCA,MAAMA,SAAS,GAAG,IAAAC,wBAAc,EAC9B,CAACC,eAAS,CAAC,EACVC,UAAU,IACT,UAACC,IAAI,EAAmB;EAAA,IAAjBC,OAAO,uEAAG,CAAC,CAAC;EACjB,MAAMC,gBAAgB,GAAG,IAAIC,yBAAgB,CAACH,IAAI,EAAEC,OAAO,CAAC;EAC5DC,gBAAgB,CAACE,MAAM,GAAGL,UAAU;EACpC,OAAOG,gBAAgB;AACzB,CAAC,CACJ;;AAED;AACA;AACA,MAAMG,eAAe,GAAIC,KAAiB,KAAkB;EAC1DV,SAAS,EAAEA,SAAS,CAACU,KAAK,CAAC;EAC3BF,MAAM,EAAEE,KAAK,CAACC,IAAI,CAACH;AACrB,CAAC,CAAC;AAEF,MAAMI,kBAAiC,GAAG;EACxCC,aAAa,EAAbA,gCAAa;EACbC,cAAc,EAAdA,iCAAc;EACdC,WAAW,EAAXA,6BAAW;EACXC,WAAW,EAAXA;AACF,CAAC;;AAED;AACA;AACA;AACA;AACA,MAAMC,aAAiC,GAAG,IAAAC,mBAAO,EAO/CT,eAAe,EAAEG,kBAAkB,CAAC;AAAC,eAExBK,aAAa;AAAA"}

package/lib/utils/fetch/types.js.flow

@@ -1,10 +1,12 @@
 // @flow
 import typeof { HTTP_METHODS } from "../../constants/Constants";
 import type { ModularUIModel } from "../../models/types";
+import type { TargetModel } from "../../modularui/types";
 
 export type RequestURLOptions = {
   url: string,
 };
+
 export type RequestBaseOptions = {
   method?: $Keys<HTTP_METHODS>,
   params?: string,
@@ -24,11 +26,17 @@ export type RequestBaseOptions = {
   includeContext?: boolean,
   locale?: string,
   cache?: boolean,
+  isReload?: boolean,
+};
+
+export type RequestOptions = { ...RequestURLOptions, ...RequestBaseOptions };
+
+export type RequestModularUIOptions = {
+  ...RequestBaseOptions,
+  targetModel?: TargetModel,
+  forceTargetModel?: boolean,
+  updateModel?: ModularUIModel,
   childmodels?: boolean,
   isValidationRequest?: boolean,
-  targetModel?: Class<ModularUIModel>,
-  updateModel?: ModularUIModel,
-  isReload?: boolean,
   removeOnUnmount?: boolean,
 };
-export type RequestOptions = { ...RequestURLOptions, ...RequestBaseOptions };

package/lib/utils/fetch/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","names":[],"sources":["../../../src/utils/fetch/types.js"],"sourcesContent":["// @flow\nimport typeof { HTTP_METHODS } from \"../../constants/Constants\";\nimport type { ModularUIModel } from \"../../models/types\";\n\nexport type RequestURLOptions = {\n  url: string,\n};\nexport type RequestBaseOptions = {\n  method?: $Keys<HTTP_METHODS>,\n  params?: string,\n  data?: string | { [key: string]: string },\n  timeout?: number,\n  responseType?: string,\n  headers?: {\n    [headerName: string]: string,\n    Accept?: string,\n    \"Accept-Language\"?: string,\n    \"Content-Type\"?: string,\n    \"x-filename\"?: string,\n    \"x-filesize\"?: string,\n  },\n  events?: { [eventName: string]: () => void },\n  onProgress?: ProgressEventHandler,\n  includeContext?: boolean,\n  locale?: string,\n  cache?: boolean,\n  childmodels?: boolean,\n  isValidationRequest?: boolean,\n  targetModel?: Class<ModularUIModel>,\n  updateModel?: ModularUIModel,\n  isReload?: boolean,\n  removeOnUnmount?: boolean,\n};\nexport type RequestOptions = { ...RequestURLOptions, ...RequestBaseOptions };\n"],"mappings":""}
+{"version":3,"file":"types.js","names":[],"sources":["../../../src/utils/fetch/types.js"],"sourcesContent":["// @flow\nimport typeof { HTTP_METHODS } from \"../../constants/Constants\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { TargetModel } from \"../../modularui/types\";\n\nexport type RequestURLOptions = {\n  url: string,\n};\n\nexport type RequestBaseOptions = {\n  method?: $Keys<HTTP_METHODS>,\n  params?: string,\n  data?: string | { [key: string]: string },\n  timeout?: number,\n  responseType?: string,\n  headers?: {\n    [headerName: string]: string,\n    Accept?: string,\n    \"Accept-Language\"?: string,\n    \"Content-Type\"?: string,\n    \"x-filename\"?: string,\n    \"x-filesize\"?: string,\n  },\n  events?: { [eventName: string]: () => void },\n  onProgress?: ProgressEventHandler,\n  includeContext?: boolean,\n  locale?: string,\n  cache?: boolean,\n  isReload?: boolean,\n};\n\nexport type RequestOptions = { ...RequestURLOptions, ...RequestBaseOptions };\n\nexport type RequestModularUIOptions = {\n  ...RequestBaseOptions,\n  targetModel?: TargetModel,\n  forceTargetModel?: boolean,\n  updateModel?: ModularUIModel,\n  childmodels?: boolean,\n  isValidationRequest?: boolean,\n  removeOnUnmount?: boolean,\n};\n"],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.25.2",
+  "version": "1.25.5",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -100,7 +100,7 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.20.7",
-    "@babel/core": "^7.20.7",
+    "@babel/core": "^7.20.12",
     "@babel/eslint-parser": "^7.19.1",
     "@babel/eslint-plugin": "^7.19.1",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
@@ -109,8 +109,8 @@
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-flow": "^7.18.6",
     "@babel/preset-react": "^7.18.6",
-    "@commitlint/cli": "^17.3.0",
-    "@commitlint/config-conventional": "^17.3.0",
+    "@commitlint/cli": "^17.4.1",
+    "@commitlint/config-conventional": "^17.4.0",
     "@testing-library/react": "^13.4.0",
     "auditjs": "^4.0.39",
     "babel-jest": "^29.3.1",
@@ -123,7 +123,7 @@
     "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-ft-flow": "^2.0.3",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest": "^27.2.0",
+    "eslint-plugin-jest": "^27.2.1",
     "eslint-plugin-jsdoc": "^39.6.4",
     "eslint-plugin-react": "^7.31.11",
     "eslint-plugin-react-hooks": "^4.5.0",
@@ -133,7 +133,7 @@
     "flow-typed": "^3.8.0",
     "glob": "^8.0.3",
     "history": "^4.0.0",
-    "husky": "^8.0.2",
+    "husky": "^8.0.3",
     "jest": "^29.3.1",
     "jest-environment-jsdom": "^29.3.1",
     "jest-junit": "^15.0.0",
@@ -141,7 +141,7 @@
     "jscodeshift": "^0.14.0",
     "lint-staged": "^13.1.0",
     "polished": "^4.0.0",
-    "prettier": "^2.8.0",
+    "prettier": "^2.8.2",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",
     "react-helmet-async": "^1.0.0",

package/src/constants/Constants.js

@@ -193,3 +193,9 @@ export const LOGIN_PATH_SETTING = "FormClient.login_url";
 export const LOGIN_USERNAME_SETTING = "FormClient.username_field_name";
 export const LOGIN_PASSWORD_SETTING = "FormClient.password_field_name";
 export const LOGOUT_PATH_SETTING = "FormClient.logout_url";
+
+export const fallbackDefaultAuthenticationType = {
+  name: "Form based authentication",
+  authentication: "DefaultFormClient",
+  isPrimary: true,
+};

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

@@ -61,7 +61,7 @@ describe("modularui hooks", () => {
       wrapper,
     });
 
-    expect(result.current).toBeUndefined();
+    expect(result.current).toBeNull();
 
     expect(store.getActions()).toStrictEqual([
       {

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

@@ -55,7 +55,7 @@ describe("modelcatalog hooks", () => {
       wrapper,
     });
 
-    expect(result.current).toBeUndefined();
+    expect(result.current).toBeNull();
 
     expect(store.getActions()).toStrictEqual([
       {

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

@@ -54,7 +54,7 @@ describe("modularui hooks", () => {
       }
     );
 
-    expect(result.current).toBeUndefined();
+    expect(result.current).toBeNull();
 
     expect(store.getActions()).toStrictEqual([
       {
@@ -104,7 +104,7 @@ describe("modularui hooks", () => {
       }
     );
 
-    expect(result.current).toBeUndefined();
+    expect(result.current).toBeNull();
 
     expect(store.getActions()).toStrictEqual([
       {

package/src/hooks/useAuthentication.js

@@ -5,7 +5,11 @@ import { getApplication } from "../redux/_modularui/ModularUISelectors";
 import { login, logout, resetAuthErrors } from "../redux/actions";
 
 import Cache from "../utils/browser/Cache";
-import { BASE, getSetting } from "../constants";
+import {
+  BASE,
+  fallbackDefaultAuthenticationType,
+  getSetting,
+} from "../constants";
 
 import type { ResetAuthErrorsAction } from "../redux/types";
 import type { AuthenticationType } from "../models/types";
@@ -38,7 +42,9 @@ export const useLogin = (): LoginHook => {
 
   return {
     isAuthenticated,
-    authenticationTypes: application?.authenticationTypes ?? [],
+    authenticationTypes: application?.authenticationTypes ?? [
+      fallbackDefaultAuthenticationType,
+    ],
     errorMessage: auth.error,
     resetErrors: () => dispatch(resetAuthErrors()),
     login: (username: string, password: string) =>
@@ -47,13 +53,17 @@ export const useLogin = (): LoginHook => {
       if (Cache.getItem("isRedirectLogin")) {
         // prevent endless loop in redirects when authentication type can't be redirected
         throw new IllegalStateException(
-          `Could not redirect to '${authenticationType.authentication}' using url: '${authenticationType.redirectUri}'`
+          `Could not redirect to '${
+            authenticationType.authentication
+          }' using url: '${authenticationType.redirectUri ?? ""}'`
         );
       }
 
       if (!isAuthenticated) {
         Cache.setItem("isRedirectLogin", true);
-        window.location.assign(`${BASE}${authenticationType.redirectUri}`);
+        window.location.assign(
+          `${BASE}${authenticationType.redirectUri ?? ""}`
+        );
       }
     },
   };
@@ -70,7 +80,9 @@ export const useLogout = (): LogoutHook => {
   const isAuthenticated = application?.isLoggedIn ?? false;
   return {
     isAuthenticated,
-    authenticationTypes: application?.authenticationTypes ?? [],
+    authenticationTypes: application?.authenticationTypes ?? [
+      fallbackDefaultAuthenticationType,
+    ],
     logout: () => {
       if (Cache.getItem("isRedirectLogin")) {
         const origin = window.location.origin;

package/src/hooks/useModularUI.js

@@ -13,7 +13,7 @@ import useDeepCompareEffect from "./useDeepCompareEffect";
 import { useLocale } from "./useI18n";
 
 import type Href from "../models/href/Href";
-import type { RequestBaseOptions } from "../utils";
+import type { RequestModularUIOptions } from "../utils";
 
 /**
  */
@@ -28,7 +28,7 @@ const useKeyForHook = (modelKey: string, url: string) => {
 export const useModularUI = (
   modelKey: string,
   url: string | Href,
-  options: RequestBaseOptions = {
+  options: RequestModularUIOptions = {
     method: HTTP_METHODS.GET,
     removeOnUnmount: false,
   }

package/src/hooks/useModularUIBasic.js

@@ -7,9 +7,10 @@ import { IllegalArgumentException, IllegalStateException } from "../exceptions";
 
 import type { ModularUIModel, Href } from "../models";
 
-type UseModularUIBasicOptions<T> = {
+type UseModularUIBasicOptions<T: ModularUIModel> = {
   expectedModels: Array<string>,
-  targetModel?: Class<T>,
+  targetModel?: Class<T> | Array<Class<T>>,
+  forceTargetModel?: boolean,
 };
 
 /**
@@ -20,16 +21,22 @@ export const useModularUIBasic = <T: ModularUIModel>(
   options: UseModularUIBasicOptions<T> = {
     expectedModels: [],
     targetModel: undefined,
+    forceTargetModel: false,
   }
-): ?T => {
+): T | null => {
   const location = useLocation();
   if (!href) {
     throw new IllegalArgumentException("Missing href");
   }
 
-  const useModularUIOptions = { targetModel: undefined, isReload: false };
+  const useModularUIOptions = {
+    targetModel: undefined,
+    forceTargetModel: undefined,
+    isReload: false,
+  };
   if (options.targetModel) {
     useModularUIOptions.targetModel = options.targetModel;
+    useModularUIOptions.forceTargetModel = options.forceTargetModel;
   }
 
   // reload when the modular service starts with the current location
@@ -37,6 +44,7 @@ export const useModularUIBasic = <T: ModularUIModel>(
     useModularUIOptions.isReload = true;
   }
 
+  // $FlowFixMe[incompatible-call]
   const modularUI = useModularUI(key, href, useModularUIOptions);
 
   if (modularUI?.model) {
@@ -54,4 +62,6 @@ export const useModularUIBasic = <T: ModularUIModel>(
 
     return model;
   }
+
+  return null;
 };

package/src/hooks/useModularUIModel.js

@@ -14,7 +14,7 @@ import { useModularUIBasic } from "./useModularUIBasic";
 /**
  * Load application
  */
-export const useApplication = (): ?ApplicationModel =>
+export const useApplication = (): ApplicationModel | null =>
   useModularUIBasic("application", "/", {
     expectedModels: ["Application"],
     targetModel: ApplicationModel,
@@ -23,7 +23,7 @@ export const useApplication = (): ?ApplicationModel =>
 /**
  * Load a tab by href
  */
-export const useTab = (href: string): ?TabModel =>
+export const useTab = (href: string): TabModel | null =>
   useModularUIBasic("tab", href, {
     expectedModels: ["Tab"],
     targetModel: TabModel,
@@ -32,7 +32,7 @@ export const useTab = (href: string): ?TabModel =>
 /**
  * Load caseview by href
  */
-export const useCaseView = (href: string): ?CaseViewModel =>
+export const useCaseView = (href: string): CaseViewModel | null =>
   useModularUIBasic("caseview", href, {
     expectedModels: ["CaseView"],
     targetModel: CaseViewModel,
@@ -42,14 +42,14 @@ export const useCaseView = (href: string): ?CaseViewModel =>
  */
 export const usePanel = (
   href: string
-): ?ListModel | ?GroupingPanelModel | ?DetailModel =>
+): ListModel | GroupingPanelModel | DetailModel | null =>
   useModularUIBasic("panel", href, {
     expectedModels: ["List", "GroupingPanel", "Detail"],
   });
 
 /**
  */
-export const useList = (href: string): ?ListModel =>
+export const useList = (href: string): ListModel | null =>
   useModularUIBasic("list", href, {
     expectedModels: ["List"],
     targetModel: ListModel,
@@ -57,15 +57,24 @@ export const useList = (href: string): ?ListModel =>
 
 /**
  */
-export const useListDetail = (href: string): ?ListDetailModel =>
+export const useListOrDetail = (href: string): ListModel | DetailModel | null =>
+  useModularUIBasic("list", href, {
+    expectedModels: ["List", "Detail"],
+    targetModel: [ListModel, DetailModel],
+  });
+
+/**
+ */
+export const useListDetail = (href: string): ListDetailModel | null =>
   useModularUIBasic("listdetail", href, {
     expectedModels: ["ListDetail"],
     targetModel: ListDetailModel,
+    forceTargetModel: true,
   });
 
 /**
  */
-export const useGroupingPanel = (href: string): ?GroupingPanelModel =>
+export const useGroupingPanel = (href: string): GroupingPanelModel | null =>
   useModularUIBasic("groupingpanel", href, {
     expectedModels: ["GroupingPanel"],
     targetModel: GroupingPanelModel,
@@ -73,7 +82,7 @@ export const useGroupingPanel = (href: string): ?GroupingPanelModel =>
 
 /**
  */
-export const useDetailPanel = (href: string): ?DetailModel =>
+export const useDetailPanel = (href: string): DetailModel | null =>
   useModularUIBasic("detailpanel", href, {
     expectedModels: ["Detail"],
     targetModel: DetailModel,
@@ -81,7 +90,7 @@ export const useDetailPanel = (href: string): ?DetailModel =>
 
 /**
  */
-export const useQuicksearch = (href: string): ?CaseSearchModel =>
+export const useQuicksearch = (href: string): CaseSearchModel | null =>
   useModularUIBasic("quicksearch", href, {
     expectedModels: ["CaseSearch"],
     targetModel: CaseSearchModel,
@@ -89,7 +98,7 @@ export const useQuicksearch = (href: string): ?CaseSearchModel =>
 
 /**
  */
-export const useUserProfile = (href: string): ?UserProfileModel =>
+export const useUserProfile = (href: string): UserProfileModel | null =>
   useModularUIBasic("userprofile", href, {
     expectedModels: ["UserProfile"],
     targetModel: UserProfileModel,