Merge pull request #342 from framgia/bugtask/hris-443

[HRIS - 443] - [BUGTASK] Filter Resets to Default Options After Dropdown Selection, Notifications Not Displayed on Update

client/src/components/molecules/NotificationFilterDropdown/index.tsx

@@ -1,5 +1,4 @@
 import classNames from 'classnames'
-import { useRouter } from 'next/router'
 import { Menu } from '@headlessui/react'
 import React, { FC, ReactNode } from 'react'
 
@@ -18,8 +17,6 @@ type Props = {
 }
 
 const NotificationFilterDropdown: FC<Props> = (props): JSX.Element => {
-  const router = useRouter()
-
   const {
     children,
     className = 'shrink-0 outline-none active:scale-95',
@@ -97,11 +94,7 @@ const NotificationFilterDropdown: FC<Props> = (props): JSX.Element => {
                 focus:border-primary focus:ring-1 focus:ring-primary
                 `}
                     id="filterStatus"
-                    defaultValue={
-                      router.query.status !== undefined
-                        ? router.query.status
-                        : STATUS_OPTIONS.ALL.toLowerCase()
-                    }
+                    value={filters.status}
                     onChange={(e) => handleStatusChange(e)}
                   >
                     {filterStatusOptions(statusOptions)}
@@ -115,11 +108,7 @@ const NotificationFilterDropdown: FC<Props> = (props): JSX.Element => {
                 focus:border-primary focus:ring-1 focus:ring-primary
                 `}
                     id="filterType"
-                    defaultValue={
-                      router.query.type !== undefined
-                        ? router.query.type
-                        : TYPE_OPTIONS.ALL.toLowerCase()
-                    }
+                    value={filters.type}
                     onChange={(e) => handleTypeChange(e)}
                   >
                     {filterTypeOptions(typeOptions)}