v4.6.9-alpha (#918)

Co-authored-by: Mufei <327958099@qq.com> Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>
2024-03-04 00:05:25 +08:00
parent f9f0b4bffd
commit 42a8184ea0
153 changed files with 4906 additions and 4307 deletions
--- a/projects/app/src/components/support/user/team/TeamManageModal/index.tsx
+++ b/projects/app/src/components/support/user/team/TeamManageModal/index.tsx
@@ -9,9 +9,7 @@ import {
  putSwitchTeam,
  putUpdateMember,
  delRemoveMember,
-  delLeaveTeam,
-  getTeamsTags,
-  insertTeamsTags
+  delLeaveTeam
 } from '@/web/support/user/team/api';
 import {
  Box,
@@ -49,7 +47,7 @@ import { useSystemStore } from '@/web/common/system/useSystemStore';

 const EditModal = dynamic(() => import('./EditModal'));
 const InviteModal = dynamic(() => import('./InviteModal'));
-const TeamTagsAsync = dynamic(() => import('../TeamTagsAsync'));
+const TeamTagModal = dynamic(() => import('../TeamTagModal'));

 const TeamManageModal = ({ onClose }: { onClose: () => void }) => {
  const { t } = useTranslation();
@@ -57,7 +55,6 @@ const TeamManageModal = ({ onClose }: { onClose: () => void }) => {
  const { toast } = useToast();
  const { teamPlanStatus } = useUserStore();
  const { feConfigs } = useSystemStore();
-  const [teamsTags, setTeamTags] = useState<any>();

  const { ConfirmModal: ConfirmRemoveMemberModal, openConfirm: openRemoveMember } = useConfirm();
  const { ConfirmModal: ConfirmLeaveTeamModal, openConfirm: openLeaveConfirm } = useConfirm({
@@ -87,8 +84,6 @@ const TeamManageModal = ({ onClose }: { onClose: () => void }) => {
    mutationFn: async (teamId: string) => {
      const token = await putSwitchTeam(teamId);
      token && setToken(token);
-      // get team tags
-      await getTeamsTags(teamId);
      return initUserInfo();
    },
    errorToast: t('user.team.Switch Team Failed')
@@ -99,11 +94,6 @@ const TeamManageModal = ({ onClose }: { onClose: () => void }) => {
    ['getMembers', userInfo?.team?.teamId],
    () => {
      if (!userInfo?.team?.teamId) return [];
-      // get team tags
-      getTeamsTags(userInfo.team.teamId).then((res: any) => {
-        setTeamTags(res);
-      });
-
      return getTeamMembers(userInfo.team.teamId);
    }
  );
@@ -217,17 +207,6 @@ const TeamManageModal = ({ onClose }: { onClose: () => void }) => {
                      : {})}
                  >
                    {team.teamName}
-                    {/* {userInfo?.team?.teamId === team.teamId && (
-                      <HStack spacing={1}>
-                        {teamsTags.slice(0, 3).map((item: any, index) => {
-                          return (
-                            <Tag key={index} size={'sm'} variant="outline" colorScheme="blue">
-                              {item.label}
-                            </Tag>
-                          );
-                        })}
-                      </HStack>
-                    )} */}
                  </Box>
                  {userInfo?.team?.teamId === team.teamId ? (
                    <MyIcon name={'common/tickFill'} w={'16px'} color={'primary.500'} />
@@ -290,31 +269,32 @@ const TeamManageModal = ({ onClose }: { onClose: () => void }) => {
              <Box ml={2} bg={'myGray.100'} borderRadius={'20px'} px={3} fontSize={'xs'}>
                {members.length}
              </Box>
-              {userInfo.team.role === TeamMemberRoleEnum.owner &&
-                teamPlanStatus?.standardConstants &&
-                teamPlanStatus.standardConstants.maxTeamMember > members.length && (
-                  <Button
-                    variant={'whitePrimary'}
-                    size="sm"
-                    borderRadius={'md'}
-                    ml={3}
-                    leftIcon={
-                      <MyIcon name={'common/inviteLight'} w={'14px'} color={'primary.500'} />
+              {userInfo.team.role === TeamMemberRoleEnum.owner && (
+                <Button
+                  variant={'whitePrimary'}
+                  size="sm"
+                  borderRadius={'md'}
+                  ml={3}
+                  leftIcon={<MyIcon name={'common/inviteLight'} w={'14px'} color={'primary.500'} />}
+                  onClick={() => {
+                    if (
+                      teamPlanStatus?.standardConstants?.maxTeamMember &&
+                      teamPlanStatus.standardConstants.maxTeamMember <= members.length
+                    ) {
+                      toast({
+                        status: 'warning',
+                        title: t('user.team.Over Max Member Tip', {
+                          max: teamPlanStatus.standardConstants.maxTeamMember
+                        })
+                      });
+                    } else {
+                      onOpenInvite();
                    }
-                    onClick={() => {
-                      if (userInfo.team.maxSize <= members.length) {
-                        toast({
-                          status: 'warning',
-                          title: t('user.team.Over Max Member Tip', { max: userInfo.team.maxSize })
-                        });
-                      } else {
-                        onOpenInvite();
-                      }
-                    }}
-                  >
-                    {t('user.team.Invite Member')}
-                  </Button>
-                )}
+                  }}
+                >
+                  {t('user.team.Invite Member')}
+                </Button>
+              )}
              {userInfo.team.role === TeamMemberRoleEnum.owner && feConfigs?.show_team_chat && (
                <Button
                  variant={'whitePrimary'}
@@ -323,14 +303,7 @@ const TeamManageModal = ({ onClose }: { onClose: () => void }) => {
                  ml={3}
                  leftIcon={<DragHandleIcon w={'14px'} color={'primary.500'} />}
                  onClick={() => {
-                    if (userInfo.team.maxSize <= members.length) {
-                      toast({
-                        status: 'warning',
-                        title: t('user.team.Team Tags Async', { max: userInfo.team.maxSize })
-                      });
-                    } else {
-                      onOpenTeamTagsAsync();
-                    }
+                    onOpenTeamTagsAsync();
                  }}
                >
                  {t('user.team.Team Tags Async')}
@@ -492,13 +465,7 @@ const TeamManageModal = ({ onClose }: { onClose: () => void }) => {
          onSuccess={refetchMembers}
        />
      )}
-      {isOpenTeamTagsAsync && (
-        <TeamTagsAsync
-          teamInfo={teamsTags?.tagsUrl}
-          teamsTags={teamsTags?.list || []}
-          onClose={onCloseTeamTagsAsync}
-        />
-      )}
+      {isOpenTeamTagsAsync && <TeamTagModal onClose={onCloseTeamTagsAsync} />}
      <ConfirmRemoveMemberModal />
      <ConfirmLeaveTeamModal />
    </>
--- a/projects/app/src/components/support/user/team/TeamTagsAsync/index.tsx
+++ b/projects/app/src/components/support/user/team/TeamTagsAsync/index.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from 'react';
+import React from 'react';
 import MyModal from '@/components/MyModal';
 import {
  Box,
@@ -11,61 +11,74 @@ import {
  HStack,
  Avatar
 } from '@chakra-ui/react';
-import { AttachmentIcon, CopyIcon, DragHandleIcon } from '@chakra-ui/icons';
-import { putUpdateTeamTags, updateTags } from '@/web/support/user/team/api';
-import { useForm } from 'react-hook-form';
+import { putUpdateTeam } from '@/web/support/user/team/api';
+import { useFieldArray, useForm } from 'react-hook-form';
 import { useTranslation } from 'next-i18next';
-import type { TeamTagsSchema } from '@fastgpt/global/support/user/team/type';
+import type { TeamTagItemType } from '@fastgpt/global/support/user/team/type';
 import { useRequest } from '@/web/common/hooks/useRequest';
 import { RepeatIcon } from '@chakra-ui/icons';
 import MyIcon from '@fastgpt/web/components/common/Icon';
-import { useToast } from '@fastgpt/web/hooks/useToast';
 import { useCopyData } from '@/web/common/hooks/useCopyData';
+import { useUserStore } from '@/web/support/user/useUserStore';
+import { useQuery } from '@tanstack/react-query';
+import { getTeamsTags, loadTeamTagsByDomain } from '@/web/support/user/team/api';

-const TeamTagsAsync = ({
-  teamsTags,
-  teamInfo,
-  onClose
-}: {
-  teamsTags: Array<TeamTagsSchema>;
-  teamInfo: any;
-  onClose: () => void;
-}) => {
+type FormType = {
+  teamDomain: string;
+  tags: TeamTagItemType[];
+};
+
+const TeamTagsAsync = ({ onClose }: { onClose: () => void }) => {
  const { t } = useTranslation();
-  const { toast } = useToast();
-  const [_teamsTags, setTeamTags] = useState<Array<TeamTagsSchema>>(teamsTags);
-
-  const { register, setValue, getValues, handleSubmit } = useForm<any>({
-    defaultValues: { ...teamInfo }
-  });
+  const { userInfo, initUserInfo } = useUserStore();
  const { copyData } = useCopyData();
+
+  const teamInfo = userInfo?.team;
+
+  if (!teamInfo) {
+    onClose();
+    return null;
+  }
+
+  const { register, control, handleSubmit } = useForm<FormType>({
+    defaultValues: {
+      teamDomain: teamInfo.teamDomain,
+      tags: []
+    }
+  });
+  const { fields: teamTags, replace: replaceTeamTags } = useFieldArray({
+    control,
+    name: 'tags'
+  });
+
  const baseUrl = global.feConfigs?.customSharePageDomain || location?.origin;
-  const linkUrl = `${baseUrl}/chat/team?shareTeamId=${teamInfo?._id}${
-    getValues('showHistory') ? '' : '&showHistory=0'
-  }`;
+  const linkUrl = `${baseUrl}/chat/team?teamId=${teamInfo.teamId}&teamToken=`;

  // tags Async
-  const { mutate: onclickAsync, isLoading: creating } = useRequest({
-    mutationFn: async (data: any) => {
-      return putUpdateTeamTags({ tagsUrl: data.tagsUrl, teamId: teamInfo?._id });
+  const { mutate: onclickUpdate, isLoading: isUpdating } = useRequest({
+    mutationFn: async (data: FormType) => {
+      return putUpdateTeam({ teamDomain: data.teamDomain, teamId: teamInfo?.teamId });
    },
-    onSuccess(id: string) {
+    onSuccess() {
+      initUserInfo();
      onClose();
    },
-    successToast: t('user.team.Team Tags Async Success'),
    errorToast: t('common.Create Failed')
  });
-  const asyncTags = async () => {
-    console.log('getValues', getValues());
-    const res: Array<TeamTagsSchema> = await updateTags(teamInfo?._id, getValues().tagsUrl);
-    setTeamTags(res);
-    toast({ status: 'success', title: '团队标签同步成功' });
-  };
-  useEffect(() => {
-    console.log('teamInfo', teamInfo);
-  }, []);
+  const { mutate: onclickTagAsync, isLoading: isSyncing } = useRequest({
+    mutationFn: (data: FormType) => loadTeamTagsByDomain(data.teamDomain),
+    onSuccess(res) {
+      replaceTeamTags(res);
+    },
+    successToast: t('support.user.team.Team Tags Async Success')
+  });
+
+  useQuery(['getTeamsTags'], getTeamsTags, {
+    onSuccess: (data) => {
+      replaceTeamTags(data);
+    }
+  });

-  // 获取
  return (
    <>
      <MyModal
@@ -80,7 +93,7 @@ const TeamTagsAsync = ({
        overflow={'hidden'}
        title={
          <Box>
-            <Box>{teamInfo?.name}</Box>
+            <Box>{teamInfo?.teamName}</Box>
            <Box color={'myGray.500'} fontSize={'xs'} fontWeight={'normal'}>
              {'填写标签同步链接，点击同步按钮即可同步'}
            </Box>
@@ -98,8 +111,8 @@ const TeamTagsAsync = ({
              autoFocus
              bg={'myWhite.600'}
              placeholder="请输入同步标签"
-              {...register('tagsUrl', {
-                required: t('core.app.error.App name can not be empty')
+              {...register('teamDomain', {
+                required: true
              })}
            />
          </Flex>
@@ -146,7 +159,7 @@ const TeamTagsAsync = ({
              }}
              spacing={1}
            >
-              {_teamsTags.map((item, index) => {
+              {teamTags.map((item, index) => {
                return (
                  <Tag key={index} mt={2} size={'md'} colorScheme="red" borderRadius="full">
                    <Avatar
@@ -161,7 +174,13 @@ const TeamTagsAsync = ({
                );
              })}
            </HStack>
-            <Button ml={4} size="md" leftIcon={<RepeatIcon />} onClick={asyncTags}>
+            <Button
+              isLoading={isSyncing}
+              ml={4}
+              size="md"
+              leftIcon={<RepeatIcon />}
+              onClick={handleSubmit((data) => onclickTagAsync(data))}
+            >
              立即同步
            </Button>
          </Flex>
@@ -170,7 +189,7 @@ const TeamTagsAsync = ({
          <Button variant={'whiteBase'} mr={3} onClick={onClose}>
            {t('common.Close')}
          </Button>
-          <Button isLoading={creating} onClick={handleSubmit((data) => onclickAsync(data))}>
+          <Button isLoading={isUpdating} onClick={handleSubmit((data) => onclickUpdate(data))}>
            {t('user.team.Tags Async')}
          </Button>
        </ModalFooter>