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
This commit is contained in:
@@ -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');
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user