From eefdd589d33af03e1de6a4f3f3f6486a7f55efc7 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Thu, 7 Mar 2024 16:44:39 -0600 Subject: [PATCH 1/3] more --- src/Components/Case/CaseDetailsPage.js | 14 ++++++------- src/Components/Document/DocEditPage.js | 3 --- src/Components/Modals/UploadModal.js | 27 +++++++++++++++++++++++++- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/Components/Case/CaseDetailsPage.js b/src/Components/Case/CaseDetailsPage.js index bb5a613..9fb5848 100644 --- a/src/Components/Case/CaseDetailsPage.js +++ b/src/Components/Case/CaseDetailsPage.js @@ -98,6 +98,11 @@ const CaseDetailsPage = () => { } }; + const handleConfirmDocType = (docType) => { + console.log("docType", docType); + setShowConfirmModal(true); + }; + const handleCancelConfirm = () => { setShowConfirmModal(false); }; @@ -108,14 +113,7 @@ const CaseDetailsPage = () => { navigate(`/signup/${isUpgrade}/${currentPlan}`); }; - async function updateUserAccountDocsGenerated() { - await updateDoc(doc(db, "users", fbUserId), { - docsGenerated: increment(1), - }); - } - const handleSuccess = (docType, docId) => { - updateUserAccountDocsGenerated(); setShowUploadModal(false); if (docType === "interrogatories-out") { setTimeout(handleNavEdit, 40000, docId, caseId); @@ -187,6 +185,8 @@ const CaseDetailsPage = () => { setIsLoading={setIsLoading} handleSuccess={handleSuccess} caseData={subCase} + handleConfirmDocType={handleConfirmDocType} + fbUserId={fbUserId} /> ) : null ) : null} diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js index da4e9ac..f0d299b 100644 --- a/src/Components/Document/DocEditPage.js +++ b/src/Components/Document/DocEditPage.js @@ -458,12 +458,9 @@ const DocEditPage = () => { } async function updateRespGenerationCount(docId) { - console.log("updaeeResponseGenerationCount fired"); if (!docId) { return; } - - console.log("updaeeResponseGenerationCount past if block"); await updateDoc(doc(db, "documents", docId), { responseGenerations: increment(1), }); diff --git a/src/Components/Modals/UploadModal.js b/src/Components/Modals/UploadModal.js index 37475f2..8e5123c 100644 --- a/src/Components/Modals/UploadModal.js +++ b/src/Components/Modals/UploadModal.js @@ -8,7 +8,13 @@ import Row from "react-bootstrap/Row"; import Col from "react-bootstrap/Col"; import Radiogroup from "../../pageElements/Radiogroup"; import { useNavigate } from "react-router-dom"; -import { collection, setDoc, doc } from "firebase/firestore"; +import { + collection, + setDoc, + doc, + updateDoc, + increment, +} from "firebase/firestore"; import { db } from "../../firebase"; import { v4 as uuidv4 } from "uuid"; import TextInput from "../../pageElements/TextInput"; @@ -30,6 +36,8 @@ const UploadModal = (props) => { handleSuccess, setIsLoading, clientPositiion, + handleConfirmDocType, + fbUserId, } = props; const { caseId, caseNumber, jurisdiction, caption, captionTwo } = caseData; const [docTitle, setDocTitle] = useState(""); @@ -65,6 +73,21 @@ const UploadModal = (props) => { setRadioValue(e.value); }; + async function updateUserAccountDocsGenerated(fbUserId) { + await updateDoc(doc(db, "users", fbUserId), { + docsGenerated: increment(1), + }); + } + + async function updateRespGenerationCount(docId) { + if (!docId) { + return; + } + await updateDoc(doc(db, "documents", docId), { + responseGenerations: increment(1), + }); + } + async function saveToDb(uuidName) { const createdAt = new Date(); const data = { @@ -84,6 +107,8 @@ const UploadModal = (props) => { if (radioValue === "complaint") { docType = "interrogatories-out"; data["docType"] = docType; + updateUserAccountDocsGenerated(fbUserId); + updateRespGenerationCount(uuidName); } try { From d2664256ecdc8b525b6315faa5ae0c2fd9f23c8a Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Thu, 7 Mar 2024 17:02:34 -0600 Subject: [PATCH 2/3] more --- src/Components/Modals/UploadModal.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Components/Modals/UploadModal.js b/src/Components/Modals/UploadModal.js index 8e5123c..34f12b9 100644 --- a/src/Components/Modals/UploadModal.js +++ b/src/Components/Modals/UploadModal.js @@ -7,7 +7,6 @@ import Form from "react-bootstrap/Form"; import Row from "react-bootstrap/Row"; import Col from "react-bootstrap/Col"; import Radiogroup from "../../pageElements/Radiogroup"; -import { useNavigate } from "react-router-dom"; import { collection, setDoc, @@ -19,7 +18,6 @@ import { db } from "../../firebase"; import { v4 as uuidv4 } from "uuid"; import TextInput from "../../pageElements/TextInput"; import { ExclamationTriangle } from "react-bootstrap-icons"; -import Radio from "../../pageElements/Radio"; import "../../styles/modals.scss"; const MAX_LENGTH_TITLE = 27; From cd7b3f286b6de4f603d83a053d6d80327b883b8e Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Thu, 7 Mar 2024 17:06:53 -0600 Subject: [PATCH 3/3] more --- src/Components/Modals/UploadModal.js | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/Components/Modals/UploadModal.js b/src/Components/Modals/UploadModal.js index 34f12b9..92cb99d 100644 --- a/src/Components/Modals/UploadModal.js +++ b/src/Components/Modals/UploadModal.js @@ -77,17 +77,14 @@ const UploadModal = (props) => { }); } - async function updateRespGenerationCount(docId) { - if (!docId) { - return; - } - await updateDoc(doc(db, "documents", docId), { - responseGenerations: increment(1), - }); - } - async function saveToDb(uuidName) { const createdAt = new Date(); + let respGenVal; + if (radioValue === "complaint") { + respGenVal = 1; + } else { + respGenVal = 0; + } const data = { ownerId: appUserId, createdAt: createdAt, @@ -99,14 +96,13 @@ const UploadModal = (props) => { parentCaseName: `${caption} v. ${captionTwo}`, parentCaseNumber: caseNumber, parentCaseJurisdiction: jurisdiction, - responseGenerations: 0, + responseGenerations: respGenVal, }; if (radioValue === "complaint") { docType = "interrogatories-out"; data["docType"] = docType; updateUserAccountDocsGenerated(fbUserId); - updateRespGenerationCount(uuidName); } try {