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.

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

feat: make notification channel headings clickable in notification pr… #981

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
60 changes: 55 additions & 5 deletions src/notification-preferences/NotificationPreferenceApp.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@ import React, { useCallback, useMemo } from 'react';
import PropTypes from 'prop-types';
import { useDispatch, useSelector } from 'react-redux';
import { useIntl } from '@edx/frontend-platform/i18n';
import { Collapsible } from '@edx/paragon';
import { Collapsible, NavItem } from '@edx/paragon';
import classNames from 'classnames';
import messages from './messages';
import ToggleSwitch from './ToggleSwitch';
import {
selectPreferenceAppToggleValue,
selectPreferenceAppToggleValue, selectPreferenceNonEditable,
eemaanamir marked this conversation as resolved.
Show resolved Hide resolved
selectPreferencesOfApp,
selectSelectedCourseId,
selectUpdatePreferencesStatus,
} from './data/selectors';
import NotificationPreferenceRow from './NotificationPreferenceRow';
import { updateAppPreferenceToggle } from './data/thunks';
import { updateAppPreferenceToggle, updateChannelPreferenceToggle } from './data/thunks';
import { LOADING_STATUS } from '../constants';
import NOTIFICATION_CHANNELS from './data/constants';

const NotificationPreferenceApp = ({ appId }) => {
const dispatch = useDispatch();
Expand All @@ -22,6 +24,35 @@ const NotificationPreferenceApp = ({ appId }) => {
const appPreferences = useSelector(selectPreferencesOfApp(appId));
const appToggle = useSelector(selectPreferenceAppToggleValue(appId));
const updatePreferencesStatus = useSelector(selectUpdatePreferencesStatus());
const nonEditable = useSelector(selectPreferenceNonEditable(appId));

const onColumnToggle = useCallback(
(event) => {
const {
id: notificationChannel,
} = event.target;
eemaanamir marked this conversation as resolved.
Show resolved Hide resolved
const truePreferences = appPreferences.filter((preference) => {
eemaanamir marked this conversation as resolved.
Show resolved Hide resolved
const isPreferenceNonEditable = nonEditable?.[preference.id]?.includes(notificationChannel) || false;
return preference[notificationChannel] === true && !isPreferenceNonEditable;
});
if (truePreferences.length > 0) {
dispatch(updateChannelPreferenceToggle(
courseId,
appId,
notificationChannel,
false,
));
} else {
dispatch(updateChannelPreferenceToggle(
courseId,
appId,
notificationChannel,
true,
));
}
},
eemaanamir marked this conversation as resolved.
Show resolved Hide resolved
[appId, appPreferences, courseId, dispatch, nonEditable],
);
eemaanamir marked this conversation as resolved.
Show resolved Hide resolved

const preferences = useMemo(() => (
appPreferences.map(preference => (
Expand All @@ -36,7 +67,6 @@ const NotificationPreferenceApp = ({ appId }) => {
dispatch(updateAppPreferenceToggle(courseId, appId, event.target.checked));
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [appId]);
eemaanamir marked this conversation as resolved.
Show resolved Hide resolved

if (!courseId) {
return null;
}
Expand All @@ -62,7 +92,27 @@ const NotificationPreferenceApp = ({ appId }) => {
<div className="d-flex flex-row header-label">
<span className="col-8 px-0">{intl.formatMessage(messages.typeLabel)}</span>
<span className="d-flex col-4 px-0">
<span className="ml-auto">{intl.formatMessage(messages.webLabel)}</span>
{NOTIFICATION_CHANNELS.map((channel) => (
<NavItem
eemaanamir marked this conversation as resolved.
Show resolved Hide resolved
id={channel}
className={classNames(
'd-flex',
{ 'ml-auto': channel === 'web' },
{ 'mx-auto': channel === 'email' },
{ 'ml-auto mr-0': channel === 'push' },
)}
role="button"
onClick={onColumnToggle}
eemaanamir marked this conversation as resolved.
Show resolved Hide resolved
>
{
// eslint-disable-next-line no-nested-ternary
channel === 'web' ? intl.formatMessage(messages.webLabel)
// eslint-disable-next-line no-nested-ternary
: channel === 'email' ? intl.formatMessage(messages.notificationHelpEmail)
: channel === 'push' ? intl.formatMessage(messages.notificationHelpPush) : null
}
eemaanamir marked this conversation as resolved.
Show resolved Hide resolved
</NavItem>
))}
</span>
</div>
<div className="my-3">
Expand Down
4 changes: 4 additions & 0 deletions src/notification-preferences/data/selectors.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ export const selectPreferenceNonEditableChannels = (appId, name) => state => (
state?.notificationPreferences.preferences.nonEditable[appId]?.[name] || []
);

export const selectPreferenceNonEditable = (appId) => state => (
eemaanamir marked this conversation as resolved.
Show resolved Hide resolved
state?.notificationPreferences.preferences.nonEditable[appId] || []
);

export const selectSelectedCourseId = () => state => (
state.notificationPreferences.preferences.selectedCourse
);
Expand Down
16 changes: 16 additions & 0 deletions src/notification-preferences/data/service.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,19 @@ export const patchPreferenceToggle = async (
const { data } = await getAuthenticatedHttpClient().patch(url, patchData);
return data;
};

export const patchChannelPreferenceToggle = async (
courseId,
notificationApp,
notificationChannel,
value,
) => {
const patchData = snakeCaseObject({
notificationApp,
notificationChannel,
value,
});
eemaanamir marked this conversation as resolved.
Show resolved Hide resolved
const url = `${getConfig().LMS_BASE_URL}/api/notifications/channel/configurations/${courseId}`;
const { data } = await getAuthenticatedHttpClient().patch(url, patchData);
return data;
};
24 changes: 23 additions & 1 deletion src/notification-preferences/data/thunks.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
import {
getCourseList,
getCourseNotificationPreferences,
patchAppPreferenceToggle,
patchAppPreferenceToggle, patchChannelPreferenceToggle,
eemaanamir marked this conversation as resolved.
Show resolved Hide resolved
patchPreferenceToggle,
} from './service';

Expand Down Expand Up @@ -148,3 +148,25 @@ export const updatePreferenceToggle = (
}
}
);

export const updateChannelPreferenceToggle = (
courseId,
notificationApp,
notificationChannel,
value,
) => (
eemaanamir marked this conversation as resolved.
Show resolved Hide resolved
async (dispatch) => {
try {
const data = await patchChannelPreferenceToggle(
courseId,
notificationApp,
notificationChannel,
value,
);
eemaanamir marked this conversation as resolved.
Show resolved Hide resolved
const normalizedData = normalizePreferences(camelCaseObject(data));
dispatch(fetchNotificationPreferenceSuccess(courseId, normalizedData));
} catch (errors) {
dispatch(fetchNotificationPreferenceFailed());
}
}
);
Loading