parse params with path-to-regexp

dvajs · Aug 30, 2016 · 3314c7c · 3314c7c
1 parent baba191
commit 3314c7c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/models/item/index.js b/src/models/item/index.js
@@ -66,11 +66,14 @@ export default {
         });
       }
 
-      return history.listen(({ pathname }, { params }) => {
+      return history.listen(({ pathname }) => {
         for (const type of ITEM_TYPES) {
-          if (pathToRegexp(`/${type}/:page?`).test(pathname)) {
+          const match = pathToRegexp(`/${type}/:page?`).exec(pathname);
+          if (match) {
+            const page = match[1];
+
             // fetch
-            fetchList(type, params.page);
+            fetchList(type, page);
 
             // watch
             if (activeType !== type) {

diff --git a/src/models/user/index.js b/src/models/user/index.js
@@ -8,18 +8,20 @@ export default {
   },
   subscriptions: {
     setup({ dispatch, history }) {
-      history.listen(({ pathname }, { params }) => {
-        if (pathToRegexp('/user/:userId').test(pathname)) {
+      history.listen(({ pathname }) => {
+        const match = pathToRegexp('/user/:userId').exec(pathname);
+        if (match) {
+          const userId = match[1];
           dispatch({
-            type: 'user/fetchUser',
-            payload: params.userId,
+            type: 'fetchUser',
+            payload: userId,
           });
         }
       });
     },
   },
   effects: {
-    *fetchUser({ payload: id }) {
+    *fetchUser({ payload: id }, { call, put }) {
       yield put({ type: 'app/showLoading' });
       const user = yield call(fetchUser, id);
       yield put({