Merge pull request #161 from kjannette/zeta

more

src/App.js

@@ -137,7 +137,7 @@ function App() {
           />
           <Route
             exact
-            path="/docedit/:documentId/:caseId/:docType/:clientPosition"
+            path="/docedit/:documentId/:caseId/:docType/:clientPosition/:responseGenerations"
             element={
               <PrivateRoute>
                 <DocEditPage />

src/Components/Case/CaseDetailsPage.js

@@ -49,7 +49,10 @@ const CaseDetailsPage = () => {
           const caseId = data.parentCaseId;
           const docType = data.docType;
           const clientPosition = data.clientPosition;
-          navigate(`/docedit/${docId}/${caseId}/${docType}/${clientPosition}`);
+          const responseGenerations = 0;
+          navigate(
+            `/docedit/${docId}/${caseId}/${docType}/${clientPosition}/${responseGenerations}`
+          );
         } else {
           setTimeout(getDocument, 30000, docId, caseId);
         }

src/Components/Document/DocEditPage.js

@@ -6,18 +6,24 @@ import { useParams } from "react-router-dom";
 import { Link, useNavigate } from "react-router-dom";
 import EditElement from "../../pageElements/EditElement";
 import { db } from "../../firebase";
-import { doc, getDoc } from "firebase/firestore";
 import { AppContext } from "../../Hooks/useContext/appContext";
 import Button from "../../pageElements/Button";
 import ConfirmModal from "../Modals/ConfirmModal";
 import LoadingSpinner from "../../pageElements/LoadingSpinner";
 import { docEditCopy } from "../../Constants/Copy/docEditCopy.js";
 import "../../styles/docedit-page.scss";
+import {
+  doc,
+  getDoc,
+  updateDoc,
+  onSnapshot,
+  increment,
+} from "firebase/firestore";
 
 const DocEditPage = (props) => {
   const navigate = useNavigate();
-  const { documentId, caseId, docType, clientPosition } = useParams();
+  const { documentId, caseId, docType, clientPosition, responseGenerations } =
-  console.log("fucking docType", docType);
+    useParams();
   const [document, setDocument] = useState(null);
   const [_docType, setDocType] = useState(docType);
   const [fetchedCase, setFetchedCase] = useState(null);
@@ -34,6 +40,9 @@ const DocEditPage = (props) => {
   const [isReport, setIsReport] = useState(false);
   const [issueText, setIssueText] = useState("");
   const [showErrorModal, setShowErrorModal] = useState(false);
+  const [responsesCreated, setResponsesCreated] = useState(
+    parseInt(responseGenerations)
+  );
   // For document generation:
   const state = group?.state[0] ? group.state[0].code : "ny";
   const lawFirm = group ? group?.firm : null;
@@ -213,6 +222,7 @@ const DocEditPage = (props) => {
             return obj;
           });
           setResponses(result);
+          updateRespGenerationCount(docId);
           setIsLoading(false);
         })
         .catch((err) => console.log(err));
@@ -221,31 +231,45 @@ const DocEditPage = (props) => {
     }
   }
 
+  async function updateRespGenerationCount(docId) {
+    await updateDoc(doc(db, "documents", docId), {
+      responseGenerations: increment(1),
+    });
+    setResponsesCreated((responsesCreated) => responsesCreated + 1);
+  }
+
   useEffect(() => {
-    console.log("docType in first useEffect", docType);
     if (!docType || docType != "combined-numbered") {
       return;
     }
+    if (responsesCreated < 1) {
+      setIsLoading(true);
       generateRespIncominIrregDiscReq(documentId, clientPosition);
+    }
   }, [documentId, docType, docType]);
-  /*
+
   useEffect(() => {
     console.log("docType in second useEffect", docType);
     if (!docType || docType == "combined-numbered") {
       return;
     }
+    if (responsesCreated > 1) {
+      setIsLoading(true);
       getCompletions(documentId, docType)
         .then((data) => {
-        const respond = data[0].responses.length > 2 ? data[0].responses : null;
+          const respond =
+            data[0].responses.length > 2 ? data[0].responses : null;
           const resp = respond?.map((item, index) => {
             // NEVER CHANGE THIS:
             return { showInputEle: false, resp: item.text, index: index };
           });
           setResponses(resp);
+          setIsLoading(false);
         })
         .catch((err) => console.log(err));
+    }
   }, [documentId, docType, docType]);
-*/
+
   async function getParsedRogs(docId, docType) {
     if (!docId || !docType) {
       return;

src/Components/Document/DocumentListPage.js

@@ -140,14 +140,23 @@ const DocumentListPage = ({ perPage }) => {
     { label: "Associated case name z - a", value: "parentCaseName2" },
   ];
 
-  function handleNavigate(documentId, caseId, documentType) {
+  function handleNavigate(
+    documentId,
+    caseId,
+    documentType,
+    clientPosition,
+    responseGenerations
+  ) {
     const docId = String(documentId);
+    const docType = String(documentType);
     if (documentType === "interrogatories-out") {
       //may include other in future ie req for admission
       navigate(`/reqedit/${docId}/interrogatories-out/${caseId}`);
     } else {
       console.log("----------------------> handeNave else");
-      navigate(`/docedit/${docId}/${caseId}`);
+      navigate(
+        `/docedit/${docId}/${caseId}/${docType}/${clientPosition}/${responseGenerations}`
+      );
     }
   }
 
@@ -217,6 +226,7 @@ const DocumentListPage = ({ perPage }) => {
                       handleNavigate={handleNavigate}
                       displayDeleteButton={true}
                       responseGenerations={doc.responseGenerations}
+                      clientPosition={doc.clientPosition}
                     />
                   ))
               ) : (

src/pageElements/Cards.js

@@ -274,6 +274,7 @@ export const DocCard = (props) => {
     responseGenerations,
     confirmDelete,
     createdAt,
+    clientPosition,
   } = props;
   const createdAtTime = createdAt?.seconds
     ? createdAt?.seconds
@@ -363,7 +364,14 @@ export const DocCard = (props) => {
           disabled={disabled}
           className={"primary-button pt-2 pb-2 gen-button"}
           onClick={() =>
-            documentId && handleNavigate(documentId, parentCaseId, docType)
+            documentId &&
+            handleNavigate(
+              documentId,
+              parentCaseId,
+              docType,
+              clientPosition,
+              responseGenerations
+            )
           }
           labelText={buttonText}
         />