orc-shared 5.7.0-dev.7 → 5.7.0-dev.9

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

@@ -51,11 +51,13 @@ var ActionModal = function ActionModal(_ref) {
   var actionPanel = /*#__PURE__*/_react.default.createElement("div", {
     className: classes.actionPanel
   }, actions.map(function (action) {
+    var _action$disabled;
     return /*#__PURE__*/_react.default.createElement(_Button.default, {
       key: action.label.id,
       variant: action.isPrimary ? "contained" : "outlined",
       color: action.isPrimary ? "primary" : "default",
       disableElevation: action.isPrimary,
+      disabled: (_action$disabled = action.disabled) != null ? _action$disabled : false,
       onClick: function onClick(e) {
         return action.handler(e);
       }

package/dist/components/MaterialUI/Inputs/LookupSelect.js

@@ -7,6 +7,7 @@ var _filterHelper = require("../../../utils/filterHelper");
 var _metadata = require("../../../selectors/metadata");
 var _localizationHelper = require("../../../utils/localizationHelper");
 var _createInput = _interopRequireWildcard(require("./createInput"));
+var _excluded = ["moduleName", "lookupName", "value", "onChange", "disabled", "metadata"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 (function () {
@@ -17,6 +18,8 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
   var enterModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.enterModule : undefined;
   enterModule && enterModule(module);
 })();
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
@@ -29,7 +32,8 @@ var LookupSelect = function LookupSelect(_ref) {
     value = _ref.value,
     onChange = _ref.onChange,
     disabled = _ref.disabled,
-    metadata = _ref.metadata;
+    metadata = _ref.metadata,
+    props = _objectWithoutProperties(_ref, _excluded);
   var options = (0, _filterHelper.extractDropboxOptions)((0, _reactRedux.useSelector)((0, _metadata.namedLookupValuesSelector)(moduleName, lookupName)));
   if (value !== null && !options.some(function (x) {
     return x.value === value;
@@ -40,13 +44,18 @@ var LookupSelect = function LookupSelect(_ref) {
       sortOrder: 0
     });
   }
+  var inputProps = {};
+  if (props != null && props["data-qa"]) {
+    inputProps["data-qa"] = props["data-qa"];
+  }
   return (0, _createInput.default)(_createInput.inputTypes.select, {
     options: options,
     value: value,
     update: function update(newValue) {
       return onChange(newValue, metadata);
     },
-    disabled: disabled
+    disabled: disabled,
+    inputProps: inputProps
   });
 };
 __signature__(LookupSelect, "useSelector{}", function () {

package/package.json

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

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

@@ -20,7 +20,7 @@ const ActionModal = ({
 	message,
 	open,
 	type,
-	actions, // Array of objects containing three properties: label, handler, isPrimary
+	actions, // Array of objects containing four properties: label, handler, isPrimary & disabled
 	backdropClickCallback,
 }) => {
 	const classes = useStyles();
@@ -42,6 +42,7 @@ const ActionModal = ({
 					variant={action.isPrimary ? "contained" : "outlined"}
 					color={action.isPrimary ? "primary" : "default"}
 					disableElevation={action.isPrimary}
+					disabled={action.disabled ?? false}
 					onClick={e => action.handler(e)}
 				>
 					<FormattedMessage {...action.label} />

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

@@ -17,8 +17,8 @@ describe("ActionModal", () => {
 		const open = true;
 		const message = "message";
 
-		const actionOne = { label: sharedMessages.yes, handler: jest.fn(), isPrimary: true };
-		const actionTwo = { label: sharedMessages.no, handler: jest.fn() };
+		const actionOne = { label: sharedMessages.yes, handler: jest.fn(), isPrimary: true, disabled: false };
+		const actionTwo = { label: sharedMessages.no, handler: jest.fn(), disabled: false };
 		const actionThree = { label: sharedMessages.cancel, handler: jest.fn() };
 
 		const backdropClickCallback = jest.fn();
@@ -32,13 +32,81 @@ describe("ActionModal", () => {
 
 		const actionPanel = (
 			<div>
-				<Button key="1" variant="contained" color="primary" onClick={() => actionOne.handler()} disableElevation>
+				<Button
+					key="1"
+					variant="contained"
+					color="primary"
+					disabled={false}
+					onClick={() => actionOne.handler()}
+					disableElevation
+				>
 					{stringifyWithoutQuotes(messages["orc-shared.yes"])}
 				</Button>
-				<Button key="2" variant="outlined" onClick={() => actionTwo.handler()}>
+				<Button key="2" variant="outlined" disabled={false} onClick={() => actionTwo.handler()}>
 					{stringifyWithoutQuotes(messages["orc-shared.no"])}
 				</Button>
-				<Button key="3" variant="outlined" onClick={() => actionThree.handler()}>
+				<Button key="3" variant="outlined" disabled={false} onClick={() => actionThree.handler()}>
+					{stringifyWithoutQuotes(messages["orc-shared.cancel"])}
+				</Button>
+			</div>
+		);
+
+		modalProps.set(ModalProps.propNames.actionPanel, actionPanel);
+
+		const component = (
+			<IntlProvider locale="en-US" messages={messages}>
+				<ActionModal
+					message={message}
+					open={open}
+					actions={[actionOne, actionTwo, actionThree]}
+					backdropClickCallback={backdropClickCallback}
+				/>
+			</IntlProvider>
+		);
+
+		const expected = (
+			<IntlProvider locale="en-US" messages={messages}>
+				<Modal message={message} modalProps={modalProps} />
+			</IntlProvider>
+		);
+
+		expect(component, "when mounted", "to satisfy", expected);
+	});
+
+	it("Renders ActionModal correctly with disabled actions", () => {
+		const open = true;
+		const message = "message";
+
+		const actionOne = { label: sharedMessages.yes, handler: jest.fn(), isPrimary: true, disabled: true };
+		const actionTwo = { label: sharedMessages.no, handler: jest.fn(), disabled: false };
+		const actionThree = { label: sharedMessages.cancel, handler: jest.fn() };
+
+		const backdropClickCallback = jest.fn();
+		const modalProps = new ModalProps();
+
+		const titleComponent = stringifyWithoutQuotes(messages["orc-shared.confirmation"]);
+
+		modalProps.set(ModalProps.propNames.title, titleComponent);
+		modalProps.set(ModalProps.propNames.open, open);
+		modalProps.set(ModalProps.propNames.backdropClickCallback, backdropClickCallback);
+		modalProps.set(ModalProps.propNames.type, "fullwidth");
+
+		const actionPanel = (
+			<div>
+				<Button
+					key="1"
+					variant="contained"
+					color="primary"
+					disabled={true}
+					onClick={() => actionOne.handler()}
+					disableElevation
+				>
+					{stringifyWithoutQuotes(messages["orc-shared.yes"])}
+				</Button>
+				<Button key="2" variant="outlined" disabled={false} onClick={() => actionTwo.handler()}>
+					{stringifyWithoutQuotes(messages["orc-shared.no"])}
+				</Button>
+				<Button key="3" variant="outlined" disabled={false} onClick={() => actionThree.handler()}>
 					{stringifyWithoutQuotes(messages["orc-shared.cancel"])}
 				</Button>
 			</div>
@@ -51,6 +119,7 @@ describe("ActionModal", () => {
 				<ActionModal
 					message={message}
 					open={open}
+					type={"fullwidth"}
 					actions={[actionOne, actionTwo, actionThree]}
 					backdropClickCallback={backdropClickCallback}
 				/>

package/src/components/MaterialUI/Inputs/LookupSelect.js

@@ -4,7 +4,7 @@ import { namedLookupValuesSelector } from "../../../selectors/metadata";
 import { getNotLocalizedString } from "../../../utils/localizationHelper";
 import createInput, { inputTypes } from "./createInput";
 
-const LookupSelect = ({ moduleName, lookupName, value, onChange, disabled, metadata }) => {
+const LookupSelect = ({ moduleName, lookupName, value, onChange, disabled, metadata, ...props }) => {
 	const options = extractDropboxOptions(useSelector(namedLookupValuesSelector(moduleName, lookupName)));
 
 	if (value !== null && !options.some(x => x.value === value)) {
@@ -15,11 +15,18 @@ const LookupSelect = ({ moduleName, lookupName, value, onChange, disabled, metad
 		});
 	}
 
+	const inputProps = {};
+
+	if (props?.["data-qa"]) {
+		inputProps["data-qa"] = props["data-qa"];
+	}
+
 	return createInput(inputTypes.select, {
 		options: options,
 		value: value,
 		update: newValue => onChange(newValue, metadata),
 		disabled: disabled,
+		inputProps: inputProps,
 	});
 };
 

package/src/components/MaterialUI/Inputs/LookupSelect.test.js

@@ -210,4 +210,25 @@ describe("LookupSelect Component", () => {
 
 		expect(update, "to have calls satisfying", [{ args: ["CanceledReason2", { a: 123 }] }]);
 	});
+
+	it("LookupSelect component with data-qa", () => {
+		const update = sinon.spy().named("update");
+		const component = (
+			<TestWrapper provider={{ store }} stylesProvider muiThemeProvider={{ theme }}>
+				<LookupSelect
+					moduleName={"order"}
+					lookupName={"CanceledStatusReasons"}
+					value={"CanceledReason3"}
+					onChange={update}
+					metadata={{ a: 123 }}
+					data-qa="custom-value"
+				/>
+			</TestWrapper>
+		);
+
+		const mountedComponent = mount(component);
+
+		const controls = mountedComponent.find("[data-qa='custom-value']").hostNodes();
+		expect(controls.length, "to equal", 1);
+	});
 });