Skip to content

release-20260205 #1509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
d-beezee merged 2 commits into from
Feb 5, 2026
Merged

release-20260205 #1509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
314841c
fix: Propagate modal ref for nested
d-beezee Feb 4, 2026
7d1c38a
Merge pull request #1508 from AppQuality/fix-nested-remove-modal
Kariamos Feb 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/common/components/inviteUsers/campaignSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
useToast,
} from '@appquality/unguess-design-system';
import { FormikHelpers } from 'formik';
import { useState } from 'react';
import { useCallback, useState } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { useAppSelector } from 'src/app/hooks';
import { appTheme } from 'src/app/theme';
Expand Down Expand Up @@ -52,6 +52,15 @@ export const CampaignSettings = ({ dataQa }: { dataQa?: string }) => {
const [addNewMember] = usePostCampaignsByCidUsersMutation();
const [removeUser] = useDeleteCampaignsByCidUsersMutation();

const [appendNode, setAppendNode] = useState<Element | null>(null);

const setModalNode = useCallback(
(node: HTMLDivElement | null) => {
setAppendNode(node);
},
[isModalOpen]
);

const {
isLoading: isLoadingCampaign,
isFetching: isFetchingCampaign,
Expand Down Expand Up @@ -277,7 +286,7 @@ export const CampaignSettings = ({ dataQa }: { dataQa?: string }) => {
{usersCount > 0 && ` (${usersCount})`}
</Button>
{isModalOpen && (
<Modal onClose={() => setIsModalOpen(false)}>
<Modal ref={setModalNode} onClose={() => setIsModalOpen(false)}>
<Modal.Header>
{t('__PERMISSION_SETTINGS_HEADER_TITLE')}{' '}
<Span style={{ color: appTheme.palette.blue[600] }}>
Expand Down Expand Up @@ -342,6 +351,7 @@ export const CampaignSettings = ({ dataQa }: { dataQa?: string }) => {
<UsersContainer>
{campaignUsers?.items.map((user) => (
<UserItem
appendNode={appendNode}
key={user.id}
user={user}
onResendInvite={() => onResendInvite(user.email)}
Expand Down
8 changes: 7 additions & 1 deletion src/common/components/inviteUsers/modals/RemoveConfirmModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,23 @@ const DangerHeader = styled(Modal.Header)`
`;

const RemoveConfirmModal = ({
appendToNode,
handleCancel,
onClose,
}: {
appendToNode?: Element | null;
handleCancel: () => void;
onClose?: (includeShared: boolean) => void;
}) => {
const { t } = useTranslation();
const [includeShared, setIncludeShared] = useState(false);

return (
<Modal isLarge onClose={handleCancel}>
<Modal
appendToNode={appendToNode ?? undefined}
isLarge
onClose={handleCancel}
>
<DangerHeader>
<AlertIcon />
{t('__PERMISSION_SETTINGS_REMOVE_CONFIRM_MODAL_HEADER')}
Expand Down
20 changes: 17 additions & 3 deletions src/common/components/inviteUsers/projectSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
useToast,
} from '@appquality/unguess-design-system';
import { FormikHelpers } from 'formik';
import { useState } from 'react';
import { useCallback, useState } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { useAppSelector } from 'src/app/hooks';
import { appTheme } from 'src/app/theme';
Expand Down Expand Up @@ -49,6 +49,15 @@ export const ProjectSettings = () => {
const [addNewMember] = usePostProjectsByPidUsersMutation();
const [removeUser] = useDeleteProjectsByPidUsersMutation();

const [appendNode, setAppendNode] = useState<Element | null>(null);

const setModalNode = useCallback(
(node: HTMLDivElement | null) => {
setAppendNode(node);
},
[isModalOpen]
);

const {
isLoading: isLoadingProjectUsers,
isFetching: isFetchingProjectUsers,
Expand Down Expand Up @@ -251,7 +260,7 @@ export const ProjectSettings = () => {
{usersCount > 0 && ` (${usersCount})`}
</Button>
{isModalOpen && (
<Modal onClose={() => setIsModalOpen(false)}>
<Modal ref={setModalNode} onClose={() => setIsModalOpen(false)}>
<Modal.Header>
{t('__PERMISSION_SETTINGS_HEADER_TITLE')}{' '}
<Span style={{ color: appTheme.palette.blue[600] }}>
Expand Down Expand Up @@ -312,6 +321,7 @@ export const ProjectSettings = () => {
<UsersContainer>
{projectUsers?.items.map((user) => (
<UserItem
appendNode={appendNode}
key={user.id}
user={user}
onResendInvite={() => onResendInvite(user.email)}
Expand Down Expand Up @@ -363,7 +373,11 @@ export const ProjectSettings = () => {
</AccordionNew.Header>
<AccordionNew.Panel>
{workspaceUsers?.items.map((user) => (
<UserItem key={user.id} user={user} />
<UserItem
appendNode={appendNode}
key={user.id}
user={user}
/>
))}
</AccordionNew.Panel>
</AccordionNew.Section>
Expand Down
3 changes: 3 additions & 0 deletions src/common/components/inviteUsers/userItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@ const UserListItem = styled.div`
`;

export const UserItem = ({
appendNode,
user,
onResendInvite,
onRemoveUser,
showRemoveConfirm,
}: {
appendNode?: Element | null;
user: GetWorkspacesByWidUsersApiResponse['items'][number];
onResendInvite?: () => void;
onRemoveUser?: (includeShared?: boolean) => void;
Expand Down Expand Up @@ -152,6 +154,7 @@ export const UserItem = ({
</UserListItem>
{showRemoveConfirmModal && onRemoveUser && (
<RemoveConfirmModal
appendToNode={appendNode}
onClose={(includeShared) => onRemoveUser(includeShared)}
handleCancel={() => setShowRemoveConfirmModal(false)}
/>
Expand Down
14 changes: 12 additions & 2 deletions src/common/components/inviteUsers/workspaceSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
useToast,
} from '@appquality/unguess-design-system';
import { FormikHelpers } from 'formik';
import { useState } from 'react';
import { useCallback, useState } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { appTheme } from 'src/app/theme';
import { ReactComponent as UsersIcon } from 'src/assets/icons/users-share.svg';
Expand Down Expand Up @@ -40,6 +40,15 @@ export const WorkspaceSettings = () => {
const [addNewMember] = usePostWorkspacesByWidUsersMutation();
const [removeUser] = useDeleteWorkspacesByWidUsersMutation();

const [appendNode, setAppendNode] = useState<Element | null>(null);

const setModalNode = useCallback(
(node: HTMLDivElement | null) => {
setAppendNode(node);
},
[isModalOpen]
);

const {
isLoading: isLoadingWorkspaceUsers,
isFetching: isFetchingWorkspaceUsers,
Expand Down Expand Up @@ -217,7 +226,7 @@ export const WorkspaceSettings = () => {
{usersCount > 0 && ` (${usersCount})`}
</Button>
{isModalOpen && (
<Modal onClose={() => setIsModalOpen(false)}>
<Modal ref={setModalNode} onClose={() => setIsModalOpen(false)}>
<Modal.Header>
{t('__PERMISSION_SETTINGS_HEADER_TITLE')}{' '}
<Span style={{ color: appTheme.palette.blue[600] }}>
Expand Down Expand Up @@ -273,6 +282,7 @@ export const WorkspaceSettings = () => {
<UsersContainer>
{workspaceUsers?.items.map((user) => (
<UserItem
appendNode={appendNode}
key={user.id}
user={user}
onResendInvite={() => onResendInvite(user.email)}
Expand Down
Loading