orc-shared 5.9.1-dev.0 → 5.10.0-dev.2

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

@@ -87,16 +87,6 @@ export const useStyles = makeStyles(theme => ({
 			backgroundColor: `${theme.palette.grey.borders} !important`,
 		},
 	},
-	container: {
-		display: "flex",
-		flexDirection: "column",
-	},
-	errorText: {
-		marginTop: theme.spacing(0.5),
-		color: theme.palette.error.main,
-		fontSize: theme.typography.fieldLabelSize,
-		float: "left",
-	},
 }));
 
 const Switch = ({ switchProps }) => {
@@ -110,7 +100,6 @@ const Switch = ({ switchProps }) => {
 	const value = switchProps?.get(SwitchProps.propNames.value) || false;
 	const onCaption = switchProps?.get(SwitchProps.propNames.onCaption);
 	const offCaption = switchProps?.get(SwitchProps.propNames.offCaption);
-	const error = switchProps?.get(SwitchProps.propNames.error);
 	const disabled = switchProps?.get(SwitchProps.propNames.disabled) || false;
 	const readOnly = switchProps?.get(SwitchProps.propNames.readOnly);
 	const className = switchProps?.get(SwitchProps.propNames.className) || "";
@@ -131,7 +120,7 @@ const Switch = ({ switchProps }) => {
 		...className,
 	};
 
-	const switchComponent = (
+	return (
 		<SwitchMui
 			disabled={disabled}
 			classes={switchClasses}
@@ -140,16 +129,6 @@ const Switch = ({ switchProps }) => {
 			color={"primary"}
 		/>
 	);
-
-	return (
-		(error && (
-			<div className={classes.container}>
-				{switchComponent}
-				<div className={classNames(classes.errorText)}>{error}</div>
-			</div>
-		)) ||
-		switchComponent
-	);
 };
 
 export default Switch;

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

@@ -60,29 +60,6 @@ describe("Switch Component", () => {
 		expect(mountedComponent.containsMatchingElement(expected), "to be truthy");
 	});
 
-	it("Renders Switch component with an error", () => {
-		const switchProps = new SwitchProps();
-
-		switchProps.set(SwitchProps.propNames.update, update);
-		switchProps.set(SwitchProps.propNames.value, true);
-		switchProps.set(SwitchProps.propNames.error, "an error");
-		switchProps.set(SwitchProps.propNames.onCaption, { id: "captionOn" });
-		switchProps.set(SwitchProps.propNames.offCaption, { id: "captionOff" });
-
-		const component = (
-			<IntlProvider messages={messages} locale="en-US">
-				<Switch switchProps={switchProps} />
-			</IntlProvider>
-		);
-
-		const mountedComponent = mount(component);
-		const expectedSwitch = <SwitchMUI checked={true} />;
-		const expectedError = <div>an error</div>;
-
-		expect(mountedComponent.containsMatchingElement(expectedSwitch), "to be truthy");
-		expect(mountedComponent.containsMatchingElement(expectedError), "to be truthy");
-	});
-
 	it("Checkbox component handles check", () => {
 		const switchProps = new SwitchProps();
 

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

@@ -10,7 +10,6 @@ class SwitchProps extends ComponentProps {
 		readOnly: "readOnly",
 		className: "className",
 		id: "id",
-		error: "error",
 		metadata: "metadata",
 	};
 
@@ -24,7 +23,6 @@ class SwitchProps extends ComponentProps {
 		this.componentProps.set(this.constructor.propNames.readOnly, null);
 		this.componentProps.set(this.constructor.propNames.className, null);
 		this.componentProps.set(this.constructor.propNames.id, null);
-		this.componentProps.set(this.constructor.propNames.error, null);
 		this.componentProps.set(this.constructor.propNames.metadata, null);
 
 		this._isSwitchProps = true;

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

@@ -11,7 +11,6 @@ describe("Switch Props", () => {
 			"readOnly",
 			"className",
 			"id",
-			"error",
 			"metadata",
 		];
 
@@ -28,7 +27,6 @@ describe("Switch Props", () => {
 			"readOnly",
 			"className",
 			"id",
-			"error",
 			"metadata",
 		];
 

package/src/hooks/useMultipleFieldEditState.js

@@ -1,7 +1,7 @@
 import { useSelector } from "react-redux";
 import { validationRules } from "../utils/modelValidationHelper";
 import { getModifiedModels } from "../selectors/view";
-import { setEditModelField, setEditModelFieldError, removeEditModelFieldError } from "../actions/view";
+import { setEditModelField, setEditModelFieldError } from "../actions/view";
 import { useDispatchWithModulesData } from "./../hooks/useDispatchWithModulesData";
 
 /* This hook is used when a component has a dynamic number of fields that can be edited (e.g.: Orders' Custom Configuration Parameters).
@@ -25,7 +25,7 @@ const useMultipleFieldEditState = (entityId, sectionName, initialValues, extende
 	const mergedValidationRules = { ...validationRules, ...extendedValidationRules };
 	const modifiedStates = useSelector(getModifiedModels(entityId))[sectionName] || {};
 
-	const useDynamicFieldState = (id, fieldName, errorTypes = [], fieldDependencies = {}) => {
+	const useDynamicFieldState = (id, fieldName, errorTypes = []) => {
 		const keys = [id, fieldName];
 
 		const initialValue = initialValues[id]?.[fieldName] ?? "";
@@ -42,15 +42,12 @@ const useMultipleFieldEditState = (entityId, sectionName, initialValues, extende
 			dispatch(setEditModelField, [keys, initialValue, initialValue, entityId, sectionName]);
 		};
 
-		const isEditStateValid = (value, dependencies = {}) => {
+		const isEditStateValid = value => {
 			const valueToValidate = value ?? editState.value;
 
 			let hasAnyValidationErrors = false;
 			errorTypes.forEach(errorType => {
-				const isValid = mergedValidationRules[errorType](valueToValidate, id, fieldName, {
-					...fieldDependencies,
-					...dependencies,
-				});
+				const isValid = mergedValidationRules[errorType](valueToValidate, id, fieldName);
 
 				if (isValid === false) {
 					dispatch(setEditModelFieldError, [keys, errorType, entityId, sectionName]);
@@ -60,10 +57,6 @@ const useMultipleFieldEditState = (entityId, sectionName, initialValues, extende
 				}
 			});
 
-			if (!hasAnyValidationErrors) {
-				dispatch(removeEditModelFieldError, [keys, entityId, sectionName]);
-			}
-
 			return !hasAnyValidationErrors;
 		};
 

package/src/hooks/useMultipleFieldEditState.test.js

@@ -5,7 +5,7 @@ import Immutable from "immutable";
 import sinon from "sinon";
 import { mount } from "enzyme";
 import * as useDispatchWithModulesDataMock from "./useDispatchWithModulesData";
-import { removeEditModelFieldError, setEditModelField, setEditModelFieldError } from "./../actions/view";
+import { setEditModelField, setEditModelFieldError } from "./../actions/view";
 import { validationErrorTypes } from "./../constants";
 import _ from "lodash";
 
@@ -404,54 +404,6 @@ describe("useMultipleFieldEditState", () => {
 		}
 	});
 
-	it("Updates edit view value and reset error correctly with custom validation rules when validation was passed", () => {
-		const useDispatchWithModulesDataSpy = sinon.spy();
-		const useDispatchWithModulesDataStub = sinon
-			.stub(useDispatchWithModulesDataMock, "useDispatchWithModulesData")
-			.returns(useDispatchWithModulesDataSpy);
-
-		try {
-			// TODOJOC
-			const mountedComponent = mountComponent();
-
-			const fieldComponent = mountedComponent.find(`#id1-prop1-update`);
-
-			const event = {
-				target: {
-					value: "anotherValue",
-				},
-			};
-
-			fieldComponent.invoke("onClick")(event);
-
-			const resetEvent = {
-				target: {
-					value: "custom",
-				},
-			};
-
-			fieldComponent.invoke("onClick")(resetEvent);
-
-			const id = "id1";
-			const fieldName = "prop1";
-			const initialFieldValue = fieldInitialValues[id][fieldName];
-
-			expect(useDispatchWithModulesDataSpy, "to have a call satisfying", {
-				args: [setEditModelField, [[id, fieldName], "anotherValue", initialFieldValue, entityId, sectionName]],
-			});
-
-			expect(useDispatchWithModulesDataSpy, "to have a call satisfying", {
-				args: [setEditModelFieldError, [[id, fieldName], "customRule", entityId, sectionName]],
-			});
-
-			expect(useDispatchWithModulesDataSpy, "to have a call satisfying", {
-				args: [removeEditModelFieldError, [[id, fieldName], entityId, sectionName]],
-			});
-		} finally {
-			useDispatchWithModulesDataStub.restore();
-		}
-	});
-
 	it.each([
 		["id1", "prop1"],
 		["id1", "prop2"],

package/src/requests

@@ -0,0 +1,34 @@
+createCustomerLookupTypeDefinitionRequest
+createEntityTypeRequest
+createOrderLookupTypeDefinitionRequest
+deleteTaskInfoRequest
+getApplicationModules
+getAuthorizedApplicationsRequest
+getCountriesRequest
+getCustomerDefinitionsRequest
+getCustomerLookupRequest
+getCustomerLookupsRequest
+getOrderDefinitionRequest
+getOrderLookupRequest
+getOrderLookupsRequest
+getProductDefinitionsRequest
+getProductLookupsRequest
+getProfileAttributeGroupsRequest
+getRequesterTasksInfoRequest
+getScopeExtendedConfigurationRequest
+getSupportedCulturesRequest
+getTaskExecutionLogsRequest
+getTaskInfoRequest
+getTimeZonesRequest
+getUserApplicationRequest
+getUserCultureRequest
+getUserPermissionsRequest
+getUserScopeRequest
+getUserScopeTreeRequest
+getVersionInfoRequest
+saveUserApplicationRequest
+saveUserCultureRequest
+signOutRequest
+updateCustomerLookupTypeDefinitionRequest
+updateEntityTypeRequest
+updateOrderLookupTypeDefinitionRequest

package/src/selectors/metadata.js

@@ -53,6 +53,23 @@ export const namedLookupValuesSelector = memoize((moduleName, lookupName) =>
 	),
 );
 
+export const namedLookupsValuesSelector = memoize((moduleName, lookupNames) =>
+	createSelector(lookupSelector(moduleName), currentLocaleOrDefault, (lookups, locale) => {
+		const lookupsValues = {};
+
+		each(lookupNames, name => {
+			const lookup = lookups.get(name);
+			if (!lookup) return;
+
+			lookupsValues[name] = lookup
+				.get("values", Immutable.Map())
+				.map(lookupValue => setTranslationWithFallbackField(locale, lookupValue, "name", "displayName"));
+		});
+
+		return Immutable.fromJS(lookupsValues);
+	}),
+);
+
 export const selectCurrentLookupDetails = memoize((moduleName, lookupName) =>
 	namedLookupSelector(moduleName, lookupName),
 );
@@ -340,7 +357,7 @@ export const variantPropertyKeyValuesSelector = memoize(({ definitionName }, pro
 							? {
 									...acc,
 									[rec]: resolveProductPropertyValue(propertyMap[camelCase(rec)], propertyBag[rec], locale, lookups),
-							  }
+								}
 							: acc,
 					{},
 				);

package/src/selectors/metadata.test.js

@@ -31,6 +31,7 @@ import {
 	lookupByNameSelector,
 	mappedLookupsListSelector,
 	lookupExistAndIsActiveSelector,
+	namedLookupsValuesSelector,
 } from "./metadata";
 
 const lookups = {
@@ -409,6 +410,109 @@ describe("namedLookupValuesSelector", () => {
 	});
 });
 
+describe("namedLookupsValuesSelector", () => {
+	let state;
+	beforeEach(() => {
+		state = Immutable.fromJS({
+			locale: { locale: "it-IT" },
+			metadata: {
+				lookups: {
+					order: {
+						index: {
+							CanceledStatusReasons: {
+								lookupName: "CanceledStatusReasons",
+								values: {
+									CanceledReason1: {
+										id: "e16d07f847284775b77cfb985724cf58",
+										value: "CanceledReason1",
+										lookupId: "CanceledStatusReasons",
+										sortOrder: 0,
+										isActive: true,
+										isSystem: true,
+										displayName: {
+											"en-CA": "Cancel for reason 1",
+											"en-US": "Cancel for reason 1",
+											"fr-CA": "Annulé pour raison 1",
+											"it-IT": "Annulla per motivo 1",
+										},
+									},
+									CanceledReason2: {
+										id: "6bbfe77703c745d68b8eaceb9cd484b1",
+										value: "CanceledReason2",
+										lookupId: "CanceledStatusReasons",
+										sortOrder: 0,
+										isActive: true,
+										isSystem: true,
+										displayName: {
+											"en-CA": "Cancel for reason 2",
+											"en-US": "Cancel for reason 2",
+											"fr-CA": "Annulé pour raison 2",
+											"it-IT": "Annulla per motivo 2",
+										},
+									},
+								},
+								isActive: true,
+								isSystem: true,
+							},
+							CartStatus: {
+								lookupName: "CartStatus",
+								values: {},
+								isActive: true,
+								isSystem: true,
+							},
+						},
+						list: [],
+					},
+				},
+			},
+		});
+	});
+
+	it("gets the value list for multiple named lookups", () =>
+		expect(
+			namedLookupsValuesSelector,
+			"when called with",
+			["order", ["CanceledStatusReasons", "CartStatus"]],
+			"when called with",
+			[state],
+			"to satisfy",
+			Immutable.fromJS({
+				CanceledStatusReasons: {
+					CanceledReason1: {
+						id: "e16d07f847284775b77cfb985724cf58",
+						value: "CanceledReason1",
+						lookupId: "CanceledStatusReasons",
+						sortOrder: 0,
+						isActive: true,
+						isSystem: true,
+						displayName: "Annulla per motivo 1",
+					},
+					CanceledReason2: {
+						id: "6bbfe77703c745d68b8eaceb9cd484b1",
+						value: "CanceledReason2",
+						lookupId: "CanceledStatusReasons",
+						sortOrder: 0,
+						isActive: true,
+						isSystem: true,
+						displayName: "Annulla per motivo 2",
+					},
+				},
+				CartStatus: {},
+			}),
+		));
+
+	it("will get an empty Map if lookup does not exist", () =>
+		expect(
+			namedLookupsValuesSelector,
+			"when called with",
+			["order", ["NotALookup"]],
+			"when called with",
+			[state],
+			"to equal",
+			Immutable.fromJS({}),
+		));
+});
+
 describe("selectCurrentLookupDetails", () => {
 	let state;
 	beforeEach(() => {