Merge pull request #33 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev
bmsimp · Jan 23, 2025 · 7596fab · 7596fab
2 parents 3d50912 + 4cfeefb
commit 7596fab
Show file tree

Hide file tree

Showing 5 changed files with 570 additions and 8 deletions.
diff --git a/src/components/CippCards/CippPropertyListCard.jsx b/src/components/CippCards/CippPropertyListCard.jsx
@@ -151,7 +151,11 @@ export const CippPropertyListCard = (props) => {
                           action: item,
                           ready: true,
                         });
-                        createDialog.handleOpen();
+                        if (item?.noConfirm) {
+                          item.customFunction(item, data, {});
+                        } else {
+                          createDialog.handleOpen();
+                        }
                       }
                 }
                 disabled={handleActionDisabled(data, item)}

diff --git a/src/components/CippComponents/CippApiDialog.jsx b/src/components/CippComponents/CippApiDialog.jsx
@@ -38,6 +38,9 @@ export const CippApiDialog = (props) => {
     bulkRequest: api.multiPost === false,
     onResult: (result) => {
       setPartialResults((prevResults) => [...prevResults, result]);
+      if (api?.onSuccess) {
+        api.onSuccess(result);
+      }
     },
   });
   const actionGetRequest = ApiGetCall({
@@ -50,6 +53,9 @@ export const CippApiDialog = (props) => {
     bulkRequest: api.multiPost === false,
     onResult: (result) => {
       setPartialResults((prevResults) => [...prevResults, result]);
+      if (api?.onSuccess) {
+        api.onSuccess(result);
+      }
     },
   });
 
@@ -58,6 +64,8 @@ export const CippApiDialog = (props) => {
       return api.dataFunction(row);
     }
     var newData = {};
+    console.log("the received row", row);
+    console.log("the received dataObject", dataObject);
 
     if (api?.postEntireRow) {
       newData = row;
@@ -85,6 +93,7 @@ export const CippApiDialog = (props) => {
         }
       });
     }
+    console.log("output", newData);
     return newData;
   };
   const tenantFilter = useSettings().currentTenant;
@@ -209,10 +218,10 @@ export const CippApiDialog = (props) => {
   }
   useEffect(() => {
     if (api.noConfirm) {
-      formHook.handleSubmit(onSubmit)();
-      createDialog.handleClose();
+      formHook.handleSubmit(onSubmit)(); // Submits the form on mount
+      createDialog.handleClose(); // Closes the dialog after submitting
     }
-  }, [api.noConfirm]);
+  }, [api.noConfirm]); // Run effect only when api.noConfirm changes
 
   const handleClose = () => {
     createDialog.handleClose();
@@ -251,7 +260,7 @@ export const CippApiDialog = (props) => {
             Close
           </Button>
           <Button variant="contained" type="submit">
-            {actionGetRequest.isSuccess || actionPostRequest.isSuccess ? "Resubmit" : "Submit"}
+            Confirm
           </Button>
         </DialogActions>
       </form>

diff --git a/src/layouts/config.js b/src/layouts/config.js
@@ -472,6 +472,11 @@ export const nativeMenuItems = [
             path: "/cipp/advanced/timers",
             roles: ["superadmin"],
           },
+          {
+            title: "Table Maintenance",
+            path: "/cipp/advanced/table-maintenance",
+            roles: ["superadmin"],
+          }
         ],
       },
     ],