Skip to content

chore : removed reported_content_email_notifications_flag dependency #775

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
ayesha-waris merged 1 commit into from
Jan 5, 2024
Merged

chore : removed reported_content_email_notifications_flag dependency #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/pages-and-resources/discussions/app-config-form/apps/openedx/OpenedXConfigForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ const OpenedXConfigForm = ({
unitLevelVisibility: true,
allowAnonymousPostsPeers: appConfigObj?.allowAnonymousPostsPeers || false,
reportedContentEmailNotifications: appConfigObj?.reportedContentEmailNotifications || false,
enableReportedContentEmailNotifications: Boolean(appConfigObj?.enableReportedContentEmailNotifications) || false,
restrictedDates: appConfigObj?.restrictedDates || [],
discussionTopics: discussionTopicsModel || [],
divideByCohorts: appConfigObj?.divideByCohorts || false,
Expand Down
4 changes: 0 additions & 4 deletions src/pages-and-resources/discussions/app-config-form/apps/openedx/OpenedXConfigForm.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ const defaultAppConfig = (divideDiscussionIds = []) => ({
allowAnonymousPosts: false,
allowAnonymousPostsPeers: false,
reportedContentEmailNotifications: false,
enableReportedContentEmailNotifications: false,
allowDivisionByUnit: false,
restrictedDates: [],
cohortsEnabled: false,
Expand Down Expand Up @@ -141,7 +140,6 @@ describe('OpenedXConfigForm', () => {
...legacyApiResponse,
plugin_configuration: {
...legacyApiResponse.plugin_configuration,
reported_content_email_notifications_flag: true,
divided_course_wide_discussions: [],
available_division_schemes: [],
},
Expand Down Expand Up @@ -181,7 +179,6 @@ describe('OpenedXConfigForm', () => {
...legacyApiResponse.plugin_configuration,
allow_anonymous: true,
reported_content_email_notifications: true,
reported_content_email_notifications_flag: true,
always_divide_inline_discussions: true,
divided_course_wide_discussions: [],
available_division_schemes: ['cohorts'],
Expand Down Expand Up @@ -222,7 +219,6 @@ describe('OpenedXConfigForm', () => {
...legacyApiResponse.plugin_configuration,
allow_anonymous: true,
reported_content_email_notifications: true,
reported_content_email_notifications_flag: true,
always_divide_inline_discussions: true,
divided_course_wide_discussions: ['13f106c6-6735-4e84-b097-0456cff55960', 'course'],
},
Expand Down
31 changes: 13 additions & 18 deletions ...d-resources/discussions/app-config-form/apps/shared/ReportedContentEmailNotifications.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,19 @@ const ReportedContentEmailNotifications = ({ intl }) => {
} = useFormikContext();

return (
// eslint-disable-next-line react/jsx-no-useless-fragment
<>
{values.enableReportedContentEmailNotifications && (
<div>
<h5 className="text-gray-500 mt-4 mb-2 ">{intl.formatMessage(messages.reportedContentEmailNotifications)}</h5>
<FormSwitchGroup
className="mb-4"
onChange={handleChange}
onBlur={handleBlur}
id="reportedContentEmailNotifications"
checked={values.reportedContentEmailNotifications}
label={intl.formatMessage(messages.reportedContentEmailNotificationsLabel)}
helpText={intl.formatMessage(messages.reportedContentEmailNotificationsHelp)}
/>
<AppConfigFormDivider thick />
</div>
)}
</>
<div>
<h5 className="text-gray-500 mt-4 mb-2 ">{intl.formatMessage(messages.reportedContentEmailNotifications)}</h5>
<FormSwitchGroup
className="mb-4"
onChange={handleChange}
onBlur={handleBlur}
id="reportedContentEmailNotifications"
checked={values.reportedContentEmailNotifications}
label={intl.formatMessage(messages.reportedContentEmailNotificationsLabel)}
helpText={intl.formatMessage(messages.reportedContentEmailNotificationsHelp)}
/>
<AppConfigFormDivider thick />
</div>
);
};

Expand Down
1 change: 0 additions & 1 deletion ...urces/discussions/app-config-form/apps/shared/discussion-topics/DiscussionTopics.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ const appConfig = {
allowAnonymousPosts: false,
allowAnonymousPostsPeers: false,
reportedContentEmailNotifications: false,
enableReportedContentEmailNotifications: false,
allowDivisionByUnit: false,
restrictedDates: [],
};
Expand Down
1 change: 0 additions & 1 deletion src/pages-and-resources/discussions/data/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ function normalizePluginConfig(data) {
allowAnonymousPosts: data.allow_anonymous,
allowAnonymousPostsPeers: data.allow_anonymous_to_peers,
reportedContentEmailNotifications: data.reported_content_email_notifications,
enableReportedContentEmailNotifications: data.reported_content_email_notifications_flag,
divisionScheme: data.division_scheme,
alwaysDivideInlineDiscussions: data.always_divide_inline_discussions,
restrictedDates: normalizeRestrictedDates(data.discussion_blackouts),
Expand Down
1 change: 0 additions & 1 deletion src/pages-and-resources/discussions/data/redux.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,6 @@ describe('Data layer integration tests', () => {
allowAnonymousPosts: false,
allowAnonymousPostsPeers: false,
reportedContentEmailNotifications: false,
enableReportedContentEmailNotifications: false,
restrictedDates: [],
// TODO: Note! As of this writing, all the data below this line is NOT returned in the API
// but we add it in during normalization.
Expand Down
1 change: 0 additions & 1 deletion src/pages-and-resources/discussions/factories/mockApiResponses.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ export const generateLegacyApiResponse = () => ({
allow_anonymous: false,
allow_anonymous_to_peers: false,
reported_content_email_notifications: false,
reported_content_email_notifications_flag: false,
always_divide_inline_discussions: false,
available_division_schemes: ['enrollment_track'],
discussion_topics: {
Expand Down
2 changes: 1 addition & 1 deletion src/schedule-and-details/pacing-section/PacingSection.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ describe('<PacingSection />', () => {
});

it('shows disabled radio inputs correctly', () => {
const pastDate = '2023-12-31';
const pastDate = '2024-12-31';
Comment thread
ayesha-waris marked this conversation as resolved.
const initialProps = { ...props, startDate: pastDate };
const { getAllByRole, queryAllByText } = render(
<RootWrapper {...initialProps} />,
Expand Down