refactor: removing unnecessary bulk email form and changing paragon d…

…ependency
eduNEXT · Mar 7, 2024 · e3e2ce8 · e3e2ce8
1 parent f2716f0
commit e3e2ce8
Show file tree

Hide file tree

Showing 25 changed files with 57 additions and 928 deletions.
diff --git a/plugins/communications-app/BodyForm/index.jsx b/plugins/communications-app/BodyForm/index.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Form } from '@edx/paragon';
+import { Form } from '@openedx/paragon';
 import { useIntl } from '@edx/frontend-platform/i18n';
 import TextEditor from '@communications-app/src/components/bulk-email-tool/text-editor/TextEditor';
 import { useSelector, useDispatch } from '@communications-app/src/components/bulk-email-tool/bulk-email-form/BuildEmailFormExtensible/context';

diff --git a/plugins/communications-app/BodyForm/package.json b/plugins/communications-app/BodyForm/package.json
@@ -8,7 +8,7 @@
   "peerDependencies": {
     "@edx/frontend-app-communications": "*",
     "@edx/frontend-platform": "*",
-    "@edx/paragon": "*",
+    "@openedx/paragon": "*",
     "prop-types": "*",
     "react": "*"
   },

diff --git a/plugins/communications-app/CheckBoxForm/index.jsx b/plugins/communications-app/CheckBoxForm/index.jsx
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import { Form, Container } from '@edx/paragon';
+import { Form, Container } from '@openedx/paragon';
 
 const CheckBoxForm = ({ isChecked, handleChange, label }) => (
   <Container className="my-4 border border-success-300 p-4">

diff --git a/plugins/communications-app/CheckBoxForm/package.json b/plugins/communications-app/CheckBoxForm/package.json
@@ -8,7 +8,7 @@
   "peerDependencies": {
     "@edx/frontend-app-communications": "*",
     "@edx/frontend-platform": "*",
-    "@edx/paragon": "*",
+    "@openedx/paragon": "*",
     "prop-types": "*",
     "react": "*"
   },

diff --git a/plugins/communications-app/InputForm/index.jsx b/plugins/communications-app/InputForm/index.jsx
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import { Form, Container } from '@edx/paragon';
+import { Form, Container } from '@openedx/paragon';
 
 const InputForm = ({
   isValid,

diff --git a/plugins/communications-app/InputForm/package.json b/plugins/communications-app/InputForm/package.json
@@ -8,7 +8,7 @@
   "peerDependencies": {
     "@edx/frontend-app-communications": "*",
     "@edx/frontend-platform": "*",
-    "@edx/paragon": "*",
+    "@openedx/paragon": "*",
     "prop-types": "*",
     "react": "*"
   },

diff --git a/plugins/communications-app/InstructionsProfreading/package.json b/plugins/communications-app/InstructionsProfreading/package.json
@@ -8,7 +8,7 @@
   "peerDependencies": {
     "@edx/frontend-app-communications": "*",
     "@edx/frontend-platform": "*",
-    "@edx/paragon": "*",
+    "@openedx/paragon": "*",
     "prop-types": "*",
     "react": "*"
   },

diff --git a/plugins/communications-app/RecipientsForm/index.jsx b/plugins/communications-app/RecipientsForm/index.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
-import { Form } from '@edx/paragon';
+import { Form } from '@openedx/paragon';
 import { FormattedMessage } from '@edx/frontend-platform/i18n';
 import { useSelector, useDispatch } from '@communications-app/src/components/bulk-email-tool/bulk-email-form/BuildEmailFormExtensible/context';
 import { actionCreators as formActions } from '@communications-app/src/components/bulk-email-tool/bulk-email-form/BuildEmailFormExtensible/context/reducer';
@@ -10,10 +10,11 @@ import './styles.scss';
 const disableIsHasLearners = ['track', 'cohort'];
 const recipientsFormDescription = 'A selectable choice from a list of potential email recipients';
 
-const RecipientsForm = ({ cohorts: additionalCohorts }) => {
+const RecipientsForm = ({ cohorts: additionalCohorts, courseModes }) => {
   const formData = useSelector((state) => state.form);
   const dispatch = useDispatch();
   const { isEditMode, emailRecipients, isFormSubmitted } = formData;
+  const hasCourseModes = courseModes.length > 1;
 
   const [selectedGroups, setSelectedGroups] = useState([]);
   const hasAllLearnersSelected = selectedGroups.some((group) => group === 'learners');
@@ -91,6 +92,24 @@ const RecipientsForm = ({ cohorts: additionalCohorts }) => {
             description={recipientsFormDescription}
           />
         </Form.Checkbox>
+        {
+          // additional modes
+          hasCourseModes
+          && courseModes.map((courseMode) => (
+            <Form.Checkbox
+              key={`track:${courseMode.slug}`}
+              value={`track:${courseMode.slug}`}
+              disabled={hasAllLearnersSelected}
+              className="col col-lg-4 col-sm-6 col-12"
+            >
+              <FormattedMessage
+                id="bulk.email.form.mode.label"
+                defaultMessage="Learners in the {courseModeName} Track"
+                values={{ courseModeName: courseMode.name }}
+              />
+            </Form.Checkbox>
+          ))
+        }
         {
             // additional cohorts
             additionalCohorts
@@ -152,10 +171,17 @@ const RecipientsForm = ({ cohorts: additionalCohorts }) => {
 
 RecipientsForm.defaultProps = {
   cohorts: [],
+  courseModes: [],
 };
 
 RecipientsForm.propTypes = {
   cohorts: PropTypes.arrayOf(PropTypes.string),
+  courseModes: PropTypes.arrayOf(
+    PropTypes.shape({
+      slug: PropTypes.string.isRequired,
+      name: PropTypes.string.isRequired,
+    }),
+  ),
 };
 
 export default RecipientsForm;
diff --git a/plugins/communications-app/RecipientsForm/package.json b/plugins/communications-app/RecipientsForm/package.json
@@ -8,7 +8,7 @@
   "peerDependencies": {
     "@edx/frontend-app-communications": "*",
     "@edx/frontend-platform": "*",
-    "@edx/paragon": "*",
+    "@openedx/paragon": "*",
     "prop-types": "*",
     "react": "*"
   },

diff --git a/plugins/communications-app/ScheduleSection/index.jsx b/plugins/communications-app/ScheduleSection/index.jsx
@@ -7,14 +7,14 @@ import {
   Form,
   Icon,
   Toast,
-} from '@edx/paragon';
+} from '@openedx/paragon';
 import {
   SpinnerSimple,
   Cancel,
   Send,
   Event,
   Check,
-} from '@edx/paragon/icons';
+} from '@openedx/paragon/icons';
 import { getConfig } from '@edx/frontend-platform';
 import { useIntl } from '@edx/frontend-platform/i18n';
 import ScheduleEmailForm from '@communications-app/src/components/bulk-email-tool/bulk-email-form/ScheduleEmailForm';

diff --git a/plugins/communications-app/ScheduleSection/package.json b/plugins/communications-app/ScheduleSection/package.json
@@ -8,7 +8,7 @@
   "peerDependencies": {
     "@edx/frontend-app-communications": "*",
     "@edx/frontend-platform": "*",
-    "@edx/paragon": "*",
+    "@openedx/paragon": "*",
     "prop-types": "*",
     "react": "*"
   },

diff --git a/plugins/communications-app/SubjectForm/index.jsx b/plugins/communications-app/SubjectForm/index.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Form } from '@edx/paragon';
+import { Form } from '@openedx/paragon';
 import { useIntl } from '@edx/frontend-platform/i18n';
 import { useSelector, useDispatch } from '@communications-app/src/components/bulk-email-tool/bulk-email-form/BuildEmailFormExtensible/context';
 import { actionCreators as formActions } from '@communications-app/src/components/bulk-email-tool/bulk-email-form/BuildEmailFormExtensible/context/reducer';

diff --git a/plugins/communications-app/SubjectForm/package.json b/plugins/communications-app/SubjectForm/package.json
@@ -8,7 +8,7 @@
   "peerDependencies": {
     "@edx/frontend-app-communications": "*",
     "@edx/frontend-platform": "*",
-    "@edx/paragon": "*",
+    "@openedx/paragon": "*",
     "prop-types": "*",
     "react": "*"
   },

diff --git a/plugins/communications-app/TaskAlertModalForm/package.json b/plugins/communications-app/TaskAlertModalForm/package.json
@@ -8,7 +8,7 @@
   "peerDependencies": {
     "@edx/frontend-app-communications": "*",
     "@edx/frontend-platform": "*",
-    "@edx/paragon": "*",
+    "@openedx/paragon": "*",
     "prop-types": "*",
     "react": "*"
   },

diff --git a/plugins/communications-app/TestComponent/package.json b/plugins/communications-app/TestComponent/package.json
@@ -8,7 +8,7 @@
   "peerDependencies": {
     "@edx/frontend-app-communications": "*",
     "@edx/frontend-platform": "*",
-    "@edx/paragon": "*",
+    "@openedx/paragon": "*",
     "prop-types": "*",
     "react": "*"
   },

diff --git a/src/components/bulk-email-tool/BulkEmailTool.jsx b/src/components/bulk-email-tool/BulkEmailTool.jsx
@@ -34,9 +34,9 @@ export default function BulkEmailTool() {
                 </h1>
               </div>
               <div className="row">
-                <BuildEmailFormExtensible 
-                  courseId={courseId} 
-                  cohorts={courseMetadata.cohorts} 
+                <BuildEmailFormExtensible
+                  courseId={courseId}
+                  cohorts={courseMetadata.cohorts}
                   courseModes={courseMetadata.courseModes}
                 />
               </div>

diff --git a/src/components/bulk-email-tool/bulk-email-form/BuildEmailFormExtensible/index.jsx b/src/components/bulk-email-tool/bulk-email-form/BuildEmailFormExtensible/index.jsx
@@ -6,21 +6,22 @@ import {
   Form,
   Spinner,
   useToggle,
-} from '@edx/paragon';
+} from '@openedx/paragon';
 import { BulkEmailContext } from '../../bulk-email-context';
 import useMobileResponsive from '../../../../utils/useMobileResponsive';
 import PluggableComponent from '../../../PluggableComponent';
 
 import { withContextProvider, useDispatch } from './context';
 import { actionCreators as formActions } from './context/reducer';
 
-const BuildEmailFormExtensible = ({ courseId, cohorts }) => {
+const BuildEmailFormExtensible = ({ courseId, cohorts, courseModes }) => {
   const isMobile = useMobileResponsive();
   const [{ editor }] = useContext(BulkEmailContext);
   const [isTaskAlertOpen, openTaskAlert, closeTaskAlert] = useToggle(false);
   const dispatch = useDispatch();
 
   useDeepCompareEffect(() => {
+    /* istanbul ignore next */
     if (editor.editMode) {
       const newRecipientsValue = editor.emailRecipients;
       const newSubjectValue = editor.emailSubject;
@@ -61,6 +62,7 @@ const BuildEmailFormExtensible = ({ courseId, cohorts }) => {
           as="communications-app-recipients-checks"
           cohorts={cohorts}
           courseId={courseId}
+          courseModes={courseModes}
         />
 
         <PluggableComponent
@@ -103,11 +105,18 @@ const BuildEmailFormExtensible = ({ courseId, cohorts }) => {
 
 BuildEmailFormExtensible.defaultProps = {
   cohorts: [],
+  courseModes: [],
 };
 
 BuildEmailFormExtensible.propTypes = {
   courseId: PropTypes.string.isRequired,
   cohorts: PropTypes.arrayOf(PropTypes.string),
+  courseModes: PropTypes.arrayOf(
+    PropTypes.shape({
+      slug: PropTypes.string.isRequired,
+      name: PropTypes.string.isRequired,
+    }),
+  ),
 };
 
 export default withContextProvider(BuildEmailFormExtensible);