Skip to content
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

Jump to bottom

fix(ban user): dont close overlay by state update #970

Merged
merged 3 commits into from
Jul 12, 2023
Merged

fix(ban user): dont close overlay by state update #970

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e4da4c
fix(ban user): dont close overlay by state update
RunzelRosinchen Jul 12, 2023
f92929e
Update src/components/groupChat/GroupChatInfo.tsx
RunzelRosinchen Jul 12, 2023
7529079
Update src/components/banUser/BanUser.tsx
RunzelRosinchen Jul 12, 2023
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
53 changes: 34 additions & 19 deletions src/components/banUser/BanUser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useState } from 'react';
import React from 'react';
import { useTranslation } from 'react-i18next';
import { apiPostBanUser } from '../../api/apiPostBanUser';
import { BUTTON_TYPES } from '../button/Button';
Expand All @@ -14,15 +14,41 @@ interface BanUserProps {
handleUserBan?: (username: string) => void;
}

export const BanUser: React.FC<BanUserProps> = ({
interface BanUserOverlayProps {
overlayActive: boolean;
userName: string;
handleOverlay?: () => void;
}

export const BanUser: React.VFC<BanUserProps> = ({
rcUserId,
chatId,
userName,
handleUserBan
}) => {
const { t: translate } = useTranslation();
const [overlayActive, setOverlayActive] = useState(false);
const [overlayItem, setOverlayItem] = useState<OverlayItem>();

const banUser = () => {
apiPostBanUser({ rcUserId, chatId }).then(() => {
if (handleUserBan) handleUserBan(userName);
});
};

return (
<>
<button className="banUser" onClick={banUser}>
{translate('banUser.ban.trigger')}
</button>
</>
);
RunzelRosinchen marked this conversation as resolved.
Show resolved Hide resolved
};

export const BanUserOverlay: React.VFC<BanUserOverlayProps> = ({
overlayActive,
userName,
handleOverlay
}) => {
const { t: translate } = useTranslation();

const banSuccessOverlay = (userName): OverlayItem => {
const compositeText =
Expand All @@ -39,32 +65,21 @@ export const BanUser: React.FC<BanUserProps> = ({
),
buttonSet: [
{
type: BUTTON_TYPES.AUTO_CLOSE,
type: BUTTON_TYPES.PRIMARY,
label: translate('banUser.ban.overlay.close')
}
]
};
};

const banUser = () => {
apiPostBanUser({ rcUserId, chatId }).then(() => {
setOverlayItem(banSuccessOverlay(userName));
setOverlayActive(true);
if (handleUserBan) handleUserBan(userName);
});
};

return (
<>
<button className="banUser" onClick={banUser}>
{translate('banUser.ban.trigger')}
</button>
{overlayActive && (
<Overlay
className="banUser__overlay"
item={overlayItem}
handleOverlayClose={() => setOverlayActive(false)}
handleOverlay={() => setOverlayActive(false)}
item={banSuccessOverlay(userName)}
handleOverlayClose={handleOverlay}
handleOverlay={handleOverlay}
/>
)}
</>
Expand Down
77 changes: 49 additions & 28 deletions src/components/groupChat/GroupChatInfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import '../profile/profile.styles';
import { Text } from '../text/Text';
import { FlyoutMenu } from '../flyoutMenu/FlyoutMenu';
import { getValueFromCookie } from '../sessionCookie/accessSessionCookie';
import { BanUser } from '../banUser/BanUser';
import { BanUser, BanUserOverlay } from '../banUser/BanUser';
import { useResponsive } from '../../hooks/useResponsive';
import { Tag } from '../tag/Tag';
import { useSession } from '../../hooks/useSession';
Expand Down Expand Up @@ -65,9 +65,11 @@ export const GroupChatInfo = () => {
const [overlayItem, setOverlayItem] = useState<OverlayItem>(null);
const [overlayActive, setOverlayActive] = useState(false);
const [redirectToSessionsList, setRedirectToSessionsList] = useState(false);
const [isUserBanOverlayOpen, setIsUserBanOverlayOpen] =
useState<boolean>(false);
const [isRequestInProgress, setIsRequestInProgress] = useState(false);
const [bannedUsers, setBannedUsers] = useState<string[]>([]);
const [isV2GroupChat, setIsV2GroupChat] = useState<boolean>(false);
const [isV2GroupChat, setIsV2GroupChat] = useState<boolean>(true);
RunzelRosinchen marked this conversation as resolved.
Show resolved Hide resolved
RunzelRosinchen marked this conversation as resolved.
Show resolved Hide resolved

const { session: activeSession, ready } = useSession(groupIdFromParam);
const sessionListTab = useSearchParam<SESSION_LIST_TAB>('sessionListTab');
Expand Down Expand Up @@ -296,37 +298,56 @@ export const GroupChatInfo = () => {
)}
{isCurrentUserModerator &&
!subscriber.isModerator && (
<FlyoutMenu
isHidden={bannedUsers.includes(
subscriber.username
)}
position={
window.innerWidth <= 900
? 'left'
: 'right'
}
>
<BanUser
userName={decodeUsername(
<>
<FlyoutMenu
isHidden={bannedUsers.includes(
subscriber.username
)}
rcUserId={
subscriber._id
position={
window.innerWidth <=
900
? 'left'
: 'right'
}
chatId={
activeSession.item
.id
}
handleUserBan={(
username
) => {
setBannedUsers([
...bannedUsers,
>
<BanUser
userName={decodeUsername(
subscriber.username
)}
rcUserId={
subscriber._id
}
chatId={
activeSession
.item.id
}
handleUserBan={(
username
]);
) => {
setBannedUsers([
...bannedUsers,
username
]);
setIsUserBanOverlayOpen(
true
);
}}
/>
</FlyoutMenu>{' '}
<BanUserOverlay
overlayActive={
isUserBanOverlayOpen
}
userName={decodeUsername(
subscriber.username
)}
handleOverlay={() => {
setIsUserBanOverlayOpen(
false
);
}}
/>
</FlyoutMenu>
></BanUserOverlay>
</>
)}
{isCurrentUserModerator &&
bannedUsers.includes(
Expand Down
58 changes: 37 additions & 21 deletions src/components/message/MessageItemComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ import { ReactComponent as XIllustration } from '../../resources/img/illustratio
import { BUTTON_TYPES } from '../button/Button';
import { apiDeleteMessage } from '../../api/apiDeleteMessage';
import { FlyoutMenu } from '../flyoutMenu/FlyoutMenu';
import { BanUser } from '../banUser/BanUser';
import { BanUser, BanUserOverlay } from '../banUser/BanUser';
import { getValueFromCookie } from '../sessionCookie/accessSessionCookie';
import { VideoChatDetails, VideoChatDetailsAlias } from './VideoChatDetails';

Expand Down Expand Up @@ -602,6 +602,8 @@ const MessageFlyoutMenu = ({
}) => {
const { activeSession } = useContext(ActiveSessionContext);
const { getSetting } = useContext(RocketChatGlobalSettingsContext);
const [isUserBanOverlayOpen, setIsUserBanOverlayOpen] =
useState<boolean>(false);

const currentUserIsModerator = isUserModerator({
chatItem: activeSession.item,
Expand All @@ -614,26 +616,40 @@ const MessageFlyoutMenu = ({
});

return (
<FlyoutMenu position={isMyMessage ? 'left-top' : 'right-top'}>
{currentUserIsModerator &&
!subscriberIsModerator &&
!isUserBanned && (
<BanUser
userName={username}
rcUserId={userId}
chatId={activeSession.item.id}
/>
)}

{isMyMessage &&
!isArchived &&
getSetting<IBooleanSetting>(SETTING_MESSAGE_ALLOWDELETING) && (
<DeleteMessage
messageId={_id}
className="flyoutMenu__item--delete"
/>
)}
</FlyoutMenu>
<>
<FlyoutMenu position={isMyMessage ? 'left-top' : 'right-top'}>
{currentUserIsModerator &&
!subscriberIsModerator &&
!isUserBanned && (
<BanUser
userName={username}
rcUserId={userId}
chatId={activeSession.item.id}
handleUserBan={() => {
setIsUserBanOverlayOpen(true);
}}
/>
)}

{isMyMessage &&
!isArchived &&
getSetting<IBooleanSetting>(
SETTING_MESSAGE_ALLOWDELETING
) && (
<DeleteMessage
messageId={_id}
className="flyoutMenu__item--delete"
/>
)}
</FlyoutMenu>
<BanUserOverlay
overlayActive={isUserBanOverlayOpen}
userName={username}
handleOverlay={() => {
setIsUserBanOverlayOpen(false);
}}
></BanUserOverlay>
</>
);
};

Expand Down
83 changes: 53 additions & 30 deletions src/components/sessionHeader/GroupChatHeader/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import { getValueFromCookie } from '../../sessionCookie/accessSessionCookie';
import { apiGetGroupMembers } from '../../../api';
import { decodeUsername } from '../../../utils/encryptionHelpers';
import { FlyoutMenu } from '../../flyoutMenu/FlyoutMenu';
import { BanUser } from '../../banUser/BanUser';
import { BanUser, BanUserOverlay } from '../../banUser/BanUser';
import { Tag } from '../../tag/Tag';
import { BUTTON_TYPES, Button, ButtonItem } from '../../button/Button';
import { useStartVideoCall } from './useStartVideoCall';
Expand All @@ -51,6 +51,9 @@ export const GroupChatHeader = ({
}: GroupChatHeaderProps) => {
const { releaseToggles } = useAppConfig();
const [subscriberList, setSubscriberList] = useState([]);

const [isUserBanOverlayOpen, setIsUserBanOverlayOpen] =
useState<boolean>(false);
const { t } = useTranslation(['common', 'consultingTypes', 'agencies']);
const { activeSession } = useContext(ActiveSessionContext);
const { userData } = useContext(UserDataContext);
Expand Down Expand Up @@ -254,40 +257,60 @@ export const GroupChatHeader = ({
</span>
{isCurrentUserModerator &&
!subscriber.isModerator && (
<FlyoutMenu
isHidden={bannedUsers.includes(
subscriber.username
)}
position={
window.innerWidth <=
520
? 'left'
: 'right'
}
isOpen={
flyoutOpenId ===
subscriber._id
}
handleClose={() =>
setFlyoutOpenId(
null
)
}
>
<BanUser
userName={decodeUsername(
<>
<FlyoutMenu
isHidden={bannedUsers.includes(
subscriber.username
)}
rcUserId={
position={
window.innerWidth <=
520
? 'left'
: 'right'
}
isOpen={
flyoutOpenId ===
subscriber._id
}
chatId={
activeSession
.item
.id
handleClose={() =>
setFlyoutOpenId(
null
)
}
/>
</FlyoutMenu>
>
<BanUser
userName={decodeUsername(
subscriber.username
)}
rcUserId={
subscriber._id
}
chatId={
activeSession
.item
.id
}
handleUserBan={() => {
setIsUserBanOverlayOpen(
true
);
}}
/>
</FlyoutMenu>{' '}
<BanUserOverlay
overlayActive={
isUserBanOverlayOpen
}
userName={decodeUsername(
subscriber.username
)}
handleOverlay={() => {
setIsUserBanOverlayOpen(
false
);
}}
></BanUserOverlay>
</>
)}
{isCurrentUserModerator &&
bannedUsers.includes(
Expand Down
Loading