Merge branch 'refactor/remove-delete-btn' into 'main'

removed delete button

See merge request vkuchenik/website-framework!65

client/src/components/Canvas/Canvas.jsx

@@ -9,7 +9,7 @@ import { chakra } from "@chakra-ui/react";
 import Personal from "./views/Personal";
 import Security from "./views/Security";
 
-export default function Canvas({...props}) {
+export default function Canvas(props) {
   const { view } = props;
     return (
         <chakra.div width="100%" height="100%">

client/src/components/Canvas/CanvasComponents/SettingsButton.jsx

@@ -3,7 +3,7 @@ import { IoIosArrowBack } from "react-icons/io";
 import { FiSettings } from "react-icons/fi";
 import WidgetMenu from "./WidgetMenu";
 
-export function SettingsButton({ onEditWidgets, onDeleteWidgets, appendWidget}) {  
+export function SettingsButton({ onEditWidgets, appendWidget}) {  
   const triggerItem = (<> <Menu.TriggerItem> <IoIosArrowBack /> Add Widget</Menu.TriggerItem> </>);
   const WidgetMenuProps = { appendWidget, triggerItem }
   return (
@@ -17,13 +17,8 @@ export function SettingsButton({ onEditWidgets, onDeleteWidgets, appendWidget})
         <Menu.Positioner>
           <Menu.Content>
             <WidgetMenu {...WidgetMenuProps}/>
-            <Menu.Item onClick={onEditWidgets} value ="editwidget">Edit Widgets</Menu.Item>
-            <Menu.Item 
-              onClick={onDeleteWidgets}
-              color="fg.error"
-              _hover={{ bg: "bg.error", color: "fg.error "}}
-            >
-              Delete Widgets
+            <Menu.Item value="eidt" onClick={onEditWidgets} >
+              Edit Widgets
             </Menu.Item>
           </Menu.Content>
         </Menu.Positioner>

client/src/components/Canvas/CanvasComponents/WidgetMenu.jsx

@@ -14,10 +14,10 @@ export default function WidgetMenu({appendWidget, triggerItem, positioning}) {
             >
               Alert Level
             </Menu.Item>
-            <Menu.Item value="co2">CO2</Menu.Item>
-            <Menu.Item value="ivans">IVANS</Menu.Item>
-            <Menu.Item value="plume heights">Plume Heights</Menu.Item>
-            <Menu.Item value="alert level changes">Alert Level Changes</Menu.Item>
+            <Menu.Item value="CO2">CO2</Menu.Item>
+            <Menu.Item value="Ivans">IVANS</Menu.Item>
+            <Menu.Item value="PlumeHeights">Plume Heights</Menu.Item>
+            <Menu.Item value="AlertLevelChanges">Alert Level Changes</Menu.Item>
           </Menu.Content>
         </Menu.Positioner>
       </Portal>

client/src/components/Canvas/views/Home.jsx

@@ -11,31 +11,11 @@ import { SaveButton } from "../CanvasComponents/SaveButton";
 import DeleteAllButton from "../CanvasComponents/DeleteAllButton";
 import { v4 as uuid } from 'uuid';
 
-export default function Home({...props}) {
+export default function Home(props) {
   // deconstructing props
   const { view, layout, setLayout, setOriginalLayout,  onLayoutChange, onChangeView, onCancel, setOriginalWidgets,
     isDelete, setIsDelete, beginEditIfNeeded, isEditable, setIsEditable, widgetArray, setWidgetArray } = props;
 
-  // const onAddWidget = (ID, w, h, minw, minh, maxw, maxh) => {
-  //   setLayout(prev => [
-  //     ...prev,
-  //     {
-  //       i: ID,
-  //       x: (prev.length * 3) % 12,
-  //       y: Infinity,
-  //       w: w, 
-  //       h: h,
-  //       minW: minw,
-  //       minH: minh,
-  //       maxW: maxw,
-  //       maxH: maxh,
-  //       static: false,
-  //       resizeHandles: ['se']
-  //     }
-  //   ]);
-  //   onEditWidgets();
-  // };
-
   function appendWidget(name, w, h, minw, minh, maxw, maxh) {
     beginEditIfNeeded(); // Save state before anything else
     
@@ -70,20 +50,6 @@ export default function Home({...props}) {
     ]);
   }
 
-  const onEditWidgets = () => {
-    console.log("widgets are now editable");
-    beginEditIfNeeded(); // Save state before anything else
-    // setOriginalLayout(layout); // Backup layout before editing
-    // Set all widgets to editable, static: false
-    setLayout(prevLayout =>
-      prevLayout.map(item => ({
-        ...item, 
-        static: false
-      }))
-    );
-    setIsEditable(true); // Enable edit mode
-  }
-
   const onSave = () => {
     console.log("saving widgets...");
     // Set all widgets back to static: true
@@ -99,10 +65,15 @@ export default function Home({...props}) {
     setOriginalWidgets([]);
   }
 
-  const onDeleteWidgets = () => {
+  const onEditWidgets = () => {
     console.log("Start deleting widgets...");
     beginEditIfNeeded(); // Save state before anything else
-    // setOriginalLayout(layout);
+    setLayout(prevLayout =>
+      prevLayout.map(item => ({
+        ...item, 
+        static: false
+      }))
+    );
     setIsEditable(true);
     setIsDelete(true);
   }
@@ -127,7 +98,7 @@ export default function Home({...props}) {
 
   // Prop Forwarding
   const MyDashboardProps = { layout, onLayoutChange, isEditable, beginEditIfNeeded, isDelete, DeleteWidget, widgetArray, appendWidget };
-  const settingsButtonProps = { onEditWidgets, onDeleteWidgets, appendWidget };
+  const settingsButtonProps = { onEditWidgets, appendWidget };
   
   return (
     /* HEADER */

client/src/components/Dashboard.jsx

@@ -23,8 +23,6 @@ export default function Dashboard() {
     if ( !isEditable ) {
       setOriginalLayout(layout);
       setOriginalWidgets(widgetArray);
-      setIsEditable(true);
-      setIsDelete(false);
     }
   };