@beinformed/ui 1.20.8 → 1.20.9

package/lib/redux/_modularui/middleware.js

@@ -7,8 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.modularuiMiddleware = void 0;
 
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/objectWithoutProperties"));
-
 var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
 
 var _ModularUIRequest = _interopRequireDefault(require("../../modularui/ModularUIRequest"));
@@ -19,15 +17,13 @@ var _ProgressIndicator = require("../actions/ProgressIndicator");
 
 var _Error = require("../actions/Error");
 
-var _excluded = ["successAction", "errorAction"];
-
 /**
  * Symbol key that carries API call info interpreted by this Redux middleware.
  */
-var createRequest = function createRequest(modularui) {
+const createRequest = modularui => {
   var _modularui$childmodel;
 
-  var request = new _ModularUIRequest.default(modularui.href, {
+  const request = new _ModularUIRequest.default(modularui.href, {
     method: modularui.method || _Constants.HTTP_METHODS.GET,
     data: modularui.data || {},
     locale: modularui.locale,
@@ -45,14 +41,14 @@ var createRequest = function createRequest(modularui) {
  */
 
 
-var responseHandler = function responseHandler(next, dispatch, successAction, model) {
+const responseHandler = (next, dispatch, successAction, model) => {
   if (successAction) {
-    var successResult = successAction(model);
+    const successResult = successAction(model);
 
     if (successResult instanceof _promise.default) {
-      successResult.then(function (result) {
+      successResult.then(result => {
         dispatch(result);
-      }).catch(function (error) {
+      }).catch(error => {
         next((0, _Error.handleError)(error));
       });
     } else {
@@ -70,16 +66,14 @@ var responseHandler = function responseHandler(next, dispatch, successAction, mo
  */
 
 
-var errorHandler = function errorHandler(next, dispatch, errorAction, err) {
+const errorHandler = (next, dispatch, errorAction, err) => {
   dispatch((0, _ProgressIndicator.finishProgress)());
 
   if (errorAction) {
-    var errorResult = errorAction(err);
+    const errorResult = errorAction(err);
 
     if (errorResult instanceof _promise.default) {
-      errorResult.then(function (result) {
-        return dispatch(result);
-      });
+      errorResult.then(result => dispatch(result));
     } else {
       dispatch(errorResult);
     }
@@ -91,35 +85,28 @@ var errorHandler = function errorHandler(next, dispatch, errorAction, err) {
  */
 
 
-var handleFetch = function handleFetch(action, locale, dispatch, next) {
+const handleFetch = (action, locale, dispatch, next) => {
   dispatch((0, _ProgressIndicator.startProgress)());
-  var _action$payload = action.payload,
-      successAction = _action$payload.successAction,
-      errorAction = _action$payload.errorAction,
-      requestOptions = (0, _objectWithoutProperties2.default)(_action$payload, _excluded);
+  const {
+    successAction,
+    errorAction,
+    ...requestOptions
+  } = action.payload;
   requestOptions.locale = locale;
-  var modularuiRequest = createRequest(requestOptions);
-  return modularuiRequest.fetch().then(function (model) {
-    return responseHandler(next, dispatch, successAction, model);
-  }).catch(function (error) {
-    return errorHandler(next, dispatch, errorAction, error);
-  });
+  const modularuiRequest = createRequest(requestOptions);
+  return modularuiRequest.fetch().then(model => responseHandler(next, dispatch, successAction, model)).catch(error => errorHandler(next, dispatch, errorAction, error));
 };
 /**
  */
 
 
-var modularuiMiddleware = function modularuiMiddleware(api) {
-  return function (next) {
-    return function (action) {
-      if (action.type === "MODULARUI/FETCH") {
-        return handleFetch( // $FlowExpectedError[incompatible-exact]
-        action, api.getState().i18n.locale, api.dispatch, next);
-      }
+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);
-    };
-  };
+  return next(action);
 };
 
 exports.modularuiMiddleware = modularuiMiddleware;

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

@@ -1 +1 @@
-{"version":3,"file":"middleware.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","payload","requestOptions","modularuiRequest","fetch","modularuiMiddleware","api","type","getState","i18n"],"sources":["../../../src/redux/_modularui/middleware.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 } 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 = (next, dispatch, successAction, model) => {\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 = (next, dispatch, errorAction, err) => {\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 = (action: ModularUIAction, locale, dispatch, next) => {\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":"middleware.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/middleware.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 } 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 = (next, dispatch, successAction, model) => {\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 = (next, dispatch, errorAction, err) => {\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 = (action: ModularUIAction, locale, dispatch, next) => {\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/modularuiUtils.js

@@ -11,8 +11,6 @@ var _startsWith = _interopRequireDefault(require("@babel/runtime-corejs3/core-js
 
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
 
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
-
 var _react = require("react");
 
 var _utils = require("../../react/utils");
@@ -24,8 +22,8 @@ var _Href = _interopRequireDefault(require("../../models/href/Href"));
 /**
  * Generate modular ui url
  */
-var getUrl = function getUrl(resource, props) {
-  var url = typeof resource === "function" ? resource(props) : resource;
+const getUrl = (resource, props) => {
+  const url = typeof resource === "function" ? resource(props) : resource;
 
   if (url instanceof _Href.default) {
     return url.toString();
@@ -37,32 +35,26 @@ var getUrl = function getUrl(resource, props) {
  */
 
 
-var useUrl = function useUrl(resource, props) {
-  var _useState = (0, _react.useState)(""),
-      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-      previousUrl = _useState2[0],
-      setPreviousUrl = _useState2[1];
-
-  var _useState3 = (0, _react.useState)(false),
-      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-      previousExact = _useState4[0],
-      setPreviousExact = _useState4[1];
-
-  var url = getUrl(resource, props);
-  var match = props.match; // when match is not available through props,
+const useUrl = (resource, props) => {
+  const [previousUrl, setPreviousUrl] = (0, _react.useState)("");
+  const [previousExact, setPreviousExact] = (0, _react.useState)(false);
+  const url = getUrl(resource, props);
+  const {
+    match
+  } = props; // when match is not available through props,
   // this is a direct call to the modular ui hoc, not using a route
 
   if (!match) {
     return url;
   }
 
-  var isDifferentUrl = url !== previousUrl;
+  const isDifferentUrl = url !== previousUrl;
 
   if (!isDifferentUrl) {
     return previousUrl;
   }
 
-  var hasDifferentStartUriPart = previousUrl !== "" && !(0, _startsWith.default)(previousUrl).call(previousUrl, match.url); // Always create an url when the match is exact
+  const hasDifferentStartUriPart = previousUrl !== "" && !(0, _startsWith.default)(previousUrl).call(previousUrl, match.url); // Always create an url when the match is exact
   // Or when the match is not exact AND the original match also was not exact
   // Or when the new start uri is different from the previous url
 
@@ -81,7 +73,7 @@ var useUrl = function useUrl(resource, props) {
 
 exports.useUrl = useUrl;
 
-var getKey = function getKey(WrappedComponent, name, url) {
+const getKey = (WrappedComponent, name, url) => {
   if (url) {
     var _context;
 
@@ -97,14 +89,14 @@ var getKey = function getKey(WrappedComponent, name, url) {
 
 exports.getKey = getKey;
 
-var useReload = function useReload(modelEntry) {
-  var reload = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+const useReload = function (modelEntry) {
+  let reload = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
 
   if (reload > 0) {
     var _modelEntry$lastModif;
 
-    var isFullyLoaded = (modelEntry === null || modelEntry === void 0 ? void 0 : modelEntry.status) === _Constants.MODULARUI_STATUS.FINISHED;
-    var lastModification = (_modelEntry$lastModif = modelEntry === null || modelEntry === void 0 ? void 0 : modelEntry.lastModification) !== null && _modelEntry$lastModif !== void 0 ? _modelEntry$lastModif : 0;
+    const isFullyLoaded = (modelEntry === null || modelEntry === void 0 ? void 0 : modelEntry.status) === _Constants.MODULARUI_STATUS.FINISHED;
+    const lastModification = (_modelEntry$lastModif = modelEntry === null || modelEntry === void 0 ? void 0 : modelEntry.lastModification) !== null && _modelEntry$lastModif !== void 0 ? _modelEntry$lastModif : 0;
 
     if (isFullyLoaded && lastModification < reload) {
       return true;

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

@@ -1 +1 @@
-{"version":3,"file":"modularuiUtils.js","names":["getUrl","resource","props","url","Href","toString","useUrl","useState","previousUrl","setPreviousUrl","previousExact","setPreviousExact","match","isDifferentUrl","hasDifferentStartUriPart","isExact","getKey","WrappedComponent","name","getDisplayName","split","useReload","modelEntry","reload","isFullyLoaded","status","MODULARUI_STATUS","FINISHED","lastModification"],"sources":["../../../src/redux/_modularui/modularuiUtils.js"],"sourcesContent":["// @flow\nimport { useState } from \"react\";\n\nimport { getDisplayName } from \"../../react/utils\";\nimport { MODULARUI_STATUS } from \"../../constants/Constants\";\nimport Href from \"../../models/href/Href\";\n\nimport type { ComponentType } from \"react\";\n\n/**\n * Generate modular ui url\n */\nconst getUrl = (resource: string | Function, props: Object) => {\n  const url = typeof resource === \"function\" ? resource(props) : resource;\n\n  if (url instanceof Href) {\n    return url.toString();\n  }\n\n  return url || \"\";\n};\n\n/**\n */\nexport const useUrl = (resource: string | Function, props: Object): string => {\n  const [previousUrl, setPreviousUrl] = useState(\"\");\n  const [previousExact, setPreviousExact] = useState(false);\n\n  const url = getUrl(resource, props);\n\n  const { match } = props;\n\n  // when match is not available through props,\n  // this is a direct call to the modular ui hoc, not using a route\n  if (!match) {\n    return url;\n  }\n\n  const isDifferentUrl = url !== previousUrl;\n  if (!isDifferentUrl) {\n    return previousUrl;\n  }\n\n  const hasDifferentStartUriPart =\n    previousUrl !== \"\" && !previousUrl.startsWith(match.url);\n\n  // Always create an url when the match is exact\n  // Or when the match is not exact AND the original match also was not exact\n  // Or when the new start uri is different from the previous url\n  if (\n    match.isExact === true ||\n    previousExact === match.isExact ||\n    hasDifferentStartUriPart\n  ) {\n    setPreviousUrl(url);\n    setPreviousExact(match.isExact);\n\n    return url;\n  }\n\n  return previousUrl;\n};\n\n/**\n * Create key for modularui request based on component name and requested url\n */\nexport const getKey = (\n  WrappedComponent: ComponentType<any>,\n  name: string,\n  url: string\n): string => {\n  if (url) {\n    return `${getDisplayName(WrappedComponent, name)}(${url.split(\"?\")[0]})`;\n  }\n\n  return getDisplayName(WrappedComponent, name);\n};\n\n/**\n * Check if the model corresponding to a modular ui service should be reloaded\n */\nexport const useReload = (modelEntry: Object, reload: number = 0): boolean => {\n  if (reload > 0) {\n    const isFullyLoaded = modelEntry?.status === MODULARUI_STATUS.FINISHED;\n    const lastModification = modelEntry?.lastModification ?? 0;\n\n    if (isFullyLoaded && lastModification < reload) {\n      return true;\n    }\n  }\n\n  return false;\n};\n"],"mappings":";;;;;;;;;;;;;;;AACA;;AAEA;;AACA;;AACA;;AAIA;AACA;AACA;AACA,IAAMA,MAAM,GAAG,SAATA,MAAS,CAACC,QAAD,EAA8BC,KAA9B,EAAgD;EAC7D,IAAMC,GAAG,GAAG,OAAOF,QAAP,KAAoB,UAApB,GAAiCA,QAAQ,CAACC,KAAD,CAAzC,GAAmDD,QAA/D;;EAEA,IAAIE,GAAG,YAAYC,aAAnB,EAAyB;IACvB,OAAOD,GAAG,CAACE,QAAJ,EAAP;EACD;;EAED,OAAOF,GAAG,IAAI,EAAd;AACD,CARD;AAUA;AACA;;;AACO,IAAMG,MAAM,GAAG,SAATA,MAAS,CAACL,QAAD,EAA8BC,KAA9B,EAAwD;EAC5E,gBAAsC,IAAAK,eAAA,EAAS,EAAT,CAAtC;EAAA;EAAA,IAAOC,WAAP;EAAA,IAAoBC,cAApB;;EACA,iBAA0C,IAAAF,eAAA,EAAS,KAAT,CAA1C;EAAA;EAAA,IAAOG,aAAP;EAAA,IAAsBC,gBAAtB;;EAEA,IAAMR,GAAG,GAAGH,MAAM,CAACC,QAAD,EAAWC,KAAX,CAAlB;EAEA,IAAQU,KAAR,GAAkBV,KAAlB,CAAQU,KAAR,CAN4E,CAQ5E;EACA;;EACA,IAAI,CAACA,KAAL,EAAY;IACV,OAAOT,GAAP;EACD;;EAED,IAAMU,cAAc,GAAGV,GAAG,KAAKK,WAA/B;;EACA,IAAI,CAACK,cAAL,EAAqB;IACnB,OAAOL,WAAP;EACD;;EAED,IAAMM,wBAAwB,GAC5BN,WAAW,KAAK,EAAhB,IAAsB,CAAC,yBAAAA,WAAW,MAAX,CAAAA,WAAW,EAAYI,KAAK,CAACT,GAAlB,CADpC,CAnB4E,CAsB5E;EACA;EACA;;EACA,IACES,KAAK,CAACG,OAAN,KAAkB,IAAlB,IACAL,aAAa,KAAKE,KAAK,CAACG,OADxB,IAEAD,wBAHF,EAIE;IACAL,cAAc,CAACN,GAAD,CAAd;IACAQ,gBAAgB,CAACC,KAAK,CAACG,OAAP,CAAhB;IAEA,OAAOZ,GAAP;EACD;;EAED,OAAOK,WAAP;AACD,CArCM;AAuCP;AACA;AACA;;;;;AACO,IAAMQ,MAAM,GAAG,SAATA,MAAS,CACpBC,gBADoB,EAEpBC,IAFoB,EAGpBf,GAHoB,EAIT;EACX,IAAIA,GAAJ,EAAS;IAAA;;IACP,iDAAU,IAAAgB,qBAAA,EAAeF,gBAAf,EAAiCC,IAAjC,CAAV,uBAAoDf,GAAG,CAACiB,KAAJ,CAAU,GAAV,EAAe,CAAf,CAApD;EACD;;EAED,OAAO,IAAAD,qBAAA,EAAeF,gBAAf,EAAiCC,IAAjC,CAAP;AACD,CAVM;AAYP;AACA;AACA;;;;;AACO,IAAMG,SAAS,GAAG,SAAZA,SAAY,CAACC,UAAD,EAAqD;EAAA,IAAhCC,MAAgC,uEAAf,CAAe;;EAC5E,IAAIA,MAAM,GAAG,CAAb,EAAgB;IAAA;;IACd,IAAMC,aAAa,GAAG,CAAAF,UAAU,SAAV,IAAAA,UAAU,WAAV,YAAAA,UAAU,CAAEG,MAAZ,MAAuBC,2BAAA,CAAiBC,QAA9D;IACA,IAAMC,gBAAgB,4BAAGN,UAAH,aAAGA,UAAH,uBAAGA,UAAU,CAAEM,gBAAf,yEAAmC,CAAzD;;IAEA,IAAIJ,aAAa,IAAII,gBAAgB,GAAGL,MAAxC,EAAgD;MAC9C,OAAO,IAAP;IACD;EACF;;EAED,OAAO,KAAP;AACD,CAXM"}
+{"version":3,"file":"modularuiUtils.js","names":["getUrl","resource","props","url","Href","toString","useUrl","previousUrl","setPreviousUrl","useState","previousExact","setPreviousExact","match","isDifferentUrl","hasDifferentStartUriPart","isExact","getKey","WrappedComponent","name","getDisplayName","split","useReload","modelEntry","reload","isFullyLoaded","status","MODULARUI_STATUS","FINISHED","lastModification"],"sources":["../../../src/redux/_modularui/modularuiUtils.js"],"sourcesContent":["// @flow\nimport { useState } from \"react\";\n\nimport { getDisplayName } from \"../../react/utils\";\nimport { MODULARUI_STATUS } from \"../../constants/Constants\";\nimport Href from \"../../models/href/Href\";\n\nimport type { ComponentType } from \"react\";\n\n/**\n * Generate modular ui url\n */\nconst getUrl = (resource: string | Function, props: Object) => {\n  const url = typeof resource === \"function\" ? resource(props) : resource;\n\n  if (url instanceof Href) {\n    return url.toString();\n  }\n\n  return url || \"\";\n};\n\n/**\n */\nexport const useUrl = (resource: string | Function, props: Object): string => {\n  const [previousUrl, setPreviousUrl] = useState(\"\");\n  const [previousExact, setPreviousExact] = useState(false);\n\n  const url = getUrl(resource, props);\n\n  const { match } = props;\n\n  // when match is not available through props,\n  // this is a direct call to the modular ui hoc, not using a route\n  if (!match) {\n    return url;\n  }\n\n  const isDifferentUrl = url !== previousUrl;\n  if (!isDifferentUrl) {\n    return previousUrl;\n  }\n\n  const hasDifferentStartUriPart =\n    previousUrl !== \"\" && !previousUrl.startsWith(match.url);\n\n  // Always create an url when the match is exact\n  // Or when the match is not exact AND the original match also was not exact\n  // Or when the new start uri is different from the previous url\n  if (\n    match.isExact === true ||\n    previousExact === match.isExact ||\n    hasDifferentStartUriPart\n  ) {\n    setPreviousUrl(url);\n    setPreviousExact(match.isExact);\n\n    return url;\n  }\n\n  return previousUrl;\n};\n\n/**\n * Create key for modularui request based on component name and requested url\n */\nexport const getKey = (\n  WrappedComponent: ComponentType<any>,\n  name: string,\n  url: string\n): string => {\n  if (url) {\n    return `${getDisplayName(WrappedComponent, name)}(${url.split(\"?\")[0]})`;\n  }\n\n  return getDisplayName(WrappedComponent, name);\n};\n\n/**\n * Check if the model corresponding to a modular ui service should be reloaded\n */\nexport const useReload = (modelEntry: Object, reload: number = 0): boolean => {\n  if (reload > 0) {\n    const isFullyLoaded = modelEntry?.status === MODULARUI_STATUS.FINISHED;\n    const lastModification = modelEntry?.lastModification ?? 0;\n\n    if (isFullyLoaded && lastModification < reload) {\n      return true;\n    }\n  }\n\n  return false;\n};\n"],"mappings":";;;;;;;;;;;;;AACA;;AAEA;;AACA;;AACA;;AAIA;AACA;AACA;AACA,MAAMA,MAAM,GAAG,CAACC,QAAD,EAA8BC,KAA9B,KAAgD;EAC7D,MAAMC,GAAG,GAAG,OAAOF,QAAP,KAAoB,UAApB,GAAiCA,QAAQ,CAACC,KAAD,CAAzC,GAAmDD,QAA/D;;EAEA,IAAIE,GAAG,YAAYC,aAAnB,EAAyB;IACvB,OAAOD,GAAG,CAACE,QAAJ,EAAP;EACD;;EAED,OAAOF,GAAG,IAAI,EAAd;AACD,CARD;AAUA;AACA;;;AACO,MAAMG,MAAM,GAAG,CAACL,QAAD,EAA8BC,KAA9B,KAAwD;EAC5E,MAAM,CAACK,WAAD,EAAcC,cAAd,IAAgC,IAAAC,eAAA,EAAS,EAAT,CAAtC;EACA,MAAM,CAACC,aAAD,EAAgBC,gBAAhB,IAAoC,IAAAF,eAAA,EAAS,KAAT,CAA1C;EAEA,MAAMN,GAAG,GAAGH,MAAM,CAACC,QAAD,EAAWC,KAAX,CAAlB;EAEA,MAAM;IAAEU;EAAF,IAAYV,KAAlB,CAN4E,CAQ5E;EACA;;EACA,IAAI,CAACU,KAAL,EAAY;IACV,OAAOT,GAAP;EACD;;EAED,MAAMU,cAAc,GAAGV,GAAG,KAAKI,WAA/B;;EACA,IAAI,CAACM,cAAL,EAAqB;IACnB,OAAON,WAAP;EACD;;EAED,MAAMO,wBAAwB,GAC5BP,WAAW,KAAK,EAAhB,IAAsB,CAAC,yBAAAA,WAAW,MAAX,CAAAA,WAAW,EAAYK,KAAK,CAACT,GAAlB,CADpC,CAnB4E,CAsB5E;EACA;EACA;;EACA,IACES,KAAK,CAACG,OAAN,KAAkB,IAAlB,IACAL,aAAa,KAAKE,KAAK,CAACG,OADxB,IAEAD,wBAHF,EAIE;IACAN,cAAc,CAACL,GAAD,CAAd;IACAQ,gBAAgB,CAACC,KAAK,CAACG,OAAP,CAAhB;IAEA,OAAOZ,GAAP;EACD;;EAED,OAAOI,WAAP;AACD,CArCM;AAuCP;AACA;AACA;;;;;AACO,MAAMS,MAAM,GAAG,CACpBC,gBADoB,EAEpBC,IAFoB,EAGpBf,GAHoB,KAIT;EACX,IAAIA,GAAJ,EAAS;IAAA;;IACP,iDAAU,IAAAgB,qBAAA,EAAeF,gBAAf,EAAiCC,IAAjC,CAAV,uBAAoDf,GAAG,CAACiB,KAAJ,CAAU,GAAV,EAAe,CAAf,CAApD;EACD;;EAED,OAAO,IAAAD,qBAAA,EAAeF,gBAAf,EAAiCC,IAAjC,CAAP;AACD,CAVM;AAYP;AACA;AACA;;;;;AACO,MAAMG,SAAS,GAAG,UAACC,UAAD,EAAqD;EAAA,IAAhCC,MAAgC,uEAAf,CAAe;;EAC5E,IAAIA,MAAM,GAAG,CAAb,EAAgB;IAAA;;IACd,MAAMC,aAAa,GAAG,CAAAF,UAAU,SAAV,IAAAA,UAAU,WAAV,YAAAA,UAAU,CAAEG,MAAZ,MAAuBC,2BAAA,CAAiBC,QAA9D;IACA,MAAMC,gBAAgB,4BAAGN,UAAH,aAAGA,UAAH,uBAAGA,UAAU,CAAEM,gBAAf,yEAAmC,CAAzD;;IAEA,IAAIJ,aAAa,IAAII,gBAAgB,GAAGL,MAAxC,EAAgD;MAC9C,OAAO,IAAP;IACD;EACF;;EAED,OAAO,KAAP;AACD,CAXM"}

package/lib/redux/_modularui/reducer.js

@@ -1,19 +1,5 @@
 "use strict";
 
-var _typeof = require("@babel/runtime-corejs3/helpers/typeof");
-
-var _Object$keys2 = require("@babel/runtime-corejs3/core-js-stable/object/keys");
-
-var _Object$getOwnPropertySymbols = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols");
-
-var _filterInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/filter");
-
-var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
-
-var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors");
-
-var _Symbol$toPrimitive = require("@babel/runtime-corejs3/core-js-stable/symbol/to-primitive");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
@@ -25,59 +11,53 @@ var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stabl
 
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
 
-var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/objectWithoutProperties"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-
 var _exceptions = require("../../exceptions");
 
 var _Constants = require("../../constants/Constants");
 
 var _models = require("../../models");
 
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[_Symbol$toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-
-function ownKeys(object, enumerableOnly) { var keys = _Object$keys2(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? Object.defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 /**
  */
-var updateStatus = function updateStatus(state, _ref) {
-  var key = _ref.key,
-      status = _ref.status;
+const updateStatus = (state, _ref) => {
+  let {
+    key,
+    status
+  } = _ref;
 
   // model should always be available when status is not loading
   if (status !== _Constants.MODULARUI_STATUS.LOADING && !state[key]) {
     return state;
   }
 
-  return _objectSpread(_objectSpread({}, state), {}, (0, _defineProperty2.default)({}, key, _objectSpread(_objectSpread({}, state[key]), {}, {
-    status: status,
-    lastModification: Date.now()
-  })));
+  return { ...state,
+    [key]: { ...state[key],
+      status,
+      lastModification: Date.now()
+    }
+  };
 };
 /**
  */
 
 
-var setModel = function setModel(state, _ref2) {
-  var key = _ref2.key,
-      model = _ref2.model;
+const setModel = (state, _ref2) => {
+  let {
+    key,
+    model
+  } = _ref2;
 
   if (!state[key]) {
     return state;
   }
 
   if (model) {
-    return _objectSpread(_objectSpread({}, state), {}, (0, _defineProperty2.default)({}, key, _objectSpread(_objectSpread({}, state[key]), {}, {
-      model: model,
-      lastModification: Date.now()
-    })));
+    return { ...state,
+      [key]: { ...state[key],
+        model,
+        lastModification: Date.now()
+      }
+    };
   }
 
   throw new _exceptions.IllegalArgumentException("No model for setModel");
@@ -86,13 +66,13 @@ var setModel = function setModel(state, _ref2) {
  */
 
 
-var getModelKey = function getModelKey(state, model) {
+const getModelKey = (state, model) => {
   var _context;
 
-  return (0, _find.default)(_context = (0, _keys.default)(state)).call(_context, function (key) {
+  return (0, _find.default)(_context = (0, _keys.default)(state)).call(_context, key => {
     var _state$key$model$conn, _state$key, _state$key$model;
 
-    var connectKey = (_state$key$model$conn = (_state$key = state[key]) === null || _state$key === void 0 ? void 0 : (_state$key$model = _state$key.model) === null || _state$key$model === void 0 ? void 0 : _state$key$model.connectKey) !== null && _state$key$model$conn !== void 0 ? _state$key$model$conn : "";
+    const connectKey = (_state$key$model$conn = (_state$key = state[key]) === null || _state$key === void 0 ? void 0 : (_state$key$model = _state$key.model) === null || _state$key$model === void 0 ? void 0 : _state$key$model.connectKey) !== null && _state$key$model$conn !== void 0 ? _state$key$model$conn : "";
     return connectKey === model.connectKey;
   });
 };
@@ -100,13 +80,13 @@ var getModelKey = function getModelKey(state, model) {
  */
 
 
-var updateModel = function updateModel(state, model) {
-  var modelKey = getModelKey(state, model);
+const updateModel = (state, model) => {
+  const modelKey = getModelKey(state, model);
 
   if (modelKey) {
     return setModel(state, {
       key: modelKey,
-      model: model
+      model
     });
   }
 
@@ -116,12 +96,12 @@ var updateModel = function updateModel(state, model) {
  */
 
 
-var removeKey = function removeKey(modelKey, state) {
-  var _context2;
-
+const 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));
+  const {
+    [modelKey]: _,
+    ...newState
+  } = state;
   return newState;
 };
 /**
@@ -129,26 +109,27 @@ var removeKey = function removeKey(modelKey, state) {
  */
 
 
-var resetModularUI = function resetModularUI(state) {
-  var newState = {};
+const resetModularUI = state => {
+  const newState = {};
 
-  for (var key in state) {
+  for (const key in state) {
     if (state[key].model instanceof _models.ApplicationModel) {
-      newState[key] = _objectSpread({}, state[key]);
+      newState[key] = { ...state[key]
+      };
     }
   }
 
   return newState;
 };
 
-var initialState = {};
+const initialState = {};
 /**
  * Modular UI Reducer
  */
 
-var ModularUIReducer = function ModularUIReducer() {
-  var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
-  var action = arguments.length > 1 ? arguments[1] : undefined;
+const ModularUIReducer = function () {
+  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initialState;
+  let action = arguments.length > 1 ? arguments[1] : undefined;
 
   if (!action) {
     return state;

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

@@ -1 +1 @@
-{"version":3,"file":"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"],"sources":["../../../src/redux/_modularui/reducer.js"],"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"],"mappings":"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"}
+{"version":3,"file":"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"],"sources":["../../../src/redux/_modularui/reducer.js"],"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"],"mappings":"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"}