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/components/support/permission/ConfigPerModal/index.tsx

@@ -7,6 +7,9 @@ import { Box, Button, Flex, HStack, ModalBody } from '@chakra-ui/react';
 import Avatar from '@/components/Avatar';
 import DefaultPermissionList from '../DefaultPerList';
 import MyIcon from '@fastgpt/web/components/common/Icon';
+import { useConfirm } from '@fastgpt/web/hooks/useConfirm';
+import { useI18n } from '@/web/context/I18n';
+import ResumeInherit from '../ResumeInheritText';
 
 export type ConfigPerModalProps = {
   avatar?: string;
@@ -18,6 +21,10 @@ export type ConfigPerModalProps = {
     onChange: (v: PermissionValueType) => Promise<any>;
   };
   managePer: MemberManagerInputPropsType;
+  isInheritPermission?: boolean;
+  resumeInheritPermission?: () => void;
+  hasParent?: boolean;
+  refetchResource?: () => void;
 };
 
 const ConfigPerModal = ({
@@ -25,71 +32,90 @@ const ConfigPerModal = ({
   name,
   defaultPer,
   managePer,
-  onClose
+  isInheritPermission,
+  resumeInheritPermission,
+  hasParent,
+  onClose,
+  refetchResource
 }: ConfigPerModalProps & {
   onClose: () => void;
 }) => {
   const { t } = useTranslation();
+
   return (
-    <MyModal
-      isOpen
-      iconSrc="/imgs/modal/key.svg"
-      onClose={onClose}
-      title={t('permission.Permission config')}
-    >
-      <ModalBody>
-        <HStack>
-          <Avatar src={avatar} w={'1.75rem'} />
-          <Box>{name}</Box>
-        </HStack>
-        <Box mt={6}>
-          <Box fontSize={'sm'}>{t('permission.Default permission')}</Box>
-          <DefaultPermissionList
-            mt="1"
-            per={defaultPer.value}
-            defaultPer={defaultPer.defaultValue}
-            onChange={defaultPer.onChange}
-          />
-        </Box>
-        <Box mt={4}>
-          <CollaboratorContextProvider {...managePer}>
-            {({ MemberListCard, onOpenManageModal, onOpenAddMember }) => {
-              return (
-                <>
-                  <Flex
-                    alignItems="center"
-                    flexDirection="row"
-                    justifyContent="space-between"
-                    w="full"
-                  >
-                    <Box fontSize={'sm'}>{t('permission.Collaborator')}</Box>
-                    <Flex flexDirection="row" gap="2">
-                      <Button
-                        size="sm"
-                        variant="whitePrimary"
-                        leftIcon={<MyIcon w="4" name="common/settingLight" />}
-                        onClick={onOpenManageModal}
-                      >
-                        {t('permission.Manage')}
-                      </Button>
-                      <Button
-                        size="sm"
-                        variant="whitePrimary"
-                        leftIcon={<MyIcon w="4" name="support/permission/collaborator" />}
-                        onClick={onOpenAddMember}
-                      >
-                        {t('common.Add')}
-                      </Button>
+    <>
+      <MyModal
+        isOpen
+        iconSrc="/imgs/modal/key.svg"
+        onClose={onClose}
+        title={t('permission.Permission config')}
+      >
+        <ModalBody>
+          <HStack>
+            <Avatar src={avatar} w={'1.75rem'} />
+            <Box>{name}</Box>
+          </HStack>
+          {!isInheritPermission && (
+            <Box mt={3}>
+              <ResumeInherit onResume={resumeInheritPermission} />
+            </Box>
+          )}
+          <Box mt={5}>
+            <Box fontSize={'sm'}>{t('permission.Default permission')}</Box>
+            <DefaultPermissionList
+              mt="1"
+              per={defaultPer.value}
+              defaultPer={defaultPer.defaultValue}
+              isInheritPermission={isInheritPermission}
+              onChange={(v) => defaultPer.onChange(v)}
+              hasParent={hasParent}
+            />
+          </Box>
+          <Box mt={4}>
+            <CollaboratorContextProvider
+              {...managePer}
+              refetchResource={refetchResource}
+              isInheritPermission={isInheritPermission}
+              hasParent={hasParent}
+            >
+              {({ MemberListCard, onOpenManageModal, onOpenAddMember }) => {
+                return (
+                  <>
+                    <Flex
+                      alignItems="center"
+                      flexDirection="row"
+                      justifyContent="space-between"
+                      w="full"
+                    >
+                      <Box fontSize={'sm'}>{t('permission.Collaborator')}</Box>
+                      <Flex flexDirection="row" gap="2">
+                        <Button
+                          size="sm"
+                          variant="whitePrimary"
+                          leftIcon={<MyIcon w="4" name="common/settingLight" />}
+                          onClick={onOpenManageModal}
+                        >
+                          {t('permission.Manage')}
+                        </Button>
+                        <Button
+                          size="sm"
+                          variant="whitePrimary"
+                          leftIcon={<MyIcon w="4" name="support/permission/collaborator" />}
+                          onClick={onOpenAddMember}
+                        >
+                          {t('common.Add')}
+                        </Button>
+                      </Flex>
                     </Flex>
-                  </Flex>
-                  <MemberListCard mt={2} p={1.5} bg="myGray.100" borderRadius="md" />
-                </>
-              );
-            }}
-          </CollaboratorContextProvider>
-        </Box>
-      </ModalBody>
-    </MyModal>
+                    <MemberListCard mt={2} p={1.5} bg="myGray.100" borderRadius="md" />
+                  </>
+                );
+              }}
+            </CollaboratorContextProvider>
+          </Box>
+        </ModalBody>
+      </MyModal>
+    </>
   );
 };