From 6d7770c3b79e8d3abba6841e0e8e284239b22e26 Mon Sep 17 00:00:00 2001 From: Kenneth Jannette Date: Fri, 12 Jan 2024 17:26:35 -0600 Subject: [PATCH] more --- src/Components/Document/DocumentListPage.js | 28 ++++++++++----------- src/pageElements/Cards.js | 7 +----- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/src/Components/Document/DocumentListPage.js b/src/Components/Document/DocumentListPage.js index 4797e29..90d2692 100644 --- a/src/Components/Document/DocumentListPage.js +++ b/src/Components/Document/DocumentListPage.js @@ -1,4 +1,4 @@ -import { useContext, useEffect, useState } from "react"; +import { useContext, useEffect, useState, useRef } from "react"; import { useNavigate } from "react-router-dom"; import { AppContext } from "../../Hooks/useContext/appContext"; import SelectDropdown from "../../pageElements/SelectDropdown"; @@ -21,6 +21,7 @@ import "../../styles/doclist-page.scss"; const DocumentListPage = ({ perPage }) => { const size = window.innerWidth < 440; const [isMobile, setIsMobile] = useState(size); + const count = useRef(null); const navigate = useNavigate(); const [showDeleteModal, setShowDeleteModal] = useState(false); const [selectedDocumentId, setSelectedDocumentId] = useState(null); @@ -36,6 +37,18 @@ const DocumentListPage = ({ perPage }) => { const [selectedDocumentType, setSelectedDocumentType] = useState(); const [showModal, setShowModal] = useState(false); + useEffect(() => { + if (count.current == null) { + setIsMobile(window.innerWidth < 440); + } + if (count.current < 3) { + setIsMobile(window.innerWidth < 440); + } + return () => { + count.current = 1; + }; + }, []); + function getDocuments() { if (!appUserId) { setAllDocs([]); @@ -121,17 +134,6 @@ const DocumentListPage = ({ perPage }) => { { label: "Associated case name z - a", value: "parentCaseName2" }, ]; - async function openDoc(docId) { - /* - may deprecate this functionality - try { - window.open(`${baseUrl}/Backend/Documents/Uploads/${docId}`, "_blank"); - } catch (err) { - console.log("Error occurred fetching document:", err); - } - */ - } - function handleNavigate( documentId, responseGenerations, @@ -203,7 +205,6 @@ const DocumentListPage = ({ perPage }) => { docType={doc.docType} documentId={doc.documentId} dateServed={doc.dateServed} - openDocument={openDoc} confirmDelete={confirmDelete} handleNavigate={handleNavigate} displayDeleteButton={true} @@ -266,7 +267,6 @@ const DocumentListPage = ({ perPage }) => { ); }; - return isMobile ? : ; }; diff --git a/src/pageElements/Cards.js b/src/pageElements/Cards.js index f15e4dd..8cba675 100644 --- a/src/pageElements/Cards.js +++ b/src/pageElements/Cards.js @@ -271,7 +271,6 @@ export const DocCard = (props) => { parentCaseId, documentId, dateServed, - openDocument, docType, displayDeleteButton, handleNavigate, @@ -283,11 +282,7 @@ export const DocCard = (props) => {
- openDocument(documentId)} - size="22px" - /> +
{title}
{dateServed ? (