Merge pull request #162 from kjannette/seven

Seven

src/Components/Case/CaseDetailsPage.js

@@ -46,6 +46,9 @@ const CaseDetailsPage = () => {
       if (doc.exists) {
         const data = doc.data();
         if (data.docType != undefined) {
+          console.log(
+            "getDocument has returned a docType---------------------------------------------------------------"
+          );
           const caseId = data.parentCaseId;
           const docType = data.docType;
           const clientPosition = data.clientPosition;
@@ -63,13 +66,14 @@ const CaseDetailsPage = () => {
   }
 
   function handleIncomingDiscoveryRequest(docId, isComplaint, clientPosition) {
-    generateRespIncomingDiscReq(docId, clientPosition);
+    //ONLY TRIGGER FROM THIS SIDE (next page)  IF IT IS COMBINED NUMBERED
+    setTimeout(generateRespIncomingDiscReq, 30000, docId, clientPosition);
     const res = getDocument(docId);
     if (res === "combined-numbered") {
       const documentId = docId;
     }
   }
-  // isComplaint = true - NEVER CHANGE THESE ARGS
+  // isComplaint = true - NEVER CHANGE THIS/THESE ARGS
   async function generateOutgoingDiscReq(docId, clientPosition) {
     try {
       const response = await fetch(
@@ -86,6 +90,9 @@ const CaseDetailsPage = () => {
   }
   //  isComplaint = false - NEVER CHANGE THESE ARGS
   async function generateRespIncomingDiscReq(docId, clientPosition) {
+    console.log(
+      "generateRespIncomingDiscReq ------------------------fired----------------->"
+    );
     try {
       const response = await fetch(
         `${apiUrl}/v1/generate-disc-responses/${docId}/${clientPosition}`,

src/Components/Document/DocEditPage.js

@@ -141,7 +141,7 @@ const DocEditPage = (props) => {
       const docRef = doc(db, "documents", `${docId}`);
       const docSnap = await getDoc(docRef);
       if (docSnap.exists()) {
-        const data = docSnap.data();
+        const data = docSnap?.data();
         return data;
       } else {
         console.log("DB item does not exist");
@@ -156,7 +156,7 @@ const DocEditPage = (props) => {
       const docRef = doc(db, "cases", `${caseId}`);
       const docSnap = await getDoc(docRef);
       if (docSnap.exists()) {
-        const _case = docSnap.data();
+        const _case = docSnap?.data();
         _case.id = docSnap._key.path.segments[1];
         setFetchedCase(_case);
       } else {
@@ -167,6 +167,21 @@ const DocEditPage = (props) => {
     }
   }
 
+  async function getParsedRogs(docId, docType) {
+    if (!docId || !docType) {
+      return;
+    }
+    console.log("getparsedrogs fired");
+    const response = await fetch(
+      `${apiUrl}/v1/get-parsed-requests/${docId}/${docType}`,
+      {
+        method: "GET",
+      }
+    );
+    const resp = await response.json();
+    return resp;
+  }
+
   useEffect(() => {
     if (!documentId) {
       return;
@@ -174,7 +189,7 @@ const DocEditPage = (props) => {
     getDocument(documentId)
       .then((data) => {
         setDocument(data);
-        const tempType = data.docType;
+        const tempType = data?.docType;
         return tempType;
       })
       .then((type) => {
@@ -189,6 +204,20 @@ const DocEditPage = (props) => {
     getCase(caseId);
   }, [caseId, documentId]);
 
+  useEffect(() => {
+    getParsedRogs(documentId, docType)
+      .then((data) => {
+        data && console.log("data in useEffect for getParsedRogs", data);
+        const respond = data[0].requests?.length > 2 ? data[0].requests : null;
+        const resp = respond?.map((item, index) => {
+          // NEVER CHANGE THIS:
+          return { showInputEle: false, text: item?.text, index: index };
+        });
+        setParsedRogs(resp);
+      })
+      .catch((err) => console.log(err));
+  }, [documentId, docType]);
+
   async function getCompletions(docId, docType) {
     if (!docId || !docType) {
       return;
@@ -221,12 +250,12 @@ const DocEditPage = (props) => {
           return response.json();
         })
         .then((data) => {
-          console.log("data in generateRespIncominIrregDiscReq", data);
+          data && console.log("data in generateRespIncominIrregDiscReq", data);
           const respArray = data[0].responses;
           const result = respArray?.map((item, index) => {
             let obj = {};
             obj["showInputEle"] = false;
-            obj["resp"] = item.text;
+            obj["resp"] = item?.text;
             obj["index"] = index;
             return obj;
           });
@@ -247,8 +276,9 @@ const DocEditPage = (props) => {
     setResponsesCreated((responsesCreated) => responsesCreated + 1);
   }
 
+  /*
   useEffect(() => {
-    if (!docType || docType != "combined-numbered") {
+    if (!docType) {
       return;
     }
     if (responsesCreated < 1) {
@@ -256,13 +286,13 @@ const DocEditPage = (props) => {
       generateRespIncominIrregDiscReq(documentId, clientPosition);
     }
   }, [documentId, docType, docType]);
+*/
 
   useEffect(() => {
-    console.log("docType in second useEffect", docType);
     if (!docType) {
       return;
     }
-    if (responseGenerations > 1) {
+    if (docType != "combined-numbered") {
       setIsLoading(true);
       getCompletions(documentId, docType)
         .then((data) => {
@@ -270,40 +300,13 @@ const DocEditPage = (props) => {
             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 };
+            return { showInputEle: false, resp: item?.text, index: index };
           });
           setResponses(resp);
           setIsLoading(false);
         })
         .catch((err) => console.log(err));
     }
-  }, [documentId, docType, responseGenerations]);
-
-  async function getParsedRogs(docId, docType) {
-    if (!docId || !docType) {
-      return;
-    }
-    const response = await fetch(
-      `${apiUrl}/v1/get-parsed-requests/${docId}/${docType}`,
-      {
-        method: "GET",
-      }
-    );
-    const resp = await response.json();
-    return resp;
-  }
-
-  useEffect(() => {
-    getParsedRogs(documentId, docType)
-      .then((data) => {
-        const respond = data[0].requests.length > 2 ? data[0].requests : null;
-        const resp = respond?.map((item, index) => {
-          // NEVER CHANGE THIS:
-          return { showInputEle: false, text: item.text, index: index };
-        });
-        setParsedRogs(resp);
-      })
-      .catch((err) => console.log(err));
   }, [documentId, docType]);
 
   async function postEditedResponses(docId, docType) {
@@ -349,7 +352,9 @@ const DocEditPage = (props) => {
     } else {
       setShowErrorModal(true);
     }
-    setIsBusy(false);
+    window.scrollTo(0, 0);
+    setTimeout(setIsBusy, 4000, false);
+    //setIsBusy(false);
   }
 
   async function getDocx() {
@@ -434,7 +439,7 @@ const DocEditPage = (props) => {
             },
           }
         );
-        console.log("++=================================resp", resp);
+
         return resp;
       }
     } catch (err) {

src/styles/howTo-page.scss

@@ -60,6 +60,7 @@
 .image-right-one {
   display: flex;
   flex-direction: row;
+  margin-bottom: 16px;
 }
 
 .image-jhon {