fix merge error

package-lock.json

@@ -13553,7 +13553,6 @@
       "resolved": "https://registry.npmmirror.com/react-dom/-/react-dom-19.2.1.tgz",
       "integrity": "sha512-ibrK8llX2a4eOskq1mXKu/TGZj9qzomO+sNfO98M6d9zIPOEhlBkMkBUBLd1vgS0gQsLDBzA+8jJBVXDnfHmJg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "scheduler": "^0.27.0"
       },

server/src/assessment/assessment.module.ts

@@ -8,7 +8,6 @@ import { AssessmentAnswer } from './entities/assessment-answer.entity';
 import { KnowledgeBaseModule } from '../knowledge-base/knowledge-base.module';
 import { KnowledgeGroupModule } from '../knowledge-group/knowledge-group.module';
 import { ModelConfigModule } from '../model-config/model-config.module';
-import { UserSettingModule } from '../user-setting/user-setting.module';
 import { ChatModule } from '../chat/chat.module';
 
 @Module({
@@ -22,7 +21,6 @@ import { ChatModule } from '../chat/chat.module';
     forwardRef(() => KnowledgeGroupModule),
     forwardRef(() => ModelConfigModule),
     forwardRef(() => ChatModule),
-    UserSettingModule,
   ],
   controllers: [AssessmentController],
   providers: [AssessmentService],

server/src/import-task/import-task.controller.ts

@@ -1,4 +1,4 @@
-import { Controller, Post, Get, Delete, Param, Body, Request, UseGuards } from '@nestjs/common';
+import { Controller, Post, Get, Delete, Param, Body, Request, UseGuards, Query } from '@nestjs/common';
 import { ImportTaskService } from './import-task.service';
 import { CombinedAuthGuard } from '../auth/combined-auth.guard';
 import { RolesGuard } from '../auth/roles.guard';
@@ -44,9 +44,4 @@ export class ImportTaskController {
     async delete(@Param('id') id: string, @Request() req) {
         return this.taskService.delete(id, req.user.id);
     }
-
-    @Delete(':id')
-    async delete(@Param('id') id: string, @Request() req) {
-        return this.taskService.delete(id, req.user.id);
-    }
 }

server/src/import-task/import-task.service.ts

@@ -63,14 +63,6 @@ export class ImportTaskService {
         };
     }
 
-    async delete(taskId: string, userId: string): Promise<void> {
-        const task = await this.taskRepository.findOne({ where: { id: taskId, userId } });
-        if (!task) {
-            throw new Error(`Task ${taskId} not found or you don't have permission to delete it.`);
-        }
-        await this.taskRepository.remove(task);
-    }
-
     async delete(taskId: string, userId: string): Promise<void> {
         const task = await this.taskRepository.findOne({ where: { id: taskId, userId } });
         if (!task) {

server/src/upload/upload.module.ts

@@ -12,7 +12,8 @@ import { UserModule } from '../user/user.module';
 
 @Module({
   imports: [
-    KnowledgeBaseModule, // Add to
+    KnowledgeBaseModule,
+    KnowledgeGroupModule,
     UserModule,
     MulterModule.registerAsync({
       imports: [ConfigModule],

server/src/upload/upload.service.ts

@@ -6,6 +6,13 @@ import * as path from 'path';
 
 @Injectable()
 export class UploadService {
+  private readonly logger = new Logger(UploadService.name);
+
+  constructor(
+    private kbService: KnowledgeBaseService,
+    private groupService: KnowledgeGroupService,
+  ) {}
+
   async processUploadedFile(file: Express.Multer.File) {
     // Add more business logic here. Example:
     // - Save file info to database

web/components/views/KnowledgeBaseView.tsx

@@ -539,8 +539,6 @@ export const KnowledgeBaseView: React.FC<KnowledgeBaseViewProps> = (props) => {
         )
     }
 
-    const totalPages = Math.ceil(totalFiles / pageSize);
-
     return (
         <div className='flex flex-row h-full w-full bg-slate-50 overflow-hidden'>
             {/* Sidebar */}

yarn.lock

@@ -320,10 +320,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/runtime@^7.21.0":
-  version "7.28.6"
-
-"@babel/runtime@^7.28.4":
+"@babel/runtime@^7.21.0", "@babel/runtime@^7.28.4":
   version "7.28.4"
   resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.28.4.tgz"
   integrity sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==
@@ -2004,21 +2001,21 @@
   dependencies:
     "@types/express" "*"
 
-"@types/node@*", "@types/node@>=18":
+"@types/node@*", "@types/node@^18.0.0 || ^20.0.0 || >=22.0.0", "@types/node@>=18":
   version "25.0.0"
   resolved "https://registry.npmmirror.com/@types/node/-/node-25.0.0.tgz"
   integrity sha512-rl78HwuZlaDIUSeUKkmogkhebA+8K1Hy7tddZuJ3D0xV8pZSfsYGTsliGUol1JPzu9EKnTxPC4L1fiWouStRew==
   dependencies:
     undici-types "~7.16.0"
 
-"@types/node@^18.0.0 || ^20.0.0 || >=22.0.0", "@types/node@^22.14.0":
+"@types/node@^22.10.7":
   version "22.19.2"
   resolved "https://registry.npmmirror.com/@types/node/-/node-22.19.2.tgz"
   integrity sha512-LPM2G3Syo1GLzXLGJAKdqoU35XvrWzGJ21/7sgZTUpbkBaOasTj8tjwn6w+hCkqaa1TfJ/w67rJSwYItlJ2mYw==
   dependencies:
     undici-types "~6.21.0"
 
-"@types/node@^22.10.7":
+"@types/node@^22.14.0":
   version "22.19.2"
   resolved "https://registry.npmmirror.com/@types/node/-/node-22.19.2.tgz"
   integrity sha512-LPM2G3Syo1GLzXLGJAKdqoU35XvrWzGJ21/7sgZTUpbkBaOasTj8tjwn6w+hCkqaa1TfJ/w67rJSwYItlJ2mYw==
@@ -4429,6 +4426,10 @@ fraction.js@^5.3.4:
   version "5.3.4"
   resolved "https://registry.npmjs.org/fraction.js/-/fraction.js-5.3.4.tgz"
   integrity sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==
+  dependencies:
+    motion-dom "^12.34.3"
+    motion-utils "^12.29.2"
+    tslib "^2.4.0"
 
 framer-motion@^12.34.3:
   version "12.34.3"
@@ -7072,11 +7073,6 @@ postcss-selector-parser@6.0.10:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss-value-parser@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
-  integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
-
 postcss@^8.1.0, postcss@^8.5.3, postcss@^8.5.6:
   version "8.5.6"
   resolved "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz"
@@ -7587,6 +7583,7 @@ serve-static@^2.2.0:
   dependencies:
     "@elastic/elasticsearch" "^9.2.0"
     "@langchain/core" "^1.1.5"
+    "@langchain/langgraph" "^1.0.4"
     "@langchain/openai" "^1.1.3"
     "@langchain/textsplitters" "^1.0.1"
     "@nestjs/common" "^11.0.1"
@@ -7618,6 +7615,7 @@ serve-static@^2.2.0:
     rxjs "^7.8.1"
     tesseract.js "^7.0.0"
     typeorm "0.3.26"
+    xlsx "^0.18.5"
 
 set-cookie-parser@^2.6.0:
   version "2.7.2"
@@ -8017,12 +8015,7 @@ tailwind-merge@^3.5.0:
   resolved "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz"
   integrity sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==
 
-tailwindcss@^4.2.1:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.0.0.tgz"
-  integrity sha512-ULRPI3A+e39T7pSaf1xoi58AqqJxVCLg8F/uM5A3FadUbnyDTgltVnXJvdkTjwCOGA6NazqHVcwPJC5h2vRYVQ==
-
-"tailwindcss@>=3.0.0 || insiders || >=4.0.0-alpha.20 || >=4.0.0-beta.1", tailwindcss@4.2.1:
+tailwindcss@^4.2.1, "tailwindcss@>=3.0.0 || insiders || >=4.0.0-alpha.20 || >=4.0.0-beta.1", tailwindcss@4.2.1:
   version "4.2.1"
   resolved "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.2.1.tgz"
   integrity sha512-/tBrSQ36vCleJkAOsy9kbNTgaxvGbyOamC30PRePTQe/o1MFwEKHQk4Cn7BNGaPtjp+PuUrByJehM1hgxfq4sw==
@@ -8603,21 +8596,7 @@ vfile@^6.0.0:
     "@types/unist" "^3.0.0"
     vfile-message "^4.0.0"
 
-"vite@^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0", "vite@^5.2.0 || ^6 || ^7":
-  version "6.4.1"
-  resolved "https://registry.npmmirror.com/vite/-/vite-6.4.1.tgz"
-  integrity sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==
-  dependencies:
-    esbuild "^0.25.0"
-    fdir "^6.4.4"
-    picomatch "^4.0.2"
-    postcss "^8.5.3"
-    rollup "^4.34.9"
-    tinyglobby "^0.2.13"
-  optionalDependencies:
-    fsevents "~2.3.3"
-
-vite@^6.2.0:
+"vite@^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0", "vite@^5.2.0 || ^6 || ^7", vite@^6.2.0:
   version "6.4.1"
   resolved "https://registry.npmmirror.com/vite/-/vite-6.4.1.tgz"
   integrity sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==
@@ -8947,9 +8926,7 @@ zlibjs@^0.3.1:
   integrity sha512-+J9RrgTKOmlxFSDHo0pI1xM6BLVUv+o0ZT9ANtCxGkjIVCCUdx9alUF8Gm+dGLKbkkkidWIHFDZHDMpfITt4+w==
 
 "zod@^3.25 || ^4.0", "zod@^3.25.32 || ^4.1.0", "zod@^3.25.76 || ^4":
-  version "4.3.6"
-  resolved "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz"
-  integrity sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==
+  version "4.1.13"
 
 zwitch@^2.0.0:
   version "2.0.4"