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>

packages/service/core/app/plugin/controller.ts

@@ -1,13 +1,15 @@
-import { FlowNodeTemplateType } from '@fastgpt/global/core/workflow/type/index.d';
+import { FlowNodeTemplateType } from '@fastgpt/global/core/workflow/type/node.d';
 import { FlowNodeTypeEnum, defaultNodeVersion } from '@fastgpt/global/core/workflow/node/constant';
 import { pluginData2FlowNodeIO } from '@fastgpt/global/core/workflow/utils';
 import { PluginSourceEnum } from '@fastgpt/global/core/plugin/constants';
-import type { PluginRuntimeType, PluginTemplateType } from '@fastgpt/global/core/plugin/type.d';
+import type { PluginRuntimeType } from '@fastgpt/global/core/workflow/runtime/type';
 import { FlowNodeTemplateTypeEnum } from '@fastgpt/global/core/workflow/constants';
 import { getHandleConfig } from '@fastgpt/global/core/workflow/template/utils';
 import { getNanoid } from '@fastgpt/global/common/string/tools';
 import { cloneDeep } from 'lodash';
 import { MongoApp } from '../schema';
+import { SystemPluginTemplateItemType } from '@fastgpt/global/core/workflow/type';
+import { getCommunityPlugins } from '@fastgpt/plugins/register';
 
 /* 
   plugin id rule:
@@ -32,11 +34,15 @@ export async function splitCombinePluginId(id: string) {
   return { source, pluginId: id };
 }
 
-const getPluginTemplateById = async (id: string): Promise<PluginTemplateType> => {
+const getPluginTemplateById = async (
+  id: string
+): Promise<SystemPluginTemplateItemType & { teamId?: string }> => {
   const { source, pluginId } = await splitCombinePluginId(id);
 
   if (source === PluginSourceEnum.community) {
-    const item = global.communityPlugins?.find((plugin) => plugin.id === pluginId);
+    const item = [...global.communityPlugins, ...getCommunityPlugins()].find(
+      (plugin) => plugin.id === pluginId
+    );
     if (!item) return Promise.reject('plugin not found');
 
     return cloneDeep(item);
@@ -52,12 +58,15 @@ const getPluginTemplateById = async (id: string): Promise<PluginTemplateType> =>
       avatar: item.avatar,
       intro: item.intro,
       showStatus: true,
-      source: PluginSourceEnum.personal,
-      nodes: item.modules,
-      edges: item.edges,
-      templateType: FlowNodeTemplateTypeEnum.personalPlugin,
+      workflow: {
+        nodes: item.modules,
+        edges: item.edges
+      },
+      templateType: FlowNodeTemplateTypeEnum.teamApp,
       isTool: true,
-      version: item?.pluginData?.nodeVersion || defaultNodeVersion
+      version: item?.pluginData?.nodeVersion || defaultNodeVersion,
+      originCost: 0,
+      currentCost: 0
     };
   }
   return Promise.reject('plugin not found');
@@ -80,7 +89,7 @@ export async function getPluginPreviewNode({ id }: { id: string }): Promise<Flow
     version: plugin.version,
     sourceHandle: getHandleConfig(true, true, true, true),
     targetHandle: getHandleConfig(true, true, true, true),
-    ...pluginData2FlowNodeIO(plugin.nodes)
+    ...pluginData2FlowNodeIO(plugin.workflow.nodes)
   };
 }
 
@@ -93,7 +102,7 @@ export async function getPluginRuntimeById(id: string): Promise<PluginRuntimeTyp
     name: plugin.name,
     avatar: plugin.avatar,
     showStatus: plugin.showStatus,
-    nodes: plugin.nodes,
-    edges: plugin.edges
+    nodes: plugin.workflow.nodes,
+    edges: plugin.workflow.edges
   };
 }

packages/service/core/app/schema.ts

@@ -7,6 +7,7 @@ import {
   TeamMemberCollectionName
 } from '@fastgpt/global/support/user/team/constant';
 import { AppDefaultPermissionVal } from '@fastgpt/global/support/permission/app/constant';
+import { getPermissionSchema } from '@fastgpt/global/support/permission/utils';
 
 export const AppCollectionName = 'apps';
 
@@ -108,11 +109,7 @@ const AppSchema = new Schema({
     type: Boolean
   },
 
-  // the default permission of a app
-  defaultPermission: {
-    type: Number,
-    default: AppDefaultPermissionVal
-  }
+  ...getPermissionSchema(AppDefaultPermissionVal)
 });
 
 try {