Merge branch 'main' into 'widgets/alert-level'

# Conflicts:
#   client/src/components/Canvas/views/Home.jsx

client/src/components/Dashboard.jsx

@@ -13,13 +13,22 @@ export default function Dashboard() {
   const [isEditable, setIsEditable] = useState(false); // editable=true means static=false (vice versa)
   const [isDelete, setIsDelete] = useState(false);
   const [originalLayout, setOriginalLayout] = useState([]);
+  const [originalWidgets, setOriginalWidgets] = useState([]);
   const [view, setView] = useState("mydashboard");
   const [layout, setLayout] = useState([]);
   const [widgetArray, setWidgetArray] = useState([]);
   const dialog = useDialog();
 
+  const beginEditIfNeeded = () => {
+    if ( !isEditable ) {
+      setOriginalLayout(layout);
+      setOriginalWidgets(widgetArray);
+      setIsEditable(true);
+      setIsDelete(false);
+    }
+  };
+
   const onCancel = () => {
-    // This is a test comment
     console.log("canceling changes...");
     if (originalLayout.length) { 
       setLayout(originalLayout.map(item => ({
@@ -27,9 +36,11 @@ export default function Dashboard() {
         static: true
       })));
     };
+    setWidgetArray(originalWidgets.length ? originalWidgets : []);
     setIsEditable(false);
     setIsDelete(false);
     setOriginalLayout([]); 
+    setOriginalWidgets([]);
   }
   
   // Prevent navigation while in Edit mode without saving or cancelling
@@ -53,7 +64,7 @@ export default function Dashboard() {
 
   // Prop Forwarding
   const canvasProps = { view, layout, setLayout, setOriginalLayout, onLayoutChange, onChangeView: handleViewChange, 
-    onCancel, isEditable, setIsEditable, isDelete, setIsDelete, widgetArray, setWidgetArray
+    onCancel, isEditable, setIsEditable, isDelete, setIsDelete, widgetArray, setWidgetArray, setOriginalWidgets, beginEditIfNeeded
   };
   const sidebarProps = { view, onChangeView: handleViewChange, darkMode, setDarkMode };
   const headerProps = { onChangeView: handleViewChange };