fix: fix route disable if disable plugin store

msgbyte · Dec 6, 2023 · ad59c97 · ad59c97
1 parent 16ed9da
commit ad59c97
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/client/web/src/routes/Main/Content/Personal/Sidebar.tsx b/client/web/src/routes/Main/Content/Personal/Sidebar.tsx
@@ -40,9 +40,9 @@ SidebarSection.displayName = 'SidebarSection';
 export const PersonalSidebar: React.FC = React.memo(() => {
   const converseList = useDMConverseList();
   const userInfo = useUserInfo();
-  const { disablePluginStore } = useGlobalConfigStore((state) => ({
-    disablePluginStore: state.disablePluginStore,
-  }));
+  const disablePluginStore = useGlobalConfigStore(
+    (state) => state.disablePluginStore
+  );
   const hasFriendRequest = useAppSelector(
     (state) =>
       state.user.friendRequests.findIndex(

diff --git a/client/web/src/routes/Main/Content/Personal/index.tsx b/client/web/src/routes/Main/Content/Personal/index.tsx
@@ -9,12 +9,16 @@ import { PersonalConverse } from './Converse';
 import { FriendPanel } from './Friends';
 import { PluginsPanel } from './Plugins';
 import { PersonalSidebar } from './Sidebar';
+import { useGlobalConfigStore } from 'tailchat-shared';
 
 export const Personal: React.FC = React.memo(() => {
   const [lastVisitPanelUrl, setLastVisitPanelUrl] = useUserSessionPreference(
     'personLastVisitPanelUrl'
   );
   const location = useLocation();
+  const disablePluginStore = useGlobalConfigStore(
+    (state) => state.disablePluginStore
+  );
 
   useEffect(() => {
     setLastVisitPanelUrl(location.pathname);
@@ -24,7 +28,9 @@ export const Personal: React.FC = React.memo(() => {
     <PageContent data-tc-role="content-personal" sidebar={<PersonalSidebar />}>
       <Routes>
         <Route path="/friends" element={<FriendPanel />} />
-        <Route path="/plugins" element={<PluginsPanel />} />
+        {!disablePluginStore && (
+          <Route path="/plugins" element={<PluginsPanel />} />
+        )}
         <Route path="/converse/:converseId" element={<PersonalConverse />} />
         {pluginCustomPanel
           .filter((p) => p.position === 'personal')