feat: add watchers field

openedx · Jul 21, 2023 · 7a69640 · 7a69640
1 parent 80b4a1e
commit 7a69640
Show file tree

Hide file tree

Showing 8 changed files with 206 additions and 2 deletions.
diff --git a/src/components/EditCoursePage/EditCourseForm.jsx b/src/components/EditCoursePage/EditCourseForm.jsx
@@ -28,12 +28,14 @@ import Collapsible from '../Collapsible';
 import PriceList from '../PriceList';
 
 import {
-  PUBLISHED, REVIEWED, EXECUTIVE_EDUCATION_SLUG, COURSE_URL_SLUG_VALIDATION_MESSAGE,
+  PUBLISHED, REVIEWED, EXECUTIVE_EDUCATION_SLUG, COURSE_URL_SLUG_VALIDATION_MESSAGE, REVIEW_BY_INTERNAL,
 } from '../../data/constants';
 import {
   titleHelp, typeHelp, getUrlSlugHelp, productSourceHelp,
 } from '../../helpText';
-import { handleCourseEditFail, editCourseValidate, courseTagValidate } from '../../utils/validation';
+import {
+  handleCourseEditFail, editCourseValidate, courseTagValidate, emailValidate,
+} from '../../utils/validation';
 import {
   formatCollaboratorOptions, getDateWithSlashes, getFormattedUTCTimeString, getOptionsData, isPristine,
   parseCourseTypeOptions, parseOptions, loadOptions, courseTagObjectsToSelectOptions, getCourseUrlSlugPattern,
@@ -1091,6 +1093,31 @@ export class BaseEditCourseForm extends React.Component {
               disabled={disabled}
               optional
             />
+            {administrator && (
+              <Field
+                name="watchers_list"
+                component={ReduxFormCreatableSelect}
+                label={(
+                  <FieldLabel
+                    id="watchers.label"
+                    text="Watchers"
+                    helpText={(
+                      <p>
+                        A comma-separated list of email addresses that will receive
+                        notifications when the course run of the course is published or reviewed.
+                      </p>
+                    )}
+                    optional
+                  />
+                )}
+                isMulti
+                disabled={!(courseInfo?.data?.course_run_statuses?.includes(REVIEW_BY_INTERNAL) && administrator)}
+                optional
+                isCreatable
+                createOptionValidator={emailValidate}
+              />
+            )}
+
             {administrator && (
             <>
               <FieldLabel text="Merchandising Location Restriction" className="mb-2" />

diff --git a/src/components/EditCoursePage/EditCourseForm.test.jsx b/src/components/EditCoursePage/EditCourseForm.test.jsx
@@ -40,6 +40,7 @@ describe('BaseEditCourseForm', () => {
     skill_names: [],
     organization_logo_override: 'http://image.src.small',
     organization_short_code_override: 'test short code',
+    watchers: ['[email protected]'],
     location_restriction: {
       restriction_type: 'allowlist',
       countries: ['AF', 'AX'],

diff --git a/src/components/EditCoursePage/EditCoursePage.test.jsx b/src/components/EditCoursePage/EditCoursePage.test.jsx
@@ -26,6 +26,7 @@ describe('EditCoursePage', () => {
   const defaultPrice = '77';
   const defaultEnd = '2019-08-14T00:00:00Z';
   const defaultUpgradeDeadlineOverride = '2019-09-14T00:00:00Z';
+  const watchers = ['[email protected]'];
 
   const courseInfo = {
     data: {
@@ -161,6 +162,8 @@ describe('EditCoursePage', () => {
       skill_names: [],
       organization_logo_override_url: 'http://image.src.small',
       organization_short_code_override: 'test short code',
+      watchers,
+      watchers_list: watchers?.length ? watchers.map(w => ({ label: w, value: w })) : null,
       location_restriction: {
         restriction_type: 'allowlist',
         countries: [
@@ -384,6 +387,8 @@ describe('EditCoursePage', () => {
       },
       organization_logo_override_url: 'http://image.src.small',
       organization_short_code_override: 'test short code',
+      watchers,
+      watchers_list: watchers?.length ? watchers.map(w => ({ label: w, value: w })) : null,
       outcome: '<p>Stuff</p>',
       prerequisites_raw: '',
       prices: {
@@ -426,6 +431,7 @@ describe('EditCoursePage', () => {
       },
       organization_logo_override: 'http://image.src.small',
       organization_short_code_override: 'test short code',
+      watchers,
       outcome: '<p>Stuff</p>',
       prerequisites_raw: '',
       prices: {
@@ -967,6 +973,7 @@ describe('EditCoursePage', () => {
       },
       organization_logo_override: 'http://image.src.small',
       organization_short_code_override: 'test short code',
+      watchers,
       outcome: '<p>Stuff</p>',
       prerequisites_raw: '',
       prices: {

diff --git a/src/components/EditCoursePage/__snapshots__/EditCourseForm.test.jsx.snap b/src/components/EditCoursePage/__snapshots__/EditCourseForm.test.jsx.snap
@@ -1700,6 +1700,9 @@ exports[`BaseEditCourseForm override slug format when IS_NEW_SLUG_FORMAT_ENABLED
           "type": "8a8f30e1-23ce-4ed3-a361-1325c656b67b",
           "uuid": "11111111-1111-1111-1111-111111111111",
           "videoSrc": "https://www.video.src/watch?v=fdsafd",
+          "watchers": Array [
+            "[email protected]",
+          ],
         }
       }
       editable={false}
@@ -3521,6 +3524,9 @@ exports[`BaseEditCourseForm renders correctly when submitting for review 1`] = `
           "type": "8a8f30e1-23ce-4ed3-a361-1325c656b67b",
           "uuid": "11111111-1111-1111-1111-111111111111",
           "videoSrc": "https://www.video.src/watch?v=fdsafd",
+          "watchers": Array [
+            "[email protected]",
+          ],
         }
       }
       editable={false}
@@ -5342,6 +5348,9 @@ exports[`BaseEditCourseForm renders html correctly while submitting 1`] = `
           "type": "8a8f30e1-23ce-4ed3-a361-1325c656b67b",
           "uuid": "11111111-1111-1111-1111-111111111111",
           "videoSrc": "https://www.video.src/watch?v=fdsafd",
+          "watchers": Array [
+            "[email protected]",
+          ],
         }
       }
       editable={false}
@@ -5396,6 +5405,9 @@ exports[`BaseEditCourseForm renders html correctly while submitting 1`] = `
           "type": "8a8f30e1-23ce-4ed3-a361-1325c656b67b",
           "uuid": "11111111-1111-1111-1111-111111111111",
           "videoSrc": "https://www.video.src/watch?v=fdsafd",
+          "watchers": Array [
+            "[email protected]",
+          ],
         }
       }
       isSubmittingForReview={false}
@@ -6706,6 +6718,29 @@ exports[`BaseEditCourseForm renders html correctly with administrator being true
         requiredHeight={110}
         requiredWidth={110}
       />
+      <Field
+        component={[Function]}
+        createOptionValidator={[Function]}
+        disabled={true}
+        isCreatable={true}
+        isMulti={true}
+        label={
+          <FieldLabel
+            className=""
+            extraText=""
+            helpText={
+              <p>
+                A comma-separated list of email addresses that will receive notifications when the course run of the course is published or reviewed.
+              </p>
+            }
+            id="watchers.label"
+            optional={true}
+            text="Watchers"
+          />
+        }
+        name="watchers_list"
+        optional={true}
+      />
       <FieldLabel
         className="mb-2"
         extraText=""
@@ -7507,6 +7542,9 @@ exports[`BaseEditCourseForm renders html correctly with administrator being true
           "type": "8a8f30e1-23ce-4ed3-a361-1325c656b67b",
           "uuid": "11111111-1111-1111-1111-111111111111",
           "videoSrc": "https://www.video.src/watch?v=fdsafd",
+          "watchers": Array [
+            "[email protected]",
+          ],
         }
       }
       editable={false}
@@ -7561,6 +7599,9 @@ exports[`BaseEditCourseForm renders html correctly with administrator being true
           "type": "8a8f30e1-23ce-4ed3-a361-1325c656b67b",
           "uuid": "11111111-1111-1111-1111-111111111111",
           "videoSrc": "https://www.video.src/watch?v=fdsafd",
+          "watchers": Array [
+            "[email protected]",
+          ],
         }
       }
       isSubmittingForReview={false}
@@ -9366,6 +9407,9 @@ exports[`BaseEditCourseForm renders html correctly with all data present 1`] = `
           "type": "8a8f30e1-23ce-4ed3-a361-1325c656b67b",
           "uuid": "11111111-1111-1111-1111-111111111111",
           "videoSrc": "https://www.video.src/watch?v=fdsafd",
+          "watchers": Array [
+            "[email protected]",
+          ],
         }
       }
       editable={false}
@@ -9420,6 +9464,9 @@ exports[`BaseEditCourseForm renders html correctly with all data present 1`] = `
           "type": "8a8f30e1-23ce-4ed3-a361-1325c656b67b",
           "uuid": "11111111-1111-1111-1111-111111111111",
           "videoSrc": "https://www.video.src/watch?v=fdsafd",
+          "watchers": Array [
+            "[email protected]",
+          ],
         }
       }
       isSubmittingForReview={false}

diff --git a/src/components/EditCoursePage/__snapshots__/EditCoursePage.test.jsx.snap b/src/components/EditCoursePage/__snapshots__/EditCoursePage.test.jsx.snap
@@ -169,6 +169,8 @@ exports[`EditCoursePage renders html correctly 1`] = `
           "type": undefined,
           "url_slug": undefined,
           "videoSrc": undefined,
+          "watchers": undefined,
+          "watchers_list": null,
         }
       }
       onSubmit={[Function]}
@@ -471,6 +473,15 @@ exports[`EditCoursePage renders page correctly with courseInfo 1`] = `
               "image": null,
               "src": "https://www.video.information/watch?v=cVsQLlk-T0s",
             },
+            "watchers": Array [
+              "[email protected]",
+            ],
+            "watchers_list": Array [
+              Object {
+                "label": "[email protected]",
+                "value": "[email protected]",
+              },
+            ],
           },
           "error": null,
           "isFetching": false,
@@ -693,6 +704,15 @@ exports[`EditCoursePage renders page correctly with courseInfo 1`] = `
           "type": "8a8f30e1-23ce-4ed3-a361-1325c656b67b",
           "url_slug": undefined,
           "videoSrc": "https://www.video.information/watch?v=cVsQLlk-T0s",
+          "watchers": Array [
+            "[email protected]",
+          ],
+          "watchers_list": Array [
+            Object {
+              "label": "[email protected]",
+              "value": "[email protected]",
+            },
+          ],
         }
       }
       number="Test101x"
@@ -975,6 +995,15 @@ exports[`EditCoursePage renders page correctly with courseInfo and courseOptions
               "image": null,
               "src": "https://www.video.information/watch?v=cVsQLlk-T0s",
             },
+            "watchers": Array [
+              "[email protected]",
+            ],
+            "watchers_list": Array [
+              Object {
+                "label": "[email protected]",
+                "value": "[email protected]",
+              },
+            ],
           },
           "error": null,
           "isFetching": false,
@@ -1570,6 +1599,15 @@ exports[`EditCoursePage renders page correctly with courseInfo and courseOptions
           "type": "8a8f30e1-23ce-4ed3-a361-1325c656b67b",
           "url_slug": undefined,
           "videoSrc": "https://www.video.information/watch?v=cVsQLlk-T0s",
+          "watchers": Array [
+            "[email protected]",
+          ],
+          "watchers_list": Array [
+            Object {
+              "label": "[email protected]",
+              "value": "[email protected]",
+            },
+          ],
         }
       }
       number="Test101x"
@@ -1767,6 +1805,8 @@ exports[`EditCoursePage renders page correctly with courseInfo error 1`] = `
           "type": undefined,
           "url_slug": undefined,
           "videoSrc": undefined,
+          "watchers": undefined,
+          "watchers_list": null,
         }
       }
       onSubmit={[Function]}
@@ -2070,6 +2110,15 @@ exports[`EditCoursePage renders page correctly with courseInfo, courseOptions, a
               "image": null,
               "src": "https://www.video.information/watch?v=cVsQLlk-T0s",
             },
+            "watchers": Array [
+              "[email protected]",
+            ],
+            "watchers_list": Array [
+              Object {
+                "label": "[email protected]",
+                "value": "[email protected]",
+              },
+            ],
           },
           "error": null,
           "isFetching": false,
@@ -2733,6 +2782,15 @@ exports[`EditCoursePage renders page correctly with courseInfo, courseOptions, a
           "type": "8a8f30e1-23ce-4ed3-a361-1325c656b67b",
           "url_slug": undefined,
           "videoSrc": "https://www.video.information/watch?v=cVsQLlk-T0s",
+          "watchers": Array [
+            "[email protected]",
+          ],
+          "watchers_list": Array [
+            Object {
+              "label": "[email protected]",
+              "value": "[email protected]",
+            },
+          ],
         }
       }
       number="Test101x"
@@ -2946,6 +3004,8 @@ exports[`EditCoursePage renders page correctly with courseInfo, courseOptions, a
           "type": undefined,
           "url_slug": undefined,
           "videoSrc": undefined,
+          "watchers": undefined,
+          "watchers_list": null,
         }
       }
       onSubmit={[Function]}
@@ -3537,6 +3597,8 @@ exports[`EditCoursePage renders page correctly with courseOptions 1`] = `
           "type": undefined,
           "url_slug": undefined,
           "videoSrc": undefined,
+          "watchers": undefined,
+          "watchers_list": null,
         }
       }
       onSubmit={[Function]}
@@ -3734,6 +3796,8 @@ exports[`EditCoursePage renders page correctly with courseOptions error 1`] = `
           "type": undefined,
           "url_slug": undefined,
           "videoSrc": undefined,
+          "watchers": undefined,
+          "watchers_list": null,
         }
       }
       onSubmit={[Function]}
@@ -4016,6 +4080,8 @@ exports[`EditCoursePage renders page correctly with courseRunOptions 1`] = `
           "type": undefined,
           "url_slug": undefined,
           "videoSrc": undefined,
+          "watchers": undefined,
+          "watchers_list": null,
         }
       }
       onSubmit={[Function]}
@@ -4213,6 +4279,8 @@ exports[`EditCoursePage renders page correctly with courseRunOptions error 1`] =
           "type": undefined,
           "url_slug": undefined,
           "videoSrc": undefined,
+          "watchers": undefined,
+          "watchers_list": null,
         }
       }
       onSubmit={[Function]}

diff --git a/src/components/EditCoursePage/index.jsx b/src/components/EditCoursePage/index.jsx
@@ -370,6 +370,7 @@ class EditCoursePage extends React.Component {
       organization_logo_override: courseData.organization_logo_override_url,
       organization_short_code_override:
         courseData.organization_short_code_override,
+      watchers: courseData.watchers_list ? courseData.watchers_list.map((watcher) => watcher.value) : [],
       outcome: courseData.outcome,
       prerequisites_raw: courseData.prerequisites_raw,
       ...priceData,
@@ -615,6 +616,7 @@ class EditCoursePage extends React.Component {
           enterprise_subscription_inclusion,
           organization_short_code_override,
           organization_logo_override_url,
+          watchers,
         },
       },
     } = this.props;
@@ -657,9 +659,11 @@ class EditCoursePage extends React.Component {
       enterprise_subscription_inclusion,
       organization_short_code_override,
       organization_logo_override_url,
+      watchers,
       location_restriction: this.buildLocationRestriction(),
       in_year_value: this.buildInYearValue(),
       tags: topics?.length ? topics.map(t => ({ label: t, value: t })) : null,
+      watchers_list: watchers?.length ? watchers.map(w => ({ label: w, value: w })) : null,
     };
   }