Fix: showing current settings tab broken in MULTI_ORG.

getredash · Apr 30, 2020 · a88defd · a88defd
1 parent ae9bbe2
commit a88defd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/client/app/pages/data-sources/DataSourcesList.jsx b/client/app/pages/data-sources/DataSourcesList.jsx
@@ -149,6 +149,7 @@ const DataSourcesListPage = wrapSettingsTab(
     permission: "admin",
     title: "Data Sources",
     path: "data_sources",
+    isActive: path => path.includes("/data_sources") && !path.includes("/groups"),
     order: 1,
   },
   DataSourcesList

diff --git a/client/app/pages/users/UsersList.jsx b/client/app/pages/users/UsersList.jsx
@@ -251,7 +251,7 @@ const UsersListPage = wrapSettingsTab(
     permission: "list_users",
     title: "Users",
     path: "users",
-    isActive: path => path.startsWith("/users") && path !== "/users/me",
+    isActive: path => path.includes("/users") && !path.includes("/users/me"),
     order: 2,
   },
   itemsList(

diff --git a/client/app/services/settingsMenu.js b/client/app/services/settingsMenu.js
@@ -10,7 +10,7 @@ class SettingsMenuItem {
   }
 
   isActive(path) {
-    return path.startsWith(this.pathPrefix);
+    return path.includes(this.pathPrefix);
   }
 
   isAvailable() {