fix: console and propType errors (#621)

* fix: console and propType errors * fix: updated default props
edx · Nov 28, 2024 · 376386c · 376386c
1 parent 48e0cd3
commit 376386c
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 8 deletions.
diff --git a/.env.development b/.env.development
@@ -22,3 +22,4 @@ LOGO_WHITE_URL=https://edx-cdn.org/v3/prod/logo-white.svg
 FAVICON_URL=https://edx-cdn.org/v3/prod/favicon.ico
 NOTIFICATION_FEEDBACK_URL=''
 CAREERS_URL=''
+STUDIO_BASE_URL=''
diff --git a/.env.test b/.env.test
@@ -22,3 +22,4 @@ LOGO_WHITE_URL=https://edx-cdn.org/v3/prod/logo-white.svg
 FAVICON_URL=https://edx-cdn.org/v3/prod/favicon.ico
 NOTIFICATION_FEEDBACK_URL=''
 CAREERS_URL=''
+STUDIO_BASE_URL=''
diff --git a/src/DesktopHeader.jsx b/src/DesktopHeader.jsx
@@ -207,7 +207,7 @@ DesktopHeader.propTypes = {
     items: PropTypes.arrayOf(PropTypes.shape({
       type: PropTypes.oneOf(['item', 'menu']),
       href: PropTypes.string,
-      content: PropTypes.string,
+      content: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
       disabled: PropTypes.bool,
       isActive: PropTypes.bool,
       onClick: PropTypes.func,
@@ -255,8 +255,8 @@ DesktopHeader.defaultProps = {
   email: '',
   loggedIn: false,
   notificationAppData: {
-    apps: { },
-    tabsCount: { },
+    apps: {},
+    tabsCount: {},
     appsId: [],
     isNewNotificationViewEnabled: false,
     notificationExpiryDays: 0,

diff --git a/src/Header.jsx b/src/Header.jsx
@@ -28,6 +28,7 @@ ensureConfig([
   'LOGO_URL',
   'ACCOUNT_SETTINGS_URL',
   'NOTIFICATION_FEEDBACK_URL',
+  'STUDIO_BASE_URL',
 ], 'Header component');
 
 subscribe(APP_CONFIG_INITIALIZED, () => {
@@ -188,6 +189,7 @@ const Header = ({
     secondaryMenu: getConfig().MINIMAL_HEADER || getConfig().AUTHN_MINIMAL_HEADER ? [] : secondaryMenu,
     userMenu: getConfig().AUTHN_MINIMAL_HEADER ? [] : userMenu,
     loggedOutItems: getConfig().AUTHN_MINIMAL_HEADER ? [] : loggedOutItems,
+    studioBaseUrl: config.STUDIO_BASE_URL,
   };
 
   if (enterpriseCustomerBrandingConfig) {

diff --git a/src/Notification/data/hook.js b/src/Notification/data/hook.js
@@ -84,7 +84,15 @@ export function useNotification() {
         isNewNotificationViewEnabled,
       };
     } catch (error) {
-      return { notificationStatus: RequestStatus.FAILED };
+      return {
+        notificationStatus: RequestStatus.FAILED,
+        apps: {},
+        appsId: [],
+        isNewNotificationViewEnabled: false,
+        notificationExpiryDays: 0,
+        showNotificationsTray: false,
+        tabsCount: { count: 0 },
+      };
     }
   }, [normalizeNotificationCounts]);
 

diff --git a/src/Notification/index.jsx b/src/Notification/index.jsx
@@ -230,8 +230,8 @@ Notifications.propTypes = {
 Notifications.defaultProps = {
   showLeftMargin: true,
   notificationAppData: {
-    apps: { },
-    tabsCount: { },
+    apps: {},
+    tabsCount: { count: 0 },
     appsId: [],
     isNewNotificationViewEnabled: false,
     notificationExpiryDays: 0,

diff --git a/src/studio-header/MobileMenu.jsx b/src/studio-header/MobileMenu.jsx
@@ -20,7 +20,7 @@ const MobileMenu = ({
           >
             <ul className="p-0" style={{ listStyleType: 'none' }}>
               {items.map(item => (
-                <li className="mobile-menu-item">
+                <li className="mobile-menu-item" key={`${id}-${item.title}`}>
                   <a href={item.href}>
                     {item.title}
                   </a>

diff --git a/src/studio-header/NavDropdownMenu.jsx b/src/studio-header/NavDropdownMenu.jsx
@@ -47,7 +47,7 @@ NavDropdownMenu.propTypes = {
   id: PropTypes.string.isRequired,
   email: PropTypes.string,
   name: PropTypes.string,
-  buttonTitle: PropTypes.string.isRequired,
+  buttonTitle: PropTypes.oneOfType([PropTypes.string, PropTypes.node]).isRequired,
   items: PropTypes.arrayOf(PropTypes.shape({
     href: PropTypes.string,
     title: PropTypes.string,