4.8.5 test fix (#1862)

* app list ui

* feat: photo view

* perf: app dataset filter

* perf: app dataset filter

* fix: chat recently apps

* perf: workflow header phone

* default templates

* default templates

* fix: input guide phone

* fix: i18n

* team chat history

* remove code

* perf: mongo connection

* log level
This commit is contained in:
Archer
2024-06-27 10:09:55 +08:00
committed by GitHub
parent 9d084b633c
commit a3b0ef066b
31 changed files with 8444 additions and 10670 deletions

View File

@@ -23,7 +23,7 @@ export const simpleBotTemplates: TemplateType = [
{
id: 'simpleChat',
avatar: '/imgs/workflow/AI.png',
name: '简易模板',
name: '简易机器人',
intro: '一个极其简单的 AI 应用,你可以绑定知识库或工具。',
type: AppTypeEnum.simple,
modules: [
@@ -3048,4 +3048,9 @@ export const pluginTemplates: TemplateType = [
}
];
export const defaultAppTemplates = simpleBotTemplates.concat(workflowTemplates[0]);
export const defaultAppTemplates = [
simpleBotTemplates[0],
simpleBotTemplates[1],
workflowTemplates[0],
workflowTemplates[1]
];

View File

@@ -17,6 +17,7 @@ import { StoreEdgeItemType } from '@fastgpt/global/core/workflow/type/edge';
import { EditorVariablePickerType } from '@fastgpt/web/components/common/Textarea/PromptEditor/type';
import { TFunction } from 'next-i18next';
import { ToolModule } from '@fastgpt/global/core/workflow/template/system/tools';
import { useDatasetStore } from '../dataset/store/dataset';
type WorkflowType = {
nodes: StoreNodeItemType[];
@@ -26,6 +27,12 @@ export function form2AppWorkflow(data: AppSimpleEditFormType): WorkflowType & {
chatConfig: AppChatConfigType;
} {
const workflowStartNodeId = 'workflowStartNodeId';
const allDatasets = useDatasetStore.getState().allDatasets;
const selectedDatasets = data.dataset.datasets.filter((item) =>
allDatasets.some((ds) => ds._id === item.datasetId)
);
function systemConfigTemplate(formData: AppSimpleEditFormType): StoreNodeItemType {
return {
nodeId: 'userGuide',
@@ -351,7 +358,7 @@ export function form2AppWorkflow(data: AppSimpleEditFormType): WorkflowType & {
FlowNodeInputTypeEnum.reference
],
label: 'core.module.input.label.Select dataset',
value: formData.dataset.datasets,
value: selectedDatasets,
valueType: WorkflowIOValueTypeEnum.selectDataset,
list: [],
required: true
@@ -447,7 +454,7 @@ export function form2AppWorkflow(data: AppSimpleEditFormType): WorkflowType & {
const datasetNodeId = getNanoid(6);
const datasetTool: WorkflowType | null =
formData.dataset.datasets.length > 0
selectedDatasets.length > 0
? {
nodes: [
{
@@ -470,7 +477,7 @@ export function form2AppWorkflow(data: AppSimpleEditFormType): WorkflowType & {
FlowNodeInputTypeEnum.reference
],
label: 'core.module.input.label.Select dataset',
value: formData.dataset.datasets,
value: selectedDatasets,
valueType: WorkflowIOValueTypeEnum.selectDataset,
list: [],
required: true
@@ -690,7 +697,7 @@ export function form2AppWorkflow(data: AppSimpleEditFormType): WorkflowType & {
const workflow = (() => {
if (data.selectedTools.length > 0) return toolTemplates(data);
if (data.dataset.datasets.length > 0) return datasetTemplate(data);
if (selectedDatasets.length > 0) return datasetTemplate(data);
return simpleChatTemplate(data);
})();

View File

@@ -12,7 +12,6 @@ type State = {
loadAllDatasets: () => Promise<DatasetSimpleItemType[]>;
myDatasets: DatasetListItemType[];
loadMyDatasets: (parentId?: string) => Promise<any>;
setMyDatasets(val: DatasetListItemType[]): void;
};
export const useDatasetStore = create<State>()(
@@ -34,11 +33,6 @@ export const useDatasetStore = create<State>()(
state.myDatasets = res;
});
return res;
},
setMyDatasets(val) {
set((state) => {
state.myDatasets = val;
});
}
})),
{