orc-shared 1.6.0-dev.6 → 1.6.0-dev.7

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

@@ -81,7 +81,8 @@ var GlobalErrorMessagesModal = function GlobalErrorMessagesModal(_ref) {
     }, /*#__PURE__*/_react.default.createElement(_ListItemIcon.default, null, "\u25CF"), /*#__PURE__*/_react.default.createElement(_ListItemText.default, null, hasLookup && /*#__PURE__*/_react.default.createElement(_LookupDisplayValue.default, {
       moduleName: msg.lookupModule,
       lookupName: msg.lookupName,
-      lookupKey: msg.lookupKey
+      lookupKey: msg.lookupKey,
+      lookupReplacementValues: msg.lookupReplacementValues
     }), !hasLookup && msg.message));
   })))));
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children, /*#__PURE__*/_react.default.createElement(_ActionModal.default, {

package/dist/components/MaterialUI/DataDisplay/PredefinedElements/LookupDisplayValue.js

@@ -6,7 +6,7 @@ var _react = _interopRequireDefault(require("react"));
 var _TooltippedTypography = _interopRequireDefault(require("../TooltippedElements/TooltippedTypography"));
 var _metadata = require("../../../../selectors/metadata");
 var _reactRedux = require("react-redux");
-var _excluded = ["moduleName", "lookupName", "lookupKey"];
+var _excluded = ["moduleName", "lookupName", "lookupKey", "lookupReplacementValues"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 (function () {
   var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
@@ -29,8 +29,14 @@ var LookupDisplayValue = function LookupDisplayValue(_ref) {
   var moduleName = _ref.moduleName,
     lookupName = _ref.lookupName,
     lookupKey = _ref.lookupKey,
+    lookupReplacementValues = _ref.lookupReplacementValues,
     otherProps = _objectWithoutProperties(_ref, _excluded);
   var value = (0, _reactRedux.useSelector)((0, _metadata.namedLookupLocalizedSelector)(moduleName, lookupName, lookupKey));
+  if (value && lookupReplacementValues) {
+    Object.keys(lookupReplacementValues).forEach(function (key) {
+      value = value.replace("{" + key + "}", lookupReplacementValues[key]);
+    });
+  }
   return /*#__PURE__*/_react.default.createElement(_TooltippedTypography.default, _extends({
     noWrap: true
   }, otherProps, {

package/dist/selectors/metadata.js

@@ -59,7 +59,7 @@ var mappedLookupsListSelector = (0, _utils.memoize)(function (moduleName) {
 exports.mappedLookupsListSelector = mappedLookupsListSelector;
 var lookupValuesSelector = (0, _utils.memoize)(function (moduleName, lookupName) {
   return (0, _reselect.createSelector)(lookups, function (lookups) {
-    return lookups.getIn([moduleName, "index", lookupName]) || _immutable.default.Map();
+    return lookups.getIn([moduleName.toLowerCase(), "index", lookupName]) || _immutable.default.Map();
   });
 });
 var lookupByNameSelector = (0, _utils.memoize)(function (moduleName, lookupName) {

package/dist/utils/responseProcessingHelper.js

@@ -46,7 +46,8 @@ var extractStandardErrorMessagesFromResponse = function extractStandardErrorMess
             message: err.message,
             lookupModule: err.lookupModule,
             lookupName: err.lookupName,
-            lookupKey: err.lookupKey
+            lookupKey: err.lookupKey,
+            lookupReplacementValues: err.lookupReplacementValues
           });
         });
       }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "orc-shared",
-	"version": "1.6.0-dev.6",
+	"version": "1.6.0-dev.7",
 	"description": "Shared code for Orckestra applications",
 	"main": "./src/index.js",
 	"exports": {

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

@@ -60,6 +60,7 @@ const GlobalErrorMessagesModal = ({ children }) => {
 													moduleName={msg.lookupModule}
 													lookupName={msg.lookupName}
 													lookupKey={msg.lookupKey}
+													lookupReplacementValues={msg.lookupReplacementValues}
 												/>
 											)}
 											{!hasLookup && msg.message}

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

@@ -48,6 +48,17 @@ const metadataPayload = {
 								isActive: false,
 								isSystem: true,
 							},
+							MessageWithArguments: {
+								id: "23caa0ebecd04792a96c2f8df5b9b35a",
+								value: "MessageWithArguments",
+								lookupId: "MessageWithArguments",
+								displayName: {
+									"en-US": "This is the message with arguments {customKey1} {customKey2}",
+								},
+								sortOrder: 1,
+								isActive: false,
+								isSystem: true,
+							},
 						},
 						displayName: {
 							"en-US": "Order Status",
@@ -94,6 +105,12 @@ describe("GlobalErrorMessagesModal", () => {
 			messages: [
 				{ message: "error msg" },
 				{ lookupModule: "order", lookupName: "OrderStatus", lookupKey: "InProgress" },
+				{
+					lookupModule: "order",
+					lookupName: "OrderStatus",
+					lookupKey: "MessageWithArguments",
+					lookupReplacementValues: { customKey1: "val1", customKey2: "val2" },
+				},
 			],
 		},
 	];
@@ -110,6 +127,17 @@ describe("GlobalErrorMessagesModal", () => {
 						<LookupDisplayValue moduleName="order" lookupName="OrderStatus" lookupKey="InProgress" />
 					</ListItemText>
 				</ListItem>
+				<ListItem key={2}>
+					<ListItemIcon>●</ListItemIcon>
+					<ListItemText>
+						<LookupDisplayValue
+							moduleName="order"
+							lookupName="OrderStatus"
+							lookupKey="MessageWithArguments"
+							lookupReplacementValues={{ customKey1: "val1", customKey2: "val2" }}
+						/>
+					</ListItemText>
+				</ListItem>
 			</List>
 		</Grid>
 	);

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

@@ -3,8 +3,14 @@ import TooltippedTypography from "../TooltippedElements/TooltippedTypography";
 import { namedLookupLocalizedSelector } from "../../../../selectors/metadata";
 import { useSelector } from "react-redux";
 
-const LookupDisplayValue = ({ moduleName, lookupName, lookupKey, ...otherProps }) => {
-	const value = useSelector(namedLookupLocalizedSelector(moduleName, lookupName, lookupKey));
+const LookupDisplayValue = ({ moduleName, lookupName, lookupKey, lookupReplacementValues, ...otherProps }) => {
+	let value = useSelector(namedLookupLocalizedSelector(moduleName, lookupName, lookupKey));
+
+	if (value && lookupReplacementValues) {
+		Object.keys(lookupReplacementValues).forEach(key => {
+			value = value.replace("{" + key + "}", lookupReplacementValues[key]);
+		});
+	}
 
 	return <TooltippedTypography noWrap {...otherProps} children={value} titleValue={value} />;
 };

package/src/components/MaterialUI/DataDisplay/PredefinedElements/LookupDisplayValue.test.js

@@ -36,6 +36,17 @@ const metadataPayload = {
 								isActive: false,
 								isSystem: true,
 							},
+							MessageWithArguments: {
+								id: "23caa0ebecd04792a96c2f8df5b9b35a",
+								value: "MessageWithArguments",
+								lookupId: "MessageWithArguments",
+								displayName: {
+									"en-US": "This is the message with arguments {customKey1} {customKey2}",
+								},
+								sortOrder: 1,
+								isActive: false,
+								isSystem: true,
+							},
 						},
 						displayName: {
 							"en-US": "Order Status",
@@ -82,4 +93,29 @@ describe("LookupDisplayValue", () => {
 
 		expect(component, "when mounted", "to satisfy", expected);
 	});
+
+	it("Renders lookup value with arguments", () => {
+		const component = (
+			<TestWrapper provider={{ store }} memoryRouter stylesProvider muiThemeProvider={{ theme }}>
+				<LookupDisplayValue
+					moduleName="order"
+					lookupName="OrderStatus"
+					lookupKey="MessageWithArguments"
+					lookupReplacementValues={{ customKey1: "val1", customKey2: "val2" }}
+				/>
+			</TestWrapper>
+		);
+
+		const expected = (
+			<TestWrapper provider={{ store }} memoryRouter stylesProvider muiThemeProvider={{ theme }}>
+				<TooltippedTypography
+					noWrap
+					children={"This is the message with arguments val1 val2"}
+					titleValue={"This is the message with arguments val1 val2"}
+				/>
+			</TestWrapper>
+		);
+
+		expect(component, "when mounted", "to satisfy", expected);
+	});
 });

package/src/selectors/metadata.js

@@ -30,7 +30,7 @@ export const mappedLookupsListSelector = memoize(moduleName =>
 );
 
 const lookupValuesSelector = memoize((moduleName, lookupName) =>
-	createSelector(lookups, lookups => lookups.getIn([moduleName, "index", lookupName]) || Immutable.Map()),
+	createSelector(lookups, lookups => lookups.getIn([moduleName.toLowerCase(), "index", lookupName]) || Immutable.Map()),
 );
 
 export const lookupByNameSelector = memoize((moduleName, lookupName) =>

package/src/selectors/metadata.test.js

@@ -394,6 +394,18 @@ describe("namedLookupValuesSelector", () => {
 			"Annulla per motivo 1",
 		);
 	});
+
+	it("retrieves localized values with an uppercase module", () => {
+		expect(
+			namedLookupLocalizedSelector,
+			"when called with",
+			["ORDER", "CanceledStatusReasons", "CanceledReason1"],
+			"when called with",
+			[state],
+			"to satisfy",
+			"Annulla per motivo 1",
+		);
+	});
 });
 
 describe("selectCurrentLookupDetails", () => {

package/src/utils/responseProcessingHelper.js

@@ -28,6 +28,7 @@ export const extractStandardErrorMessagesFromResponse = (response, validationLoo
 						lookupModule: err.lookupModule,
 						lookupName: err.lookupName,
 						lookupKey: err.lookupKey,
+						lookupReplacementValues: err.lookupReplacementValues,
 					});
 				});
 			}

package/src/utils/responseProcessingHelper.test.js

@@ -179,4 +179,40 @@ describe("extractStandardErrorMessagesFromResponse", () => {
 			],
 		});
 	});
+
+	it("Returns error with empty messages with 500 with messages containing arguments", () => {
+		const response = {
+			error: true,
+			payload: {
+				status: 500,
+				response: {
+					errors: [
+						{
+							message: "msg1",
+							lookupModule: "mod2",
+							lookupName: "name3",
+							lookupKey: "key4",
+							lookupReplacementValues: { key: "val" },
+						},
+						{ message: "", lookupModule: "mod5", lookupName: "name5", lookupKey: "key5" },
+					],
+				},
+			},
+		};
+		const extractedMessages = extractStandardErrorMessagesFromResponse(response, "fallback module", "fallback name");
+
+		expect(extractedMessages, "to equal", {
+			hasErrors: true,
+			messages: [
+				{
+					message: "msg1",
+					lookupModule: "mod2",
+					lookupName: "name3",
+					lookupKey: "key4",
+					lookupReplacementValues: { key: "val" },
+				},
+				{ message: "", lookupModule: "mod5", lookupName: "name5", lookupKey: "key5" },
+			],
+		});
+	});
 });