Merge pull request #276 from zimmerman-team/feat/DX-2100

Feat/dx 2100
zimmerman-team · Dec 10, 2024 · 580b2b2 · 580b2b2
2 parents 0035df7 + a9b800e
commit 580b2b2
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 18 deletions.
diff --git a/src/app/components/Dialogs/deleteChartDialog.tsx b/src/app/components/Dialogs/deleteChartDialog.tsx
@@ -54,7 +54,10 @@ export default function DeleteChartDialog(props: Props) {
     >
       <div className={classes.paper}>
         <form
-          onSubmit={() => props.handleDelete(props.cardId as string)}
+          onSubmit={(e) => {
+            e.preventDefault();
+            props.handleDelete(props.cardId as string);
+          }}
           data-cy="delete-chart-item-form"
           aria-label="form"
         >

diff --git a/src/app/components/Dialogs/deleteDatasetDialog.tsx b/src/app/components/Dialogs/deleteDatasetDialog.tsx
@@ -72,8 +72,12 @@ export default function DeleteDatasetDialog(props: Props) {
         ) : (
           <div className={classes.paper}>
             <form
-              onSubmit={() => props.handleDelete(props.cardId)}
+              onSubmit={(e) => {
+                e.preventDefault();
+                props.handleDelete(props.cardId);
+              }}
               data-cy="delete-dataset-item-form"
+              aria-label="form"
             >
               <div
                 css={`

diff --git a/src/app/components/Dialogs/deleteReportDialog.tsx b/src/app/components/Dialogs/deleteReportDialog.tsx
@@ -55,7 +55,10 @@ export default function DeleteReportDialog(props: Props) {
     >
       <div className={classes.paper}>
         <form
-          onSubmit={() => props.handleDelete(props.cardId as string)}
+          onSubmit={(e) => {
+            e.preventDefault();
+            props.handleDelete(props.cardId as string);
+          }}
           data-cy="delete-report-item-form"
           aria-label="form"
         >

diff --git a/src/app/modules/chart-module/components/chartSubheaderToolbar/index.tsx b/src/app/modules/chart-module/components/chartSubheaderToolbar/index.tsx
@@ -229,9 +229,10 @@ export function ChartSubheaderToolbar(
           filterString: "filter[order]=updatedDate desc",
         });
       })
-      .catch((error) => console.log(error));
-
-    history.replace("/");
+      .catch((error) => console.log(error))
+      .finally(() => {
+        history.replace("/");
+      });
   };
 
   const handleDuplicate = () => {

diff --git a/src/app/modules/chart-module/index.tsx b/src/app/modules/chart-module/index.tsx
@@ -282,13 +282,7 @@ export default function ChartModule() {
       isMappingValid,
       isAIAssisted: selectedAIChart,
     };
-    if (view !== undefined && page !== "new") {
-      editChart({
-        token,
-        patchId: page,
-        values: chart,
-      });
-    } else {
+    if (page === "new") {
       try {
         return await axios.post(`${process.env.REACT_APP_API}/chart/`, chart, {
           headers: {
@@ -299,6 +293,12 @@ export default function ChartModule() {
       } catch (e) {
         console.log(e);
       }
+    } else if (view !== undefined) {
+      editChart({
+        token,
+        patchId: page,
+        values: chart,
+      });
     }
   };
 

diff --git a/src/app/modules/dataset-module/component/datasetSubHeaderToolbar.tsx b/src/app/modules/dataset-module/component/datasetSubHeaderToolbar.tsx
@@ -157,8 +157,10 @@ export default function DatasetSubHeaderToolbar(
           filterString: "filter[order]=updatedDate desc",
         });
       })
-      .catch((error) => console.log(error));
-    history.replace("/");
+      .catch((error) => console.log(error))
+      .finally(() => {
+        history.replace("/");
+      });
   }
 
   return (

diff --git a/src/app/modules/report-module/components/reportSubHeaderToolbar/index.tsx b/src/app/modules/report-module/components/reportSubHeaderToolbar/index.tsx
@@ -205,9 +205,10 @@ export function ReportSubheaderToolbar(
           filterString: "filter[order]=updatedDate desc",
         });
       })
-      .catch((error) => console.log(error));
-
-    history.replace("/");
+      .catch((error) => console.log(error))
+      .finally(() => {
+        history.replace("/");
+      });
   };
 
   const handleDuplicate = () => {