Merge pull request #34 from KelvinTegelaar/dev

[pull] dev from KelvinTegelaar:dev
bmsimp · Jan 24, 2025 · 15b94d5 · 15b94d5
2 parents 7596fab + eda639f
commit 15b94d5
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/src/components/CippComponents/CippApiDialog.jsx b/src/components/CippComponents/CippApiDialog.jsx
@@ -9,7 +9,16 @@ import { useSettings } from "../../hooks/use-settings";
 import CippFormComponent from "./CippFormComponent";
 
 export const CippApiDialog = (props) => {
-  const { createDialog, title, fields, api, row = {}, relatedQueryKeys, ...other } = props;
+  const {
+    createDialog,
+    title,
+    fields,
+    api,
+    row = {},
+    relatedQueryKeys,
+    dialogAfterEffect,
+    ...other
+  } = props;
   const router = useRouter();
   const [addedFieldData, setAddedFieldData] = useState({});
   const [partialResults, setPartialResults] = useState([]);
@@ -64,8 +73,6 @@ 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;
@@ -93,7 +100,6 @@ export const CippApiDialog = (props) => {
         }
       });
     }
-    console.log("output", newData);
     return newData;
   };
   const tenantFilter = useSettings().currentTenant;
@@ -138,6 +144,7 @@ export const CippApiDialog = (props) => {
           data: arrayOfObjects,
         });
       }
+
       return;
     }
 
@@ -191,7 +198,12 @@ export const CippApiDialog = (props) => {
       });
     }
   };
-
+  //add a useEffect, when dialogAfterEffect exists, and the post or get request is successful, run the dialogAfterEffect function
+  useEffect(() => {
+    if (dialogAfterEffect && (actionPostRequest.isSuccess || actionGetRequest.isSuccess)) {
+      dialogAfterEffect(actionPostRequest.data.data || actionGetRequest.data);
+    }
+  }, [actionPostRequest.isSuccess, actionGetRequest.isSuccess]);
   const formHook = useForm();
   const onSubmit = (data) => handleActionClick(row, api, data);
   const selectedType = api.type === "POST" ? actionPostRequest : actionGetRequest;

diff --git a/src/components/CippStandards/CippStandardsSideBar.jsx b/src/components/CippStandards/CippStandardsSideBar.jsx
@@ -75,6 +75,10 @@ const CippStandardsSideBar = ({
   edit,
 }) => {
   const [currentStep, setCurrentStep] = useState(0);
+  const [savedItem, setSavedItem] = useState(null);
+  const dialogAfterEffect = (id) => {
+    setSavedItem(id);
+  };
 
   const watchForm = useWatch({ control: formControl.control });
 
@@ -208,6 +212,7 @@ const CippStandardsSideBar = ({
       </ActionList>
       <Divider />
       <CippApiDialog
+        dialogAfterEffect={(data) => dialogAfterEffect(data.id)}
         createDialog={createDialog}
         title="Add Standard"
         api={{
@@ -223,6 +228,7 @@ const CippStandardsSideBar = ({
             templateName: "templateName",
             standards: "standards",
             ...(edit ? { GUID: "GUID" } : {}),
+            ...(savedItem ? { GUID: savedItem } : {}),
             runManually: "runManually",
           },
         }}

diff --git a/src/components/CippWizard/CippWizardCSVImport.jsx b/src/components/CippWizard/CippWizardCSVImport.jsx
@@ -43,7 +43,6 @@ export const CippWizardCSVImport = (props) => {
   const handleAddItem = () => {
     const newRowData = formControl.getValues("addrow");
     if (newRowData === undefined) return false;
-
     const newTableData = [...tableData, newRowData];
     setTableData(newTableData);
     setOpen(false);
@@ -87,6 +86,15 @@ export const CippWizardCSVImport = (props) => {
                   label={getCippTranslation(field)}
                   type="textField"
                   formControl={formControl}
+                  onKeyDown={(e) => {
+                    if (e.key === "Enter") {
+                      if (e.target.value === "") return false;
+                      handleAddItem();
+                      setTimeout(() => {
+                        formControl.setValue(`addrow.${field}`, "");
+                      }, 500);
+                    }
+                  }}
                 />
               </Grid>
             </>