orc-shared 1.5.0-dev.3 → 1.5.0-dev.4

package/dist/components/Routing/SubPage.js

@@ -107,7 +107,8 @@ var SubPage = function SubPage(_ref) {
         disableElevation: action.isPrimary,
         disabled: action.disabled,
         onClick: function onClick(e) {
-          action.handler && action.handler(e);
+          var actionHandlerResult = action.handler && action.handler(e);
+          if (action.handler && action.validateBeforeClose && !actionHandlerResult) return;
           closeSubPage();
         }
       }, /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, action.label));

package/package.json

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

package/src/components/Routing/SubPage.js

@@ -80,7 +80,8 @@ export const SubPage = ({ config, match, location, history, root, modulePrependP
 						disableElevation={action.isPrimary}
 						disabled={action.disabled}
 						onClick={e => {
-							action.handler && action.handler(e);
+							let actionHandlerResult = action.handler && action.handler(e);
+							if (action.handler && action.validateBeforeClose && !actionHandlerResult) return;
 							closeSubPage();
 						}}
 					>

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,86 @@ 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")] }]);
+	});
 });