From 2ccdcdd480583b0498c66e0772e16a12189f7e7f Mon Sep 17 00:00:00 2001 From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca> Date: Wed, 19 Feb 2025 14:45:40 -0500 Subject: [PATCH 1/4] resolve react ownerState warning by correctly passing CalendarIcon --- src/Pages/Maintenance/CreateMaintenance/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Pages/Maintenance/CreateMaintenance/index.jsx b/src/Pages/Maintenance/CreateMaintenance/index.jsx index 9563107ce..15f327b1f 100644 --- a/src/Pages/Maintenance/CreateMaintenance/index.jsx +++ b/src/Pages/Maintenance/CreateMaintenance/index.jsx @@ -359,7 +359,7 @@ const CreateMaintenance = () => { disablePast disableHighlightToday value={form.startDate} - slots={{ openPickerIcon: CalendarIcon }} + slots={{ openPickerIcon: () => }} slotProps={{ switchViewButton: { sx: { display: "none" } }, nextIconButton: { sx: { ml: theme.spacing(2) } }, From a9ebb8abc1d6de51ae1b05e8a0314826ebe357a1 Mon Sep 17 00:00:00 2001 From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca> Date: Wed, 19 Feb 2025 15:52:16 -0500 Subject: [PATCH 2/4] fetch monitors data from filteredmonitors object to include type data --- src/Pages/Maintenance/CreateMaintenance/index.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Pages/Maintenance/CreateMaintenance/index.jsx b/src/Pages/Maintenance/CreateMaintenance/index.jsx index 15f327b1f..1894dd62d 100644 --- a/src/Pages/Maintenance/CreateMaintenance/index.jsx +++ b/src/Pages/Maintenance/CreateMaintenance/index.jsx @@ -137,7 +137,9 @@ const CreateMaintenance = () => { limit: null, types: ["http", "ping", "pagespeed"], }); - const monitors = response.data.data.monitors; + console.log(response); + const monitors = response.data.data.filteredMonitors; //fetching monitor data from fileterdMonitors + console.log(monitors); setMonitors(monitors); if (maintenanceWindowId === undefined) { From ee0a02d46e644bb9edf3c50d7c8f0509fdb6580b Mon Sep 17 00:00:00 2001 From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca> Date: Wed, 19 Feb 2025 16:40:26 -0500 Subject: [PATCH 3/4] fix monitor selection issue by correctly extracting selected monitors from event --- src/Pages/Maintenance/CreateMaintenance/index.jsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Pages/Maintenance/CreateMaintenance/index.jsx b/src/Pages/Maintenance/CreateMaintenance/index.jsx index 1894dd62d..247fabd09 100644 --- a/src/Pages/Maintenance/CreateMaintenance/index.jsx +++ b/src/Pages/Maintenance/CreateMaintenance/index.jsx @@ -137,9 +137,7 @@ const CreateMaintenance = () => { limit: null, types: ["http", "ping", "pagespeed"], }); - console.log(response); const monitors = response.data.data.filteredMonitors; //fetching monitor data from fileterdMonitors - console.log(monitors); setMonitors(monitors); if (maintenanceWindowId === undefined) { @@ -180,10 +178,13 @@ const CreateMaintenance = () => { setSearch(value); }; - const handleSelectMonitors = (_, monitors) => { - setForm({ ...form, monitors }); + const handleSelectMonitors = (event, selectedMonitors) => { + const monitorsArray = Array.isArray(event) ? event : selectedMonitors; // Check if the selected monitors are in event or the selectedMonitors + if (!monitorsArray) return; + + setForm({ ...form, monitors: monitorsArray }); // Update form state with the selected monitors const { error } = maintenanceWindowValidation.validate( - { monitors }, + { monitors: monitorsArray }, { abortEarly: false } ); setErrors((prev) => { From 673df3a7a4a787d4641330eae6bbda6e89e5023c Mon Sep 17 00:00:00 2001 From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca> Date: Thu, 20 Feb 2025 12:58:28 -0500 Subject: [PATCH 4/4] correct handleSelectMonitors function to align with Search component --- src/Pages/Maintenance/CreateMaintenance/index.jsx | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Pages/Maintenance/CreateMaintenance/index.jsx b/src/Pages/Maintenance/CreateMaintenance/index.jsx index 247fabd09..abc31361a 100644 --- a/src/Pages/Maintenance/CreateMaintenance/index.jsx +++ b/src/Pages/Maintenance/CreateMaintenance/index.jsx @@ -137,7 +137,7 @@ const CreateMaintenance = () => { limit: null, types: ["http", "ping", "pagespeed"], }); - const monitors = response.data.data.filteredMonitors; //fetching monitor data from fileterdMonitors + const monitors = response.data.data.monitors; setMonitors(monitors); if (maintenanceWindowId === undefined) { @@ -178,13 +178,10 @@ const CreateMaintenance = () => { setSearch(value); }; - const handleSelectMonitors = (event, selectedMonitors) => { - const monitorsArray = Array.isArray(event) ? event : selectedMonitors; // Check if the selected monitors are in event or the selectedMonitors - if (!monitorsArray) return; - - setForm({ ...form, monitors: monitorsArray }); // Update form state with the selected monitors + const handleSelectMonitors = (monitors) => { + setForm({ ...form, monitors }); const { error } = maintenanceWindowValidation.validate( - { monitors: monitorsArray }, + { monitors }, { abortEarly: false } ); setErrors((prev) => {