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/service/core/app/workflow.ts

@@ -1,5 +1,5 @@
 import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
-import type { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/index.d';
+import type { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/node.d';
 
 export const getChatModelNameListByModules = (nodes: StoreNodeItemType[]): string[] => {
   return nodes

projects/app/src/service/core/dataset/data/controller.ts

@@ -115,7 +115,7 @@ export async function insertData2Dataset({
  */
 export async function updateData2Dataset({
   dataId,
-  q,
+  q = '',
   a,
   indexes,
   model
@@ -140,7 +140,7 @@ export async function updateData2Dataset({
     formatIndexes.unshift(defaultIndex ? defaultIndex : getDefaultIndex({ q, a }));
   }
   formatIndexes = formatIndexes.slice(0, 6);
-
+  console.log(formatIndexes);
   // patch indexes, create, update, delete
   const patchResult: PatchIndexesProps[] = [];
 

projects/app/src/service/support/permission/auth/chat.ts

@@ -56,7 +56,7 @@ export async function autChatCrud({
     // auth team space chat
     if (spaceTeamId && teamToken) {
       const { uid } = await authTeamSpaceToken({ teamId: spaceTeamId, teamToken });
-      addLog.debug('Auth team token', { uid, spaceTeamId, teamToken, chatUid: chat.outLinkUid });
+      addLog.debug('Auth team token', { uid, spaceTeamId, teamToken, chatUid: chat?.outLinkUid });
       if (!chat || (String(chat.teamId) === String(spaceTeamId) && chat.outLinkUid === uid)) {
         return { uid };
       }

projects/app/src/service/support/wallet/usage/push.ts

@@ -19,7 +19,7 @@ export const pushChatUsage = ({
   pluginId?: string;
   teamId: string;
   tmbId: string;
-  source: `${UsageSourceEnum}`;
+  source: UsageSourceEnum;
   flowUsages: ChatNodeUsageType[];
 }) => {
   const totalPoints = flowUsages.reduce((sum, item) => sum + (item.totalPoints || 0), 0);
@@ -94,7 +94,7 @@ export const pushGenerateVectorUsage = ({
   tmbId: string;
   tokens: number;
   model: string;
-  source?: `${UsageSourceEnum}`;
+  source?: UsageSourceEnum;
 
   extensionModel?: string;
   extensionTokens?: number;
@@ -210,7 +210,7 @@ export function pushAudioSpeechUsage({
   charsLength: number;
   teamId: string;
   tmbId: string;
-  source: `${UsageSourceEnum}`;
+  source: UsageSourceEnum;
 }) {
   const { totalPoints, modelName } = formatModelChars2Points({
     model,

projects/app/src/service/support/wallet/usage/utils.ts

@@ -8,7 +8,7 @@ export function authType2UsageSource({
 }: {
   authType?: `${AuthUserTypeEnum}`;
   shareId?: string;
-  source?: `${UsageSourceEnum}`;
+  source?: UsageSourceEnum;
 }) {
   if (source) return source;
   if (shareId) return UsageSourceEnum.shareLink;

projects/app/src/service/utils/chat/saveChat.ts

@@ -6,7 +6,7 @@ import { MongoChat } from '@fastgpt/service/core/chat/chatSchema';
 import { addLog } from '@fastgpt/service/common/system/log';
 import { getChatTitleFromChatMessage } from '@fastgpt/global/core/chat/utils';
 import { mongoSessionRun } from '@fastgpt/service/common/mongo/sessionRun';
-import { StoreNodeItemType } from '@fastgpt/global/core/workflow/type';
+import { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/node';
 import {
   getAppChatConfig,
   getGuideModule,