From 6923af70ad253d9c731711e8ca7d4814334994e4 Mon Sep 17 00:00:00 2001
From: ma-zhongxu <mzxzxx1234@163.com>
Date: Fri, 28 Feb 2025 20:33:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=96=B0=E5=A2=9E=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/Sidebar/index.jsx     |  2 +-
 .../Members/AddMemberModal/index.jsx          | 12 +++---
 .../pages/WorkspaceSettings/Members/index.jsx |  8 ++--
 frontend/src/utils/constants.js               |  4 +-
 server/endpoints/admin.js                     | 43 +++++++++++++++++++
 server/models/deptUsers.js                    |  1 +
 server/models/user.js                         |  2 +
 server/models/workspace.js                    |  3 +-
 8 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/Sidebar/index.jsx b/frontend/src/components/Sidebar/index.jsx
index 69a4bac..8ac098e 100644
--- a/frontend/src/components/Sidebar/index.jsx
+++ b/frontend/src/components/Sidebar/index.jsx
@@ -62,7 +62,7 @@ export default function Sidebar() {
               <div className="relative h-[calc(100%-60px)] flex flex-col w-full justify-between pt-[10px] overflow-y-scroll no-scroll">
                 <div className="flex flex-col gap-y-2 pb-[60px] overflow-y-scroll no-scroll">
                   <div className="flex gap-x-2 items-center justify-between">
-                    {(!user || user?.role !== "default") && (
+                    {(!user || user?.role == "admin") && (
                       <button
                         onClick={showNewWsModal}
                         className="light:bg-[#C2E7FE] light:hover:bg-[#7CD4FD] flex flex-grow w-[75%] h-[44px] gap-x-2 py-[5px] px-2.5 mb-2 bg-white rounded-[8px] text-sidebar justify-center items-center hover:bg-opacity-80 transition-all duration-300"
diff --git a/frontend/src/pages/WorkspaceSettings/Members/AddMemberModal/index.jsx b/frontend/src/pages/WorkspaceSettings/Members/AddMemberModal/index.jsx
index 4dcda7d..0722c60 100644
--- a/frontend/src/pages/WorkspaceSettings/Members/AddMemberModal/index.jsx
+++ b/frontend/src/pages/WorkspaceSettings/Members/AddMemberModal/index.jsx
@@ -64,12 +64,12 @@ export default function AddMemberModal({ closeModal, workspace, users }) {
       <div className="w-full max-w-2xl bg-theme-bg-secondary rounded-lg shadow border-2 border-theme-modal-border overflow-hidden">
         <div className="flex items-center justify-between p-6 border-b rounded-t border-theme-modal-border">
           <div className="flex items-center gap-x-4">
-            <h3 className="text-base font-semibold text-white">Users</h3>
+            <h3 className="text-base font-semibold text-white">用户</h3>
             <div className="relative">
               <input
                 onChange={handleSearch}
                 className="w-[400px] h-[34px] bg-theme-bg-primary rounded-[100px] text-white placeholder:text-theme-text-secondary text-sm px-10 pl-10"
-                placeholder="Search for a user"
+                placeholder="搜索用户"
               />
               <MagnifyingGlass
                 size={16}
@@ -113,7 +113,7 @@ export default function AddMemberModal({ closeModal, workspace, users }) {
                 ))
               ) : (
                 <p className="text-theme-text-secondary text-sm font-medium ">
-                  No users found
+                  未找到用户
                 </p>
               )}
             </table>
@@ -135,7 +135,7 @@ export default function AddMemberModal({ closeModal, workspace, users }) {
                     <div className="w-2 h-2 bg-white rounded-[2px]" />
                   )}
                 </div>
-                <p className="text-white text-sm font-medium">Select All</p>
+                <p className="text-white text-sm font-medium">全选</p>
               </button>
               {selectedUsers.length > 0 && (
                 <button
@@ -144,7 +144,7 @@ export default function AddMemberModal({ closeModal, workspace, users }) {
                   className="flex items-center gap-x-2 ml-2"
                 >
                   <p className="text-theme-text-secondary text-sm font-medium hover:text-theme-text-primary">
-                    Unselect
+                    反选
                   </p>
                 </button>
               )}
@@ -153,7 +153,7 @@ export default function AddMemberModal({ closeModal, workspace, users }) {
               type="submit"
               className="transition-all duration-300 text-xs px-2 py-1 font-semibold rounded-lg bg-primary-button hover:bg-secondary border-2 border-transparent hover:border-primary-button hover:text-white h-[32px] w-[68px] -mr-8 whitespace-nowrap shadow-[0_4px_14px_rgba(0,0,0,0.25)]"
             >
-              Save
+              保存
             </button>
           </div>
         </form>
diff --git a/frontend/src/pages/WorkspaceSettings/Members/index.jsx b/frontend/src/pages/WorkspaceSettings/Members/index.jsx
index d7f8bea..e18f5a7 100644
--- a/frontend/src/pages/WorkspaceSettings/Members/index.jsx
+++ b/frontend/src/pages/WorkspaceSettings/Members/index.jsx
@@ -51,13 +51,13 @@ export default function Members({ workspace }) {
         <thead className="text-white text-opacity-80 text-xs leading-[18px] font-bold uppercase border-white/10 border-b border-opacity-60">
           <tr>
             <th scope="col" className="px-6 py-3 rounded-tl-lg">
-              Username
+              用户名
             </th>
             <th scope="col" className="px-6 py-3">
-              Role
+              角色
             </th>
             <th scope="col" className="px-6 py-3">
-              Date Added
+              添加时间
             </th>
             <th scope="col" className="px-6 py-3 rounded-tr-lg">
               {" "}
@@ -78,7 +78,7 @@ export default function Members({ workspace }) {
           )}
         </tbody>
       </table>
-      <CTAButton onClick={openModal}>Manage Users</CTAButton>
+      <CTAButton onClick={openModal}>用户管理</CTAButton>
       <ModalWrapper isOpen={isOpen}>
         <AddMemberModal
           closeModal={closeModal}
diff --git a/frontend/src/utils/constants.js b/frontend/src/utils/constants.js
index ccf3044..13af314 100644
--- a/frontend/src/utils/constants.js
+++ b/frontend/src/utils/constants.js
@@ -1,5 +1,5 @@
-// export const API_BASE = import.meta.env.VITE_API_BASE || "/api";
-export const API_BASE = 'http://172.16.2.31:3001/api'
+export const API_BASE = import.meta.env.VITE_API_BASE || "/api";
+// export const API_BASE = 'http://172.16.2.31:3001/api'
 export const ONBOARDING_SURVEY_URL = "https://onboarding.anythingllm.com";
 
 export const AUTH_USER = "anythingllm_user";
diff --git a/server/endpoints/admin.js b/server/endpoints/admin.js
index 1a3fd95..3d5a31e 100644
--- a/server/endpoints/admin.js
+++ b/server/endpoints/admin.js
@@ -5,9 +5,11 @@ const { Invite } = require("../models/invite");
 const { SystemSettings } = require("../models/systemSettings");
 const { Telemetry } = require("../models/telemetry");
 const { User } = require("../models/user");
+const { DeptUsers } = require("../models/deptUsers");
 const { DocumentVectors } = require("../models/vectors");
 const { Workspace } = require("../models/workspace");
 const { WorkspaceChats } = require("../models/workspaceChats");
+const prisma = require("../utils/prisma");
 const {
   getVectorDbClass,
   getEmbeddingEngineSelection,
@@ -80,6 +82,47 @@ function adminEndpoints(app) {
     }
   );
 
+  app.post(
+    "/admin/users/add/:deptId",
+    [validatedRequest, strictMultiUserRoleValid([ROLES.admin, ROLES.manager])],
+    async (request, response) => {
+      try {
+        const currUser = await userFromSession(request, response);
+        const { deptId } = request.params;
+        const newUserParams = reqBody(request);
+        const roleValidation = validRoleSelection(currUser, newUserParams);
+
+        if (!roleValidation.valid) {
+          return response.status(400).json({ error: roleValidation.error });
+        }
+
+        await prisma.$transaction(async () => {
+          try {
+            const { user: newUser, error } = await User.create(newUserParams);
+            console.log("newUser", newUser);
+
+            const deptUser = await DeptUsers.create({
+              data: { userId: newUser.id, deptId: deptId },
+            });
+
+            await EventLogs.logEvent(
+              "user_created",
+              { userName: newUser.username, createdBy: currUser.username },
+              currUser.id
+            );
+
+            response.status(200).json({ user: newUser, error });
+          } catch (error) {
+            throw new Error(`Transaction failed: ${error.message}`);
+          }
+        });
+      } catch (e) {
+        console.error("Error creating user and dept user association:", e);
+        response.status(500).json({ error: "Internal Server Error" });
+      }
+    }
+  );
+
   // app.post(
   //   "/admin/users/new",
   //   [validatedRequest, strictMultiUserRoleValid([ROLES.admin, ROLES.manager])],
diff --git a/server/models/deptUsers.js b/server/models/deptUsers.js
index e978212..908d77f 100644
--- a/server/models/deptUsers.js
+++ b/server/models/deptUsers.js
@@ -43,6 +43,7 @@ const DeptUsers = {
    * @returns {Promise<{ deptUser: DeptUser | null, error: string | null }>}
    */
   create: async function (data) {
+    console.log("55555555555555555", data);
     try {
       const validatedData = {};
       for (const key of this.writable) {
diff --git a/server/models/user.js b/server/models/user.js
index e6915d9..f122e85 100644
--- a/server/models/user.js
+++ b/server/models/user.js
@@ -101,6 +101,8 @@ const User = {
             this.validations.dailyMessageLimit(dailyMessageLimit),
         },
       });
+      // const vue = this.filterFields(user);
+      console.log("6666666666",user);
       return { user: this.filterFields(user), error: null };
     } catch (error) {
       console.error("FAILED TO CREATE USER.", error.message);
diff --git a/server/models/workspace.js b/server/models/workspace.js
index 91d6593..bdfbda2 100644
--- a/server/models/workspace.js
+++ b/server/models/workspace.js
@@ -318,7 +318,8 @@ const Workspace = {
     limit = null,
     orderBy = null
   ) {
-    if ([ROLES.admin, ROLES.manager].includes(user.role))
+    // if ([ROLES.admin, ROLES.manager].includes(user.role))
+    if ([ROLES.admin].includes(user.role))
       return await this.where(clause, limit, orderBy);
 
     try {