Merge branch 'master' into hu/ent-8887

openedx · Aug 13, 2024 · 57c2c85 · 57c2c85
2 parents ab638fc + 4f4566e
commit 57c2c85
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 24 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/course/course-header/CourseRunCards.jsx b/src/components/course/course-header/CourseRunCards.jsx
@@ -5,11 +5,11 @@ import CourseRunCard from './CourseRunCard';
 import DeprecatedCourseRunCard from './deprecated/CourseRunCard';
 import { useUserSubsidyApplicableToCourse } from '../data';
 import {
+  LEARNER_CREDIT_SUBSIDY_TYPE,
   useCourseMetadata,
   useEnterpriseCourseEnrollments,
   useEnterpriseCustomerContainsContent,
   useUserEntitlements,
-  LEARNER_CREDIT_SUBSIDY_TYPE,
 } from '../../app/data';
 
 /**

diff --git a/src/components/course/data/courseLoader.ts b/src/components/course/data/courseLoader.ts
@@ -177,8 +177,8 @@ const makeCourseLoader: Types.MakeRouteLoaderFunctionWithQueryClient = function
     // redirect to the appropriate course route.
     if (
       courseMetadata.courseType
-        && getCourseTypeConfig(courseMetadata)
-        && !pathContainsCourseTypeSlug(requestUrl.pathname, courseMetadata.courseType)
+      && getCourseTypeConfig(courseMetadata)
+      && !pathContainsCourseTypeSlug(requestUrl.pathname, courseMetadata.courseType)
     ) {
       const newUrl = getLinkToCourse(courseMetadata, enterpriseSlug);
       throw redirect(newUrl);

diff --git a/src/components/dashboard/main-content/course-enrollments/course-cards/BaseCourseCard.jsx b/src/components/dashboard/main-content/course-enrollments/course-cards/BaseCourseCard.jsx
@@ -121,7 +121,7 @@ export const getScreenReaderText = (str) => (
 );
 
 const BaseCourseCard = ({
-  hasEmailsEnabled: defaultHasEmailsEnabled,
+  hasEmailsEnabled,
   title,
   dropdownMenuItems: customDropdownMenuItem,
   canUnenroll,
@@ -148,7 +148,6 @@ const BaseCourseCard = ({
   const intl = useIntl();
   const { LEARNER_SUPPORT_PACED_COURSE_MODE_URL } = getConfig();
   const { data: enterpriseCustomer } = useEnterpriseCustomer();
-  const [hasEmailsEnabled, setHasEmailsEnabled] = useState(defaultHasEmailsEnabled);
   const [emailSettingsModal, setEmailSettingsModal] = useState({
     open: false,
     options: {},
@@ -267,11 +266,8 @@ const BaseCourseCard = ({
     }));
   };
 
-  const handleEmailSettingsModalOnClose = (newValue) => {
+  const handleEmailSettingsModalOnClose = () => {
     resetModals();
-    if (hasEmailsEnabled !== undefined) {
-      setHasEmailsEnabled(newValue);
-    }
   };
 
   const handleUnenrollModalOnClose = () => {

diff --git a/...ents/dashboard/main-content/course-enrollments/course-cards/tests/BaseCourseCard.test.jsx b/...ents/dashboard/main-content/course-enrollments/course-cards/tests/BaseCourseCard.test.jsx
@@ -80,7 +80,8 @@ describe('<BaseCourseCard />', () => {
     it('handles email settings modal close/cancel', async () => {
       userEvent.click(screen.getByTestId('modal-footer-btn', { name: 'Close' }));
       await waitFor(() => {
-        expect(screen.queryByRole('dialog')).not.toBeInTheDocument();
+        const dialogElement = screen.getByTestId('modal');
+        expect(dialogElement).not.toHaveClass('show');
       });
     });
   });

diff --git a/src/components/video/VideoPlayer.jsx b/src/components/video/VideoPlayer.jsx
@@ -4,7 +4,7 @@ import VideoJS from './VideoJS';
 
 const hlsExtension = '.m3u8';
 const defaultOptions = {
-  autoplay: false,
+  autoplay: true,
   controls: true,
   responsive: true,
   fluid: true,
@@ -17,6 +17,8 @@ const VideoPlayer = ({ videoURL, onReady, customOptions }) => {
     if (isMp4Video) {
       return {
         ...defaultOptions,
+        // Disable autoplay if `showTranscripts` is enabled (video detail page); enable autoplay otherwise.
+        autoplay: !customOptions?.showTranscripts,
         sources: [{ src: videoURL, type: 'video/mp4' }],
       };
     }
@@ -35,6 +37,7 @@ const VideoPlayer = ({ videoURL, onReady, customOptions }) => {
       controls: true,
       sources: [{ src: videoURL, type: 'application/x-mpegURL' }],
     };
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [videoURL]);
 
   return (