From 80d121e87a8570619fb9d15029f4aeb6c9a8969b Mon Sep 17 00:00:00 2001
From: karenvicent <karenvergara@msn.com>
Date: Mon, 8 Sep 2025 10:49:42 -0400
Subject: [PATCH] add llama suggestions

---
 client/src/Components/PageStateWrapper/index.jsx | 6 +++---
 client/src/Hooks/useNotifications.js             | 2 +-
 client/src/Pages/Maintenance/index.jsx           | 9 +++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/client/src/Components/PageStateWrapper/index.jsx b/client/src/Components/PageStateWrapper/index.jsx
index c6350cef8..f971b2c9c 100644
--- a/client/src/Components/PageStateWrapper/index.jsx
+++ b/client/src/Components/PageStateWrapper/index.jsx
@@ -17,9 +17,9 @@ const PageStateWrapper = ({
 	const theme = useTheme();
 	const { t } = useTranslation();
 	const isAdmin = useIsAdmin();
-	const hasInitialized = !isLoading && items !== undefined;
-	const showEmpty = items == undefined || items.length === 0;
-
+	const isEmpty = items === null || (Array.isArray(items) && items.length === 0);
+	const hasInitialized = items !== undefined && !(isLoading && isEmpty);
+	const showEmpty = !isLoading && isEmpty;
 	if (networkError) {
 		return (
 			<GenericFallback>
diff --git a/client/src/Hooks/useNotifications.js b/client/src/Hooks/useNotifications.js
index 7feebd44c..539725958 100644
--- a/client/src/Hooks/useNotifications.js
+++ b/client/src/Hooks/useNotifications.js
@@ -34,7 +34,7 @@ const useCreateNotification = () => {
 
 const useGetNotificationsByTeamId = (updateTrigger) => {
 	const [notifications, setNotifications] = useState([]);
-	const [isLoading, setIsLoading] = useState(false);
+	const [isLoading, setIsLoading] = useState(true);
 	const [error, setError] = useState(null);
 	const { t } = useTranslation();
 
diff --git a/client/src/Pages/Maintenance/index.jsx b/client/src/Pages/Maintenance/index.jsx
index b53706216..09fb4c2c4 100644
--- a/client/src/Pages/Maintenance/index.jsx
+++ b/client/src/Pages/Maintenance/index.jsx
@@ -15,13 +15,13 @@ const Maintenance = () => {
 	const { t } = useTranslation();
 	const navigate = useNavigate();
 	const rowsPerPage = useSelector((state) => state?.ui?.maintenance?.rowsPerPage ?? 5);
-	const [maintenanceWindows, setMaintenanceWindows] = useState([]);
+	const [maintenanceWindows, setMaintenanceWindows] = useState(undefined);
 	const [maintenanceWindowCount, setMaintenanceWindowCount] = useState(0);
 	const [page, setPage] = useState(0);
 	const [sort, setSort] = useState({});
 	const [updateTrigger, setUpdateTrigger] = useState(false);
 	const [networkError, setNetworkError] = useState(false);
-	const [isLoading, setIsLoading] = useState(false);
+	const [isLoading, setIsLoading] = useState(true)
 
 	const handleActionMenuDelete = () => {
 		setUpdateTrigger((prev) => !prev);
@@ -30,14 +30,15 @@ const Maintenance = () => {
 	useEffect(() => {
 		const fetchMaintenanceWindows = async () => {
 			try {
+				setNetworkError(false);
 				setIsLoading(true);
 				const response = await networkService.getMaintenanceWindowsByTeamId({
 					page: page,
 					rowsPerPage: rowsPerPage,
 				});
 				const { maintenanceWindows, maintenanceWindowCount } = response.data.data;
-				setMaintenanceWindows(maintenanceWindows);
-				setMaintenanceWindowCount(maintenanceWindowCount);
+				setMaintenanceWindows(maintenanceWindows ?? []);      
+                setMaintenanceWindowCount(maintenanceWindowCount ?? 0);
 			} catch (error) {
 				setNetworkError(true);
 			} finally {