Merge remote-tracking branch 'upstream/main'

Author: Kehinde Oki

app/airflow/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "carrot-airflow"
-version = "4.2.8"
+version = "4.2.9"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"

app/api/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "api"
-version = "4.2.8"
+version = "4.2.9"
 description = "Web app for Carrot-Mapper"
 
 authors = [

app/next-client-app/components/scanreports/CreateScanReportForm.tsx

@@ -137,12 +137,14 @@ export function CreateScanReportForm({
         validationSchema={validationSchema}
         validateOnChange={false}
         validateOnBlur={false}
-        onSubmit={(data) => {
+        onSubmit={async (data) => {
+        // Return a Promise so Formik sets isSubmitting and prevents submitting multiple times
           toast.info("Validating and uploading...");
-          handleSubmit(data);
+          await handleSubmit(data);
         }}
       >
-        {({ values, handleChange, handleSubmit, setFieldValue }) => (
+        {({ values, handleChange, handleSubmit, setFieldValue, isSubmitting }) => (
+        // added isSubmitting to the form to disable the submit button while upload is in progress
           <form
             className="w-full max-w-2xl"
             onSubmit={handleSubmit}
@@ -365,6 +367,7 @@ export function CreateScanReportForm({
                 <Button
                   type="submit"
                   disabled={
+                    isSubmitting ||
                     values.dataPartner === 0 ||
                     values.dataset === 0 ||
                     values.dataset === -1 ||

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "carrot-mapper"
-version = "4.2.8"
+version = "4.2.9"
 description = ""
 authors = [
     { name = "Sam Cox", email = "sam.cox@nottingham.ac.uk" },