fix: handle null displayname (openedx#1074)

eduNEXT · Jun 7, 2024 · 7f5e82a · 7f5e82a
1 parent 7aa2baa
commit 7f5e82a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
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('')}

diff --git a/src/studio-home/card-item/index.jsx b/src/studio-home/card-item/index.jsx
@@ -42,7 +42,7 @@ const CardItem = ({
   const isShowRerunLink = allowCourseReruns
     && rerunCreatorStatus
     && courseCreatorStatus === COURSE_CREATOR_STATES.granted;
-  const hasDisplayName = displayName.trim().length ? displayName : courseKey;
+  const hasDisplayName = (displayName ?? '').trim().length ? displayName : courseKey;
 
   return (
     <Card className="card-item">

diff --git a/src/studio-home/tabs-section/utils.js b/src/studio-home/tabs-section/utils.js
@@ -5,8 +5,11 @@
  * @returns {array} - An array of alphabetically sorted courses or libraries.
  */
 const sortAlphabeticallyArray = (arr) => [...arr]
-  .sort((firstArrayData, secondArrayData) => firstArrayData
-    .displayName.localeCompare(secondArrayData.displayName));
+  .sort((firstArrayData, secondArrayData) => {
+    const firstDisplayName = firstArrayData.displayName ?? '';
+    const secondDisplayName = secondArrayData.displayName ?? '';
+    return firstDisplayName.localeCompare(secondDisplayName);
+  });
 
 // eslint-disable-next-line import/prefer-default-export
 export { sortAlphabeticallyArray };