diff --git a/worklenz-frontend/public/locales/alb/project-view/project-member-drawer.json b/worklenz-frontend/public/locales/alb/project-view/project-member-drawer.json index 2065c01a..03c891c0 100644 --- a/worklenz-frontend/public/locales/alb/project-view/project-member-drawer.json +++ b/worklenz-frontend/public/locales/alb/project-view/project-member-drawer.json @@ -5,5 +5,7 @@ "inviteAsAMember": "Fto si anëtar", "inviteNewMemberByEmail": "Fto anëtar të ri me email", "members": "Anëtarë", - "copyProjectLink": "Kopjo lidhjen e projektit" + "copyProjectLink": "Kopjo lidhjen e projektit", + "inviteMember": "Fto anëtar", + "alsoInviteToProject": "Fto edhe në projekt" } diff --git a/worklenz-frontend/public/locales/de/project-view/project-member-drawer.json b/worklenz-frontend/public/locales/de/project-view/project-member-drawer.json index f47f89b3..b92056e8 100644 --- a/worklenz-frontend/public/locales/de/project-view/project-member-drawer.json +++ b/worklenz-frontend/public/locales/de/project-view/project-member-drawer.json @@ -5,5 +5,7 @@ "inviteAsAMember": "Als Mitglied einladen", "inviteNewMemberByEmail": "Neues Mitglied per E-Mail einladen", "members": "Mitglieder", - "copyProjectLink": "Projektlink kopieren" + "copyProjectLink": "Projektlink kopieren", + "inviteMember": "Mitglied einladen", + "alsoInviteToProject": "Auch zum Projekt einladen" } diff --git a/worklenz-frontend/public/locales/en/project-view/project-member-drawer.json b/worklenz-frontend/public/locales/en/project-view/project-member-drawer.json index f267b242..29262250 100644 --- a/worklenz-frontend/public/locales/en/project-view/project-member-drawer.json +++ b/worklenz-frontend/public/locales/en/project-view/project-member-drawer.json @@ -5,5 +5,7 @@ "inviteAsAMember": "Invite as a member", "inviteNewMemberByEmail": "Invite new member by email", "members": "Members", - "copyProjectLink": "Copy project link" + "copyProjectLink": "Copy project link", + "inviteMember": "Invite Member", + "alsoInviteToProject": "Also invite to project" } diff --git a/worklenz-frontend/public/locales/es/project-view/project-member-drawer.json b/worklenz-frontend/public/locales/es/project-view/project-member-drawer.json index 80583339..2ade994e 100644 --- a/worklenz-frontend/public/locales/es/project-view/project-member-drawer.json +++ b/worklenz-frontend/public/locales/es/project-view/project-member-drawer.json @@ -5,5 +5,7 @@ "inviteAsAMember": "Invitar como miembro", "inviteNewMemberByEmail": "Invitar nuevo miembro por correo electrónico", "members": "Miembros", - "copyProjectLink": "Copiar enlace del proyecto" + "copyProjectLink": "Copiar enlace del proyecto", + "inviteMember": "Invitar miembro", + "alsoInviteToProject": "También invitar al proyecto" } diff --git a/worklenz-frontend/public/locales/pt/project-view/project-member-drawer.json b/worklenz-frontend/public/locales/pt/project-view/project-member-drawer.json index 73f63784..0c5c7b1a 100644 --- a/worklenz-frontend/public/locales/pt/project-view/project-member-drawer.json +++ b/worklenz-frontend/public/locales/pt/project-view/project-member-drawer.json @@ -5,5 +5,7 @@ "inviteAsAMember": "Convidar como membro", "inviteNewMemberByEmail": "Convidar novo membro por e-mail", "members": "Membros", - "copyProjectLink": "Copiar link do projeto" + "copyProjectLink": "Copiar link do projeto", + "inviteMember": "Convidar membro", + "alsoInviteToProject": "Convidar também para o projeto" } diff --git a/worklenz-frontend/public/locales/zh/project-view/project-member-drawer.json b/worklenz-frontend/public/locales/zh/project-view/project-member-drawer.json index 8d26a38f..512ab0d0 100644 --- a/worklenz-frontend/public/locales/zh/project-view/project-member-drawer.json +++ b/worklenz-frontend/public/locales/zh/project-view/project-member-drawer.json @@ -5,5 +5,7 @@ "inviteAsAMember": "邀请为成员", "inviteNewMemberByEmail": "通过电子邮件邀请新成员", "members": "成员", - "copyProjectLink": "复制项目链接" + "copyProjectLink": "复制项目链接", + "inviteMember": "邀请成员", + "alsoInviteToProject": "也邀请到项目" } \ No newline at end of file diff --git a/worklenz-frontend/src/components/AssigneeSelector.tsx b/worklenz-frontend/src/components/AssigneeSelector.tsx index f9d8fd1f..bb0f799c 100644 --- a/worklenz-frontend/src/components/AssigneeSelector.tsx +++ b/worklenz-frontend/src/components/AssigneeSelector.tsx @@ -11,7 +11,7 @@ import { useAuthService } from '@/hooks/useAuth'; import { Avatar, Button, Checkbox } from '@/components'; import { sortTeamMembers } from '@/utils/sort-team-members'; import { useAppDispatch } from '@/hooks/useAppDispatch'; -import { toggleProjectMemberDrawer } from '@/features/projects/singleProject/members/projectMembersSlice'; +import { setIsFromAssigner, toggleProjectMemberDrawer } from '@/features/projects/singleProject/members/projectMembersSlice'; import { updateEnhancedKanbanTaskAssignees } from '@/features/enhanced-kanban/enhanced-kanban.slice'; interface AssigneeSelectorProps { @@ -206,6 +206,7 @@ const AssigneeSelector: React.FC = ({ const handleInviteProjectMemberDrawer = () => { setIsOpen(false); // Close the assignee dropdown first + dispatch(setIsFromAssigner(true)); dispatch(toggleProjectMemberDrawer()); // Then open the invite drawer }; diff --git a/worklenz-frontend/src/components/projects/project-member-invite-drawer/project-member-invite-drawer.tsx b/worklenz-frontend/src/components/projects/project-member-invite-drawer/project-member-invite-drawer.tsx index 5fa655ec..5bc09a9b 100644 --- a/worklenz-frontend/src/components/projects/project-member-invite-drawer/project-member-invite-drawer.tsx +++ b/worklenz-frontend/src/components/projects/project-member-invite-drawer/project-member-invite-drawer.tsx @@ -22,7 +22,7 @@ import { teamMembersApiService } from '@/api/team-members/teamMembers.api.servic const ProjectMemberDrawer = () => { const { t } = useTranslation('project-view/project-member-drawer'); - const { isDrawerOpen, currentMembersList, isLoading } = useAppSelector( + const { isDrawerOpen, currentMembersList, isLoading, isFromAssigner } = useAppSelector( state => state.projectMemberReducer ); const { projectId } = useAppSelector(state => state.projectReducer); @@ -176,8 +176,9 @@ const ProjectMemberDrawer = () => { ); const renderNotFoundContent = () => ( - + + {isFromAssigner && + + + } ); return ( {t('title')} + {isFromAssigner ? t('inviteMember') : t('title')} } open={isDrawerOpen} onCancel={() => dispatch(toggleProjectMemberDrawer())} afterOpenChange={handleOpenChange} footer={ -