Merge branch 'rpenido/fal-3753-library-home-page-bare-bones' into rpe…

…nido/fal-3768-create-new-library-form
open-craft · Jun 20, 2024 · e6b877d · e6b877d
2 parents bccaedc + 3ae6fe8
commit e6b877d
Show file tree

Hide file tree

Showing 44 changed files with 646 additions and 861 deletions.
diff --git a/README.rst b/README.rst
@@ -267,8 +267,6 @@ Tagging/Taxonomy functionality.
 Feature: Libraries V2/Legacy Tabs
 =================================
 
-.. image:: ./docs/readme-images/feature-v2-and-legacy-libs.png
-
 Configuration
 -------------
 

diff --git a/docs/readme-images/feature-v2-and-legacy-libs.png b/docs/readme-images/feature-v2-and-legacy-libs.png
diff --git a/plugins/course-apps/proctoring/Settings.test.jsx b/plugins/course-apps/proctoring/Settings.test.jsx
diff --git a/src/accessibility-page/messages.js b/src/accessibility-page/messages.js
@@ -2,7 +2,7 @@ import { defineMessages } from '@edx/frontend-platform/i18n';
 
 const messages = defineMessages({
   pageTitle: {
-    id: 'course-authoring.import.page.title',
+    id: 'course-authoring.accessibility.page.title',
     defaultMessage: 'Studio Accessibility Policy| {siteName}',
   },
 });

diff --git a/src/certificates/layout/header-buttons/HeaderButtons.test.jsx b/src/certificates/layout/header-buttons/HeaderButtons.test.jsx
@@ -59,10 +59,10 @@ describe('HeaderButtons Component', () => {
     expect(previewLink).toHaveAttribute('href', expect.stringContaining(certificatesDataMock.courseModes[0]));
 
     const dropdownButton = getByRole('button', { name: certificatesDataMock.courseModes[0] });
-    await userEvent.click(dropdownButton);
+    userEvent.click(dropdownButton);
 
     const verifiedMode = await getByRole('button', { name: certificatesDataMock.courseModes[1] });
-    await userEvent.click(verifiedMode);
+    userEvent.click(verifiedMode);
 
     await waitFor(() => {
       expect(previewLink).toHaveAttribute('href', expect.stringContaining(certificatesDataMock.courseModes[1]));
@@ -78,7 +78,7 @@ describe('HeaderButtons Component', () => {
     const { getByRole, queryByRole } = renderComponent();
 
     const activationButton = getByRole('button', { name: messages.headingActionsActivate.defaultMessage });
-    await userEvent.click(activationButton);
+    userEvent.click(activationButton);
 
     axiosMock.onPost(
       getUpdateCertificateApiUrl(courseId, certificatesDataMock.certificates[0].id),
@@ -110,7 +110,7 @@ describe('HeaderButtons Component', () => {
     const { getByRole, queryByRole } = renderComponent();
 
     const deactivateButton = getByRole('button', { name: messages.headingActionsDeactivate.defaultMessage });
-    await userEvent.click(deactivateButton);
+    userEvent.click(deactivateButton);
 
     axiosMock.onPost(
       getUpdateCertificateApiUrl(courseId, certificatesDataMock.certificates[0].id),

diff --git a/src/content-tags-drawer/messages.js b/src/content-tags-drawer/messages.js
@@ -69,7 +69,7 @@ const messages = defineMessages({
     defaultMessage: 'Add a tag',
   },
   collapsibleNoTagsAddedText: {
-    id: 'course-authoring.content-tags-drawer.content-tags-collapsible.custom-menu.placeholder-text',
+    id: 'course-authoring.content-tags-drawer.content-tags-collapsible.custom-menu.no-tags-added-text',
     defaultMessage: 'No tags added yet.',
   },
   collapsibleAddStagedTagsButtonText: {

diff --git a/src/course-checklist/ChecklistSection/ChecklistItemComment.jsx b/src/course-checklist/ChecklistSection/ChecklistItemComment.jsx
@@ -79,10 +79,9 @@ const ChecklistItemComment = ({
         <ul className="assignment-list">
           {gradedAssignmentsOutsideDateRange.map(assignment => (
             <li className="assignment-list-item" key={assignment.id}>
-              <Hyperlink
-                content={assignment.displayName}
-                destination={`${outlineUrl}#${assignment.id}`}
-              />
+              <Hyperlink destination={`${outlineUrl}#${assignment.id}`}>
+                {assignment.displayName}
+              </Hyperlink>
             </li>
           ))}
         </ul>

diff --git a/src/course-outline/card-header/messages.js b/src/course-outline/card-header/messages.js
@@ -58,7 +58,7 @@ const messages = defineMessages({
     defaultMessage: 'Delete',
   },
   menuCopy: {
-    id: 'course-authoring.course-outline.card.menu.delete',
+    id: 'course-authoring.course-outline.card.menu.copy',
     defaultMessage: 'Copy to clipboard',
   },
   menuProctoringLinkText: {

diff --git a/src/course-outline/data/thunk.js b/src/course-outline/data/thunk.js
@@ -57,7 +57,10 @@ import {
 const getErrorDetails = (error, dismissible = true) => {
   const errorInfo = { dismissible };
   if (error.response?.data) {
-    errorInfo.data = JSON.stringify(error.response.data);
+    const { data } = error.response;
+    if ((typeof data === 'string' && !data.includes('</html>')) || typeof data === 'object') {
+      errorInfo.data = JSON.stringify(data);
+    }
     errorInfo.status = error.response.status;
     errorInfo.type = API_ERROR_TYPES.serverError;
   } else if (error.request) {

diff --git a/src/course-outline/page-alerts/PageAlerts.jsx b/src/course-outline/page-alerts/PageAlerts.jsx
@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
+import { uniqBy } from 'lodash';
 import { getConfig } from '@edx/frontend-platform';
 import { useDispatch, useSelector } from 'react-redux';
 import { FormattedMessage, useIntl } from '@edx/frontend-platform/i18n';
@@ -336,15 +337,13 @@ const PageAlerts = ({
   };
 
   const renderApiErrors = () => {
-    const errorList = Object.entries(errors).filter(obj => obj[1] !== null).map(([k, v]) => {
+    let errorList = Object.entries(errors).filter(obj => obj[1] !== null).map(([k, v]) => {
       switch (v.type) {
       case API_ERROR_TYPES.serverError:
         return {
           key: k,
-          desc: v.data,
-          title: intl.formatMessage(messages.serverErrorAlert, {
-            status: v.status,
-          }),
+          desc: v.data || intl.formatMessage(messages.serverErrorAlertBody),
+          title: intl.formatMessage(messages.serverErrorAlert),
           dismissible: v.dismissible,
         };
       case API_ERROR_TYPES.networkError:
@@ -356,11 +355,12 @@ const PageAlerts = ({
       default:
         return {
           key: k,
-          desc: v.data,
+          title: v.data,
           dismissible: v.dismissible,
         };
       }
     });
+    errorList = uniqBy(errorList, 'title');
     if (!errorList?.length) {
       return null;
     }
@@ -373,10 +373,7 @@ const PageAlerts = ({
             key={msgObj.key}
             dismissError={() => dispatch(dismissError(msgObj.key))}
           >
-            {msgObj.title
-              && (
-                <Alert.Heading>{msgObj.title}</Alert.Heading>
-              )}
+            <Alert.Heading>{msgObj.title}</Alert.Heading>
             {msgObj.desc && <Truncate lines={2}>{msgObj.desc}</Truncate>}
           </ErrorAlert>
         ) : (
@@ -385,10 +382,7 @@ const PageAlerts = ({
             icon={ErrorIcon}
             key={msgObj.key}
           >
-            {msgObj.title
-                && (
-                  <Alert.Heading>{msgObj.title}</Alert.Heading>
-                )}
+            <Alert.Heading>{msgObj.title}</Alert.Heading>
             {msgObj.desc && <Truncate lines={2}>{msgObj.desc}</Truncate>}
           </Alert>
         )

diff --git a/src/course-outline/page-alerts/messages.js b/src/course-outline/page-alerts/messages.js
@@ -22,7 +22,7 @@ const messages = defineMessages({
     description: 'Learn more link in upgraded discussion notification alert',
   },
   discussionNotificationFeedback: {
-    id: 'course-authoring.course-outline.page-alerts.discussionNotificationLearnMore',
+    id: 'course-authoring.course-outline.page-alerts.discussionNotificationFeedback',
     defaultMessage: 'Share feedback',
     description: 'Share feedback link in upgraded discussion notification alert',
   },
@@ -108,7 +108,12 @@ const messages = defineMessages({
   },
   serverErrorAlert: {
     id: 'course-authoring.course-outline.page-alert.server-error.title',
-    defaultMessage: 'Request failed with status: {status}',
+    defaultMessage: 'The Studio servers encountered an error',
+    description: 'Generic server error alert title.',
+  },
+  serverErrorAlertBody: {
+    id: 'course-authoring.course-outline.page-alert.server-error.body',
+    defaultMessage: ' An error occurred in Studio and the page could not be loaded. Please try again in a few moments. We\'ve logged the error and our staff is currently working to resolve this error as soon as possible.',
     description: 'Generic server error alert title.',
   },
   networkErrorAlert: {

diff --git a/src/course-outline/status-bar/messages.js b/src/course-outline/status-bar/messages.js
@@ -56,7 +56,7 @@ const messages = defineMessages({
     defaultMessage: 'Video Sharing',
   },
   videoSharingLink: {
-    id: 'course-authoring.course-outline.status-bar.video-sharing.title',
+    id: 'course-authoring.course-outline.status-bar.video-sharing.link',
     defaultMessage: 'Learn more',
   },
   videoSharingPerVideoText: {

diff --git a/src/course-outline/subsection-card/messages.js b/src/course-outline/subsection-card/messages.js
@@ -6,7 +6,7 @@ const messages = defineMessages({
     defaultMessage: 'New unit',
   },
   pasteButton: {
-    id: 'course-authoring.course-outline.subsection.button.new-unit',
+    id: 'course-authoring.course-outline.subsection.button.paste-unit',
     defaultMessage: 'Paste unit',
   },
 });

diff --git a/src/course-team/course-team-member/messages.js b/src/course-team/course-team-member/messages.js
@@ -22,7 +22,7 @@ const messages = defineMessages({
     defaultMessage: 'Add admin access',
   },
   removeButton: {
-    id: 'course-authoring.course-team.member.button.remove',
+    id: 'course-authoring.course-team.member.button.remove-admin-access',
     defaultMessage: 'Remove admin access',
   },
   deleteUserButton: {

diff --git a/src/course-unit/add-component/add-component-modals/ComponentModalView.jsx b/src/course-unit/add-component/add-component-modals/ComponentModalView.jsx
@@ -42,7 +42,7 @@ const ComponentModalView = ({
       <ModalContainer
         isOpen={isOpen}
         close={close}
-        title={intl.formatMessage(messages.modalContainerTitle, { componentTitle: displayName.toLowerCase() })}
+        title={intl.formatMessage(messages.modalContainerTitle, { componentTitle: (displayName ?? '').toLowerCase() })}
         btnText={intl.formatMessage(messages.modalBtnText)}
         onSubmit={handleSubmit}
         resetDisabled={() => setModuleTitle('')}