orc-shared 1.4.0 → 1.5.0-dev.10

package/dist/utils/urlHelper.js

@@ -2,39 +2,31 @@
 
 exports.__esModule = true;
 exports.tryGetNewEntityIdKey = exports.resolveEntityId = exports.getValueFromUrlByKey = exports.NEW_ENTITY_URL_KEY = 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);
 })();
-
 function _createForOfIteratorHelperLoose(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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 getValueFromUrlByKey = function getValueFromUrlByKey(url, path, key) {
-  var valuesFromUrl = url.split("/"); // remove the regex of the parameters, the part between parentheses (path to regex syntax)
+  var valuesFromUrl = url.split("/");
 
+  // remove the regex of the parameters, the part between parentheses (path to regex syntax)
   var keysFromPath = path.replace(/(\([^/]+?\))/g, "").split("/");
   var keyIndex = keysFromPath.indexOf(key);
   return valuesFromUrl[keyIndex];
 };
-
 exports.getValueFromUrlByKey = getValueFromUrlByKey;
 var NEW_ENTITY_URL_KEY = "new";
 /* expected url formats for new mode:
@@ -43,13 +35,10 @@ var NEW_ENTITY_URL_KEY = "new";
 	/new{number} => new{number}
 	/new{number}/section => new{number}
 */
-
 exports.NEW_ENTITY_URL_KEY = NEW_ENTITY_URL_KEY;
-
 var tryGetNewEntityIdKey = function tryGetNewEntityIdKey(url) {
   var valuesFromUrl = url.split("/");
   if (valuesFromUrl.length < 2) return;
-
   for (var _iterator = _createForOfIteratorHelperLoose(valuesFromUrl), _step; !(_step = _iterator()).done;) {
     var section = _step.value;
     if (section === NEW_ENTITY_URL_KEY) return section;
@@ -57,55 +46,41 @@ var tryGetNewEntityIdKey = function tryGetNewEntityIdKey(url) {
     if (match) return match[1];
   }
 };
-
 exports.tryGetNewEntityIdKey = tryGetNewEntityIdKey;
-
 var resolveEntityId = function resolveEntityId(url, path, entityIdKey) {
   var newKey = tryGetNewEntityIdKey(url);
   var key = entityIdKey === newKey ? entityIdKey : ":".concat(entityIdKey);
   return getValueFromUrlByKey(url, path, key);
 };
-
 exports.resolveEntityId = resolveEntityId;
 ;
-
 (function () {
   var reactHotLoader = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default : undefined;
-
   if (!reactHotLoader) {
     return;
   }
-
   reactHotLoader.register(getValueFromUrlByKey, "getValueFromUrlByKey", "/home/vsts/work/1/s/src/utils/urlHelper.js");
   reactHotLoader.register(NEW_ENTITY_URL_KEY, "NEW_ENTITY_URL_KEY", "/home/vsts/work/1/s/src/utils/urlHelper.js");
   reactHotLoader.register(tryGetNewEntityIdKey, "tryGetNewEntityIdKey", "/home/vsts/work/1/s/src/utils/urlHelper.js");
   reactHotLoader.register(resolveEntityId, "resolveEntityId", "/home/vsts/work/1/s/src/utils/urlHelper.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(getValueFromUrlByKey, "getValueFromUrlByKey", "/home/vsts/work/1/s/src/utils/urlHelper.js");
   reactHotLoader.register(NEW_ENTITY_URL_KEY, "NEW_ENTITY_URL_KEY", "/home/vsts/work/1/s/src/utils/urlHelper.js");
   reactHotLoader.register(tryGetNewEntityIdKey, "tryGetNewEntityIdKey", "/home/vsts/work/1/s/src/utils/urlHelper.js");
   reactHotLoader.register(resolveEntityId, "resolveEntityId", "/home/vsts/work/1/s/src/utils/urlHelper.js");
 })();
-
 ;
-
 (function () {
   var leaveModule = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.leaveModule : undefined;
   leaveModule && leaveModule(module);

package/dist/whyDidYouRerender.js

@@ -1,21 +1,16 @@
 "use strict";
 
 var _react = _interopRequireDefault(require("react"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
-
 var __signature__ = typeof reactHotLoaderGlobal !== 'undefined' ? reactHotLoaderGlobal.default.signature : function (a) {
   return a;
 };
-
 // If you want to investigate rerenderer of components, import that file before "react-hot-loader", usually in App.js
 if (process.env.NODE_ENV === "development") {
   var whyDidYouRender = require("@welldone-software/why-did-you-render");
-
   whyDidYouRender(_react.default, {
     trackAllPureComponents: true
   });

package/package.json

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

package/src/components/Routing/SubPage.js

@@ -78,9 +78,24 @@ export const SubPage = ({ config, match, location, history, root, modulePrependP
 						variant={action.isPrimary ? "contained" : "outlined"}
 						color={action.isPrimary ? "primary" : "default"}
 						disableElevation={action.isPrimary}
+						disabled={action.disabled}
 						onClick={e => {
-							action.handler && action.handler(e);
-							closeSubPage();
+							if (!action.handler) {
+								closeSubPage();
+								return;
+							}
+
+							let actionHandlerResult = action.handler(e);
+							if (typeof actionHandlerResult === "object") {
+								// promise
+								actionHandlerResult.then(actionResult => {
+									if (action.validateBeforeClose && !actionResult) return;
+									closeSubPage();
+								});
+							} else {
+								if (action.validateBeforeClose && !actionHandlerResult) return;
+								closeSubPage();
+							}
 						}}
 					>
 						<FormattedMessage {...action.label} />

package/src/components/Routing/SubPage.test.js

@@ -180,7 +180,6 @@ describe("SubPage", () => {
 		expect(history.push, "to have calls satisfying", [{ args: ["/foo"] }]);
 		expect(dispatch, "to have calls satisfying", [{ args: [mapHref("/foo", "/foo")] }]);
 	});
-
 	it("renders action panel passed from props", () => {
 		const actions = () => [{ label: sharedMessages.cancel }, { label: sharedMessages.applyChanges }];
 
@@ -262,4 +261,172 @@ describe("SubPage", () => {
 		expect(applyButtonClassName, "to contain", "MuiButton-containedPrimary");
 		expect(someEvent, "was called");
 	});
+
+	it("Do not close when clicking action button has validateBeforeClose and result is false", () => {
+		const applyHandler = () => false;
+
+		const actions = () => [
+			{ label: sharedMessages.applyChanges, isPrimary: true, handler: applyHandler, validateBeforeClose: true },
+		];
+
+		const component = (
+			<TestWrapper provider={{ store }} intlProvider={intlProvider} stylesProvider muiThemeProvider={{ theme }}>
+				<div>
+					<div id="outer" />
+					<Router history={history}>
+						<Route
+							path="/foo/bar"
+							render={route => (
+								<SubPage
+									config={{
+										component: InnerView,
+										set: true,
+										title: "Item Details",
+										componentProps: { actionPanel: actions },
+									}}
+									root="/foo"
+									path="/foo/bar"
+									{...route}
+								/>
+							)}
+						/>
+					</Router>
+				</div>
+			</TestWrapper>
+		);
+		const mountedComponent = mount(component);
+
+		const applyButton = mountedComponent.find("button").at(0);
+
+		applyButton.invoke("onClick")();
+		expect(history.push, "not to have calls satisfying", [{ args: ["/foo"] }]);
+		expect(dispatch, "not to have calls satisfying", [{ args: [mapHref("/foo", "/foo")] }]);
+	});
+
+	it("Close when clicking action button has validateBeforeClose and result is true", () => {
+		const applyHandler = () => true;
+
+		const actions = () => [
+			{ label: sharedMessages.applyChanges, isPrimary: true, handler: applyHandler, validateBeforeClose: true },
+		];
+
+		const component = (
+			<TestWrapper provider={{ store }} intlProvider={intlProvider} stylesProvider muiThemeProvider={{ theme }}>
+				<div>
+					<div id="outer" />
+					<Router history={history}>
+						<Route
+							path="/foo/bar"
+							render={route => (
+								<SubPage
+									config={{
+										component: InnerView,
+										set: true,
+										title: "Item Details",
+										componentProps: { actionPanel: actions },
+									}}
+									root="/foo"
+									path="/foo/bar"
+									{...route}
+								/>
+							)}
+						/>
+					</Router>
+				</div>
+			</TestWrapper>
+		);
+		const mountedComponent = mount(component);
+
+		const applyButton = mountedComponent.find("button").at(0);
+
+		applyButton.invoke("onClick")();
+		expect(history.push, "to have calls satisfying", [{ args: ["/foo"] }]);
+		expect(dispatch, "to have calls satisfying", [{ args: [mapHref("/foo", "/foo")] }]);
+	});
+
+	it("Close when clicking action button has validateBeforeClose and result as promise with true", () => {
+		const applyHandler = () => Promise.resolve(true);
+
+		const actions = () => [
+			{ label: sharedMessages.applyChanges, isPrimary: true, handler: applyHandler, validateBeforeClose: true },
+		];
+
+		const component = (
+			<TestWrapper provider={{ store }} intlProvider={intlProvider} stylesProvider muiThemeProvider={{ theme }}>
+				<div>
+					<div id="outer" />
+					<Router history={history}>
+						<Route
+							path="/foo/bar"
+							render={route => (
+								<SubPage
+									config={{
+										component: InnerView,
+										set: true,
+										title: "Item Details",
+										componentProps: { actionPanel: actions },
+									}}
+									root="/foo"
+									path="/foo/bar"
+									{...route}
+								/>
+							)}
+						/>
+					</Router>
+				</div>
+			</TestWrapper>
+		);
+		const mountedComponent = mount(component);
+
+		const applyButton = mountedComponent.find("button").at(0);
+
+		applyButton.invoke("onClick")();
+		setTimeout(() => {
+			expect(history.push, "to have calls satisfying", [{ args: ["/foo"] }]);
+			expect(dispatch, "to have calls satisfying", [{ args: [mapHref("/foo", "/foo")] }]);
+		}, 200);
+	});
+
+	it("Do not Close when clicking action button has validateBeforeClose and result as promise with false", () => {
+		const applyHandler = () => Promise.resolve(false);
+
+		const actions = () => [
+			{ label: sharedMessages.applyChanges, isPrimary: true, handler: applyHandler, validateBeforeClose: true },
+		];
+
+		const component = (
+			<TestWrapper provider={{ store }} intlProvider={intlProvider} stylesProvider muiThemeProvider={{ theme }}>
+				<div>
+					<div id="outer" />
+					<Router history={history}>
+						<Route
+							path="/foo/bar"
+							render={route => (
+								<SubPage
+									config={{
+										component: InnerView,
+										set: true,
+										title: "Item Details",
+										componentProps: { actionPanel: actions },
+									}}
+									root="/foo"
+									path="/foo/bar"
+									{...route}
+								/>
+							)}
+						/>
+					</Router>
+				</div>
+			</TestWrapper>
+		);
+		const mountedComponent = mount(component);
+
+		const applyButton = mountedComponent.find("button").at(0);
+
+		applyButton.invoke("onClick")();
+		setTimeout(() => {
+			expect(history.push, "not to have calls satisfying", [{ args: ["/foo"] }]);
+			expect(dispatch, "not to have calls satisfying", [{ args: [mapHref("/foo", "/foo")] }]);
+		}, 200);
+	});
 });

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",

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/selectors/authentication.js

@@ -42,6 +42,19 @@ export const hasEditorPermissionsForScope = (scope, roleGroup) =>
 		hasRolePermissions(appRolesClaims, scope, platformRoles.Editor, scopes),
 	);
 
+export const hasPermissionsForRole = (roleGroup, role) =>
+	createSelector(
+		selectGroupRolesClaims(roleGroup),
+		getCurrentScope,
+		getScopesSelector,
+		(appRolesClaims, currentScope, scopes) => hasRolePermissions(appRolesClaims, currentScope, role, scopes),
+	);
+
+export const hasPermissionsForRoleAndScope = (scope, roleGroup, role) =>
+	createSelector(selectGroupRolesClaims(roleGroup), getScopesSelector, (appRolesClaims, scopes) =>
+		hasRolePermissions(appRolesClaims, scope, role, scopes),
+	);
+
 export const hasAdministratorPermissions = roleGroup =>
 	createSelector(
 		selectGroupRolesClaims(roleGroup),