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/pages/dataset/detail/components/InputDataModal.tsx

@@ -14,7 +14,7 @@ import MyModal from '@fastgpt/web/components/common/MyModal';
 import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
 import { useQuery } from '@tanstack/react-query';
 import { useTranslation } from 'next-i18next';
-import { useRequest } from '@fastgpt/web/hooks/useRequest';
+import { useRequest, useRequest2 } from '@fastgpt/web/hooks/useRequest';
 import { useConfirm } from '@fastgpt/web/hooks/useConfirm';
 import { getDefaultIndex } from '@fastgpt/global/core/dataset/utils';
 import { DatasetDataIndexItemType } from '@fastgpt/global/core/dataset/type';
@@ -183,13 +183,14 @@ const InputDataModal = ({
     errorToast: t('common.error.unKnow')
   });
   // update
-  const { mutate: onUpdateData, isLoading: isUpdating } = useRequest({
-    mutationFn: async (e: InputDataType) => {
-      if (!dataId) return e;
+
+  const { runAsync: onUpdateData, loading: isUpdating } = useRequest2(
+    async (e: InputDataType) => {
+      if (!dataId) return Promise.reject(t('common.error.unKnow'));
 
       // not exactly same
       await putDatasetDataById({
-        id: dataId,
+        dataId,
         ...e,
         indexes:
           e.indexes?.map((index) =>
@@ -202,13 +203,14 @@ const InputDataModal = ({
         ...e
       };
     },
-    successToast: t('dataset.data.Update Success Tip'),
-    errorToast: t('common.error.unKnow'),
-    onSuccess(data) {
-      onSuccess(data);
-      onClose();
+    {
+      successToast: t('dataset.data.Update Success Tip'),
+      onSuccess(data) {
+        onSuccess(data);
+        onClose();
+      }
     }
-  });
+  );
   // delete
   const { mutate: onDeleteData, isLoading: isDeleting } = useRequest({
     mutationFn: () => {
@@ -224,10 +226,7 @@ const InputDataModal = ({
     errorToast: t('common.error.unKnow')
   });
 
-  const isLoading = useMemo(
-    () => isImporting || isUpdating || isFetchingData || isDeleting,
-    [isImporting, isUpdating, isFetchingData, isDeleting]
-  );
+  const isLoading = isFetchingData || isDeleting;
 
   return (
     <MyModal isOpen={true} isCentered w={'90vw'} maxW={'1440px'} h={'90vh'}>
@@ -370,6 +369,7 @@ const InputDataModal = ({
             >
               <Button
                 isDisabled={!collection.permission.hasWritePer}
+                isLoading={isImporting || isUpdating}
                 // @ts-ignore
                 onClick={handleSubmit(dataId ? onUpdateData : sureImportData)}
               >