Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit 4a33e04a by Finley Ge Committed by GitHub
Options

Dataset frontend style adjusting (#1820) 

* feat: dataset controllers

feat: dataset schema

fix: add missing type to dataset schema
Signed-off-by: FinleyGe <m13203533462@163.com>

* chore: use new auth method

Signed-off-by: FinleyGe <m13203533462@163.com>

* feat: finish the dataset permission

fix: ts errors
Signed-off-by: FinleyGe <m13203533462@163.com>

* chore: adjust the code

* chore: adjust the code

* chore: dataset fe adjusting

* fix: double delete confirm

---------

Signed-off-by: FinleyGe <m13203533462@163.com>
parent a9ab9ebe
Showing with 99 additions and 124 deletions
package.json
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
"@chakra-ui/cli": "^2.4.1", "@chakra-ui/cli": "^2.4.1",
"husky": "^8.0.3", "husky": "^8.0.3",
"i18next": "23.10.0", "i18next": "23.10.0",
"lint-staged": "^13.2.1", "lint-staged": "^13.3.0",
"next-i18next": "15.2.0", "next-i18next": "15.2.0",
"prettier": "3.2.4", "prettier": "3.2.4",
"react-i18next": "13.5.0", "react-i18next": "13.5.0",
"zhlint": "^0.7.1" "zhlint": "^0.7.4"
}, },
"lint-staged": { "lint-staged": {
"./**/**/*.{ts,tsx,scss}": "npm run format-code", "./**/**/*.{ts,tsx,scss}": "npm run format-code",
......
packages/global/core/dataset/api.d.ts
import { DatasetDataIndexItemType, DatasetSchemaType } from './type'; import { DatasetDataIndexItemType, DatasetSchemaType } from './type';
import { TrainingModeEnum, DatasetCollectionTypeEnum } from './constants'; import { TrainingModeEnum, DatasetCollectionTypeEnum } from './constants';
import type { LLMModelItemType } from '../ai/model.d'; import type { LLMModelItemType } from '../ai/model.d';
import { ParentIdType } from 'common/parentFolder/type';
/* ================= dataset ===================== */ /* ================= dataset ===================== */
export type DatasetUpdateBody = { export type DatasetUpdateBody = {
id: string; id: string;
parentId?: string; parentId?: ParentIdType;
name?: string; name?: string;
avatar?: string; avatar?: string;
intro?: string; intro?: string;
......
packages/web/i18n/en/common.json
...@@ -1128,6 +1128,7 @@ ...@@ -1128,6 +1128,7 @@
"Create Folder": "Create Folder", "Create Folder": "Create Folder",
"Create manual collection": "Create manual collection", "Create manual collection": "Create manual collection",
"Delete Dataset Error": "Delete Dataset Error", "Delete Dataset Error": "Delete Dataset Error",
"Edit Info": "Edit Information",
"Edit Folder": "Edit Folder", "Edit Folder": "Edit Folder",
"Export": "Export", "Export": "Export",
"Export Dataset Limit Error": "Export Dataset Error", "Export Dataset Limit Error": "Export Dataset Error",
......
packages/web/i18n/zh/common.json
...@@ -1137,6 +1137,7 @@ ...@@ -1137,6 +1137,7 @@
"Create Folder": "创建文件夹", "Create Folder": "创建文件夹",
"Create manual collection": "创建手动数据集", "Create manual collection": "创建手动数据集",
"Delete Dataset Error": "删除知识库异常", "Delete Dataset Error": "删除知识库异常",
"Edit Info": "编辑信息",
"Edit Folder": "编辑文件夹", "Edit Folder": "编辑文件夹",
"Export": "导出", "Export": "导出",
"Export Dataset Limit Error": "导出数据失败", "Export Dataset Limit Error": "导出数据失败",
......
pnpm-lock.yaml
This source diff could not be displayed because it is too large. You can view the blob instead.
projects/app/src/pages/api/core/dataset/list.ts
...@@ -12,6 +12,7 @@ import { ...@@ -12,6 +12,7 @@ import {
} from '@fastgpt/global/support/permission/constant'; } from '@fastgpt/global/support/permission/constant';
import { MongoResourcePermission } from '@fastgpt/service/support/permission/schema'; import { MongoResourcePermission } from '@fastgpt/service/support/permission/schema';
import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils'; import { parseParentIdInMongo } from '@fastgpt/global/common/parentFolder/utils';
import { DatasetDefaultPermission } from '@fastgpt/global/support/permission/dataset/constant';
async function handler(req: NextApiRequest) { async function handler(req: NextApiRequest) {
const { parentId, type } = req.query as { parentId?: string; type?: DatasetTypeEnum }; const { parentId, type } = req.query as { parentId?: string; type?: DatasetTypeEnum };
...@@ -71,7 +72,7 @@ async function handler(req: NextApiRequest) { ...@@ -71,7 +72,7 @@ async function handler(req: NextApiRequest) {
type: item.type, type: item.type,
permission: item.permission, permission: item.permission,
vectorModel: getVectorModel(item.vectorModel), vectorModel: getVectorModel(item.vectorModel),
defaultPermission: item.defaultPermission defaultPermission: item.defaultPermission ?? DatasetDefaultPermission
})) }))
); );
......
projects/app/src/pages/dataset/detail/index.tsx
...@@ -59,7 +59,7 @@ const Detail = ({ datasetId, currentTab }: Props) => { ...@@ -59,7 +59,7 @@ const Detail = ({ datasetId, currentTab }: Props) => {
<Slider currentTab={currentTab} /> <Slider currentTab={currentTab} />
{!!datasetDetail._id && ( {!!datasetDetail._id && (
<Box flex={'1 0 0'} pb={0}> <Box flex={'1 0 0'} pb={0} overflow={'auto'}>
{currentTab === TabEnum.collectionCard && ( {currentTab === TabEnum.collectionCard && (
<CollectionPageContextProvider> <CollectionPageContextProvider>
<CollectionCard /> <CollectionCard />
......
projects/app/src/pages/dataset/list/context.tsx
import { getDatasetPaths } from '@/web/core/dataset/api'; import { getDatasetPaths, putDatasetById } from '@/web/core/dataset/api';
import { useDatasetStore } from '@/web/core/dataset/store/dataset'; import { useDatasetStore } from '@/web/core/dataset/store/dataset';
import { getErrText } from '@fastgpt/global/common/error/utils'; import {
import { ParentTreePathItemType } from '@fastgpt/global/common/parentFolder/type'; GetResourceFolderListProps,
import { useToast } from '@fastgpt/web/hooks/useToast'; ParentIdType,
import { useQuery } from '@tanstack/react-query'; ParentTreePathItemType
import { useTranslation } from 'next-i18next'; } from '@fastgpt/global/common/parentFolder/type';
import { useRouter } from 'next/router'; import { useRouter } from 'next/router';
import React from 'react'; import React, { useCallback, useState } from 'react';
import { createContext } from 'use-context-selector'; import { createContext } from 'use-context-selector';
import { useI18n } from '@/web/context/I18n';
import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
import { DatasetUpdateBody } from '@fastgpt/global/core/dataset/api';
import dynamic from 'next/dynamic';
const MoveModal = dynamic(() => import('@/components/common/folder/MoveModal'));
export type DatasetContextType = { export type DatasetContextType = {
refetch: () => void; refetchDatasets: () => void;
isFetching: boolean; refetchPaths: () => void;
isFetchingDatasets: boolean;
setMoveDatasetId: (id: string) => void;
paths: ParentTreePathItemType[]; paths: ParentTreePathItemType[];
}; };
export const DatasetContext = createContext<DatasetContextType>({ export const DatasetContext = createContext<DatasetContextType>({
refetch: () => {}, refetchDatasets: () => {},
isFetching: false, isFetchingDatasets: false,
setMoveDatasetId: () => {},
refetchPaths: () => {},
paths: [] paths: []
}); });
function DatasetContextProvider({ children }: { children: React.ReactNode }) { function DatasetContextProvider({ children }: { children: React.ReactNode }) {
const router = useRouter(); const router = useRouter();
const { toast } = useToast(); const { commonT } = useI18n();
const { t } = useTranslation();
const { parentId } = router.query as { parentId: string }; const { parentId = null } = router.query as { parentId?: string | null };
const { loadMyDatasets } = useDatasetStore(); const { loadMyDatasets } = useDatasetStore();
const { data, refetch, isFetching } = useQuery( const getDatasetFolderList = useCallback(async ({ parentId }: GetResourceFolderListProps) => {
['loadDataset', parentId], const res = await getDatasetPaths(parentId);
() => { return res.map((item) => ({
return Promise.all([loadMyDatasets(parentId), getDatasetPaths(parentId)]); id: item.parentId,
}, name: item.parentName
}));
}, []);
const { data: paths = [], runAsync: refetchPaths } = useRequest2(
() => getDatasetPaths(parentId),
{ {
onError(err) { manual: false,
toast({ refreshDeps: [parentId]
status: 'error',
title: t(getErrText(err))
});
} }
);
const { runAsync: refetchDatasets, loading: isFetchingDatasets } = useRequest2(
() => loadMyDatasets(parentId ?? undefined),
{
manual: false,
refreshDeps: [parentId]
} }
); );
const paths = data?.[1] || []; const [moveDatasetId, setMoveDatasetId] = useState<string>();
const { runAsync: onUpdateDataset } = useRequest2((data: DatasetUpdateBody) =>
putDatasetById(data).then(async (res) => {
await Promise.all([refetchDatasets(), refetchPaths()]);
return res;
})
);
const onMoveDataset = useCallback(
async (parentId: ParentIdType) => {
if (!moveDatasetId) return;
await onUpdateDataset({
id: moveDatasetId,
parentId
});
},
[moveDatasetId, onUpdateDataset]
);
const contextValue = { const contextValue = {
refetch, refetchDatasets,
isFetching, isFetchingDatasets,
paths setMoveDatasetId,
paths,
refetchPaths
}; };
return <DatasetContext.Provider value={contextValue}>{children}</DatasetContext.Provider>; return (
<DatasetContext.Provider value={contextValue}>
{children}
{!!moveDatasetId && (
<MoveModal
moveResourceId={moveDatasetId}
server={getDatasetFolderList}
title={commonT('Move')}
onClose={() => setMoveDatasetId(undefined)}
onConfirm={onMoveDataset}
/>
)}
</DatasetContext.Provider>
);
} }
export default DatasetContextProvider; export default DatasetContextProvider;
projects/app/src/pages/dataset/list/index.tsx
import React from 'react'; import React from 'react';
import { Box, Flex, useDisclosure, Image, Button } from '@chakra-ui/react'; import { Box, Flex, Image } from '@chakra-ui/react';
import { useRouter } from 'next/router'; import { useRouter } from 'next/router';
import PageContainer from '@/components/PageContainer'; import PageContainer from '@/components/PageContainer';
import { AddIcon } from '@chakra-ui/icons';
import { postCreateDataset } from '@/web/core/dataset/api';
import { useTranslation } from 'next-i18next'; import { useTranslation } from 'next-i18next';
import MyIcon from '@fastgpt/web/components/common/Icon';
import { serviceSideProps } from '@/web/common/utils/i18n'; import { serviceSideProps } from '@/web/common/utils/i18n';
import dynamic from 'next/dynamic'; import ParentPaths from '@/components/common/folder/Path';
import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants';
import { FolderImgUrl, FolderIcon } from '@fastgpt/global/common/file/image/constants';
import MyMenu from '@fastgpt/web/components/common/MyMenu';
import EditFolderModal, { useEditFolder } from '../component/EditFolderModal';
import { useUserStore } from '@/web/support/user/useUserStore';
import ParentPaths from '@/components/common/ParentPaths';
import { useDatasetStore } from '@/web/core/dataset/store/dataset'; import { useDatasetStore } from '@/web/core/dataset/store/dataset';
import List from './component/List'; import List from './component/List';
import { DatasetContext } from './context'; import { DatasetContext } from './context';
import DatasetContextProvider from './context'; import DatasetContextProvider from './context';
import { useContextSelector } from 'use-context-selector'; import { useContextSelector } from 'use-context-selector';
const CreateModal = dynamic(() => import('./component/CreateModal'), { ssr: false });
const Dataset = () => { const Dataset = () => {
const { t } = useTranslation(); const { t } = useTranslation();
const router = useRouter(); const router = useRouter();
const { userInfo } = useUserStore();
const { myDatasets } = useDatasetStore(); const { myDatasets } = useDatasetStore();
const { parentId } = router.query as { parentId: string };
const {
isOpen: isOpenCreateModal,
onOpen: onOpenCreateModal,
onClose: onCloseCreateModal
} = useDisclosure();
const { editFolderData, setEditFolderData } = useEditFolder(); const { paths, isFetchingDatasets } = useContextSelector(DatasetContext, (v) => v);
const { paths, refetch, isFetching } = useContextSelector(DatasetContext, (v) => v);
return ( return (
<PageContainer <PageContainer
isLoading={myDatasets.length === 0 && isFetching} isLoading={myDatasets.length === 0 && isFetchingDatasets}
insertProps={{ px: [5, '48px'] }} insertProps={{ px: [5, '48px'] }}
> >
<Flex pt={[4, '30px']} alignItems={'center'} justifyContent={'space-between'}> <Flex pt={[4, '30px']} alignItems={'center'} justifyContent={'space-between'}>
{/* url path */} {/* url path */}
<ParentPaths <ParentPaths
paths={paths.map((path) => ({ paths={paths}
parentId: path.parentId,
parentName: path.parentName
}))}
FirstPathDom={ FirstPathDom={
<Flex flex={1} alignItems={'center'}> <Flex flex={1} alignItems={'center'}>
<Image src={'/imgs/workflow/db.png'} alt={''} mr={2} h={'24px'} /> <Image src={'/imgs/workflow/db.png'} alt={''} mr={2} h={'24px'} />
...@@ -66,68 +43,8 @@ const Dataset = () => { ...@@ -66,68 +43,8 @@ const Dataset = () => {
}); });
}} }}
/> />
{/* create icon */}
{userInfo?.team?.permission.hasWritePer && (
<MyMenu
offset={[-30, 5]}
width={120}
Button={
<Button variant={'primaryOutline'} px={0}>
<Flex alignItems={'center'} px={'20px'}>
<AddIcon mr={2} />
<Box>{t('common.Create New')}</Box>
</Flex>
</Button>
}
menuList={[
{
children: [
{
label: (
<Flex>
<MyIcon name={FolderIcon} w={'20px'} mr={1} />
{t('Folder')}
</Flex>
),
onClick: () => setEditFolderData({})
},
{
label: (
<Flex>
<Image src={'/imgs/workflow/db.png'} alt={''} w={'20px'} mr={1} />
{t('core.dataset.Dataset')}
</Flex>
),
onClick: onOpenCreateModal
}
]
}
]}
/>
)}
</Flex> </Flex>
<List /> <List />
{isOpenCreateModal && <CreateModal onClose={onCloseCreateModal} parentId={parentId} />}
{!!editFolderData && (
<EditFolderModal
onClose={() => setEditFolderData(undefined)}
editCallback={async (name) => {
try {
await postCreateDataset({
parentId,
name,
type: DatasetTypeEnum.folder,
avatar: FolderImgUrl,
intro: ''
});
refetch();
} catch (error) {
return Promise.reject(error);
}
}}
isEdit={false}
/>
)}
</PageContainer> </PageContainer>
); );
}; };
......
projects/app/src/web/core/dataset/api.ts
import { GET, POST, PUT, DELETE } from '@/web/common/api/request'; import { GET, POST, PUT, DELETE } from '@/web/common/api/request';
import type { ParentTreePathItemType } from '@fastgpt/global/common/parentFolder/type.d'; import type {
ParentIdType,
ParentTreePathItemType
} from '@fastgpt/global/common/parentFolder/type.d';
import type { import type {
DatasetItemType, DatasetItemType,
DatasetListItemType, DatasetListItemType,
...@@ -56,7 +59,7 @@ export const getDatasets = (data: { parentId?: string; type?: DatasetTypeEnum }) ...@@ -56,7 +59,7 @@ export const getDatasets = (data: { parentId?: string; type?: DatasetTypeEnum })
*/ */
export const getAllDataset = () => GET<DatasetSimpleItemType[]>(`/core/dataset/allDataset`); export const getAllDataset = () => GET<DatasetSimpleItemType[]>(`/core/dataset/allDataset`);
export const getDatasetPaths = (parentId?: string) => export const getDatasetPaths = (parentId: ParentIdType) =>
GET<ParentTreePathItemType[]>('/core/dataset/paths', { parentId }); GET<ParentTreePathItemType[]>('/core/dataset/paths', { parentId });
export const getDatasetById = (id: string) => GET<DatasetItemType>(`/core/dataset/detail?id=${id}`); export const getDatasetById = (id: string) => GET<DatasetItemType>(`/core/dataset/detail?id=${id}`);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment