@beinformed/ui 1.65.29 → 2.0.0-beta.1

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

@@ -1,224 +0,0 @@
-// @flow
-import { HTTP_METHODS, MODULARUI_STATUS } from "../../constants/Constants";
-import Href from "../../models/href/Href";
-import ErrorResponse from "../../models/error/ErrorResponse";
-import { finishProgress, startProgress } from "../actions/ProgressIndicator";
-import { handleError } from "../actions/Error";
-
-import type { ModularUIModel } from "../../models/types";
-import type { Dispatch, ThunkAction } from "../types";
-import type {
-  ModularUIAction,
-  SetModelAction,
-  InitModelAction,
-  UpdateModelAction,
-  UpdateFormAction,
-  RemoveModelByKeyAction,
-  ResetModularUIAction,
-  UpdateStatusAction,
-} from "./types";
-import type {
-  RequestModularUIOptions,
-  UpdateHandler,
-} from "../../utils/fetch/types";
-
-/**
- */
-export const setModel = (
-  key: string,
-  model: ModularUIModel,
-): SetModelAction => {
-  // set key on model for later reference
-  model.connectKey = key;
-  return {
-    type: "MODULARUI/SET",
-    payload: {
-      key,
-      model,
-    },
-  };
-};
-
-/**
- */
-export const initModels = (
-  models: Array<{ key: string, model: ModularUIModel }>,
-): InitModelAction => ({
-  type: "MODULARUI/INIT",
-  payload: models,
-});
-
-/**
- */
-export const updateModel = (model: ModularUIModel): UpdateModelAction => ({
-  type: "MODULARUI/UPDATE",
-  payload: model,
-});
-
-/**
- */
-export const updateForm = (model: ModularUIModel): UpdateFormAction => ({
-  type: "MODULARUI/UPDATE_FORM",
-  payload: model,
-});
-
-/**
- */
-export const removeModelByKey = (key: string): RemoveModelByKeyAction => ({
-  type: "MODULARUI/REMOVE_KEY",
-  payload: key,
-});
-
-/**
- * Removes all models except the application model from the modular ui reducer
- */
-export const resetModularUI = (): ResetModularUIAction => ({
-  type: "MODULARUI/RESET",
-});
-
-/**
- */
-export const updateStatus = (
-  key: string,
-  status: $Keys<typeof MODULARUI_STATUS>,
-  requestOptions: any,
-): UpdateStatusAction => ({
-  type: "MODULARUI/STATUS",
-  payload: { key, status, requestOptions },
-});
-
-/**
- */
-const loadModelSuccessAction = (
-  key: string,
-  model: ModularUIModel,
-  updateHandler: UpdateHandler | void,
-): UpdateModelAction | SetModelAction => {
-  if (updateHandler) {
-    return updateModel(updateHandler(model));
-  }
-  return setModel(key, model);
-};
-
-/**
- * Retrieve the preferred language for this request, falls back to the browser language or english
- */
-const getRequestLocale = (optionLocale: ?string): string => {
-  if (optionLocale) {
-    return optionLocale;
-  }
-
-  // $FlowIssue
-  return globalThis.navigator?.language?.split("-")[0] || "en";
-};
-
-/**
- * This action is handled by the modularui middleware
- */
-export const loadModel = (
-  key: string,
-  href: Href | string,
-  options?: RequestModularUIOptions,
-): ModularUIAction => ({
-  type: "MODULARUI/FETCH",
-  payload: {
-    key,
-    origin: options?.origin,
-    contextPath: options?.contextPath,
-    href:
-      href instanceof Href
-        ? href
-        : new Href(href, "", {
-            origin: options?.origin,
-            contextPath: options?.contextPath,
-          }),
-    method: options?.method ?? HTTP_METHODS.GET,
-    params: options?.params,
-    data: options?.data,
-    timeout: options?.timeout,
-    headers: options?.headers,
-    events: options?.events,
-    onProgress: options?.onProgress,
-    locale: getRequestLocale(options?.locale),
-    childmodels: options?.childmodels,
-    targetModel: options?.targetModel,
-    forceTargetModel: options?.forceTargetModel,
-    cache: options?.cache,
-    isReload: options?.isReload,
-    withCredentials: options?.withCredentials,
-    /**
-     */
-    successAction: (model) =>
-      loadModelSuccessAction(key, model, options?.updateHandler),
-    /**
-     */
-    errorAction: (error) => {
-      const errorResponse = new ErrorResponse(error, key, {
-        origin: options?.origin,
-        contextPath: options?.contextPath,
-      });
-      if (
-        errorResponse.isChangePassword ||
-        errorResponse.isResourceNotFoundAfterReload
-      ) {
-        return removeModelByKey(key);
-      }
-      return updateStatus(key, MODULARUI_STATUS.ERROR);
-    },
-  },
-});
-
-/**
- */
-export const loadModularUI =
-  (
-    key: string,
-    href: Href | string,
-    options?: RequestModularUIOptions,
-    retryCount: number = 3,
-    retryDelay: number = 200,
-  ): ThunkAction<> =>
-  (dispatch: Dispatch, getState) => {
-    const modularuiStore = getState()?.modularui;
-    const currentRequest = modularuiStore?.[key];
-
-    const isLoading = currentRequest?.status === MODULARUI_STATUS.LOADING;
-
-    if (isLoading) {
-      const isDifferentRequest =
-        currentRequest.requestOptions?.href?.toString() !== href.toString();
-      if (isDifferentRequest && retryCount > 0) {
-        return new Promise((resolve) => {
-          setTimeout(() => {
-            resolve(
-              dispatch(
-                loadModularUI(key, href, options, retryCount - 1, retryDelay),
-              ),
-            );
-          }, retryDelay);
-        });
-      }
-
-      // Same request is already loading — do nothing
-      return Promise.resolve();
-    }
-
-    dispatch(startProgress());
-
-    const loadModelPromise = dispatch(loadModel(key, href, options));
-
-    return Promise.resolve(loadModelPromise)
-      .then(() => dispatch(finishProgress()))
-      .catch((error) => dispatch(handleError(error)));
-  };
-
-/**
- */
-export const reloadModel = (
-  model: ModularUIModel,
-  options?: RequestModularUIOptions,
-): ThunkAction<> =>
-  loadModularUI(model.connectKey, model.selfhref, {
-    ...options,
-    isReload: true,
-  });

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

@@ -1 +0,0 @@
-{"version":3,"file":"ModularUIActions.js","names":["HTTP_METHODS","MODULARUI_STATUS","Href","ErrorResponse","finishProgress","startProgress","handleError","setModel","key","model","connectKey","type","payload","initModels","models","updateModel","updateForm","removeModelByKey","resetModularUI","updateStatus","status","requestOptions","loadModelSuccessAction","updateHandler","getRequestLocale","optionLocale","_globalThis","navigator","language","split","loadModel","href","options","origin","contextPath","method","GET","params","data","timeout","headers","events","onProgress","locale","childmodels","targetModel","forceTargetModel","cache","isReload","withCredentials","successAction","errorAction","error","errorResponse","isChangePassword","isResourceNotFoundAfterReload","ERROR","loadModularUI","retryCount","retryDelay","dispatch","getState","modularuiStore","modularui","currentRequest","isLoading","LOADING","isDifferentRequest","toString","_Promise","resolve","setTimeout","loadModelPromise","then","catch","reloadModel","selfhref"],"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  InitModelAction,\n  UpdateModelAction,\n  UpdateFormAction,\n  RemoveModelByKeyAction,\n  ResetModularUIAction,\n  UpdateStatusAction,\n} from \"./types\";\nimport type {\n  RequestModularUIOptions,\n  UpdateHandler,\n} 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 initModels = (\n  models: Array<{ key: string, model: ModularUIModel }>,\n): InitModelAction => ({\n  type: \"MODULARUI/INIT\",\n  payload: models,\n});\n\n/**\n */\nexport const updateModel = (model: ModularUIModel): UpdateModelAction => ({\n  type: \"MODULARUI/UPDATE\",\n  payload: model,\n});\n\n/**\n */\nexport const updateForm = (model: ModularUIModel): UpdateFormAction => ({\n  type: \"MODULARUI/UPDATE_FORM\",\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  requestOptions: any,\n): UpdateStatusAction => ({\n  type: \"MODULARUI/STATUS\",\n  payload: { key, status, requestOptions },\n});\n\n/**\n */\nconst loadModelSuccessAction = (\n  key: string,\n  model: ModularUIModel,\n  updateHandler: UpdateHandler | void,\n): UpdateModelAction | SetModelAction => {\n  if (updateHandler) {\n    return updateModel(updateHandler(model));\n  }\n  return setModel(key, model);\n};\n\n/**\n * Retrieve the preferred language for this request, falls back to the browser language or english\n */\nconst getRequestLocale = (optionLocale: ?string): string => {\n  if (optionLocale) {\n    return optionLocale;\n  }\n\n  // $FlowIssue\n  return globalThis.navigator?.language?.split(\"-\")[0] || \"en\";\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    key,\n    origin: options?.origin,\n    contextPath: options?.contextPath,\n    href:\n      href instanceof Href\n        ? href\n        : new Href(href, \"\", {\n            origin: options?.origin,\n            contextPath: options?.contextPath,\n          }),\n    method: options?.method ?? HTTP_METHODS.GET,\n    params: options?.params,\n    data: options?.data,\n    timeout: options?.timeout,\n    headers: options?.headers,\n    events: options?.events,\n    onProgress: options?.onProgress,\n    locale: getRequestLocale(options?.locale),\n    childmodels: options?.childmodels,\n    targetModel: options?.targetModel,\n    forceTargetModel: options?.forceTargetModel,\n    cache: options?.cache,\n    isReload: options?.isReload,\n    withCredentials: options?.withCredentials,\n    /**\n     */\n    successAction: (model) =>\n      loadModelSuccessAction(key, model, options?.updateHandler),\n    /**\n     */\n    errorAction: (error) => {\n      const errorResponse = new ErrorResponse(error, key, {\n        origin: options?.origin,\n        contextPath: options?.contextPath,\n      });\n      if (\n        errorResponse.isChangePassword ||\n        errorResponse.isResourceNotFoundAfterReload\n      ) {\n        return removeModelByKey(key);\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    retryCount: number = 3,\n    retryDelay: number = 200,\n  ): ThunkAction<> =>\n  (dispatch: Dispatch, getState) => {\n    const modularuiStore = getState()?.modularui;\n    const currentRequest = modularuiStore?.[key];\n\n    const isLoading = currentRequest?.status === MODULARUI_STATUS.LOADING;\n\n    if (isLoading) {\n      const isDifferentRequest =\n        currentRequest.requestOptions?.href?.toString() !== href.toString();\n      if (isDifferentRequest && retryCount > 0) {\n        return new Promise((resolve) => {\n          setTimeout(() => {\n            resolve(\n              dispatch(\n                loadModularUI(key, href, options, retryCount - 1, retryDelay),\n              ),\n            );\n          }, retryDelay);\n        });\n      }\n\n      // Same request is already loading — do nothing\n      return Promise.resolve();\n    }\n\n    dispatch(startProgress());\n\n    const loadModelPromise = dispatch(loadModel(key, href, options));\n\n    return Promise.resolve(loadModelPromise)\n      .then(() => dispatch(finishProgress()))\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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","ignoreList":[]}

package/esm/redux/_modularui/ModularUIConnector.js

@@ -1,86 +0,0 @@
-import { useDispatch } from "react-redux";
-import { useLocation } from "react-router";
-import { loadModularUI, reloadModel } from "./ModularUIActions";
-import Href from "../../models/href/Href";
-import { getDisplayName } from "../../react/utils";
-import { useUrl } from "./ModularUIUtils";
-import { useModularUI } from "../../hooks/useModularUI";
-import { useModularUIBasic } from "../../hooks/useModularUIBasic";
-import { useLocale } from "../../hooks/useI18n";
-import FormModel from "../../models/form/FormModel";
-import { jsx as _jsx } from "react/jsx-runtime";
-const patchUpdateModelOption = oldOptions => {
-  if ("updateModel" in oldOptions && oldOptions.updateModel instanceof FormModel) {
-    return {
-      ...oldOptions,
-      updateHandler: newModel => {
-        if (newModel instanceof FormModel) {
-          // $FLowFixMe
-          const clonedModel = oldOptions.updateModel.clone();
-          clonedModel.update(newModel);
-          return clonedModel;
-        }
-        return newModel;
-      }
-    };
-  }
-  return oldOptions;
-};
-
-/**
- * @deprecated - will be removed in the future, use the equivalent hook 'useModularUI' or 'useModularUIBasic' instead
- */
-const modularUIConnector = (name, resource,
-// $FlowIssue
-options = {}) => {
-  const {
-    propName = "data",
-    removeOnUnmount = false,
-    ...otherOptions
-  } = options;
-  return Component => {
-    const WrappedComponent = props => {
-      const finalRemoveOnUnmount = props.removeOnUnmount ?? removeOnUnmount;
-      const dispatch = useDispatch();
-      const location = useLocation();
-      const locale = useLocale();
-      const url = useUrl(resource, {
-        location,
-        ...props
-      });
-
-      // $FlowFixMe
-      const model = useModularUIBasic(name, url, options);
-      const modelEntry = useModularUI(name, url, {
-        ...otherOptions,
-        removeOnUnmount: finalRemoveOnUnmount
-      });
-      const modelKey = model?.connectKey ?? name;
-      const handleFetch = (href, fetchOptions) => {
-        dispatch(loadModularUI(modelKey, href, patchUpdateModelOption(fetchOptions)));
-      };
-      const handleManualReload = (m, o) => {
-        dispatch(reloadModel(m, o));
-      };
-      const newProps = {
-        modelKey,
-        [propName ?? "data"]: model,
-        location,
-        status: modelEntry?.status ?? null,
-        lastModification: modelEntry?.lastModification ?? null,
-        hasModel: Boolean(model),
-        locale,
-        fetchModularUI: handleFetch,
-        reloadModel: handleManualReload
-      };
-      return /*#__PURE__*/_jsx(Component, {
-        ...props,
-        ...newProps
-      });
-    };
-    WrappedComponent.displayName = `BI.modularui(${getDisplayName(Component, name)})`;
-    return WrappedComponent;
-  };
-};
-export default modularUIConnector;
-//# sourceMappingURL=ModularUIConnector.js.map

package/esm/redux/_modularui/ModularUIConnector.js.flow

@@ -1,120 +0,0 @@
-// @flow
-import { useDispatch } from "react-redux";
-import { useLocation } from "react-router";
-
-import { loadModularUI, reloadModel } from "./ModularUIActions";
-
-import Href from "../../models/href/Href";
-import { getDisplayName } from "../../react/utils";
-
-import { useUrl } from "./ModularUIUtils";
-import { useModularUI } from "../../hooks/useModularUI";
-import { useModularUIBasic } from "../../hooks/useModularUIBasic";
-
-import { useLocale } from "../../hooks/useI18n";
-
-import FormModel from "../../models/form/FormModel";
-
-import type { ComponentType, Node } from "react";
-import type { Location } from "react-router";
-import type { ModularUIModel } from "../../models/types";
-import type { ModularUIOptions } from "./types";
-
-export type InjectedProps = {
-  +modelKey: string,
-  +location: Location,
-  +status: string | null,
-  +lastModification: number | null,
-  +hasModel: boolean,
-  +locale: string,
-  +fetchModularUI: (href: string | Href, fetchOptions: Object) => void,
-  +reloadModel: (model: ModularUIModel, options: Object) => void,
-  +data?: ?ModularUIModel,
-};
-
-const patchUpdateModelOption = (oldOptions: Object) => {
-  if (
-    "updateModel" in oldOptions &&
-    oldOptions.updateModel instanceof FormModel
-  ) {
-    return {
-      ...oldOptions,
-      updateHandler: (newModel: ModularUIModel): ModularUIModel => {
-        if (newModel instanceof FormModel) {
-          // $FLowFixMe
-          const clonedModel: FormModel = oldOptions.updateModel.clone();
-          clonedModel.update(newModel);
-          return clonedModel;
-        }
-        return newModel;
-      },
-    };
-  }
-
-  return oldOptions;
-};
-
-/**
- * @deprecated - will be removed in the future, use the equivalent hook 'useModularUI' or 'useModularUIBasic' instead
- */
-const modularUIConnector = (
-  name: string,
-  resource: string | Function,
-  // $FlowIssue
-  options: ModularUIOptions = {},
-): ((Component: ComponentType<any>) => (props: any) => Node) => {
-  const {
-    propName = "data",
-    removeOnUnmount = false,
-    ...otherOptions
-  } = options;
-
-  return (Component: ComponentType<any>) => {
-    const WrappedComponent = (props: any) => {
-      const finalRemoveOnUnmount = props.removeOnUnmount ?? removeOnUnmount;
-
-      const dispatch = useDispatch();
-      const location = useLocation();
-      const locale = useLocale();
-      const url = useUrl(resource, { location, ...props });
-
-      // $FlowFixMe
-      const model = useModularUIBasic<ModularUIModel>(name, url, options);
-
-      const modelEntry = useModularUI(name, url, {
-        ...otherOptions,
-        removeOnUnmount: finalRemoveOnUnmount,
-      });
-      const modelKey = model?.connectKey ?? name;
-
-      const handleFetch = (href: string | Href, fetchOptions: Object) => {
-        dispatch(
-          loadModularUI(modelKey, href, patchUpdateModelOption(fetchOptions)),
-        );
-      };
-
-      const handleManualReload = (m: ModularUIModel, o: Object) => {
-        dispatch(reloadModel(m, o));
-      };
-
-      const newProps: InjectedProps = {
-        modelKey,
-        [propName ?? "data"]: model,
-        location,
-        status: modelEntry?.status ?? null,
-        lastModification: modelEntry?.lastModification ?? null,
-        hasModel: Boolean(model),
-        locale,
-        fetchModularUI: handleFetch,
-        reloadModel: handleManualReload,
-      };
-
-      return <Component {...props} {...newProps} />;
-    };
-
-    WrappedComponent.displayName = `BI.modularui(${getDisplayName(Component, name)})`;
-    return WrappedComponent;
-  };
-};
-
-export default modularUIConnector;

package/esm/redux/_modularui/ModularUIConnector.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ModularUIConnector.js","names":["useDispatch","useLocation","loadModularUI","reloadModel","Href","getDisplayName","useUrl","useModularUI","useModularUIBasic","useLocale","FormModel","jsx","_jsx","patchUpdateModelOption","oldOptions","updateModel","updateHandler","newModel","clonedModel","clone","update","modularUIConnector","name","resource","options","propName","removeOnUnmount","otherOptions","Component","WrappedComponent","props","finalRemoveOnUnmount","dispatch","location","locale","url","model","modelEntry","modelKey","connectKey","handleFetch","href","fetchOptions","handleManualReload","m","o","newProps","status","lastModification","hasModel","Boolean","fetchModularUI","displayName"],"sources":["../../../src/redux/_modularui/ModularUIConnector.js"],"sourcesContent":["// @flow\nimport { useDispatch } from \"react-redux\";\nimport { useLocation } from \"react-router\";\n\nimport { loadModularUI, reloadModel } from \"./ModularUIActions\";\n\nimport Href from \"../../models/href/Href\";\nimport { getDisplayName } from \"../../react/utils\";\n\nimport { useUrl } from \"./ModularUIUtils\";\nimport { useModularUI } from \"../../hooks/useModularUI\";\nimport { useModularUIBasic } from \"../../hooks/useModularUIBasic\";\n\nimport { useLocale } from \"../../hooks/useI18n\";\n\nimport FormModel from \"../../models/form/FormModel\";\n\nimport type { ComponentType, Node } from \"react\";\nimport type { Location } from \"react-router\";\nimport type { ModularUIModel } from \"../../models/types\";\nimport type { ModularUIOptions } from \"./types\";\n\nexport type InjectedProps = {\n  +modelKey: string,\n  +location: Location,\n  +status: string | null,\n  +lastModification: number | null,\n  +hasModel: boolean,\n  +locale: string,\n  +fetchModularUI: (href: string | Href, fetchOptions: Object) => void,\n  +reloadModel: (model: ModularUIModel, options: Object) => void,\n  +data?: ?ModularUIModel,\n};\n\nconst patchUpdateModelOption = (oldOptions: Object) => {\n  if (\n    \"updateModel\" in oldOptions &&\n    oldOptions.updateModel instanceof FormModel\n  ) {\n    return {\n      ...oldOptions,\n      updateHandler: (newModel: ModularUIModel): ModularUIModel => {\n        if (newModel instanceof FormModel) {\n          // $FLowFixMe\n          const clonedModel: FormModel = oldOptions.updateModel.clone();\n          clonedModel.update(newModel);\n          return clonedModel;\n        }\n        return newModel;\n      },\n    };\n  }\n\n  return oldOptions;\n};\n\n/**\n * @deprecated - will be removed in the future, use the equivalent hook 'useModularUI' or 'useModularUIBasic' instead\n */\nconst modularUIConnector = (\n  name: string,\n  resource: string | Function,\n  // $FlowIssue\n  options: ModularUIOptions = {},\n): ((Component: ComponentType<any>) => (props: any) => Node) => {\n  const {\n    propName = \"data\",\n    removeOnUnmount = false,\n    ...otherOptions\n  } = options;\n\n  return (Component: ComponentType<any>) => {\n    const WrappedComponent = (props: any) => {\n      const finalRemoveOnUnmount = props.removeOnUnmount ?? removeOnUnmount;\n\n      const dispatch = useDispatch();\n      const location = useLocation();\n      const locale = useLocale();\n      const url = useUrl(resource, { location, ...props });\n\n      // $FlowFixMe\n      const model = useModularUIBasic<ModularUIModel>(name, url, options);\n\n      const modelEntry = useModularUI(name, url, {\n        ...otherOptions,\n        removeOnUnmount: finalRemoveOnUnmount,\n      });\n      const modelKey = model?.connectKey ?? name;\n\n      const handleFetch = (href: string | Href, fetchOptions: Object) => {\n        dispatch(\n          loadModularUI(modelKey, href, patchUpdateModelOption(fetchOptions)),\n        );\n      };\n\n      const handleManualReload = (m: ModularUIModel, o: Object) => {\n        dispatch(reloadModel(m, o));\n      };\n\n      const newProps: InjectedProps = {\n        modelKey,\n        [propName ?? \"data\"]: model,\n        location,\n        status: modelEntry?.status ?? null,\n        lastModification: modelEntry?.lastModification ?? null,\n        hasModel: Boolean(model),\n        locale,\n        fetchModularUI: handleFetch,\n        reloadModel: handleManualReload,\n      };\n\n      return <Component {...props} {...newProps} />;\n    };\n\n    WrappedComponent.displayName = `BI.modularui(${getDisplayName(Component, name)})`;\n    return WrappedComponent;\n  };\n};\n\nexport default modularUIConnector;\n"],"mappings":"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","ignoreList":[]}

package/esm/redux/_modularui/ModularUIMiddleware.js

@@ -1,99 +0,0 @@
-import _Promise from "@babel/runtime-corejs3/core-js-stable/promise";
-import ModularUIRequest from "../../modularui/ModularUIRequest";
-import { HTTP_METHODS, MODULARUI_STATUS } from "../../constants/Constants";
-import { startProgress, finishProgress } from "../actions/ProgressIndicator";
-import { handleError } from "../actions/Error";
-import { updateStatus } from "./ModularUIActions";
-/**
- * Symbol key that carries API call info interpreted by this Redux middleware.
- */
-const createRequest = modularui => {
-  const request = new ModularUIRequest(modularui.href, {
-    method: modularui.method || HTTP_METHODS.GET,
-    params: modularui.params || "",
-    data: modularui.data || {},
-    locale: modularui.locale,
-    childmodels: modularui.childmodels ?? true,
-    isReload: modularui.isReload,
-    cache: modularui.cache,
-    headers: modularui.headers,
-    events: modularui.events,
-    onProgress: modularui.onProgress
-  });
-  if (modularui.origin) {
-    request.origin = modularui.origin;
-  }
-  if (modularui.contextPath) {
-    request.contextPath = modularui.contextPath;
-  }
-  if (modularui.targetModel) {
-    request.targetModel = modularui.targetModel;
-    request.forceTargetModel = modularui.forceTargetModel ?? false;
-  }
-  return request;
-};
-
-/**
- */
-const responseHandler = (next, dispatch, successAction, model) => {
-  if (successAction) {
-    const successResult = successAction(model);
-    if (successResult instanceof _Promise) {
-      successResult.then(result => {
-        dispatch(result);
-      }).catch(error => {
-        next(handleError(error));
-      });
-    } else {
-      try {
-        dispatch(successResult);
-      } catch (error) {
-        throw new Error(`Result of successResult is not a valid redux action: ${error}`);
-      }
-    }
-  }
-  return next(finishProgress());
-};
-
-/**
- */
-const errorHandler = (next, dispatch, errorAction, err) => {
-  dispatch(finishProgress());
-  if (errorAction) {
-    const errorResult = errorAction(err);
-    if (errorResult instanceof _Promise) {
-      errorResult.then(result => dispatch(result));
-    } else {
-      dispatch(errorResult);
-    }
-  }
-  return next(handleError(err));
-};
-
-/**
- */
-const handleFetch = (action, locale, dispatch, next) => {
-  dispatch(startProgress());
-  const {
-    key,
-    successAction,
-    errorAction,
-    ...requestOptions
-  } = action.payload;
-  requestOptions.locale = locale;
-  const modularuiRequest = createRequest(requestOptions);
-  dispatch(updateStatus(key, MODULARUI_STATUS.LOADING, requestOptions));
-  return modularuiRequest.fetch().then(model => responseHandler(next, dispatch, successAction, model)).catch(error => errorHandler(next, dispatch, errorAction, error));
-};
-
-/**
- */
-export const modularUIMiddleware = api => next => action => {
-  if (action.type === "MODULARUI/FETCH") {
-    return handleFetch(
-    // $FlowExpectedError[incompatible-exact]
-    action, api.getState().i18n.locale, api.dispatch, next);
-  }
-  return next(action);
-};
-//# sourceMappingURL=ModularUIMiddleware.js.map