fix notification dropdown links (#2280)

* update Router to adjust when shop URL is in provided data * update notification onClick to open dashboard panel when needed * re-add markOneAsRead
reactioncommerce · May 16, 2017 · 650679b · 650679b
1 parent f4f7f61
commit 650679b
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/imports/plugins/core/router/lib/router.js b/imports/plugins/core/router/lib/router.js
@@ -141,12 +141,18 @@ Router.pathFor = (path, options = {}) => {
 
 
 Router.go = (path, params, query) => {
-  const actualPath = Router.pathFor(path, {
-    hash: {
-      ...params,
-      query
-    }
-  });
+  let actualPath;
+
+  if (typeof path === "string" && path.startsWith("/")) {
+    actualPath = path;
+  } else {
+    actualPath = Router.pathFor(path, {
+      hash: {
+        ...params,
+        query
+      }
+    });
+  }
 
   if (window) {
     history.push(actualPath);

diff --git a/imports/plugins/included/notifications/client/components/notificationDropdown.js b/imports/plugins/included/notifications/client/components/notificationDropdown.js
@@ -27,6 +27,16 @@ class NotificationDropdown extends Component {
   }
 
   handleClick(notify) {
+    if (notify.type === "forAdmin") {
+      const actionViewData = Reaction.Apps({
+        name: "reaction-orders",
+        provides: "dashboard"
+      });
+      Reaction.showActionView(actionViewData);
+    } else {
+      Reaction.Router.go(notify.url);
+    }
+
     const { markOneAsRead } = this.props;
     return markOneAsRead(notify._id);
   }
@@ -61,7 +71,7 @@ class NotificationDropdown extends Component {
                   const i18n = `notifications.messages.${notify.type}`;
                   return (
                         <li className={read} key={key}>
-                            <a href={notify.url} onClick={() => {
+                            <a onClick={() => {
                               this.handleClick(notify);
                             }}
                             >