orc-shared 1.6.0-dev.1 → 1.6.0-dev.2

package/dist/components/Routing/Page.js

@@ -8,6 +8,7 @@ var _withErrorBoundary = _interopRequireDefault(require("../../hocs/withErrorBou
 var _FullPage = _interopRequireDefault(require("./FullPage"));
 var _SubPage = _interopRequireDefault(require("./SubPage"));
 var _withWaypointing = _interopRequireDefault(require("./withWaypointing"));
+var _urlPattern = _interopRequireDefault(require("url-pattern"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -45,6 +46,7 @@ var Page = function Page(_ref) {
   var WrappedView = (0, _react.useMemo)(function () {
     return (0, _withErrorBoundary.default)(path)((0, _withWaypointing.default)(View, isVisible));
   }, [path, View, isVisible]);
+  var parentUrlPattern = new _urlPattern.default(path);
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactRouter.Switch, null, Object.entries(pages).map(function (_ref2) {
     var _ref3 = _slicedToArray(_ref2, 2),
       subpath = _ref3[0],
@@ -83,7 +85,8 @@ var Page = function Page(_ref) {
       render: function render(route) {
         return /*#__PURE__*/_react.default.createElement(_SubPage.default, _extends({
           root: path,
-          config: config
+          config: config,
+          parentUrlPattern: parentUrlPattern
         }, route, {
           modulePrependPath: modulePrependPath
         }));

package/dist/components/Routing/SegmentPage.js

@@ -230,6 +230,8 @@ var SegmentPage = function SegmentPage(_ref4) {
       }));
     }
     if (config.subpages) {
+      var parentUrl = path + segpath;
+      var parentUrlPattern = new _urlPattern.default(parentUrl);
       subpages.push.apply(subpages, Object.entries(config.subpages).map(function (_ref9) {
         var _ref10 = _slicedToArray(_ref9, 2),
           subpath = _ref10[0],
@@ -241,7 +243,8 @@ var SegmentPage = function SegmentPage(_ref4) {
           render: function render(route) {
             return /*#__PURE__*/_react.default.createElement(_SubPage.default, _extends({
               root: path,
-              config: config
+              config: config,
+              parentUrlPattern: parentUrlPattern
             }, route, {
               modulePrependPath: modulePrependPath
             }));

package/dist/components/Routing/SubPage.js

@@ -52,7 +52,8 @@ var SubPage = function SubPage(_ref) {
     location = _ref.location,
     history = _ref.history,
     root = _ref.root,
-    modulePrependPath = _ref.modulePrependPath;
+    modulePrependPath = _ref.modulePrependPath,
+    parentUrlPattern = _ref.parentUrlPattern;
   var classes = useStyles();
   var dispatch = (0, _reactRedux.useDispatch)();
   var View = config.component,
@@ -60,15 +61,13 @@ var SubPage = function SubPage(_ref) {
   var pattern = new _urlPattern.default(root);
   var baseHref = pattern.stringify(match.params);
   var path = location.pathname;
-  var basePathArr = path.split("/");
-  basePathArr.pop();
-  var basePath = basePathArr.join("/");
   var WrappedView = (0, _react.useMemo)(function () {
     return (0, _withErrorBoundary.default)(path)((0, _withWaypointing.default)(View));
   }, [path, View]);
   var closeSubPage = function closeSubPage() {
-    history.push(basePath);
-    dispatch((0, _navigation.mapHref)(basePath, basePath));
+    var parentHref = parentUrlPattern.stringify(match.params);
+    history.push(parentHref);
+    dispatch((0, _navigation.mapHref)(parentHref, parentHref));
   };
   var message = /*#__PURE__*/_react.default.createElement(WrappedView, _extends({
     match: match,

package/package.json

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

package/src/components/Routing/Page.js

@@ -4,9 +4,12 @@ import withErrorBoundary from "../../hocs/withErrorBoundary";
 import FullPage from "./FullPage";
 import SubPage from "./SubPage";
 import withWaypointing from "./withWaypointing";
+import UrlPattern from "url-pattern";
 
 const Page = ({ component: View, path, pages = {}, subpages = {}, modulePrependPath, isVisible = true }) => {
 	const WrappedView = useMemo(() => withErrorBoundary(path)(withWaypointing(View, isVisible)), [path, View, isVisible]);
+	const parentUrlPattern = new UrlPattern(path);
+
 	return (
 		<React.Fragment>
 			<Switch>
@@ -38,7 +41,15 @@ const Page = ({ component: View, path, pages = {}, subpages = {}, modulePrependP
 					<Route
 						key={subpath}
 						path={path + subpath}
-						render={route => <SubPage root={path} config={config} {...route} modulePrependPath={modulePrependPath} />}
+						render={route => (
+							<SubPage
+								root={path}
+								config={config}
+								parentUrlPattern={parentUrlPattern}
+								{...route}
+								modulePrependPath={modulePrependPath}
+							/>
+						)}
 					/>
 				))}
 			</Switch>

package/src/components/Routing/SegmentPage.js

@@ -197,6 +197,9 @@ const SegmentPage = ({
 			);
 		}
 		if (config.subpages) {
+			const parentUrl = path + segpath;
+			const parentUrlPattern = new UrlPattern(parentUrl);
+
 			subpages.push(
 				...Object.entries(config.subpages).map(([subpath, config]) => {
 					const pagePath = segpath + subpath;
@@ -204,7 +207,15 @@ const SegmentPage = ({
 						<Route
 							key={pagePath}
 							path={path + pagePath}
-							render={route => <SubPage root={path} config={config} {...route} modulePrependPath={modulePrependPath} />}
+							render={route => (
+								<SubPage
+									root={path}
+									config={config}
+									parentUrlPattern={parentUrlPattern}
+									{...route}
+									modulePrependPath={modulePrependPath}
+								/>
+							)}
 						/>
 					);
 				}),

package/src/components/Routing/SubPage.js

@@ -20,22 +20,19 @@ const useStyles = makeStyles(theme => ({
 	},
 }));
 
-export const SubPage = ({ config, match, location, history, root, modulePrependPath }) => {
+export const SubPage = ({ config, match, location, history, root, modulePrependPath, parentUrlPattern }) => {
 	const classes = useStyles();
 	const dispatch = useDispatch();
 	let { component: View, ...props } = config;
 	const pattern = new UrlPattern(root);
 	const baseHref = pattern.stringify(match.params);
-
 	const path = location.pathname;
 
-	const basePathArr = path.split("/");
-	basePathArr.pop();
-	const basePath = basePathArr.join("/");
 	const WrappedView = useMemo(() => withErrorBoundary(path)(withWaypointing(View)), [path, View]);
 	const closeSubPage = () => {
-		history.push(basePath);
-		dispatch(mapHref(basePath, basePath));
+		const parentHref = parentUrlPattern.stringify(match.params);
+		history.push(parentHref);
+		dispatch(mapHref(parentHref, parentHref));
 	};
 
 	const message = (

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

@@ -13,6 +13,7 @@ import Button from "@material-ui/core/Button";
 import translations from "~/translations/en-US.json";
 import { TestWrapper, createMuiTheme } from "../../utils/testUtils";
 import sharedMessages from "../../sharedMessages";
+import UrlPattern from "url-pattern";
 
 const InnerView = ({ theme, pathname, search, mapFrom, match, location, routeIsAligned, set }) => (
 	<PropStruct
@@ -92,6 +93,7 @@ describe("SubPage", () => {
 									config={{ component: InnerView, set: true, title: "Item Details" }}
 									root="/foo"
 									path="/foo/bar"
+									parentUrlPattern={new UrlPattern("/foo")}
 									{...route}
 								/>
 							)}
@@ -140,6 +142,7 @@ describe("SubPage", () => {
 									config={{ component: InnerView, set: true, title: sharedMessages.confirmation }}
 									root="/foo"
 									path="/foo/bar"
+									parentUrlPattern={new UrlPattern("/foo")}
 									{...route}
 								/>
 							)}
@@ -164,6 +167,7 @@ describe("SubPage", () => {
 									config={{ component: InnerView, set: true, title: "Item Details" }}
 									root="/foo"
 									path="/foo/bar"
+									parentUrlPattern={new UrlPattern("/foo")}
 									{...route}
 								/>
 							)}
@@ -180,6 +184,42 @@ describe("SubPage", () => {
 		expect(history.push, "to have calls satisfying", [{ args: ["/foo"] }]);
 		expect(dispatch, "to have calls satisfying", [{ args: [mapHref("/foo", "/foo")] }]);
 	});
+	it("closing the dialog navigate to the parentUrlPattern with parameters", () => {
+		history = createMemoryHistory({ initialEntries: ["/foo/bar/123/456"] });
+		sinon.spy(history, "push");
+		history.push.named("history.push");
+		dispatch.resetHistory();
+
+		const component = (
+			<TestWrapper provider={{ store }} intlProvider={intlProvider} stylesProvider muiThemeProvider={{ theme }}>
+				<div>
+					<div id="outer" />
+					<Router history={history}>
+						<Route
+							path="/foo/bar/:parentId/:id"
+							render={route => (
+								<SubPage
+									config={{ component: InnerView, set: true, title: "Item Details" }}
+									root="/foo/bar/:parentId/:id"
+									path="/foo/bar/123/456"
+									parentUrlPattern={new UrlPattern("/foo/bar/:parentId")}
+									{...route}
+								/>
+							)}
+						/>
+					</Router>
+				</div>
+			</TestWrapper>
+		);
+		const mountedComponent = mount(component);
+
+		const closeButton = mountedComponent.find("button").at(0);
+
+		closeButton.invoke("onClick")();
+		expect(history.push, "to have calls satisfying", [{ args: ["/foo/bar/123"] }]);
+		expect(dispatch, "to have a call satisfying", { args: [mapHref("/foo/bar/123", "/foo/bar/123")] });
+	});
+
 	it("renders action panel passed from props", () => {
 		const actions = () => [{ label: sharedMessages.cancel }, { label: sharedMessages.applyChanges }];
 
@@ -200,6 +240,7 @@ describe("SubPage", () => {
 									}}
 									root="/foo"
 									path="/foo/bar"
+									parentUrlPattern={new UrlPattern("/foo")}
 									{...route}
 								/>
 							)}
@@ -242,6 +283,7 @@ describe("SubPage", () => {
 									}}
 									root="/foo"
 									path="/foo/bar"
+									parentUrlPattern={new UrlPattern("/foo")}
 									{...route}
 								/>
 							)}
@@ -286,6 +328,7 @@ describe("SubPage", () => {
 									}}
 									root="/foo"
 									path="/foo/bar"
+									parentUrlPattern={new UrlPattern("/foo")}
 									{...route}
 								/>
 							)}
@@ -327,6 +370,7 @@ describe("SubPage", () => {
 									}}
 									root="/foo"
 									path="/foo/bar"
+									parentUrlPattern={new UrlPattern("/foo")}
 									{...route}
 								/>
 							)}
@@ -368,6 +412,7 @@ describe("SubPage", () => {
 									}}
 									root="/foo"
 									path="/foo/bar"
+									parentUrlPattern={new UrlPattern("/foo")}
 									{...route}
 								/>
 							)}
@@ -411,6 +456,7 @@ describe("SubPage", () => {
 									}}
 									root="/foo"
 									path="/foo/bar"
+									parentUrlPattern={new UrlPattern("/foo")}
 									{...route}
 								/>
 							)}