From 3cb2846f591feba1fddb14f5fdc2ecaf93530a51 Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sun, 21 Jan 2024 16:11:27 -0600
Subject: [PATCH 1/3] more

---
 src/Components/Modals/CreateModal.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Components/Modals/CreateModal.js b/src/Components/Modals/CreateModal.js
index 40be97e..4a14176 100644
--- a/src/Components/Modals/CreateModal.js
+++ b/src/Components/Modals/CreateModal.js
@@ -29,8 +29,10 @@ const CreateModal = ({ setShowModal, caseData }) => {
   const appUserId = group.appUserId;
   const editCaseId = caseData?.id;
   const isEditing = typeof editCaseId !== "undefined";
-
+  console.log("group", group);
   const [isBusy, setIsBusy] = useState(false);
+  const caseNumCopy =
+    group.state == "New York" ? "Index Number" : "Case Number";
   const [data, setData] = useState(
     getFormDataDefaults(fields, isEditing ? caseData : undefined)
   );
@@ -168,7 +170,7 @@ const CreateModal = ({ setShowModal, caseData }) => {
         <Row>
           <Col className="mb-3">
             {isEditing ? (
-              <div className="edit-modal-label">Index number</div>
+              <div className="edit-modal-label">{caseNumCopy}</div>
             ) : (
               <></>
             )}

From 48bface0d8569dee6dd1f9eded5ef5552b8d8a1e Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sun, 21 Jan 2024 16:22:48 -0600
Subject: [PATCH 2/3] more

---
 src/Components/Modals/CreateModal.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Components/Modals/CreateModal.js b/src/Components/Modals/CreateModal.js
index 4a14176..ef34264 100644
--- a/src/Components/Modals/CreateModal.js
+++ b/src/Components/Modals/CreateModal.js
@@ -29,8 +29,8 @@ const CreateModal = ({ setShowModal, caseData }) => {
   const appUserId = group.appUserId;
   const editCaseId = caseData?.id;
   const isEditing = typeof editCaseId !== "undefined";
-  console.log("group", group);
   const [isBusy, setIsBusy] = useState(false);
+  const [newCaseId, setNewCaseId] = useState();
   const caseNumCopy =
     group.state == "New York" ? "Index Number" : "Case Number";
   const [data, setData] = useState(
@@ -64,16 +64,17 @@ const CreateModal = ({ setShowModal, caseData }) => {
         console.log("Error updating case:", err);
       }
     } else {
-      const caseId = uuidv4();
+      const tempId = uuidv4();
+      setNewCaseId(tempId);
       const ownerId = appUserId; // userId;
       const caseData = {
         ownerId,
-        caseId,
+        caseId: newCaseId,
         ...dataValues,
       };
       try {
         const casesRef = collection(db, "cases");
-        await setDoc(doc(casesRef, `${caseId}`), caseData);
+        await setDoc(doc(casesRef, `${newCaseId}`), caseData);
         setShowModal(false);
       } catch (err) {
         console.log("Error creating case:", err);
@@ -104,7 +105,7 @@ const CreateModal = ({ setShowModal, caseData }) => {
       }
     }
 
-    navigate("/dashboard");
+    navigate(`/casedetails/${newCaseId}`);
   };
 
   const radioOptions = [

From c55772c9dc975a3be2af7d6798f11109bd34c223 Mon Sep 17 00:00:00 2001
From: Kenneth Jannette <sj@sjdev.co>
Date: Sun, 21 Jan 2024 17:01:28 -0600
Subject: [PATCH 3/3] more

---
 src/Components/Case/CaseDetailsPage.js |  1 +
 src/Components/Modals/CreateModal.js   | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/Components/Case/CaseDetailsPage.js b/src/Components/Case/CaseDetailsPage.js
index 8ddf861..fed3151 100644
--- a/src/Components/Case/CaseDetailsPage.js
+++ b/src/Components/Case/CaseDetailsPage.js
@@ -23,6 +23,7 @@ const CaseDetailsPage = () => {
   const message =
     "Parsing document.  Please be patient, this may take several minutes.";
 
+  console.log("----------->caseId in caseDetails", caseId);
   const handleNavigate = () => {
     navigate("/documents");
   };
diff --git a/src/Components/Modals/CreateModal.js b/src/Components/Modals/CreateModal.js
index ef34264..77dff73 100644
--- a/src/Components/Modals/CreateModal.js
+++ b/src/Components/Modals/CreateModal.js
@@ -64,18 +64,18 @@ const CreateModal = ({ setShowModal, caseData }) => {
         console.log("Error updating case:", err);
       }
     } else {
-      const tempId = uuidv4();
-      setNewCaseId(tempId);
+      const caseId = uuidv4();
       const ownerId = appUserId; // userId;
       const caseData = {
         ownerId,
-        caseId: newCaseId,
+        caseId,
         ...dataValues,
       };
       try {
         const casesRef = collection(db, "cases");
-        await setDoc(doc(casesRef, `${newCaseId}`), caseData);
+        await setDoc(doc(casesRef, `${caseId}`), caseData);
         setShowModal(false);
+        return caseId;
       } catch (err) {
         console.log("Error creating case:", err);
       }
@@ -91,21 +91,26 @@ const CreateModal = ({ setShowModal, caseData }) => {
     }
   };
 
+  const handleCreateCaseNavigation = (caseId) => {
+    console.log("caseId in handleCreateCaseNavigation", caseId);
+  };
+
   const handleCreateCase = (e) => {
     e.preventDefault();
     const dataValues = validateData();
-
+    let caseId;
     if (dataValues === null) {
       return;
     } else {
       try {
-        saveCaseData(dataValues);
+        saveCaseData(dataValues).then((res) => {
+          const caseId = res;
+          navigate(`/casedetails/${caseId}`);
+        });
       } catch (err) {
         console.log(err);
       }
     }
-
-    navigate(`/casedetails/${newCaseId}`);
   };
 
   const radioOptions = [