chore: update with latest changes from master

Author: bradenmacdonald

.stylelintrc.json

@@ -8,7 +8,7 @@
       "ignoreUnits": ["\\.5"]
     }],
     "property-no-vendor-prefix": [true, {
-      "ignoreProperties": ["animation", "filter"]
+      "ignoreProperties": ["animation", "filter", "transform", "transition"]
     }],
     "value-no-vendor-prefix": [true, {
       "ignoreValues": ["fill-available"]

package-lock.json

@@ -39,13 +39,13 @@
     "@edx/frontend-component-footer": "^12.3.0",
     "@edx/frontend-component-header": "^4.7.0",
     "@edx/frontend-enterprise-hotjar": "^2.0.0",
-    "@edx/frontend-lib-content-components": "1.175.0",
+    "@edx/frontend-lib-content-components": "1.175.1",
     "@edx/frontend-platform": "5.6.1",
-    "@edx/paragon": "^20.45.4",
-    "@fortawesome/fontawesome-svg-core": "1.2.28",
-    "@fortawesome/free-brands-svg-icons": "5.11.2",
-    "@fortawesome/free-regular-svg-icons": "5.11.2",
-    "@fortawesome/free-solid-svg-icons": "5.11.2",
+    "@edx/paragon": "^21.5.6",
+    "@fortawesome/fontawesome-svg-core": "1.2.36",
+    "@fortawesome/free-brands-svg-icons": "5.15.4",
+    "@fortawesome/free-regular-svg-icons": "5.15.4",
+    "@fortawesome/free-solid-svg-icons": "5.15.4",
     "@fortawesome/react-fontawesome": "0.2.0",
     "@openedx-plugins/course-app-calculator": "file:plugins/course-apps/calculator",
     "@openedx-plugins/course-app-edxnotes": "file:plugins/course-apps/edxnotes",
@@ -65,7 +65,7 @@
     "formik": "2.2.6",
     "jszip": "^3.10.1",
     "lodash": "4.17.21",
-    "moment": "2.29.2",
+    "moment": "2.29.4",
     "prop-types": "15.7.2",
     "react": "17.0.2",
     "react-datepicker": "^4.13.0",
@@ -76,28 +76,29 @@
     "react-router": "6.16.0",
     "react-router-dom": "6.16.0",
     "react-textarea-autosize": "^8.4.1",
-    "react-transition-group": "4.4.1",
+    "react-transition-group": "4.4.5",
     "redux": "4.0.5",
     "regenerator-runtime": "0.13.7",
     "universal-cookie": "^4.0.4",
     "uuid": "^3.4.0",
     "yup": "0.31.1"
   },
   "devDependencies": {
-    "@edx/browserslist-config": "1.0.0",
-    "@edx/frontend-build": "13.0.1",
+    "@edx/browserslist-config": "1.2.0",
+    "@edx/frontend-build": "13.0.4",
     "@edx/reactifex": "^1.0.3",
     "@edx/stylelint-config-edx": "^2.3.0",
     "@edx/typescript-config": "^1.0.1",
-    "@testing-library/jest-dom": "5.16.4",
+    "@testing-library/jest-dom": "5.17.0",
     "@testing-library/react": "12.1.5",
     "@testing-library/user-event": "^13.2.1",
     "@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
     "axios-mock-adapter": "1.20.0",
     "enzyme": "3.11.0",
     "enzyme-to-json": "^3.6.2",
-    "glob": "7.2.0",
+    "glob": "7.2.3",
     "husky": "7.0.4",
+    "jest-canvas-mock": "^2.5.2",
     "react-test-renderer": "17.0.2",
     "reactifex": "1.1.1",
     "ts-loader": "^9.5.0"

package.json

@@ -8,7 +8,7 @@ import ProctoredExamSettings from './proctored-exam-settings/ProctoredExamSettin
 import EditorContainer from './editors/EditorContainer';
 import VideoSelectorContainer from './selectors/VideoSelectorContainer';
 import CustomPages from './custom-pages';
-import FilesAndUploads from './files-and-uploads';
+import { FilesPage, VideosPage } from './files-and-videos';
 import { AdvancedSettings } from './advanced-settings';
 import ScheduleAndDetails from './schedule-and-details';
 import { GradingSettings } from './grading-settings';
@@ -49,11 +49,11 @@ const CourseAuthoringRoutes = () => {
         />
         <Route
           path="assets"
-          element={<PageWrap><FilesAndUploads courseId={courseId} /></PageWrap>}
+          element={<PageWrap><FilesPage courseId={courseId} /></PageWrap>}
         />
         <Route
           path="videos"
-          element={process.env.ENABLE_NEW_VIDEO_UPLOAD_PAGE === 'true' ? <PageWrap><Placeholder /></PageWrap> : null}
+          element={process.env.ENABLE_VIDEO_UPLOAD_PAGE_LINK_IN_CONTENT_DROPDOWN === 'true' ? <PageWrap><VideosPage courseId={courseId} /></PageWrap> : null}
         />
         <Route
           path="pages-and-resources/*"

src/CourseAuthoringRoutes.jsx

@@ -1,8 +1,6 @@
 import React, { useEffect, useContext, useState } from 'react';
 import PropTypes from 'prop-types';
-import {
-  Routes, Route, useLocation, useNavigate,
-} from 'react-router-dom';
+import { Routes, Route, useNavigate } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
 import { AppContext, PageWrap } from '@edx/frontend-platform/react';
 import { injectIntl, FormattedMessage, intlShape } from '@edx/frontend-platform/i18n';
@@ -53,13 +51,11 @@ const CustomPages = ({
   const [orderedPages, setOrderedPages] = useState([]);
   const [currentPage, setCurrentPage] = useState();
   const [isOpen, open, close] = useToggle(false);
-  const [isEditModalOpen, openEditModal, closeEditModal] = useToggle(false);
 
   const courseDetails = useModel('courseDetails', courseId);
   document.title = getPageHeadTitle(courseDetails?.name, intl.formatMessage(messages.heading));
 
   const { config } = useContext(AppContext);
-  const location = useLocation();
   const learningCourseURL = `${config.LEARNING_BASE_URL}/course/${courseId}`;
 
   useEffect(() => {
@@ -79,15 +75,14 @@ const CustomPages = ({
     dispatch(updatePageOrder(courseId, newPageOrder));
   };
   const handleEditClose = () => (content) => {
-    navigate(location.pathname);
+    navigate(`/course/${courseId}/custom-pages`);
     if (!content?.metadata) {
-      closeEditModal();
+      setCurrentPage(null);
       return;
     }
     dispatch(updateSingleCustomPage({
       blockId: currentPage,
       metadata: { displayName: content.metadata.display_name },
-      onClose: closeEditModal,
       setCurrentPage,
     }));
   };
@@ -192,7 +187,6 @@ const CustomPages = ({
                       deletePageStatus,
                       courseId,
                       setCurrentPage,
-                      openEditModal,
                     }}
                   />
                 </SortableItem>
@@ -262,7 +256,6 @@ const CustomPages = ({
               <PageWrap>
                 <EditModal
                   courseId={courseId}
-                  isOpen={isEditModalOpen}
                   pageId={currentPage}
                   onClose={handleEditClose}
                 />