From d6c5c87412f0b1ee7e45495603bf71edd57e9da5 Mon Sep 17 00:00:00 2001
From: proddy <paul@derbyshire.nl>
Date: Sat, 24 Jun 2023 16:51:04 +0200
Subject: [PATCH] fix Cancel

---
 interface/src/project/SettingsEntities.tsx  | 11 +++++++++--
 interface/src/project/SettingsScheduler.tsx | 13 ++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/interface/src/project/SettingsEntities.tsx b/interface/src/project/SettingsEntities.tsx
index cec062a6a..2efe981fa 100644
--- a/interface/src/project/SettingsEntities.tsx
+++ b/interface/src/project/SettingsEntities.tsx
@@ -34,7 +34,8 @@ const SettingsEntities: FC = () => {
     send: fetchEntities,
     error
   } = useRequest(EMSESP.readEntities, {
-    initialData: []
+    initialData: [],
+    force: true
   });
 
   const { send: writeEntities } = useRequest((data) => EMSESP.writeEntities(data), { immediate: false });
@@ -146,6 +147,12 @@ const SettingsEntities: FC = () => {
     setDialogOpen(false);
   };
 
+  const onDialogCancel = async () => {
+    await fetchEntities().then(() => {
+      setNumChanges(0);
+    });
+  };
+
   const onDialogSave = (updatedItem: EntityItem) => {
     setDialogOpen(false);
 
@@ -246,7 +253,7 @@ const SettingsEntities: FC = () => {
         <Box flexGrow={1}>
           {numChanges > 0 && (
             <ButtonRow>
-              <Button startIcon={<CancelIcon />} variant="outlined" onClick={fetchEntities} color="secondary">
+              <Button startIcon={<CancelIcon />} variant="outlined" onClick={onDialogCancel} color="secondary">
                 {LL.CANCEL()}
               </Button>
               <Button
diff --git a/interface/src/project/SettingsScheduler.tsx b/interface/src/project/SettingsScheduler.tsx
index b7259d613..58c3757b0 100644
--- a/interface/src/project/SettingsScheduler.tsx
+++ b/interface/src/project/SettingsScheduler.tsx
@@ -36,7 +36,8 @@ const SettingsScheduler: FC = () => {
     send: fetchSchedule,
     error
   } = useRequest(EMSESP.readSchedule, {
-    initialData: []
+    initialData: [],
+    force: true
   });
 
   const { send: writeSchedule } = useRequest((data) => EMSESP.writeSchedule(data), { immediate: false });
@@ -144,6 +145,12 @@ const SettingsScheduler: FC = () => {
     setDialogOpen(false);
   };
 
+  const onDialogCancel = async () => {
+    await fetchSchedule().then(() => {
+      setNumChanges(0);
+    });
+  };
+
   const onDialogSave = (updatedItem: ScheduleItem) => {
     setDialogOpen(false);
 
@@ -252,7 +259,7 @@ const SettingsScheduler: FC = () => {
           onClose={onDialogClose}
           onSave={onDialogSave}
           selectedItem={selectedScheduleItem}
-          validator={schedulerItemValidation()}
+          validator={schedulerItemValidation(schedule, selectedScheduleItem)}
           dow={dow}
         />
       )}
@@ -261,7 +268,7 @@ const SettingsScheduler: FC = () => {
         <Box flexGrow={1}>
           {numChanges !== 0 && (
             <ButtonRow>
-              <Button startIcon={<CancelIcon />} variant="outlined" onClick={fetchSchedule} color="secondary">
+              <Button startIcon={<CancelIcon />} variant="outlined" onClick={onDialogCancel} color="secondary">
                 {LL.CANCEL()}
               </Button>
               <Button