4.8.5 test fix (#1835)

* faq

* perf: navbar name and fix dataset selector

* feat: app tag

* perf: icon

* fix: update workflow bug

* perf: dataset ui

* perf: menu

* fix: ts

* fix: auth file and app list ui

* app list

* app list

* perf: init api

* update per

* log level

projects/app/src/pages/dataset/list/component/CreateModal.tsx

@@ -20,7 +20,7 @@ import { MongoImageTypeEnum } from '@fastgpt/global/common/file/image/constants'
 import AIModelSelector from '@/components/Select/AIModelSelector';
 import { useI18n } from '@/web/context/I18n';
 import QuestionTip from '@fastgpt/web/components/common/MyTooltip/QuestionTip';
-import { DatasetDefaultPermission } from '@fastgpt/global/support/permission/dataset/constant';
+import { DatasetDefaultPermissionVal } from '@fastgpt/global/support/permission/dataset/constant';
 
 const CreateModal = ({ onClose, parentId }: { onClose: () => void; parentId?: string }) => {
   const { t } = useTranslation();
@@ -40,7 +40,7 @@ const CreateModal = ({ onClose, parentId }: { onClose: () => void; parentId?: st
       intro: '',
       vectorModel: filterNotHiddenVectorModelList[0].model,
       agentModel: datasetModelList[0].model,
-      defaultPermission: DatasetDefaultPermission
+      defaultPermission: DatasetDefaultPermissionVal
     }
   });
   const avatar = watch('avatar');

projects/app/src/pages/dataset/list/component/List.tsx

@@ -19,9 +19,9 @@ import { downloadFetch } from '@/web/common/system/utils';
 import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
 import dynamic from 'next/dynamic';
 import { useContextSelector } from 'use-context-selector';
-import { DatasetContext } from '../context';
+import { DatasetsContext } from '../context';
 import {
-  DatasetDefaultPermission,
+  DatasetDefaultPermissionVal,
   DatasetPermissionList
 } from '@fastgpt/global/support/permission/dataset/constant';
 import ConfigPerModal from '@/components/support/permission/ConfigPerModal';
@@ -49,16 +49,17 @@ function List() {
     editedDataset,
     setEditedDataset,
     onDelDataset
-  } = useContextSelector(DatasetContext, (v) => v);
+  } = useContextSelector(DatasetsContext, (v) => v);
   const [editPerDatasetIndex, setEditPerDatasetIndex] = useState<number>();
   const { myDatasets, loadMyDatasets } = useDatasetStore();
+  const [loadingDatasetId, setLoadingDatasetId] = useState<string>();
 
   const { getBoxProps } = useFolderDrag({
     activeStyles: {
       borderColor: 'primary.600'
     },
     onDrop: async (dragId: string, targetId: string) => {
-      setLoading(true);
+      setLoadingDatasetId(dragId);
       try {
         await putDatasetById({
           id: dragId,
@@ -66,7 +67,7 @@ function List() {
         });
         refetchDatasets();
       } catch (error) {}
-      setLoading(false);
+      setLoadingDatasetId(undefined);
     }
   });
 
@@ -160,6 +161,7 @@ function List() {
               }
             >
               <MyBox
+                isLoading={loadingDatasetId === dataset._id}
                 display={'flex'}
                 flexDirection={'column'}
                 py={3}
@@ -254,18 +256,6 @@ function List() {
                               label: t('Move'),
                               onClick: () => setMoveDatasetId(dataset._id)
                             },
-
-                            ...(dataset.type != DatasetTypeEnum.folder
-                              ? [
-                                  {
-                                    icon: 'export',
-                                    label: t('Export'),
-                                    onClick: () => {
-                                      exportDataset(dataset);
-                                    }
-                                  }
-                                ]
-                              : []),
                             ...(dataset.permission.hasManagePer
                               ? [
                                   {
@@ -277,6 +267,21 @@ function List() {
                               : [])
                           ]
                         },
+                        ...(dataset.type != DatasetTypeEnum.folder
+                          ? [
+                              {
+                                children: [
+                                  {
+                                    icon: 'export',
+                                    label: t('Export'),
+                                    onClick: () => {
+                                      exportDataset(dataset);
+                                    }
+                                  }
+                                ]
+                              }
+                            ]
+                          : []),
                         ...(dataset.permission.hasManagePer
                           ? [
                               {
@@ -361,7 +366,7 @@ function List() {
           name={editPerDataset.name}
           defaultPer={{
             value: editPerDataset.defaultPermission,
-            defaultValue: DatasetDefaultPermission,
+            defaultValue: DatasetDefaultPermissionVal,
             onChange: async (e) => {
               await putDatasetById({
                 id: editPerDataset._id,

projects/app/src/pages/dataset/list/context.tsx

@@ -15,13 +15,12 @@ import { useRouter } from 'next/router';
 import React, { useCallback, useState } from 'react';
 import { createContext } from 'use-context-selector';
 import { useI18n } from '@/web/context/I18n';
-import { useRequest, useRequest2 } from '@fastgpt/web/hooks/useRequest';
+import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
 import { DatasetUpdateBody } from '@fastgpt/global/core/dataset/api';
 import dynamic from 'next/dynamic';
 import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants';
 import { DatasetItemType } from '@fastgpt/global/core/dataset/type';
 import { EditResourceInfoFormType } from '@/components/common/Modal/EditResourceModal';
-import { useSystemStore } from '@/web/common/system/useSystemStore';
 import { useTranslation } from 'react-i18next';
 
 const MoveModal = dynamic(() => import('@/components/common/folder/MoveModal'));
@@ -39,7 +38,7 @@ export type DatasetContextType = {
   onDelDataset: (id: string) => Promise<void>;
 };
 
-export const DatasetContext = createContext<DatasetContextType>({
+export const DatasetsContext = createContext<DatasetContextType>({
   refetchDatasets: () => {},
   isFetchingDatasets: false,
   setMoveDatasetId: () => {},
@@ -136,7 +135,7 @@ function DatasetContextProvider({ children }: { children: React.ReactNode }) {
   };
 
   return (
-    <DatasetContext.Provider value={contextValue}>
+    <DatasetsContext.Provider value={contextValue}>
       {children}
       {!!moveDatasetId && (
         <MoveModal
@@ -147,7 +146,7 @@ function DatasetContextProvider({ children }: { children: React.ReactNode }) {
           onConfirm={onMoveDataset}
         />
       )}
-    </DatasetContext.Provider>
+    </DatasetsContext.Provider>
   );
 }
 

projects/app/src/pages/dataset/list/index.tsx

@@ -7,7 +7,7 @@ import { serviceSideProps } from '@/web/common/utils/i18n';
 import ParentPaths from '@/components/common/folder/Path';
 import { useDatasetStore } from '@/web/core/dataset/store/dataset';
 import List from './component/List';
-import { DatasetContext } from './context';
+import { DatasetsContext } from './context';
 import DatasetContextProvider from './context';
 import { useContextSelector } from 'use-context-selector';
 import MyMenu from '@fastgpt/web/components/common/MyMenu';
@@ -22,7 +22,7 @@ import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants';
 import FolderSlideCard from '@/components/common/folder/SlideCard';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
 import {
-  DatasetDefaultPermission,
+  DatasetDefaultPermissionVal,
   DatasetPermissionList
 } from '@fastgpt/global/support/permission/dataset/constant';
 import {
@@ -54,7 +54,7 @@ const Dataset = () => {
     setEditedDataset,
     setMoveDatasetId,
     onDelDataset
-  } = useContextSelector(DatasetContext, (v) => v);
+  } = useContextSelector(DatasetsContext, (v) => v);
   const { userInfo } = useUserStore();
 
   const [editFolderData, setEditFolderData] = useState<EditFolderFormType>();
@@ -68,11 +68,11 @@ const Dataset = () => {
   return (
     <PageContainer
       isLoading={myDatasets.length === 0 && isFetchingDatasets}
-      insertProps={{ px: [5, '48px'] }}
+      insertProps={{ px: folderDetail ? [4, 6] : [5, '10'] }}
     >
-      <Flex pt={[8, 10]} pr={folderDetail ? [4, 6] : [4, 10]}>
+      <Flex pt={[4, 6]}>
         <Flex flexGrow={1} flexDirection="column">
-          <Flex alignItems={'center'} justifyContent={'space-between'}>
+          <Flex alignItems={'flex-start'} justifyContent={'space-between'}>
             <ParentPaths
               paths={paths}
               FirstPathDom={
@@ -162,7 +162,7 @@ const Dataset = () => {
               }
               defaultPer={{
                 value: folderDetail.defaultPermission,
-                defaultValue: DatasetDefaultPermission,
+                defaultValue: DatasetDefaultPermissionVal,
                 onChange: (e) => {
                   return putDatasetById({
                     id: folderDetail._id,