From fe1641b2d606214f2764270eb5ef3a04b7568e82 Mon Sep 17 00:00:00 2001 From: jessrey-asterisk Date: Mon, 4 Nov 2024 11:45:50 +0800 Subject: [PATCH 1/2] [HRIS-433] - [BUGTASK] Notification Filter List lacking Change Shift --- .../components/molecules/NotificationFilterDropdown/index.tsx | 1 + client/src/pages/notifications.tsx | 2 +- client/src/utils/constants/notificationFilter.ts | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/client/src/components/molecules/NotificationFilterDropdown/index.tsx b/client/src/components/molecules/NotificationFilterDropdown/index.tsx index 61047b36..17e9802f 100644 --- a/client/src/components/molecules/NotificationFilterDropdown/index.tsx +++ b/client/src/components/molecules/NotificationFilterDropdown/index.tsx @@ -40,6 +40,7 @@ const NotificationFilterDropdown: FC = (props): JSX.Element => { TYPE_OPTIONS.UNDERTIME, TYPE_OPTIONS.LEAVE, TYPE_OPTIONS.OFFSET, + TYPE_OPTIONS.CHANGE_SHIFT, TYPE_OPTIONS.ESL_CHANGE_SHIFT, TYPE_OPTIONS.OFFSET_SCHEDULE ] diff --git a/client/src/pages/notifications.tsx b/client/src/pages/notifications.tsx index c74c52a6..de669d1f 100644 --- a/client/src/pages/notifications.tsx +++ b/client/src/pages/notifications.tsx @@ -77,7 +77,7 @@ const Notifications: NextPage = (): JSX.Element => { managerRemarks: parsedData.ManagerRemarks, startDate: parsedData.StartDate, endDate: parsedData.EndDate, - leaveType: notificationType === 'Leave'? parsedData.LeaveType : null + leaveType: notificationType === 'Leave' ? parsedData.LeaveType : null } return mapped }) diff --git a/client/src/utils/constants/notificationFilter.ts b/client/src/utils/constants/notificationFilter.ts index ff7ebe1d..9bbd8158 100644 --- a/client/src/utils/constants/notificationFilter.ts +++ b/client/src/utils/constants/notificationFilter.ts @@ -12,5 +12,6 @@ export const TYPE_OPTIONS = { LEAVE: 'Leave', OFFSET: 'Offset', ESL_CHANGE_SHIFT: 'Esl Change Shift', - OFFSET_SCHEDULE: 'Offset Schedule' + OFFSET_SCHEDULE: 'Offset Schedule', + CHANGE_SHIFT: 'Change Shift', } From 3297077ae42051f69453df63554e29f9447619c8 Mon Sep 17 00:00:00 2001 From: jessrey-asterisk Date: Tue, 5 Nov 2024 14:03:23 +0800 Subject: [PATCH 2/2] Fix for prettier error in Build Frontend checks --- client/src/utils/constants/notificationFilter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/utils/constants/notificationFilter.ts b/client/src/utils/constants/notificationFilter.ts index 9bbd8158..37cb3d9a 100644 --- a/client/src/utils/constants/notificationFilter.ts +++ b/client/src/utils/constants/notificationFilter.ts @@ -13,5 +13,5 @@ export const TYPE_OPTIONS = { OFFSET: 'Offset', ESL_CHANGE_SHIFT: 'Esl Change Shift', OFFSET_SCHEDULE: 'Offset Schedule', - CHANGE_SHIFT: 'Change Shift', + CHANGE_SHIFT: 'Change Shift' }