4.8.6 merge (#1943)

* Dataset collection forbid (#1885)

* perf: tool call support same id

* feat: collection forbid

* feat: collection forbid

* Inheritance Permission for apps (#1897)

* feat: app schema define

chore: references of authapp

* feat: authApp method inheritance

* feat: create and update api

* feat: update

* feat: inheritance Permission controller for app.

* feat: abstract version of inheritPermission

* feat: ancestorId for apps

* chore: update app

* fix: inheritPermission abstract version

* feat: update folder defaultPermission

* feat: app update api

* chore: inheritance frontend

* chore: app list api

* feat: update defaultPermission in app deatil

* feat: backend api finished

* feat: app inheritance permission fe

* fix: app update defaultpermission causes collaborator miss

* fix: ts error

* chore: adjust the codes

* chore: i18n

chore: i18n

* chore: fe adjust and i18n

* chore: adjust the code

* feat: resume api;
chore: rewrite update api and inheritPermission methods

* chore: something

* chore: fe code adjusting

* feat: frontend adjusting

* chore: fe code adjusting

* chore: adjusting the code

* perf: fe loading

* format

* Inheritance fix (#1908)

* fix: SlideCard

* fix: authapp did not return parent app for inheritance app

* fix: fe adjusting

* feat: fe adjusing

* perf: inherit per ux

* doc

* fix: ts errors (#1916)

* perf: inherit permission

* fix: permission inherit

* Workflow type (#1938)

* perf: workflow type

tmp workflow

perf: workflow type

feat: custom field config

* perf: dynamic input

* perf: node classify

* perf: node classify

* perf: node classify

* perf: node classify

* fix: workflow custom input

* feat: text editor and customFeedback move to basic nodes

* feat: community system plugin

* fix: ts

* feat: exprEval plugin

* perf: workflow type

* perf: plugin important

* fix: default templates

* perf: markdown hr css

* lock

* perf: fetch url

* perf: new plugin version

* fix: chat histories update

* fix: collection paths invalid

* perf: app card ui

---------

Co-authored-by: Finley Ge <32237950+FinleyGe@users.noreply.github.com>

projects/app/src/global/core/api/datasetReq.d.ts

@@ -22,14 +22,4 @@ export type GetDatasetCollectionsProps = RequestPaging & {
   selectFolder?: boolean;
 };
 
-export type UpdateDatasetCollectionParams = {
-  id: string;
-  parentId?: string;
-  name?: string;
-};
-
 /* ==== data ===== */
-export type GetDatasetDataListProps = RequestPaging & {
-  searchText?: string;
-  collectionId: string;
-};

projects/app/src/global/core/chat/api.d.ts

@@ -1,5 +1,4 @@
 import type { AppChatConfigType, AppTTSConfigType } from '@fastgpt/global/core/app/type.d';
-import { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/index.d';
 import { AdminFbkType, ChatItemType } from '@fastgpt/global/core/chat/type';
 import type { OutLinkChatAuthProps } from '@fastgpt/global/support/permission/chat.d';
 

projects/app/src/global/core/dataset/api.d.ts

@@ -37,15 +37,6 @@ export type InsertOneDatasetDataProps = PushDatasetDataChunkProps & {
   collectionId: string;
 };
 
-export type UpdateDatasetDataProps = {
-  id: string;
-  q?: string; // embedding content
-  a?: string; // bonus content
-  indexes: (Omit<DatasetDataIndexItemType, 'dataId'> & {
-    dataId?: string; // pg data id
-  })[];
-};
-
 export type GetTrainingQueueProps = {
   vectorModel: string;
   agentModel: string;

projects/app/src/global/core/dataset/type.d.ts

@@ -10,16 +10,21 @@ import { DatasetPermission } from '@fastgpt/global/support/permission/dataset/co
 /* ================= collection ===================== */
 export type DatasetCollectionsListItemType = {
   _id: string;
-  parentId?: string;
-  tmbId: string;
-  name: string;
+  parentId?: DatasetCollectionSchemaType['parentId'];
+  tmbId: DatasetCollectionSchemaType['tmbId'];
+  name: DatasetCollectionSchemaType['name'];
   type: DatasetCollectionSchemaType['type'];
-  updateTime: Date;
-  dataAmount: number;
-  trainingAmount: number;
+  createTime: DatasetCollectionSchemaType['createTime'];
+  updateTime: DatasetCollectionSchemaType['updateTime'];
+  forbid?: DatasetCollectionSchemaType['forbid'];
+  trainingType?: DatasetCollectionSchemaType['trainingType'];
+
   fileId?: string;
   rawLink?: string;
   permission: DatasetPermission;
+
+  dataAmount: number;
+  trainingAmount: number;
 };
 
 /* ================= data ===================== */
@@ -30,5 +35,5 @@ export type DatasetDataListItemType = {
   q: string; // embedding content
   a: string; // bonus content
   chunkIndex?: number;
-  indexes: DatasetDataSchemaType['indexes'];
+  // indexes: DatasetDataSchemaType['indexes'];
 };