diff --git a/frontend/src/container/OrganizationSettings/EditMembersDetails/index.tsx b/frontend/src/container/OrganizationSettings/EditMembersDetails/index.tsx index efe4689217..5a30e92ba0 100644 --- a/frontend/src/container/OrganizationSettings/EditMembersDetails/index.tsx +++ b/frontend/src/container/OrganizationSettings/EditMembersDetails/index.tsx @@ -29,6 +29,14 @@ function EditMembersDetails({ const [isLoading, setIsLoading] = useState(false); const [state, copyToClipboard] = useCopyToClipboard(); + useEffect(() => { + return (): void => { + setName(''); + setRole('VIEWER'); + setEmailAddress(''); + }; + }, [setEmailAddress, setName, setRole]); + const getPasswordLink = (token: string): string => { return `${window.location.origin}${ROUTES.PASSWORD_RESET}?token=${token}`; }; diff --git a/frontend/src/container/OrganizationSettings/InviteTeamMembers/index.tsx b/frontend/src/container/OrganizationSettings/InviteTeamMembers/index.tsx index b2d5d270a2..6a4910de59 100644 --- a/frontend/src/container/OrganizationSettings/InviteTeamMembers/index.tsx +++ b/frontend/src/container/OrganizationSettings/InviteTeamMembers/index.tsx @@ -1,6 +1,6 @@ import { PlusOutlined } from '@ant-design/icons'; import { Button, Form, Input, Select, Space, Typography } from 'antd'; -import React, { useCallback } from 'react'; +import React, { useCallback, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; import { InviteTeamMembersProps } from '../PendingInvitesContainer/index'; @@ -11,6 +11,18 @@ const { Option } = Select; function InviteTeamMembers({ allMembers, setAllMembers }: Props): JSX.Element { const { t } = useTranslation('organizationsettings'); + useEffect(() => { + return (): void => { + setAllMembers([ + { + email: '', + name: '', + role: 'VIEWER', + }, + ]); + }; + }, [setAllMembers]); + const onAddHandler = (): void => { setAllMembers((state) => [ ...state, diff --git a/frontend/src/container/OrganizationSettings/Members/index.tsx b/frontend/src/container/OrganizationSettings/Members/index.tsx index 618b9c8222..966f876aaf 100644 --- a/frontend/src/container/OrganizationSettings/Members/index.tsx +++ b/frontend/src/container/OrganizationSettings/Members/index.tsx @@ -180,6 +180,7 @@ function UserFunction({ onOk={(): void => onModalToggleHandler(setIsModalVisible, false)} onCancel={(): void => onModalToggleHandler(setIsModalVisible, false)} centered + destroyOnClose footer={[