orc-shared 1.6.0-dev.3 → 1.6.0-dev.5

package/dist/hooks/useNotificationRequestState.js

@@ -68,8 +68,8 @@ var useNotificationRequestState = function useNotificationRequestState(_ref) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [formatMessage, successAction, successMessageId, successMessageValues]);
   var onError = (0, _react.useCallback)(function (errorResponse) {
-    var _errorResponse$respon, _errorResponse$respon2, _errorResponse$respon3;
-    var errorMessage = (_errorResponse$respon = errorResponse == null ? void 0 : (_errorResponse$respon2 = errorResponse.response) == null ? void 0 : (_errorResponse$respon3 = _errorResponse$respon2.responseStatus) == null ? void 0 : _errorResponse$respon3.message) != null ? _errorResponse$respon : null;
+    var _errorResponse$respon, _errorResponse$respon2;
+    var errorMessage = (_errorResponse$respon = errorResponse == null || (_errorResponse$respon2 = errorResponse.response) == null || (_errorResponse$respon2 = _errorResponse$respon2.responseStatus) == null ? void 0 : _errorResponse$respon2.message) != null ? _errorResponse$respon : null;
     var message = formatMessage(errorMessageId, _objectSpread(_objectSpread({}, errorMessageValues), {}, {
       errorMessage: errorMessage != null ? errorMessage : formatMessage(_sharedMessages.default.errorUnknown)
     }));

package/dist/reducers/globalErrorMessages.js

@@ -0,0 +1,79 @@
+"use strict";
+
+exports.__esModule = true;
+exports.default = void 0;
+var _immutable = _interopRequireDefault(require("immutable"));
+var _globalErrorMessages = require("../actions/globalErrorMessages");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+(function () {
+  var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
+  enterModule && enterModule(module);
+})();
+(function () {
+  var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
+  enterModule && enterModule(module);
+})();
+var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+  return a;
+};
+var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+  return a;
+};
+var initialState = _immutable.default.fromJS({
+  dialog: {
+    errorMessages: []
+  }
+});
+var globalErrorMessages = function globalErrorMessages(state, action) {
+  if (state === void 0) {
+    state = initialState;
+  }
+  switch (action.type) {
+    case _globalErrorMessages.PUSH_GLOBAL_ERROR_MESSAGE:
+      {
+        var newMsgs = state.getIn(["dialog", "errorMessages"]).push(_immutable.default.fromJS(action.payload));
+        return state.setIn(["dialog", "errorMessages"], newMsgs);
+      }
+    case _globalErrorMessages.POP_GLOBAL_ERROR_MESSAGE:
+      {
+        var _newMsgs = state.getIn(["dialog", "errorMessages"]).shift();
+        return state.setIn(["dialog", "errorMessages"], _newMsgs);
+      }
+    default:
+      return state;
+  }
+};
+var _default = globalErrorMessages;
+var _default2 = _default;
+var _default3 = _default2;
+exports.default = _default3;
+;
+(function () {
+  var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
+  if (!reactHotLoader) {
+    return;
+  }
+  reactHotLoader.register(initialState, "initialState", "/home/vsts/work/1/s/src/reducers/globalErrorMessages.js");
+  reactHotLoader.register(globalErrorMessages, "globalErrorMessages", "/home/vsts/work/1/s/src/reducers/globalErrorMessages.js");
+  reactHotLoader.register(_default, "default", "/home/vsts/work/1/s/src/reducers/globalErrorMessages.js");
+})();
+;
+(function () {
+  var leaveModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined;
+  leaveModule && leaveModule(module);
+})();
+;
+(function () {
+  var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
+  if (!reactHotLoader) {
+    return;
+  }
+  reactHotLoader.register(initialState, "initialState", "/home/vsts/work/1/s/src/reducers/globalErrorMessages.js");
+  reactHotLoader.register(globalErrorMessages, "globalErrorMessages", "/home/vsts/work/1/s/src/reducers/globalErrorMessages.js");
+  reactHotLoader.register(_default2, "default", "/home/vsts/work/1/s/src/reducers/globalErrorMessages.js");
+})();
+;
+(function () {
+  var leaveModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined;
+  leaveModule && leaveModule(module);
+})();

package/dist/selectors/authentication.js

@@ -41,8 +41,8 @@ var hasRolePermissions = function hasRolePermissions(appRolesClaims, scopeId, ro
   if (appRolesClaims != null && scopeId != null) {
     var allowed = !!appRolesClaims.getIn(["*", role]) || !!appRolesClaims.getIn([scopeId, role]);
     if (!allowed) {
-      var _scopes$get$toJS$pare, _scopes$get, _scopes$get$toJS;
-      var parentScopeId = (_scopes$get$toJS$pare = (_scopes$get = scopes.get(scopeId)) == null ? void 0 : (_scopes$get$toJS = _scopes$get.toJS()) == null ? void 0 : _scopes$get$toJS.parentScopeId) != null ? _scopes$get$toJS$pare : null;
+      var _scopes$get$toJS$pare, _scopes$get;
+      var parentScopeId = (_scopes$get$toJS$pare = (_scopes$get = scopes.get(scopeId)) == null || (_scopes$get = _scopes$get.toJS()) == null ? void 0 : _scopes$get.parentScopeId) != null ? _scopes$get$toJS$pare : null;
       return hasRolePermissions(appRolesClaims, parentScopeId, role, scopes);
     }
     return allowed;

package/dist/selectors/globalErrorMessages.js

@@ -0,0 +1,58 @@
+"use strict";
+
+exports.__esModule = true;
+exports.firstDialogErrorMessageSelector = void 0;
+var _reselect = require("reselect");
+(function () {
+  var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
+  enterModule && enterModule(module);
+})();
+(function () {
+  var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
+  enterModule && enterModule(module);
+})();
+var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+  return a;
+};
+var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+  return a;
+};
+var globalMsgData = function globalMsgData(state) {
+  return state.get("globalErrorMessages");
+};
+var firstDialogErrorMessageSelector = (0, _reselect.createSelector)(globalMsgData, function (data) {
+  var msgs = data.getIn(["dialog", "errorMessages"]);
+  if (msgs.size === 0) {
+    return null;
+  }
+  return msgs.first().toJS();
+});
+exports.firstDialogErrorMessageSelector = firstDialogErrorMessageSelector;
+;
+(function () {
+  var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
+  if (!reactHotLoader) {
+    return;
+  }
+  reactHotLoader.register(globalMsgData, "globalMsgData", "/home/vsts/work/1/s/src/selectors/globalErrorMessages.js");
+  reactHotLoader.register(firstDialogErrorMessageSelector, "firstDialogErrorMessageSelector", "/home/vsts/work/1/s/src/selectors/globalErrorMessages.js");
+})();
+;
+(function () {
+  var leaveModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined;
+  leaveModule && leaveModule(module);
+})();
+;
+(function () {
+  var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
+  if (!reactHotLoader) {
+    return;
+  }
+  reactHotLoader.register(globalMsgData, "globalMsgData", "/home/vsts/work/1/s/src/selectors/globalErrorMessages.js");
+  reactHotLoader.register(firstDialogErrorMessageSelector, "firstDialogErrorMessageSelector", "/home/vsts/work/1/s/src/selectors/globalErrorMessages.js");
+})();
+;
+(function () {
+  var leaveModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined;
+  leaveModule && leaveModule(module);
+})();

package/dist/selectors/metadata.js

@@ -369,7 +369,7 @@ var resolveProductPropertyValue = function resolveProductPropertyValue(property,
       case "Lookup":
         var lookupName = (_property$lookupDefin = property.lookupDefinition) == null ? void 0 : _property$lookupDefin.lookupName;
         var lookup = lookups == null ? void 0 : lookups.get(lookupName);
-        var lookupValue = lookup == null ? void 0 : (_lookup$get = lookup.get("values")) == null ? void 0 : _lookup$get.get(propertyValue);
+        var lookupValue = lookup == null || (_lookup$get = lookup.get("values")) == null ? void 0 : _lookup$get.get(propertyValue);
         return (0, _localizationHelper.getLocalization)(lookupValue == null ? void 0 : lookupValue.get("displayName"), locale, lookupValue == null ? void 0 : lookupValue.get("value"));
       default:
         return propertyValue;

package/dist/utils/responseProcessingHelper.js

@@ -0,0 +1,86 @@
+"use strict";
+
+exports.__esModule = true;
+exports.extractStandardErrorMessagesFromResponse = void 0;
+(function () {
+  var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
+  enterModule && enterModule(module);
+})();
+(function () {
+  var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
+  enterModule && enterModule(module);
+})();
+var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+  return a;
+};
+var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
+  return a;
+};
+var extractStandardErrorMessagesFromResponse = function extractStandardErrorMessagesFromResponse(response, validationLookupModule, validationLookupName) {
+  var hasErrors = false;
+  var messages = [];
+  if (response != null && response.error) {
+    var _response$payload, _response$payload3;
+    hasErrors = true;
+    if (((_response$payload = response.payload) == null ? void 0 : _response$payload.status) === 422) {
+      var _response$payload2;
+      if ((_response$payload2 = response.payload) != null && (_response$payload2 = _response$payload2.response) != null && _response$payload2.failures) {
+        // uses structure from our .Net ValidationFailuresExceptionHandler
+        response.payload.response.failures.forEach(function (failure) {
+          if (failure.errorCode) {
+            messages.push({
+              message: failure.errorMessage,
+              lookupModule: validationLookupModule,
+              lookupName: validationLookupName,
+              lookupKey: failure.errorCode
+            });
+          }
+        });
+      }
+    } else if (((_response$payload3 = response.payload) == null ? void 0 : _response$payload3.status) === 500) {
+      var _response$payload4;
+      if ((_response$payload4 = response.payload) != null && (_response$payload4 = _response$payload4.response) != null && _response$payload4.errors) {
+        // uses structure from our .Net OrckestraExceptionErrorHandler
+        response.payload.response.errors.forEach(function (err) {
+          messages.push({
+            message: err.message,
+            lookupModule: err.lookupModule,
+            lookupName: err.lookupName,
+            lookupKey: err.lookupKey
+          });
+        });
+      }
+    }
+  }
+  return {
+    hasErrors: hasErrors,
+    messages: messages
+  };
+};
+exports.extractStandardErrorMessagesFromResponse = extractStandardErrorMessagesFromResponse;
+;
+(function () {
+  var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
+  if (!reactHotLoader) {
+    return;
+  }
+  reactHotLoader.register(extractStandardErrorMessagesFromResponse, "extractStandardErrorMessagesFromResponse", "/home/vsts/work/1/s/src/utils/responseProcessingHelper.js");
+})();
+;
+(function () {
+  var leaveModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined;
+  leaveModule && leaveModule(module);
+})();
+;
+(function () {
+  var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
+  if (!reactHotLoader) {
+    return;
+  }
+  reactHotLoader.register(extractStandardErrorMessagesFromResponse, "extractStandardErrorMessagesFromResponse", "/home/vsts/work/1/s/src/utils/responseProcessingHelper.js");
+})();
+;
+(function () {
+  var leaveModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined;
+  leaveModule && leaveModule(module);
+})();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "orc-shared",
-	"version": "1.6.0-dev.3",
+	"version": "1.6.0-dev.5",
 	"description": "Shared code for Orckestra applications",
 	"main": "./src/index.js",
 	"exports": {
@@ -47,7 +47,9 @@
 			"cultureIso": "fr-CA"
 		}
 	],
-	"devDependencies": {},
+	"devDependencies": {
+		"@testing-library/react": "^10.4.9"
+	},
 	"peerDependencies": {
 		"orc-scripts": "1.7.0-dev.1"
 	},

package/src/actions/globalErrorMessages.js

@@ -0,0 +1,12 @@
+export const PUSH_GLOBAL_ERROR_MESSAGE = "PUSH_GLOBAL_ERROR_MESSAGE";
+
+export const pushGlobalErrorMessage = msg => ({
+	type: PUSH_GLOBAL_ERROR_MESSAGE,
+	payload: msg,
+});
+
+export const POP_GLOBAL_ERROR_MESSAGE = "POP_GLOBAL_ERROR_MESSAGE";
+
+export const popGlobalErrorMessage = () => ({
+	type: POP_GLOBAL_ERROR_MESSAGE,
+});

package/src/actions/globalErrorMessages.test.js

@@ -0,0 +1,21 @@
+import {
+	POP_GLOBAL_ERROR_MESSAGE,
+	popGlobalErrorMessage,
+	PUSH_GLOBAL_ERROR_MESSAGE,
+	pushGlobalErrorMessage,
+} from "./globalErrorMessages";
+
+describe("pushGlobalErrorMessage", () => {
+	it("create action with message", () =>
+		expect(pushGlobalErrorMessage, "when called with", [{ custom: "message" }], "to equal", {
+			type: PUSH_GLOBAL_ERROR_MESSAGE,
+			payload: { custom: "message" },
+		}));
+});
+
+describe("popGlobalErrorMessage", () => {
+	it("create action", () =>
+		expect(popGlobalErrorMessage, "when called with", [], "to equal", {
+			type: POP_GLOBAL_ERROR_MESSAGE,
+		}));
+});

package/src/buildStore.js

@@ -21,6 +21,7 @@ import modulesReducer from "./reducers/modules";
 import metadataReducer from "./reducers/metadata";
 import requestStatesReducer from "./reducers/requestStates";
 import tasksReducer from "./reducers/tasks";
+import globalErrorMessagesReducer from "./reducers/globalErrorMessages";
 
 window.BUILD_ID = BUILD_ID;
 window.BUILD_NUMBER = BUILD_NUMBER;
@@ -67,6 +68,7 @@ const buildStore = (reducers, devOptions = {}) => {
 			metadata: metadataReducer,
 			requestStates: requestStatesReducer,
 			tasks: tasksReducer,
+			globalErrorMessages: globalErrorMessagesReducer,
 		});
 	const rootReducer = buildReducer(reducers);
 

package/src/components/MaterialUI/DataDisplay/PredefinedElements/GlobalErrorMessages.js

@@ -0,0 +1,92 @@
+import React from "react";
+import { useIntl } from "react-intl";
+import { makeStyles } from "@material-ui/core/styles";
+import sharedMessages from "../../../../sharedMessages";
+import Grid from "@material-ui/core/Grid";
+import ListItemText from "@material-ui/core/ListItemText";
+import List from "@material-ui/core/List";
+import ListItem from "@material-ui/core/ListItem";
+import ListItemIcon from "@material-ui/core/ListItemIcon";
+import LookupDisplayValue from "./LookupDisplayValue";
+import ActionModal from "./ActionModal";
+import { useDispatch, useSelector } from "react-redux";
+import { firstDialogErrorMessageSelector } from "../../../../selectors/globalErrorMessages";
+import { popGlobalErrorMessage } from "../../../../actions/globalErrorMessages";
+
+const useStyles = makeStyles(theme => ({
+	grid: {
+		maxHeight: "40vh",
+		overflowY: "auto",
+	},
+}));
+
+const GlobalErrorMessagesModal = ({ children }) => {
+	const classes = useStyles();
+	const { formatMessage } = useIntl();
+	const dispatch = useDispatch();
+
+	const msg = useSelector(firstDialogErrorMessageSelector);
+
+	if (msg === null) {
+		return <>{children}</>;
+	}
+
+	const closeCallback = () => {
+		dispatch(popGlobalErrorMessage());
+	};
+	const actions = [{ label: sharedMessages.close, isPrimary: true, handler: closeCallback }];
+
+	let content = (
+		<Grid container spacing={2} className={classes.grid}>
+			<Grid container item spacing={0}>
+				{msg.description && (
+					<Grid item xs={12}>
+						{msg.description}
+					</Grid>
+				)}
+
+				{msg.messages?.length > 0 && (
+					<Grid item xs={12}>
+						<List className={classes.root}>
+							{msg.messages.map((msg, index) => {
+								const hasLookup = msg.lookupModule && msg.lookupName && msg.lookupKey;
+
+								return (
+									<ListItem key={index}>
+										<ListItemIcon>●</ListItemIcon>
+										<ListItemText>
+											{hasLookup && (
+												<LookupDisplayValue
+													moduleName={msg.lookupModule}
+													lookupName={msg.lookupName}
+													lookupKey={msg.lookupKey}
+												/>
+											)}
+											{!hasLookup && msg.message}
+										</ListItemText>
+									</ListItem>
+								);
+							})}
+						</List>
+					</Grid>
+				)}
+			</Grid>
+		</Grid>
+	);
+
+	return (
+		<>
+			{children}
+			{
+				<ActionModal
+					title={msg.title || formatMessage(sharedMessages.error)}
+					message={content}
+					open={true}
+					actions={actions}
+				/>
+			}
+		</>
+	);
+};
+
+export default GlobalErrorMessagesModal;