🐛 Administrator can go to any configuration page #1346Hs/1028 bugfix3

Phinease · web-flow · commit 46472cf56a5c · 2025-10-30T09:54:59.000+08:00
diff --git a/frontend/app/[locale]/chat/components/chatLeftSidebar.tsx b/frontend/app/[locale]/chat/components/chatLeftSidebar.tsx
@@ -9,6 +9,9 @@ import {
   ChevronLeft,
   ChevronRight,
   User,
+  Database,
+  Box,
+  Bot,
 } from "lucide-react";
 
 import { Button } from "@/components/ui/button";
@@ -37,7 +40,8 @@ import { StaticScrollArea } from "@/components/ui/scrollArea";
 import { USER_ROLES } from "@/const/modelConfig";
 import { useConfig } from "@/hooks/useConfig";
 import { useResponsiveTextSize } from "@/hooks/useResponsiveTextSize";
-import { Spin, Tag, ConfigProvider } from "antd";
+import { Spin, Tag, ConfigProvider, Dropdown, Menu } from "antd";
+import type { MenuProps } from "antd";
 import { getRoleColor } from "@/lib/auth";
 import { useAuth } from "@/hooks/useAuth";
 import { extractColorsFromUri } from "@/lib/avatar";
@@ -120,6 +124,7 @@ export function ChatSidebar({
   onRename,
   onDelete,
   onSettingsClick,
+  settingsMenuItems,
   onDropdownOpenChange,
   onToggleSidebar,
   expanded,
@@ -237,6 +242,100 @@ export function ChatSidebar({
     );
   };
 
+  // Get icon for menu item based on key
+  const getMenuIcon = (key: string) => {
+    switch (key) {
+      case "models":
+        return <Box className="h-4 w-4" />;
+      case "knowledges":
+        return <Database className="h-4 w-4" />;
+      case "agents":
+        return <Bot className="h-4 w-4" />;
+    }
+  };
+
+  // Render settings button (with dropdown for admin, plain button for regular users)
+  const renderSettingsButton = (isCollapsed: boolean = false) => {
+    const buttonContent = (
+      <Button
+        variant="ghost"
+        size="icon"
+        className={isCollapsed ? "h-10 w-10 rounded-full hover:bg-slate-100" : "size-10 rounded-full hover:bg-slate-100"}
+        onClick={settingsMenuItems ? undefined : onSettingsClick}
+      >
+        <Settings className={isCollapsed ? "h-6 w-6" : "size-5"} />
+      </Button>
+    );
+
+    // If settingsMenuItems is provided, show dropdown with icons
+    if (settingsMenuItems && settingsMenuItems.length > 0) {
+      const menuProps: MenuProps = {
+        items: settingsMenuItems.map((item, index) => ({
+          key: item.key,
+          label: (
+            <div className="flex items-center gap-3 py-1">
+              <span className="text-gray-600">{getMenuIcon(item.key)}</span>
+              <span className="text-sm font-medium">{item.label}</span>
+            </div>
+          ),
+          onClick: item.onClick,
+          style: {
+            padding: "8px 16px",
+          },
+        })),
+        style: {
+          minWidth: "240px",
+          borderRadius: "8px",
+          boxShadow: "0 4px 12px rgba(0, 0, 0, 0.15)",
+        },
+      };
+
+      return (
+        <TooltipProvider>
+          <Tooltip>
+            <TooltipTrigger asChild>
+              <ConfigProvider
+                getPopupContainer={() => document.body}
+                theme={{
+                  components: {
+                    Dropdown: {
+                      paddingBlock: 4,
+                    },
+                  },
+                }}
+              >
+                <Dropdown menu={menuProps} placement="topRight" trigger={["click"]}>
+                  <div className={isCollapsed ? "flex justify-center" : ""}>
+                    {buttonContent}
+                  </div>
+                </Dropdown>
+              </ConfigProvider>
+            </TooltipTrigger>
+            <TooltipContent side={isCollapsed ? "right" : "top"}>
+              {t("chatLeftSidebar.settings")}
+            </TooltipContent>
+          </Tooltip>
+        </TooltipProvider>
+      );
+    }
+
+    // Otherwise, show plain button for regular users (shouldn't reach here anymore)
+    return (
+      <TooltipProvider>
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <div className={isCollapsed ? "flex justify-center" : ""}>
+              {buttonContent}
+            </div>
+          </TooltipTrigger>
+          <TooltipContent side={isCollapsed ? "right" : "top"}>
+            {t("chatLeftSidebar.settings")}
+          </TooltipContent>
+        </Tooltip>
+      </TooltipProvider>
+    );
+  };
+
   // Render dialog list items
   const renderDialogList = (dialogs: ConversationListItem[], title: string) => {
     if (dialogs.length === 0) return null;
@@ -461,25 +560,7 @@ export function ChatSidebar({
         ) : null}
 
         {/* Settings button */}
-        <TooltipProvider>
-          <Tooltip>
-            <TooltipTrigger asChild>
-              <div className="flex justify-center">
-                <Button
-                  variant="ghost"
-                  size="icon"
-                  className="h-10 w-10 rounded-full hover:bg-slate-100"
-                  onClick={onSettingsClick}
-                >
-                  <Settings className="h-6 w-6" />
-                </Button>
-              </div>
-            </TooltipTrigger>
-            <TooltipContent side="right">
-              {t("chatLeftSidebar.settings")}
-            </TooltipContent>
-          </Tooltip>
-        </TooltipProvider>
+        {renderSettingsButton(true)}
       </>
     );
   };
@@ -628,14 +709,7 @@ export function ChatSidebar({
                   </div>
                 </ConfigProvider>
               ) : null}
-              <Button
-                variant="ghost"
-                size="icon"
-                className="size-10 rounded-full hover:bg-slate-100"
-                onClick={onSettingsClick}
-              >
-                <Settings className="size-5" />
-              </Button>
+              {renderSettingsButton(false)}
             </div>
           </div>
         ) : (
diff --git a/frontend/app/[locale]/chat/internal/chatInterface.tsx b/frontend/app/[locale]/chat/internal/chatInterface.tsx
@@ -1533,6 +1533,48 @@ export function ChatInterface() {
     };
   }, []);
 
+  // Handle settings click - not used when menu items are provided
+  const handleSettingsClick = () => {
+    // This function is kept for compatibility but not used
+    // Both admin and regular users now use dropdown menus
+  };
+
+  // Settings menu items based on user role
+  const settingsMenuItems = user?.role === "admin" ? [
+    // Admin has three options
+    {
+      key: "models",
+      label: t("chatLeftSidebar.settingsMenu.modelConfig"),
+      onClick: () => {
+        localStorage.setItem("show_page", "1");
+        router.push("/setup/models");
+      },
+    },
+    {
+      key: "knowledges",
+      label: t("chatLeftSidebar.settingsMenu.knowledgeConfig"),
+      onClick: () => {
+        router.push("/setup/knowledges");
+      },
+    },
+    {
+      key: "agents",
+      label: t("chatLeftSidebar.settingsMenu.agentConfig"),
+      onClick: () => {
+        router.push("/setup/agents");
+      },
+    },
+  ] : [
+    // Regular user only has knowledge base configuration
+    {
+      key: "knowledges",
+      label: t("chatLeftSidebar.settingsMenu.knowledgeConfig"),
+      onClick: () => {
+        router.push("/setup/knowledges");
+      },
+    },
+  ];
+
   return (
     <>
       <div className="flex h-screen">
@@ -1546,13 +1588,8 @@ export function ChatInterface() {
           onDialogClick={handleDialogClick}
           onRename={handleConversationRename}
           onDelete={handleConversationDeleteClick}
-          onSettingsClick={() => {
-            localStorage.setItem(
-              "show_page",
-              user?.role === "admin" ? "1" : "2"
-            );
-            router.push("/setup");
-          }}
+          onSettingsClick={handleSettingsClick}
+          settingsMenuItems={settingsMenuItems}
           onDropdownOpenChange={(open: boolean, id: string | null) =>
             setOpenDropdownId(open ? id : null)
           }
diff --git a/frontend/public/locales/en/common.json b/frontend/public/locales/en/common.json
@@ -100,6 +100,9 @@
   "chatLeftSidebar.noHistory": "No conversation history",
   "chatLeftSidebar.expandSidebar": "Expand Sidebar",
   "chatLeftSidebar.settings": "Settings",
+  "chatLeftSidebar.settingsMenu.modelConfig": "Application & Model Configuration",
+  "chatLeftSidebar.settingsMenu.knowledgeConfig": "Knowledge Base Configuration",
+  "chatLeftSidebar.settingsMenu.agentConfig": "Agent Configuration",
   "chatLeftSidebar.confirmDeletionTitle": "Delete Conversation",
   "chatLeftSidebar.confirmDeletionDescription": "Are you sure you want to delete this conversation? This action cannot be undone.",
   "chatLeftSidebar.cancel": "Cancel",
diff --git a/frontend/public/locales/zh/common.json b/frontend/public/locales/zh/common.json
@@ -100,6 +100,9 @@
   "chatLeftSidebar.noHistory": "无历史对话",
   "chatLeftSidebar.expandSidebar": "展开边栏",
   "chatLeftSidebar.settings": "设置",
+  "chatLeftSidebar.settingsMenu.modelConfig": "应用与模型配置",
+  "chatLeftSidebar.settingsMenu.knowledgeConfig": "知识库配置",
+  "chatLeftSidebar.settingsMenu.agentConfig": "智能体配置",
   "chatLeftSidebar.confirmDeletionTitle": "删除对话",
   "chatLeftSidebar.confirmDeletionDescription": "确定要删除这个对话吗？此操作无法撤销。",
   "chatLeftSidebar.cancel": "取消",
diff --git a/frontend/types/chat.ts b/frontend/types/chat.ts
@@ -249,6 +249,13 @@ export interface FilePreview {
   previewUrl?: string;
 }
 
+// Settings menu item type for admin users
+export interface SettingsMenuItem {
+  key: string;
+  label: string;
+  onClick: () => void;
+}
+
 // Chat sidebar props type
 export interface ChatSidebarProps {
   conversationList: ConversationListItem[];
@@ -261,6 +268,7 @@ export interface ChatSidebarProps {
   onRename: (dialogId: number, title: string) => void;
   onDelete: (dialogId: number) => void;
   onSettingsClick: () => void;
+  settingsMenuItems?: SettingsMenuItem[];
   onDropdownOpenChange: (open: boolean, id: string | null) => void;
   onToggleSidebar: () => void;
   expanded: boolean;
