-
Notifications
You must be signed in to change notification settings - Fork 5.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat: app owner change (#2271) * feat(app): changeOwner api * feat: changeOwner api * feat: ChangeOwnerModal * feat: update change owner api * chore: move change owner api into pro version feat(fe): change owner modal * feat: add change owner button and modal to InfoModal * change owner ux * feat: doc * perf: remove info change owner btn --------- Co-authored-by: Finley Ge <[email protected]>
- Loading branch information
Showing
14 changed files
with
258 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
packages/web/components/common/Icon/icons/common/lineChange.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions
4
packages/web/components/common/Icon/icons/modal/changePer.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
162 changes: 162 additions & 0 deletions
162
projects/app/src/components/support/permission/ChangeOwnerModal/index.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,162 @@ | ||
| import { getTeamMembers } from '@/web/support/user/team/api'; | ||
| import { | ||
| Box, | ||
| Flex, | ||
| HStack, | ||
| Input, | ||
| ModalBody, | ||
| ModalFooter, | ||
| Button, | ||
| useDisclosure | ||
| } from '@chakra-ui/react'; | ||
| import { TeamMemberItemType } from '@fastgpt/global/support/user/team/type'; | ||
| import Avatar from '@fastgpt/web/components/common/Avatar'; | ||
| import Icon from '@fastgpt/web/components/common/Icon'; | ||
| import MyModal from '@fastgpt/web/components/common/MyModal'; | ||
| import MyTag from '@fastgpt/web/components/common/Tag'; | ||
| import { useRequest2 } from '@fastgpt/web/hooks/useRequest'; | ||
| import { useTranslation } from 'next-i18next'; | ||
| import React, { useState } from 'react'; | ||
|
|
||
| export type ChangeOwnerModalProps = { | ||
| avatar?: string; | ||
| name: string; | ||
| onChangeOwner: (tmbId: string) => Promise<unknown>; | ||
| }; | ||
|
|
||
| export function ChangeOwnerModal({ | ||
| onClose, | ||
| avatar, | ||
| name, | ||
| onChangeOwner | ||
| }: ChangeOwnerModalProps & { onClose: () => void }) { | ||
| const { t } = useTranslation(); | ||
| const [inputValue, setInputValue] = React.useState(''); | ||
| const { data: teamMembers = [] } = useRequest2(getTeamMembers, { | ||
| manual: false | ||
| }); | ||
|
|
||
| const memberList = teamMembers.filter((item) => { | ||
| return item.memberName.includes(inputValue); | ||
| }); | ||
|
|
||
| const { | ||
| isOpen: isOpenMemberListMenu, | ||
| onClose: onCloseMemberListMenu, | ||
| onOpen: onOpenMemberListMenu | ||
| } = useDisclosure(); | ||
| const [selectedMember, setSelectedMember] = useState<TeamMemberItemType | null>(null); | ||
|
|
||
| const { runAsync, loading } = useRequest2(onChangeOwner, { | ||
| onSuccess: onClose, | ||
| successToast: t('common:permission.change_owner_success'), | ||
| errorToast: t('common:permission.change_owner_failed') | ||
| }); | ||
|
|
||
| const onConfirm = async () => { | ||
| if (!selectedMember) { | ||
| return; | ||
| } | ||
| await runAsync(selectedMember.tmbId); | ||
| }; | ||
|
|
||
| return ( | ||
| <MyModal | ||
| isOpen | ||
| iconSrc="modal/changePer" | ||
| onClose={onClose} | ||
| title={t('common:permission.change_owner')} | ||
| isLoading={loading} | ||
| > | ||
| <ModalBody> | ||
| <HStack> | ||
| <Avatar src={avatar} w={'1.75rem'} borderRadius={'md'} /> | ||
| <Box>{name}</Box> | ||
| </HStack> | ||
| <Flex mt={4} justify="start" flexDirection="column"> | ||
| <Box fontSize="14px" fontWeight="500" color="myGray.900"> | ||
| {t('common:permission.change_owner_to')} | ||
| </Box> | ||
| <Flex mt="4" alignItems="center" position={'relative'}> | ||
| {selectedMember && ( | ||
| <Avatar | ||
| src={selectedMember.avatar} | ||
| w={'20px'} | ||
| borderRadius={'md'} | ||
| position="absolute" | ||
| left={3} | ||
| /> | ||
| )} | ||
| <Input | ||
| placeholder={t('common:permission.change_owner_placeholder')} | ||
| value={inputValue} | ||
| onChange={(e) => { | ||
| setInputValue(e.target.value); | ||
| setSelectedMember(null); | ||
| }} | ||
| onFocus={() => { | ||
| onOpenMemberListMenu(); | ||
| setSelectedMember(null); | ||
| }} | ||
| // onBlur={() => { | ||
| // setTimeout(() => { | ||
| // onCloseMemberListMenu(); | ||
| // }, 10); | ||
| // }} | ||
| {...(selectedMember && { pl: '10' })} | ||
| /> | ||
| </Flex> | ||
| {isOpenMemberListMenu && memberList.length > 0 && ( | ||
| <Flex | ||
| mt={2} | ||
| w={'100%'} | ||
| flexDirection={'column'} | ||
| gap={2} | ||
| p={1} | ||
| boxShadow="lg" | ||
| bg="white" | ||
| borderRadius="md" | ||
| zIndex={10} | ||
| maxH={'300px'} | ||
| overflow={'auto'} | ||
| > | ||
| {memberList.map((item) => ( | ||
| <Box | ||
| key={item.tmbId} | ||
| p="2" | ||
| _hover={{ bg: 'myGray.100' }} | ||
| mx="1" | ||
| borderRadius="md" | ||
| cursor={'pointer'} | ||
| onClickCapture={() => { | ||
| setInputValue(item.memberName); | ||
| setSelectedMember(item); | ||
| onCloseMemberListMenu(); | ||
| }} | ||
| > | ||
| <Flex align="center"> | ||
| <Avatar src={item.avatar} w="1.25rem" /> | ||
| <Box ml="2">{item.memberName}</Box> | ||
| </Flex> | ||
| </Box> | ||
| ))} | ||
| </Flex> | ||
| )} | ||
|
|
||
| <MyTag mt="4" colorSchema="blue"> | ||
| <Icon name="common/info" w="1rem" /> | ||
| <Box ml="2">{t('common:permission.change_owner_tip')}</Box> | ||
| </MyTag> | ||
| </Flex> | ||
| </ModalBody> | ||
| <ModalFooter> | ||
| <HStack> | ||
| <Button onClick={onClose} variant={'whiteBase'}> | ||
| {t('common:common.Cancel')} | ||
| </Button> | ||
| <Button onClick={onConfirm}>{t('common:common.Confirm')}</Button> | ||
| </HStack> | ||
| </ModalFooter> | ||
| </MyModal> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.