Skip to content

Commit d208f74

Browse files
authored
fix: Apply string set into the moderation section (#391)
* Add string set * CHANNEL_SETTING__OPERATORS__ADD_BUTTON: 'Add' * CHANNEL_SETTING__MODERATION__EMPTY_BAN: 'No banned members yet' * CHANNEL_SETTING__MODERATION__ALL_BAN: 'All banned members' * Apply string set * on the BannedUserList component * `No banned members yet` * `All banned members` * `Unban` on the context menu of the banned user list * on the BannedUsersModal component * `Unban` on the context menu of the banned user list * on the AddOperatorsModal component * `Add` for the submit button * on the InviteUsersModal component * `Invite` for the submit button * on the MutedMembersModal component * `Unmute` on the context menu of the muted user list * Remove string set * CHANNEL_SETTING__UNMUTE: 'Unmute' * Replace the string set to CHANNEL_SETTING__MODERATION__UNMUTE on the MutedMemberList component * Modify CSS * To improve the word break with StringSet customization on the submit button
1 parent 56c8760 commit d208f74

File tree

11 files changed

+40
-19
lines changed

11 files changed

+40
-19
lines changed

src/smart-components/App/stories/integrated.stories.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,18 @@ export const GroupChannel = () => {
219219
isMessageReceiptStatusEnabledOnChannelList={sampleOptions.messageStatus}
220220
imageCompression={{ compressionRate: sampleOptions.imageCompression ? 0.7 : 1 }}
221221
replyType={sampleOptions.replyType}
222+
stringSet={{
223+
CHANNEL_SETTING__MODERATION__REGISTER_AS_OPERATOR: '오퍼레이터 등록',
224+
CHANNEL_SETTING__MODERATION__UNREGISTER_OPERATOR: '오퍼레이터 해제',
225+
CHANNEL_SETTING__MODERATION__MUTE: '유저 음소거',
226+
CHANNEL_SETTING__MODERATION__UNMUTE: '유저 음소거 해제',
227+
CHANNEL_SETTING__MODERATION__BAN: '유저 밴',
228+
CHANNEL_SETTING__MODERATION__UNBAN: '유저 언밴',
229+
BUTTON__CREATE: '만들다',
230+
BUTTON__INVITE: '초대하다',
231+
CHANNEL_SETTING__MODERATION__EMPTY_BAN: '차단된 된 유저가 아무도 없습니다',
232+
CHANNEL_SETTING__MODERATION__ALL_BAN: '차단된 유저 모두보기'
233+
}}
222234
/>
223235
</div>
224236
</div>

src/smart-components/ChannelSettings/components/ModerationPanel/AddOperatorsModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export default function AddOperatorsModal({
4949
<Modal
5050
isFullScreenOnMobile
5151
type={ButtonTypes.PRIMARY}
52-
submitText="Add"
52+
submitText={stringSet.CHANNEL_SETTING__OPERATORS__ADD_BUTTON}
5353
onCancel={onCancel}
5454
onSubmit={() => {
5555
const members = Object.keys(selectedMembers).filter((m) => selectedMembers[m]);

src/smart-components/ChannelSettings/components/ModerationPanel/BannedUserList.tsx

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ import React, {
33
useEffect,
44
useState,
55
useCallback,
6+
useContext,
67
} from 'react';
8+
import { BannedUserListQueryParams } from '@sendbird/chat';
79

810
import Button, { ButtonTypes, ButtonSizes } from '../../../../ui/Button';
911
import
@@ -18,21 +20,23 @@ import ContextMenu, { MenuItem, MenuItems } from '../../../../ui/ContextMenu';
1820
import UserListItem from '../UserListItem';
1921
import BannedUsersModal from './BannedUsersModal';
2022
import { useChannelSettingsContext } from '../../context/ChannelSettingsProvider';
23+
import { LocalizationContext } from '../../../../lib/LocalizationContext';
2124

2225
export const BannedMemberList = (): ReactElement => {
2326
const [members, setMembers] = useState([]);
2427
const [hasNext, setHasNext] = useState(false);
2528
const [showModal, setShowModal] = useState(false);
2629

30+
const { stringSet } = useContext(LocalizationContext);
2731
const { channel } = useChannelSettingsContext();
2832

33+
const bannedUserListQueryParams: BannedUserListQueryParams = { limit: 10 };
2934
useEffect(() => {
3035
if (!channel) {
3136
setMembers([]);
3237
return;
3338
}
34-
35-
const bannedUserListQuery = channel?.createBannedUserListQuery();
39+
const bannedUserListQuery = channel?.createBannedUserListQuery(bannedUserListQueryParams);
3640
bannedUserListQuery.next().then((users) => {
3741
setMembers(users);
3842
setHasNext(bannedUserListQuery.hasNext);
@@ -44,8 +48,7 @@ export const BannedMemberList = (): ReactElement => {
4448
setMembers([]);
4549
return;
4650
}
47-
48-
const bannedUserListQuery = channel?.createBannedUserListQuery();
51+
const bannedUserListQuery = channel?.createBannedUserListQuery(bannedUserListQueryParams);
4952
bannedUserListQuery.next().then((users) => {
5053
setMembers(users);
5154
setHasNext(bannedUserListQuery.hasNext);
@@ -91,7 +94,7 @@ export const BannedMemberList = (): ReactElement => {
9194
})
9295
}}
9396
>
94-
Unban
97+
{stringSet.CHANNEL_SETTING__MODERATION__UNBAN}
9598
</MenuItem>
9699
</MenuItems>
97100
)}
@@ -108,7 +111,7 @@ export const BannedMemberList = (): ReactElement => {
108111
type={LabelTypography.SUBTITLE_2}
109112
color={LabelColors.ONBACKGROUND_3}
110113
>
111-
No banned members yet
114+
{stringSet.CHANNEL_SETTING__MODERATION__EMPTY_BAN}
112115
</Label>
113116
)
114117
}
@@ -124,7 +127,7 @@ export const BannedMemberList = (): ReactElement => {
124127
setShowModal(true);
125128
}}
126129
>
127-
All banned members
130+
{stringSet.CHANNEL_SETTING__MODERATION__ALL_BAN}
128131
</Button>
129132
</div>
130133
)
@@ -143,5 +146,4 @@ export const BannedMemberList = (): ReactElement => {
143146
);
144147
}
145148

146-
147149
export default BannedMemberList;

src/smart-components/ChannelSettings/components/ModerationPanel/BannedUsersModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export default function BannedUsersModal({
9999
})
100100
}}
101101
>
102-
Unban
102+
{stringSet.CHANNEL_SETTING__MODERATION__BAN}
103103
</MenuItem>
104104
</MenuItems>
105105
)}

src/smart-components/ChannelSettings/components/ModerationPanel/InviteUsersModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export default function InviteUsers({
4343
<Modal
4444
isFullScreenOnMobile
4545
disabled={Object.keys(selectedMembers).length === 0}
46-
submitText="Invite"
46+
submitText={stringSet.BUTTON__INVITE}
4747
type={ButtonTypes.PRIMARY}
4848
onCancel={() => onCancel()}
4949
onSubmit={() => {

src/smart-components/ChannelSettings/components/ModerationPanel/MutedMemberList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import IconButton from '../../../../ui/IconButton';
1010
import Icon, { IconTypes, IconColors } from '../../../../ui/Icon';
1111
import ContextMenu, { MenuItem, MenuItems } from '../../../../ui/ContextMenu';
1212
import
13-
Label, {
13+
Label, {
1414
LabelTypography,
1515
LabelColors,
1616
} from '../../../../ui/Label';
@@ -106,7 +106,7 @@ export const MutedMemberList = (): ReactElement => {
106106
}}
107107
>
108108
<>
109-
{stringSet.CHANNEL_SETTING__UNMUTE}
109+
{stringSet?.CHANNEL_SETTING__UNMUTE || stringSet.CHANNEL_SETTING__MODERATION__UNMUTE}
110110
</>
111111
</MenuItem>
112112
</MenuItems>

src/smart-components/ChannelSettings/components/ModerationPanel/MutedMembersModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export default function MutedMembersModal({
107107
})
108108
}}
109109
>
110-
Unmute
110+
{stringSet.CHANNEL_SETTING__MODERATION__UNMUTE}
111111
</MenuItem>
112112
</MenuItems>
113113
)}

src/smart-components/OpenChannelApp/components/CommunityChannelList.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { ReactElement, useEffect, useState, useRef } from 'react';
1+
import React, { ReactElement, useEffect, useState, useRef, useContext } from 'react';
22
import type { User } from '@sendbird/chat';
33
import type { OpenChannel, OpenChannelCreateParams, OpenChannelListQuery, SendbirdOpenChat } from '@sendbird/chat/openChannel';
44
import withSendBird from '../../../lib/SendbirdSdkContext';
@@ -13,6 +13,7 @@ import IconButton from '../../../ui/IconButton';
1313
import Icon, { IconColors, IconTypes } from '../../../ui/Icon';
1414
import Modal from '../../../ui/Modal';
1515
import TextButton from '../../../ui/TextButton';
16+
import { LocalizationContext } from '../../../lib/LocalizationContext';
1617

1718
const SB_COMMUNITY_TYPE = 'SB_COMMUNITY_TYPE';
1819

@@ -39,6 +40,7 @@ function CommunityChannelList({
3940
const [currentFile, setCurrentFile] = useState(null);
4041
const [currentChannelName, setCurrentChannelName] = useState('');
4142
const hiddenInputRef = useRef(null);
43+
const { stringSet } = useContext(LocalizationContext);
4244

4345
useEffect(() => {
4446
if (!sdk || !sdk.openChannel) {
@@ -105,7 +107,7 @@ function CommunityChannelList({
105107
});
106108
}}
107109
type="PRIMARY"
108-
submitText="Create"
110+
submitText={stringSet.CREATE_OPEN_CHANNEL_LIST__SUBMIT}
109111
>
110112
<div className="community-channel__add-channel">
111113
<div className="community-channel__add-channel__image-box">

src/smart-components/OpenChannelSettings/components/OperatorUI/AddOperatorsModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export default function AddOperatorsModal({
4747
<Modal
4848
isFullScreenOnMobile
4949
type={ButtonTypes.PRIMARY}
50-
submitText="Add"
50+
submitText={stringSet.CHANNEL_SETTING__OPERATORS__ADD_BUTTON}
5151
onCancel={onCancel}
5252
onSubmit={() => {
5353
const users = Object.keys(selectedUsers).filter((m) => selectedUsers[m]);

src/ui/Label/stringSet.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ const getStringSet = (lang = 'en') => {
6363
CHANNEL_SETTING__OPERATORS__TITLE: 'Operators',
6464
CHANNEL_SETTING__OPERATORS__TITLE_ALL: 'All operators',
6565
CHANNEL_SETTING__OPERATORS__TITLE_ADD: 'Add operator',
66+
CHANNEL_SETTING__OPERATORS__ADD_BUTTON: 'Add',
6667
CHANNEL_SETTING__MUTED_MEMBERS__TITLE: 'Muted members',
6768
CHANNEL_SETTING__MUTED_MEMBERS__TITLE_ALL: 'All muted members',
68-
CHANNEL_SETTING__UNMUTE: 'Unmute',
6969
CHANNEL_SETTING__NO_UNMUTED: 'No muted members yet',
7070
CHANNEL_SETTING__BANNED_MEMBERS__TITLE: 'Banned users',
7171
CHANNEL_SETTING__FREEZE_CHANNEL: 'Freeze Channel',
@@ -75,6 +75,8 @@ const getStringSet = (lang = 'en') => {
7575
CHANNEL_SETTING__MODERATION__UNMUTE: 'Unmute',
7676
CHANNEL_SETTING__MODERATION__BAN: 'Ban',
7777
CHANNEL_SETTING__MODERATION__UNBAN: 'Unban',
78+
CHANNEL_SETTING__MODERATION__EMPTY_BAN: 'No banned members yet',
79+
CHANNEL_SETTING__MODERATION__ALL_BAN: 'All banned members',
7880
BUTTON__CANCEL: 'Cancel',
7981
BUTTON__DELETE: 'Delete',
8082
BUTTON__SAVE: 'Save',

0 commit comments

Comments
 (0)