Adjusting filter test and lint

RedHatInsights · Sep 7, 2023 · 53cf84f · 53cf84f
1 parent 5bfb546
commit 53cf84f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/src/components/NotificationsDrawer/DrawerPanelContent.test.tsx b/src/components/NotificationsDrawer/DrawerPanelContent.test.tsx
@@ -132,6 +132,7 @@ describe('Drawer panel functionality', () => {
     fireEvent.click(filterMenuItems[2]);
 
     const filteredNotification = renderedResult.getAllByRole('listitem');
+
     expect(filteredNotification.length === 1);
   });
 });
diff --git a/src/components/NotificationsDrawer/DrawerPanelContent.tsx b/src/components/NotificationsDrawer/DrawerPanelContent.tsx
@@ -189,6 +189,7 @@ const DrawerPanelBase = ({ innerRef }: DrawerPanelProps) => {
               onClick={() => setIsFilterDropdownOpen(!isFilterDropdownOpen)}
               id="notifications-filter-toggle"
               variant="plain"
+              aria-label="Notifications filter"
             >
               <FilterIcon />
             </MenuToggle>
@@ -199,7 +200,6 @@ const DrawerPanelBase = ({ innerRef }: DrawerPanelProps) => {
             position: PopoverPosition.right,
           }}
           id="notifications-filter-dropdown"
-          aria-label="Notifications filter"
         >
           {filterDropdownItems()}
         </Dropdown>
@@ -210,6 +210,7 @@ const DrawerPanelBase = ({ innerRef }: DrawerPanelProps) => {
               onClick={() => setIsDropdownOpen(!isDropdownOpen)}
               variant="plain"
               id="notifications-actions-toggle"
+              aria-label="Notifications actions dropdown"
               isFullWidth
             >
               <EllipsisVIcon />

diff --git a/src/components/NotificationsDrawer/NotificationItem.tsx b/src/components/NotificationsDrawer/NotificationItem.tsx
@@ -38,7 +38,7 @@ const NotificationItem: React.FC<NotificationItemProps> = ({ notification, onNav
   return (
     <React.Fragment>
       <NotificationDrawerList>
-        <NotificationDrawerListItem variant="info" isRead={notification.read}>
+        <NotificationDrawerListItem aria-label={`Notification item ${notification.id}`} variant="info" isRead={notification.read}>
           <NotificationDrawerListItemHeader title={notification.title} srTitle="Info notification:">
             <Checkbox isChecked={notification.read} onChange={onCheckboxToggle} id="read-checkbox" name="read-checkbox" />
             <Dropdown

diff --git a/src/components/NotificationsDrawer/notificationDrawerUtils.ts b/src/components/NotificationsDrawer/notificationDrawerUtils.ts
@@ -48,5 +48,5 @@ export const readTestData = [
     read: true,
     source: 'MARS',
     created: '25 mins ago',
-  }
+  },
 ];
diff --git a/src/redux/chromeReducers.ts b/src/redux/chromeReducers.ts
@@ -5,6 +5,7 @@ import { ChromeModule, NavItem, Navigation } from '../@types/types';
 import { ITLess, generateRoutesList, highlightItems, isBeta, levelArray } from '../utils/common';
 import { ThreeScaleError } from '../utils/responseInterceptors';
 import { AccessRequest, ChromeState, NotificationData } from './store';
+import { testData } from '../components/NotificationsDrawer/notificationDrawerUtils';
 
 export function contextSwitcherBannerReducer(state: ChromeState): ChromeState {
   return {
@@ -338,7 +339,7 @@ export function toggleNotificationsReducer(state: ChromeState) {
     ...state,
     notifications: {
       ...state.notifications,
-      data: state.notifications?.data || [],
+      data: testData, //state.notifications?.data || [],
       isExpanded: !state.notifications?.isExpanded,
     },
   };