fix: fixed tab click issue (#612)

edx · Nov 13, 2024 · 85a0935 · 85a0935
1 parent 440230c
commit 85a0935
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 30 deletions.
diff --git a/src/Notification/NotificationSections.jsx b/src/Notification/NotificationSections.jsx
@@ -94,7 +94,7 @@ const NotificationSections = () => {
     >
       {renderNotificationSection('today', today)}
       {renderNotificationSection('earlier', earlier)}
-      {(hasMorePages === undefined || hasMorePages) && notificationListStatus === RequestStatus.IN_PROGRESS ? (
+      {notificationListStatus === RequestStatus.IN_PROGRESS ? (
         <div className="d-flex justify-content-center p-4">
           <Spinner animation="border" variant="primary" size="lg" data-testid="notifications-loading-spinner" />
         </div>

diff --git a/src/Notification/index.jsx b/src/Notification/index.jsx
@@ -81,9 +81,9 @@ const Notifications = ({ notificationAppData, showLeftMargin }) => {
     setAppName(selectedAppName);
     setNotificationData(prevData => ({
       ...prevData,
-      ...{ notificationListStatus: RequestStatus.IDLE },
+      ...{ notificationListStatus: appName === selectedAppName ? RequestStatus.SUCCESSFUL : RequestStatus.IN_PROGRESS },
     }));
-  }, []);
+  }, [appName]);
 
   const updateNotificationData = useCallback((data) => {
     setNotificationData(prevData => ({
@@ -150,13 +150,13 @@ const Notifications = ({ notificationAppData, showLeftMargin }) => {
                 </NotificationPopoverContext.Provider>
               </Popover.Content>
               {getConfig().NOTIFICATION_FEEDBACK_URL && (
-                <Button
-                  onClick={enableFeedback}
-                  variant="warning"
-                  className="notification-feedback-widget"
-                >
-                  {intl.formatMessage(messages.feedback)}
-                </Button>
+              <Button
+                onClick={enableFeedback}
+                variant="warning"
+                className="notification-feedback-widget"
+              >
+                {intl.formatMessage(messages.feedback)}
+              </Button>
               )}
             </div>
           </Popover>
@@ -178,18 +178,18 @@ const Notifications = ({ notificationAppData, showLeftMargin }) => {
             data-testid="notification-bell-icon"
           />
           {tabsCount?.count > 0 && (
-          <Bubble
-            variant="error"
-            data-testid="notification-count"
-            className={classNames('notification-badge zindex-1 cursor-pointer p-1', {
-              'notification-badge-unrounded mt-1': tabsCount.count >= 10,
-              'notification-badge-rounded': tabsCount.count < 10,
-            })}
-            onClick={toggleNotificationTray}
-          >
-            {tabsCount.count >= 100 ? <div className="d-flex">99<p className="mb-0 plus-icon">+</p></div>
-              : tabsCount.count}
-          </Bubble>
+            <Bubble
+              variant="error"
+              data-testid="notification-count"
+              className={classNames('notification-badge zindex-1 cursor-pointer p-1', {
+                'notification-badge-unrounded mt-1': tabsCount.count >= 10,
+                'notification-badge-rounded': tabsCount.count < 10,
+              })}
+              onClick={toggleNotificationTray}
+            >
+              {tabsCount.count >= 100 ? <div className="d-flex">99<p className="mb-0 plus-icon">+</p></div>
+                : tabsCount.count}
+            </Bubble>
           )}
         </div>
       </OverlayTrigger>

diff --git a/src/Notification/notification.scss b/src/Notification/notification.scss
@@ -157,14 +157,6 @@
       height: 10px;
       width: 10px;
     }
-
-    .nav-tabs .nav-link {
-      &:focus {
-        &::before {
-          border: none !important;
-        }
-      }
-    }
   }
 
   .notification-feedback-widget {