From c775d6e581f1c5c315430c1dee4447738d077a4d Mon Sep 17 00:00:00 2001
From: Loi Phan <phanhuuloi15@gmail.com>
Date: Mon, 30 Oct 2023 20:50:32 +0700
Subject: [PATCH] Fix bug and optimized code

---
 hotel-management/src/constants/config.ts  | 4 +++-
 hotel-management/src/helpers/utils.ts     | 4 ++--
 hotel-management/src/pages/User/Table.tsx | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/hotel-management/src/constants/config.ts b/hotel-management/src/constants/config.ts
index 9ad978c..dfd286b 100644
--- a/hotel-management/src/constants/config.ts
+++ b/hotel-management/src/constants/config.ts
@@ -1,3 +1,5 @@
 const TIME_OUT_SEC = 1;
+const DEFAULT_SORT_BY = 'id';
+const DEFAULT_ORDER_BY = 'asc';
 
-export { TIME_OUT_SEC };
+export { TIME_OUT_SEC, DEFAULT_SORT_BY, DEFAULT_ORDER_BY };
diff --git a/hotel-management/src/helpers/utils.ts b/hotel-management/src/helpers/utils.ts
index 58cf7d8..ce9e2d6 100644
--- a/hotel-management/src/helpers/utils.ts
+++ b/hotel-management/src/helpers/utils.ts
@@ -57,8 +57,8 @@ const getValueUser = (user: TUser | null = null, prop: string): string => {
 
 const searchQuery = (phone: string, sort: string, order: string) => {
   const phoneParams = phone ? 'phone_like=' + phone : '';
-  const sortParams = sort ? '_sort=' + sort : '_sort=id';
-  const orderParams = order ? '_order=' + order : '_order=asc';
+  const sortParams = sort ? '_sort=' + sort : '';
+  const orderParams = order ? '_order=' + order : '';
   const finalParam = [phoneParams, sortParams, orderParams];
   let query = '';
   let isFirstParam = true;
diff --git a/hotel-management/src/pages/User/Table.tsx b/hotel-management/src/pages/User/Table.tsx
index 17e514d..e55a4b1 100644
--- a/hotel-management/src/pages/User/Table.tsx
+++ b/hotel-management/src/pages/User/Table.tsx
@@ -28,6 +28,7 @@ import Search from '../../components/Search';
 import SortBy from '../../components/SortBy';
 import OrderBy from '../../components/OrderBy';
 import { useSearchParams } from 'react-router-dom';
+import { DEFAULT_ORDER_BY, DEFAULT_SORT_BY } from '../../constants/config';
 
 interface IUserRow {
   user: TUser;
@@ -113,10 +114,10 @@ const UserTable = ({
   const [users, setUsers] = useState<TUser[]>([]);
   const sortByValue = searchParams.get('sortBy')
     ? searchParams.get('sortBy')!
-    : '';
+    : DEFAULT_SORT_BY;
   const orderByValue = searchParams.get('orderBy')
     ? searchParams.get('orderBy')!
-    : '';
+    : DEFAULT_ORDER_BY;
 
   const { data, isPending, errorMsg } = useFetch(
     'users',