Skip to content

MM-61683: Ensure radio button groups are properly formed #52

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

Open
SaurabhSharma-884 wants to merge 8 commits into
base: master
Choose a base branch
from
Open

MM-61683: Ensure radio button groups are properly formed #52

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
241e37e
MM-61683: Ensure radio button groups are properly formed
SaurabhSharma-884 Jan 5, 2025
864eebd
MM-61683: Fix the failing i18 CI
SaurabhSharma-884 Jan 7, 2025
d7710dc
MM-61683: Fix desktop notification translation IDs
SaurabhSharma-884 Jan 7, 2025
e43cb2a
MM-61683: Fix lint-style
SaurabhSharma-884 Jan 7, 2025
b1a36d8
MM-61683: Update name attribute inside channel notification modal
SaurabhSharma-884 Jan 20, 2025
5ff5a10
MM-61683: Revert creating a constant for default messages and id
SaurabhSharma-884 Jan 20, 2025
4db5917
MM-61683: Add legend tag inside radio setting item component
SaurabhSharma-884 Jan 21, 2025
432bbf8
MM-61683: Update snapshot
SaurabhSharma-884 Jan 21, 2025
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
42 changes: 24 additions & 18 deletions ...nents/channel_notifications_modal/__snapshots__/channel_notifications_modal.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ Object {
data-testid="mm-modal-generic-section-item__content"
>
<fieldset
aria-label="Notify me about…"
class="mm-modal-generic-section-item__fieldset-radio"
>
<label
Expand All @@ -195,7 +196,7 @@ Object {
checked=""
data-testid="desktopNotification-all"
id="desktopNotification-all"
name="desktopNotification-all"
name="desktop"
type="radio"
value="all"
/>
Expand All @@ -208,7 +209,7 @@ Object {
<input
data-testid="desktopNotification-mention"
id="desktopNotification-mention"
name="desktopNotification-mention"
name="desktop"
type="radio"
value="mention"
/>
Expand All @@ -220,7 +221,7 @@ Object {
<input
data-testid="desktopNotification-none"
id="desktopNotification-none"
name="desktopNotification-none"
name="desktop"
type="radio"
value="none"
/>
Expand Down Expand Up @@ -605,6 +606,7 @@ Object {
data-testid="mm-modal-generic-section-item__content"
>
<fieldset
aria-label="Notify me about…"
class="mm-modal-generic-section-item__fieldset-radio"
>
<label
Expand All @@ -614,7 +616,7 @@ Object {
checked=""
data-testid="desktopNotification-all"
id="desktopNotification-all"
name="desktopNotification-all"
name="desktop"
type="radio"
value="all"
/>
Expand All @@ -627,7 +629,7 @@ Object {
<input
data-testid="desktopNotification-mention"
id="desktopNotification-mention"
name="desktopNotification-mention"
name="desktop"
type="radio"
value="mention"
/>
Expand All @@ -639,7 +641,7 @@ Object {
<input
data-testid="desktopNotification-none"
id="desktopNotification-none"
name="desktopNotification-none"
name="desktop"
type="radio"
value="none"
/>
Expand Down Expand Up @@ -802,6 +804,7 @@ Object {
data-testid="mm-modal-generic-section-item__content"
>
<fieldset
aria-label="Notify me about…"
class="mm-modal-generic-section-item__fieldset-radio"
>
<label
Expand All @@ -810,7 +813,7 @@ Object {
<input
data-testid="MobileNotification-all"
id="MobileNotification-all"
name="MobileNotification-all"
name="push"
type="radio"
value="all"
/>
Expand All @@ -823,7 +826,7 @@ Object {
checked=""
data-testid="MobileNotification-mention"
id="MobileNotification-mention"
name="MobileNotification-mention"
name="push"
type="radio"
value="mention"
/>
Expand All @@ -836,7 +839,7 @@ Object {
<input
data-testid="MobileNotification-none"
id="MobileNotification-none"
name="MobileNotification-none"
name="push"
type="radio"
value="none"
/>
Expand Down Expand Up @@ -1466,6 +1469,7 @@ Object {
data-testid="mm-modal-generic-section-item__content"
>
<fieldset
aria-label="Notify me about…"
class="mm-modal-generic-section-item__fieldset-radio"
>
<label
Expand All @@ -1475,7 +1479,7 @@ Object {
checked=""
data-testid="desktopNotification-all"
id="desktopNotification-all"
name="desktopNotification-all"
name="desktop"
type="radio"
value="all"
/>
Expand All @@ -1488,7 +1492,7 @@ Object {
<input
data-testid="desktopNotification-mention"
id="desktopNotification-mention"
name="desktopNotification-mention"
name="desktop"
type="radio"
value="mention"
/>
Expand All @@ -1500,7 +1504,7 @@ Object {
<input
data-testid="desktopNotification-none"
id="desktopNotification-none"
name="desktopNotification-none"
name="desktop"
type="radio"
value="none"
/>
Expand Down Expand Up @@ -1966,6 +1970,7 @@ Object {
data-testid="mm-modal-generic-section-item__content"
>
<fieldset
aria-label="Notify me about…"
class="mm-modal-generic-section-item__fieldset-radio"
>
<label
Expand All @@ -1975,7 +1980,7 @@ Object {
checked=""
data-testid="desktopNotification-all"
id="desktopNotification-all"
name="desktopNotification-all"
name="desktop"
type="radio"
value="all"
/>
Expand All @@ -1988,7 +1993,7 @@ Object {
<input
data-testid="desktopNotification-mention"
id="desktopNotification-mention"
name="desktopNotification-mention"
name="desktop"
type="radio"
value="mention"
/>
Expand All @@ -2000,7 +2005,7 @@ Object {
<input
data-testid="desktopNotification-none"
id="desktopNotification-none"
name="desktopNotification-none"
name="desktop"
type="radio"
value="none"
/>
Expand Down Expand Up @@ -2466,6 +2471,7 @@ Object {
data-testid="mm-modal-generic-section-item__content"
>
<fieldset
aria-label="Notify me about…"
class="mm-modal-generic-section-item__fieldset-radio"
>
<label
Expand All @@ -2475,7 +2481,7 @@ Object {
checked=""
data-testid="desktopNotification-all"
id="desktopNotification-all"
name="desktopNotification-all"
name="desktop"
type="radio"
value="all"
/>
Expand All @@ -2488,7 +2494,7 @@ Object {
<input
data-testid="desktopNotification-mention"
id="desktopNotification-mention"
name="desktopNotification-mention"
name="desktop"
type="radio"
value="mention"
/>
Expand All @@ -2500,7 +2506,7 @@ Object {
<input
data-testid="desktopNotification-none"
id="desktopNotification-none"
name="desktopNotification-none"
name="desktop"
type="radio"
value="none"
/>
Expand Down
32 changes: 16 additions & 16 deletions webapp/channels/src/components/channel_notifications_modal/channel_notifications_modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,22 +240,22 @@ export default function ChannelNotificationsModal(props: Props) {
handleChange={(e) => handleChange({push: e.target.value})}
/>
{props.collapsedReplyThreads && settings.push === 'mention' &&
<CheckboxSettingItem
dataTestId='mobile-reply-threads-checkbox-section'
title={formatMessage({
id: 'channel_notifications.ThreadsReplyTitle',
defaultMessage: 'Thread reply notifications',
})}
inputFieldTitle={
<FormattedMessage
id='channel_notifications.checkbox.threadsReplyTitle'
defaultMessage="Notify me about replies to threads I\'m following"
/>
}
inputFieldValue={settings.push_threads === 'all'}
inputFieldData={utils.MobileReplyThreadsInputFieldData}
handleChange={(e) => handleChange({push_threads: e ? 'all' : 'mention'})}
/>}
<CheckboxSettingItem
dataTestId='mobile-reply-threads-checkbox-section'
title={formatMessage({
id: 'channel_notifications.ThreadsReplyTitle',
defaultMessage: 'Thread reply notifications',
})}
inputFieldTitle={
<FormattedMessage
id='channel_notifications.checkbox.threadsReplyTitle'
defaultMessage="Notify me about replies to threads I\'m following"
/>
}
inputFieldValue={settings.push_threads === 'all'}
inputFieldData={utils.MobileReplyThreadsInputFieldData}
handleChange={(e) => handleChange({push_threads: e ? 'all' : 'mention'})}
/>}
</>
)}
</>
Expand Down
Loading