@steroidsjs/core 3.0.0-beta.112 → 3.0.0-beta.114

package/actions/router.js

@@ -2,6 +2,7 @@
 exports.__esModule = true;
 exports.goToParent = exports.goToRoute = exports.initParams = exports.initRoutes = exports.ROUTER_SET_DATA = exports.ROUTER_SET_PARAMS = exports.ROUTER_INIT_ROUTES = void 0;
 var connected_react_router_1 = require("connected-react-router");
+var path_to_regexp_1 = require("path-to-regexp");
 exports.ROUTER_INIT_ROUTES = 'ROUTER_INIT_ROUTES';
 exports.ROUTER_SET_PARAMS = 'ROUTER_SET_PARAMS';
 exports.ROUTER_SET_DATA = 'ROUTER_SET_DATA';
@@ -15,6 +16,20 @@ var initParams = function (params) { return ({
     params: params
 }); };
 exports.initParams = initParams;
+// Include in the result only those parameters that are present as route parameters in the path
+// For example, given the path '/users/:id' and the parameters { id: 1, page: 3, totalPages: 10 }, the function will return { id: 1 }.
+var filterParamsForPath = function (path, params) {
+    if (!path) {
+        return params;
+    }
+    var parsedPath = (0, path_to_regexp_1.parse)(path);
+    return parsedPath.reduce(function (filteredParams, param) {
+        if (typeof param === 'object' && params[param.name]) {
+            filteredParams[param.name] = params[param.name];
+        }
+        return filteredParams;
+    }, {});
+};
 var goToRoute = function (routeId, params, isReplace) {
     if (params === void 0) { params = null; }
     if (isReplace === void 0) { isReplace = false; }
@@ -27,8 +42,10 @@ var goToRoute = function (routeId, params, isReplace) {
         var getRouteProp = require('../reducers/router').getRouteProp;
         var buildUrl = require('../reducers/router').buildUrl;
         var path = getRouteProp(getState(), routeId, 'path');
-        var method = isReplace ? connected_react_router_1.replace : connected_react_router_1.push;
-        return dispatch(method(buildUrl(path, params)));
+        var filteredParams = filterParamsForPath(path, params);
+        var routeUrl = buildUrl(path, filteredParams);
+        var reduxAction = isReplace ? (0, connected_react_router_1.replace)(routeUrl) : (0, connected_react_router_1.push)(routeUrl);
+        return dispatch(reduxAction);
     };
 };
 exports.goToRoute = goToRoute;