perf: model test;perf: sidebar trigger (#4127)

* fix: import dataset step error;perf: ai proxy avatar (#4074)

* perf: pg config params

* perf: ai proxy avatar

* fix: import dataset step error

* feat: data input ux

* perf: app dataset rewite

* perf: model test

* perf: sidebar trigger

* lock

* update nanoid version

* fix: select component ux

* fix: ts

* fix: vitest

* remove test

projects/app/src/pages/account/info/index.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 import {
   Box,
   Flex,
@@ -44,6 +44,7 @@ import { useRouter } from 'next/router';
 import TeamSelector from '@/pageComponents/account/TeamSelector';
 import { getWorkorderURL } from '@/web/common/workorder/api';
 import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
+import { useMount } from 'ahooks';
 
 const StandDetailModal = dynamic(
   () => import('@/pageComponents/account/info/standardDetailModal'),
@@ -64,7 +65,9 @@ const Info = () => {
   const standardPlan = teamPlanStatus?.standardConstants;
   const { isOpen: isOpenContact, onClose: onCloseContact, onOpen: onOpenContact } = useDisclosure();
 
-  useQuery(['init'], initUserInfo);
+  useMount(() => {
+    initUserInfo();
+  });
 
   return (
     <AccountContainer>

projects/app/src/pages/account/usage/index.tsx

@@ -130,7 +130,7 @@ const UsageTable = () => {
                 { label: t('account_usage:every_month'), value: 'month' }
               ]}
               value={unit}
-              onchange={setUnit}
+              onChange={setUnit}
             />
           )} */}
         </Flex>

projects/app/src/pages/api/core/ai/model/test.ts

@@ -132,14 +132,12 @@ const testTTSModel = async (model: TTSModelType, headers: Record<string, string>
     model.requestUrl
       ? {
           path: model.requestUrl,
-          headers: model.requestAuth
-            ? {
-                Authorization: `Bearer ${model.requestAuth}`,
-                ...headers
-              }
-            : headers
+          headers: {
+            ...(model.requestAuth ? { Authorization: `Bearer ${model.requestAuth}` } : {}),
+            ...headers
+          }
         }
-      : {}
+      : { headers }
   );
 };
 

projects/app/src/pages/api/core/ai/model/update.ts

@@ -27,6 +27,13 @@ async function handler(
   const dbModel = await MongoSystemModel.findOne({ model }).lean();
   const modelData = findModelFromAlldata(model);
 
+  if (metadata) {
+    delete metadata.isActive;
+    delete metadata.isDefault;
+    delete metadata.isDefaultDatasetTextModel;
+    delete metadata.isDefaultDatasetImageModel;
+  }
+
   const metadataConcat: Record<string, any> = {
     ...modelData, // system config
     ...dbModel?.metadata, // db config

projects/app/src/pages/api/core/app/list.ts

@@ -19,6 +19,7 @@ import { concatPer } from '@fastgpt/service/support/permission/controller';
 import { getGroupsByTmbId } from '@fastgpt/service/support/permission/memberGroup/controllers';
 import { getOrgIdSetWithParentByTmbId } from '@fastgpt/service/support/permission/org/controllers';
 import { addSourceMember } from '@fastgpt/service/support/user/utils';
+import { getNanoid } from '../../../../../../../packages/global/common/string/tools';
 
 export type ListAppBody = {
   parentId?: ParentIdType;

projects/app/src/pages/api/core/app/version/list.test.ts

@@ -1,35 +0,0 @@
-import { MongoApp } from '@fastgpt/service/core/app/schema';
-import { MongoAppVersion } from '@fastgpt/service/core/app/version/schema';
-import { getRootUser } from '@test/datas/users';
-import { Call } from '@test/utils/request';
-import { describe, expect, it } from 'vitest';
-import handler, { type versionListBody, type versionListResponse } from './list';
-
-describe('app version list test', () => {
-  it('should return app version list', async () => {
-    const root = await getRootUser();
-    const app = await MongoApp.create({
-      name: 'test',
-      tmbId: root.tmbId,
-      teamId: root.teamId
-    });
-    await MongoAppVersion.create(
-      [...Array(10).keys()].map((i) => ({
-        tmbId: root.tmbId,
-        appId: app._id,
-        versionName: `v${i}`
-      }))
-    );
-    const res = await Call<versionListBody, {}, versionListResponse>(handler, {
-      auth: root,
-      body: {
-        pageSize: 10,
-        offset: 0,
-        appId: app._id
-      }
-    });
-    expect(res.code).toBe(200);
-    expect(res.data.total).toBe(10);
-    expect(res.data.list.length).toBe(10);
-  });
-});

projects/app/src/pages/chat/index.tsx

@@ -65,14 +65,6 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {
   const chatRecords = useContextSelector(ChatRecordContext, (v) => v.chatRecords);
   const totalRecordsCount = useContextSelector(ChatRecordContext, (v) => v.totalRecordsCount);
 
-  const [sidebarFolded, setSidebarFolded] = useState(false);
-
-  useEffect(() => {
-    if (quoteData) {
-      setSidebarFolded(true);
-    }
-  }, [quoteData]);
-
   // Load chat init data
   const { loading } = useRequest2(
     async () => {
@@ -156,9 +148,7 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {
     );
 
     return isPc || !appId ? (
-      <SideBar isFolded={sidebarFolded} onFoldChange={setSidebarFolded}>
-        {Children}
-      </SideBar>
+      <SideBar externalTrigger={!!quoteData}>{Children}</SideBar>
     ) : (
       <Drawer
         isOpen={isOpenSlider}
@@ -171,7 +161,7 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {
         <DrawerContent maxWidth={'75vw'}>{Children}</DrawerContent>
       </Drawer>
     );
-  }, [t, isPc, appId, isOpenSlider, onCloseSlider, sidebarFolded]);
+  }, [t, isPc, appId, isOpenSlider, onCloseSlider, quoteData]);
 
   return (
     <Flex h={'100%'}>

projects/app/src/pages/chat/share.tsx

@@ -90,14 +90,6 @@ const OutLink = (props: Props) => {
   const totalRecordsCount = useContextSelector(ChatRecordContext, (v) => v.totalRecordsCount);
   const isChatRecordsLoaded = useContextSelector(ChatRecordContext, (v) => v.isChatRecordsLoaded);
 
-  const [sidebarFolded, setSidebarFolded] = useState(false);
-
-  useEffect(() => {
-    if (quoteData) {
-      setSidebarFolded(true);
-    }
-  }, [quoteData]);
-
   const initSign = useRef(false);
   const { data, loading } = useRequest2(
     async () => {
@@ -229,9 +221,7 @@ const OutLink = (props: Props) => {
     if (showHistory !== '1') return null;
 
     return isPc ? (
-      <SideBar isFolded={sidebarFolded} onFoldChange={setSidebarFolded}>
-        {Children}
-      </SideBar>
+      <SideBar externalTrigger={!!quoteData}>{Children}</SideBar>
     ) : (
       <Drawer
         isOpen={isOpenSlider}
@@ -246,7 +236,7 @@ const OutLink = (props: Props) => {
         </DrawerContent>
       </Drawer>
     );
-  }, [isOpenSlider, isPc, onCloseSlider, showHistory, t, sidebarFolded]);
+  }, [isOpenSlider, isPc, onCloseSlider, quoteData, showHistory, t]);
 
   return (
     <>

projects/app/src/pages/chat/team.tsx

@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo } from 'react';
 import NextHead from '@/components/common/NextHead';
 import { getTeamChatInfo } from '@/web/core/chat/api';
 import { useRouter } from 'next/router';
@@ -70,14 +70,6 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {
   const chatRecords = useContextSelector(ChatRecordContext, (v) => v.chatRecords);
   const totalRecordsCount = useContextSelector(ChatRecordContext, (v) => v.totalRecordsCount);
 
-  const [sidebarFolded, setSidebarFolded] = useState(false);
-
-  useEffect(() => {
-    if (quoteData) {
-      setSidebarFolded(true);
-    }
-  }, [quoteData]);
-
   // get chat app info
   const { loading } = useRequest2(
     async () => {
@@ -174,9 +166,7 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {
     );
 
     return isPc || !appId ? (
-      <SideBar isFolded={sidebarFolded} onFoldChange={setSidebarFolded}>
-        {Children}
-      </SideBar>
+      <SideBar externalTrigger={!!quoteData}>{Children}</SideBar>
     ) : (
       <Drawer
         isOpen={isOpenSlider}
@@ -189,7 +179,7 @@ const Chat = ({ myApps }: { myApps: AppListItemType[] }) => {
         <DrawerContent maxWidth={'75vw'}>{Children}</DrawerContent>
       </Drawer>
     );
-  }, [appId, isOpenSlider, isPc, onCloseSlider, t, sidebarFolded]);
+  }, [appId, isOpenSlider, isPc, onCloseSlider, quoteData, t]);
 
   return (
     <Flex h={'100%'}>