orc-shared 5.4.0-dev.0 → 5.5.1-dev.1

package/src/components/Text.test.js

@@ -1,7 +1,8 @@
 import React from "react";
-import { Provider } from "react-redux";
-import { IntlProvider } from "react-intl";
 import Text, { Placeholder } from "./Text";
+import { createMuiTheme, TestWrapper } from "../utils/testUtils";
+
+const theme = createMuiTheme();
 
 describe("Text", () => {
 	let state, store;
@@ -16,11 +17,9 @@ describe("Text", () => {
 
 	it("renders a simple message", () =>
 		expect(
-			<Provider store={store}>
-				<IntlProvider locale="en">
-					<Text message="Test message" />
-				</IntlProvider>
-			</Provider>,
+			<TestWrapper provider={{ store }} intlProvider memoryRouter stylesProvider muiThemeProvider={{ theme }}>
+				<Text message="Test message" />
+			</TestWrapper>,
 			"when mounted",
 			"to satisfy",
 			"Test message",
@@ -28,11 +27,9 @@ describe("Text", () => {
 
 	it("renders an empty string", () =>
 		expect(
-			<Provider store={store}>
-				<IntlProvider locale="en">
-					<Text message="" />
-				</IntlProvider>
-			</Provider>,
+			<TestWrapper provider={{ store }} intlProvider memoryRouter stylesProvider muiThemeProvider={{ theme }}>
+				<Text message="" />
+			</TestWrapper>,
 			"when mounted",
 			"to satisfy",
 			"",
@@ -40,11 +37,9 @@ describe("Text", () => {
 
 	it("renders a translated message", () =>
 		expect(
-			<Provider store={store}>
-				<IntlProvider locale="en">
-					<Text message={{ id: "test.msg", defaultMessage: "Test message" }} />
-				</IntlProvider>
-			</Provider>,
+			<TestWrapper provider={{ store }} intlProvider memoryRouter stylesProvider muiThemeProvider={{ theme }}>
+				<Text message={{ id: "test.msg", defaultMessage: "Test message" }} />
+			</TestWrapper>,
 			"when mounted",
 			"to satisfy",
 			"Test message",
@@ -52,17 +47,15 @@ describe("Text", () => {
 
 	it("renders a translated message with values", () =>
 		expect(
-			<Provider store={store}>
-				<IntlProvider locale="en">
-					<Text
-						message={{
-							id: "test.msg",
-							defaultMessage: "Test message {foo}",
-							values: { foo: 3 },
-						}}
-					/>
-				</IntlProvider>
-			</Provider>,
+			<TestWrapper provider={{ store }} intlProvider memoryRouter stylesProvider muiThemeProvider={{ theme }}>
+				<Text
+					message={{
+						id: "test.msg",
+						defaultMessage: "Test message {foo}",
+						values: { foo: 3 },
+					}}
+				/>
+			</TestWrapper>,
 			"when mounted",
 			"to satisfy",
 			"Test message 3",
@@ -70,17 +63,15 @@ describe("Text", () => {
 
 	it("renders a translated message with a value selector", () =>
 		expect(
-			<Provider store={store}>
-				<IntlProvider locale="en">
-					<Text
-						message={{
-							id: "test.msg",
-							defaultMessage: "Test message {foo}",
-							values: state => state.dataVal,
-						}}
-					/>
-				</IntlProvider>
-			</Provider>,
+			<TestWrapper provider={{ store }} intlProvider memoryRouter stylesProvider muiThemeProvider={{ theme }}>
+				<Text
+					message={{
+						id: "test.msg",
+						defaultMessage: "Test message {foo}",
+						values: state => state.dataVal,
+					}}
+				/>
+			</TestWrapper>,
 			"when mounted",
 			"to satisfy",
 			"Test message 3",
@@ -88,16 +79,14 @@ describe("Text", () => {
 
 	it("renders a translated message missing its values as a placeholder", () =>
 		expect(
-			<Provider store={store}>
-				<IntlProvider locale="en">
-					<Text
-						message={{
-							id: "test.msg",
-							defaultMessage: "Test message {foo}",
-						}}
-					/>
-				</IntlProvider>
-			</Provider>,
+			<TestWrapper provider={{ store }} intlProvider memoryRouter stylesProvider muiThemeProvider={{ theme }}>
+				<Text
+					message={{
+						id: "test.msg",
+						defaultMessage: "Test message {foo}",
+					}}
+				/>
+			</TestWrapper>,
 			"when mounted",
 			"to satisfy",
 			<Placeholder />,
@@ -105,11 +94,9 @@ describe("Text", () => {
 
 	it("renders an error", () =>
 		expect(
-			<Provider store={store}>
-				<IntlProvider locale="en">
-					<Text message="Test message" error={{ message: "This failed" }} />
-				</IntlProvider>
-			</Provider>,
+			<TestWrapper provider={{ store }} intlProvider memoryRouter stylesProvider muiThemeProvider={{ theme }}>
+				<Text message="Test message" error={{ message: "This failed" }} />
+			</TestWrapper>,
 			"when mounted",
 			"to satisfy",
 			<span
@@ -126,11 +113,9 @@ describe("Text", () => {
 
 	it("renders an error if no message given", () =>
 		expect(
-			<Provider store={store}>
-				<IntlProvider locale="en">
-					<Text />
-				</IntlProvider>
-			</Provider>,
+			<TestWrapper provider={{ store }} intlProvider memoryRouter stylesProvider muiThemeProvider={{ theme }}>
+				<Text />
+			</TestWrapper>,
 			"when mounted",
 			"to satisfy",
 			<span

package/src/constants.js

@@ -13,11 +13,13 @@ export const platformRoles = {
 	Administrator: "Administrator",
 	Editor: "Editor",
 	Reader: "Reader",
+	Recipient: "Recipient",
 };
 
 export const roleGroups = {
 	Products: "Products",
 	Orders: "Orders",
+	OrderReturn: "OrderReturn",
 	Marketing: "Marketing",
 	Analytics: "Analytics",
 	Shopping: "Shopping",
@@ -105,3 +107,16 @@ export const requestStateOperationMap = {
 	fetch: "fetches",
 	update: "updates",
 };
+
+export const taskStatuses = {
+	created: "Created",
+	waitingToRun: "WaitingToRun",
+	running: "Running",
+	ranToCompletion: "RanToCompletion",
+	canceled: "Canceled",
+	faulted: "Faulted",
+	idle: "Idle",
+	waitingToCancel: "WaitingToCancel",
+	ignored: "Ignored",
+	queuedForSequence: "QueuedForSequence",
+};

package/src/content/iconsSheet.svg

@@ -708,4 +708,26 @@
  <polygon fill="#FFF" points="9.6 12 16 8.4 9.6 4.8"/>
  </g>
 </symbol>
+<symbol id="icon-barcode" viewBox="0 0 25 20" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.00031 16.0315C1.27645 16.0315 1.50031 16.2554 1.50031 16.5315V19.0005H3.96931C4.24545 19.0005 4.46931 19.2244 4.46931 19.5005C4.46931 19.7766 4.24545 20.0005 3.96931 20.0005H1.00031C0.724163 20.0005 0.500305 19.7766 0.500305 19.5005V16.5315C0.500305 16.2554 0.724163 16.0315 1.00031 16.0315Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.5 0.500244C0.5 0.224102 0.723858 0.000244141 1 0.000244141H3.969C4.24514 0.000244141 4.469 0.224102 4.469 0.500244C4.469 0.776386 4.24514 1.00024 3.969 1.00024H1.5V3.46924C1.5 3.74539 1.27614 3.96924 1 3.96924C0.723858 3.96924 0.5 3.74539 0.5 3.46924V0.500244Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.5313 0.5C20.5313 0.223858 20.7552 0 21.0313 0H24.0003C24.2765 0 24.5003 0.223858 24.5003 0.5V3.469C24.5003 3.74514 24.2765 3.969 24.0003 3.969C23.7242 3.969 23.5003 3.74514 23.5003 3.469V1H21.0313C20.7552 1 20.5313 0.776142 20.5313 0.5Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.0005 16.0312C24.2766 16.0312 24.5005 16.2551 24.5005 16.5312V19.5002C24.5005 19.7764 24.2766 20.0002 24.0005 20.0002H21.0315C20.7554 20.0002 20.5315 19.7764 20.5315 19.5002C20.5315 19.2241 20.7554 19.0002 21.0315 19.0002H23.5005V16.5312C23.5005 16.2551 23.7244 16.0312 24.0005 16.0312Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M3.50031 15.0002V5.00024H4.50031V15.0002H3.50031Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.50031 12.0002V5.00024H6.50031V12.0002H5.50031Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.50031 12.0002V5.00024H8.50031V12.0002H7.50031Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.5003 12.0002V5.00024H11.5003V12.0002H10.5003Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.5003 12.0002V5.00024H13.5003V12.0002H12.5003Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M14.5003 12.0002V5.00024H15.5003V12.0002H14.5003Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.5003 12.0002V5.00024H17.5003V12.0002H16.5003Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M18.5003 12.0002V5.00024H19.5003V12.0002H18.5003Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.5003 15.0002V5.00024H21.5003V15.0002H20.5003Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.50031 13.0002H5.50031V14.0002H6.50031V13.0002Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.50031 13.0002H7.50031V14.0002H8.50031V13.0002Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.5003 13.0002H10.5003V14.0002H11.5003V13.0002Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.5003 13.0002H12.5003V14.0002H13.5003V13.0002Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.5003 13.0002H14.5003V14.0002H15.5003V13.0002Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.5003 13.0002H16.5003V14.0002H17.5003V13.0002Z" fill="#333333"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.5003 13.0002H18.5003V14.0002H19.5003V13.0002Z" fill="#333333"/>
+</symbol>
 </svg>

package/src/hooks/useEditState.js

@@ -190,8 +190,18 @@ export const useDynamicEditState = (entityId, sectionName, extendedValidationRul
 		};
 
 		const resetEditState = (path = []) => {
-			const fullPath = !path.length ? [...keys] : [...keys, "value", ...getValidPath(path)];
-			dispatchWithModulesData(setEditModelField, [fullPath, initialValue, initialValue, entityId, sectionName]);
+			const pathToField = getValidPath(path);
+			const fullPath = !path.length ? [...keys] : [...keys, "value", ...pathToField];
+
+			const initialFieldValue = !path.length ? initialValue : get(initialValue, pathToField);
+
+			dispatchWithModulesData(setEditModelField, [
+				fullPath,
+				initialFieldValue,
+				initialFieldValue,
+				entityId,
+				sectionName,
+			]);
 		};
 
 		const isEditStateValid = (value, path = [], errorTypes = [], dependencies = {}) => {

package/src/hooks/useEditState.test.js

@@ -1171,7 +1171,7 @@ describe("useDynamicEditState", () => {
 		expect(useDispatchWithModulesDataSpy, "to have a call satisfying", {
 			args: [
 				setEditModelField,
-				[["field", "value", "c", "d"], initialFieldValue, initialFieldValue, entityId, sectionName],
+				[["field", "value", "c", "d"], initialFieldValue.c.d, initialFieldValue.c.d, entityId, sectionName],
 			],
 		});
 

package/src/hooks/useLabelMessage.test.js

@@ -5,12 +5,14 @@ import Immutable from "immutable";
 import sinon from "sinon";
 import { messageContainsValues } from "./useLabelMessage";
 import useLabelMessage from "./useLabelMessage";
+import { createMuiTheme, extractMessages, TestWrapper } from "../utils/testUtils";
 
 const TestComp = ({ message, buildMessage }) => {
 	const [msgResult, missingValues = false] = useLabelMessage(message, buildMessage);
 
 	return <div missing-values={missingValues ? 1 : 0}>{msgResult}</div>;
 };
+const theme = createMuiTheme();
 
 describe("useLabelMessage", () => {
 	let store, state;
@@ -45,12 +47,18 @@ describe("useLabelMessage", () => {
 			values: { aValue: "testValue" },
 		};
 
+		const messages = extractMessages({ "test.msg": message });
+
 		return expect(
-			<Provider store={store}>
-				<IntlProvider locale="en">
-					<TestComp message={message} />
-				</IntlProvider>
-			</Provider>,
+			<TestWrapper
+				provider={{ store }}
+				intlProvider={{ messages }}
+				memoryRouter
+				stylesProvider
+				muiThemeProvider={{ theme }}
+			>
+				<TestComp message={message} />
+			</TestWrapper>,
 			"when mounted",
 			"to satisfy",
 			<div>Test message testValue</div>,
@@ -65,11 +73,9 @@ describe("useLabelMessage", () => {
 		};
 
 		return expect(
-			<Provider store={store}>
-				<IntlProvider locale="en">
-					<TestComp message={message} />
-				</IntlProvider>
-			</Provider>,
+			<TestWrapper provider={{ store }} intlProvider memoryRouter stylesProvider muiThemeProvider={{ theme }}>
+				<TestComp message={message} />
+			</TestWrapper>,
 			"when mounted",
 			"to satisfy",
 			<div missing-values={1}></div>,

package/src/reducers/navigation.js

@@ -6,6 +6,7 @@ import {
 	SET_HREF_CONFIG,
 	SET_CURRENT_PREPEND_PATH,
 	SET_CLOSING_TAB_HANDLER_ACTIONS,
+	REMOVE_MODULE_TABS,
 } from "../actions/navigation";
 import { getAllAfterPrependHref } from "../utils/parseHelper";
 import { APPLICATION_SCOPE_HAS_CHANGED } from "../actions/scopes";
@@ -73,6 +74,29 @@ const navigationReducer = (state = initialState, action) => {
 					s.deleteIn(["tabIndex", remainingSection]);
 				}
 			});
+		case REMOVE_MODULE_TABS:
+			return state.withMutations(s => {
+				const { module } = action.payload;
+
+				s.deleteIn(["moduleTabs", module]);
+				s.deleteIn(["closingTabsHandlerActions", module]);
+
+				s.get("tabIndex")
+					.keySeq()
+					.forEach(key => {
+						if (key.startsWith(module)) {
+							s.deleteIn(["tabIndex", key]);
+						}
+					});
+
+				s.get("mappedHrefs")
+					.keySeq()
+					.forEach(key => {
+						if (key.startsWith(module)) {
+							s.deleteIn(["mappedHrefs", key]);
+						}
+					});
+			});
 		case SET_HREF_CONFIG:
 			return state.set("config", Immutable.fromJS(action.payload));
 		case SET_CURRENT_PREPEND_PATH:

package/src/reducers/navigation.test.js

@@ -6,6 +6,7 @@ import {
 	setHrefConfig,
 	setCurrentPrependPath,
 	setClosingTabHandlerActions,
+	removeModuleTabs,
 } from "../actions/navigation";
 import reducer from "./navigation";
 import { applicationScopeHasChanged } from "../actions/scopes";
@@ -295,6 +296,43 @@ describe("Navigation reducer", () => {
 		});
 	});
 
+	describe("REMOVE_MODULE_TABS", () => {
+		it("can remove module tabs", () => {
+			const oldState = Immutable.fromJS({
+				moduleTabs: { test: ["test/new", "test/old"], another: [1, 2, 3] },
+				closingTabsHandlerActions: { test: [0, 1, 2], another: [] },
+				tabIndex: { "test/old": {}, "test/new": {}, test: {}, another: {} },
+				mappedHrefs: { "test/old": {}, "test/new": {}, test: {}, another2: {} },
+				config: { prependPath: "/:scope/" },
+			});
+			const action = removeModuleTabs("test");
+			const newState = reducer(oldState, action);
+			return expect(newState, "not to be", oldState).and(
+				"to equal",
+				Immutable.fromJS({
+					moduleTabs: { another: [1, 2, 3] },
+					closingTabsHandlerActions: { another: [] },
+					tabIndex: { another: {} },
+					mappedHrefs: { another2: {} },
+					config: { prependPath: "/:scope/" },
+				}),
+			);
+		});
+
+		it("does nothing if the module to remove is not found", () => {
+			const oldState = Immutable.fromJS({
+				moduleTabs: { test: ["test/new", "test/old"], another: [1, 2, 3] },
+				closingTabsHandlerActions: { test: [0, 1, 2], another: [] },
+				tabIndex: { "test/old": {}, "test/new": {}, test: {}, another: {} },
+				mappedHrefs: { "test/old": {}, "test/new": {}, test: {}, another2: {} },
+				config: { prependPath: "/:scope/" },
+			});
+			const action = removeModuleTabs("unknown");
+			const newState = reducer(oldState, action);
+			return expect(newState, "to be", oldState);
+		});
+	});
+
 	describe("SET_HREF_CONFIG", () => {
 		it("update href config in navigation state", () => {
 			const oldState = Immutable.fromJS({

package/src/reducers/request.js

@@ -11,6 +11,10 @@ export const LOGOUT = "logout";
 
 const requestReducer = (state = initialState, action) => {
 	if (action.type.endsWith("_REQUEST")) {
+		if (safeGet(action, "meta", "addToActiveRequests") === false) {
+			// this flag should only be used by requests triggered by a background process to avoid the spinner
+			return state;
+		}
 		const requestName = action.type.replace(/_REQUEST$/, "");
 		return state.setIn(["actives", requestName], true);
 	}

package/src/reducers/request.test.js

@@ -28,6 +28,17 @@ describe("Request reducer", () => {
 		);
 	});
 
+	it("ignore activity flag when a request is started because addToActiveRequests is false", () => {
+		const oldState = Immutable.fromJS({
+			actives: {
+				SOME_FLAG: true,
+			},
+		});
+		const action = { type: "TEST_THIS_REQUEST", meta: { addToActiveRequests: false } };
+		const newState = reducer(oldState, action);
+		expect(newState, "to be", oldState);
+	});
+
 	it("clears activity and logout flag when a request succeeds", () => {
 		const oldState = Immutable.fromJS({
 			actives: {

package/src/reducers/tasks.js

@@ -0,0 +1,56 @@
+import Immutable from "immutable";
+import { safeGet } from "../utils";
+import {
+	GET_TASK_LIST_SUCCESS,
+	DELETE_TASK_REQUEST,
+	GET_TASK_LOG_SUCCESS,
+	CLEAR_TASK_LOG,
+	GET_TASKINFO_SUCCESS,
+} from "../actions/tasks";
+import { compareObjectProperty } from "../utils/propertyHelper";
+
+const initialState = Immutable.fromJS({
+	tasks: [],
+	taskInfos: {},
+	logs: {},
+});
+
+const tasks = (state = initialState, action) => {
+	switch (action.type) {
+		case GET_TASKINFO_SUCCESS:
+			return state.setIn(["taskInfos", action.payload.taskId], Immutable.fromJS(action.payload));
+		case GET_TASK_LIST_SUCCESS:
+			return state.set(
+				"tasks",
+				Immutable.fromJS(action.payload.sort((a, b) => compareObjectProperty(a, b, "created"))),
+			);
+		case DELETE_TASK_REQUEST:
+			const deleteTaskId = safeGet(action, "meta", "taskId");
+
+			return state.withMutations(s => {
+				s.set(
+					"tasks",
+					s.get("tasks").filter(task => task.get("taskId") !== deleteTaskId),
+				);
+				s.deleteIn(["logs", deleteTaskId]);
+				s.deleteIn(["taskInfos", deleteTaskId]);
+			});
+		case GET_TASK_LOG_SUCCESS:
+			const logTaskId = safeGet(action, "meta", "taskId");
+			if (action.payload?.length > 0) {
+				return state.setIn(
+					["logs", logTaskId],
+					Immutable.fromJS(action.payload.sort((a, b) => compareObjectProperty(a, b, "executionTime"))),
+				);
+			} else {
+				return state.deleteIn(["logs", logTaskId]);
+			}
+		case CLEAR_TASK_LOG:
+			const taskId = safeGet(action, "meta", "taskId");
+			return state.deleteIn(["logs", taskId]);
+		default:
+			return state;
+	}
+};
+
+export default tasks;