From a5b166f41dd7dc2d49535f1cadda28862932f6c4 Mon Sep 17 00:00:00 2001 From: modem7 Date: Tue, 2 Jan 2024 17:39:50 +0000 Subject: [PATCH 1/2] implement docker cache mount for yarn --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 464960b..a6d6129 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ WORKDIR /data COPY ./package.json ./yarn.lock ./playwright.config.ts ./ # Increase timeout to pass github actions arm64 build -RUN yarn install --network-timeout 10000000 +RUN --mount=type=cache,sharing=locked,target=/usr/local/share/.cache/yarn yarn install --network-timeout 10000000 RUN npx playwright install-deps && \ apt-get clean && \ From 98fbb5b678e64d273d4e48996468389a3e4cb578 Mon Sep 17 00:00:00 2001 From: daniel31x13 Date: Tue, 2 Jan 2024 15:11:38 -0500 Subject: [PATCH 2/2] bug fixed --- components/ModalContent/PreservedFormatsModal.tsx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/components/ModalContent/PreservedFormatsModal.tsx b/components/ModalContent/PreservedFormatsModal.tsx index b9b51c6..af3053c 100644 --- a/components/ModalContent/PreservedFormatsModal.tsx +++ b/components/ModalContent/PreservedFormatsModal.tsx @@ -69,11 +69,13 @@ export default function PreservedFormatsModal({ onClose, activeLink }: Props) { const isReady = () => { return ( - collectionOwner.archiveAsScreenshot === - (link && link.pdf && link.pdf !== "pending") && - collectionOwner.archiveAsPDF === - (link && link.pdf && link.pdf !== "pending") && link && + (collectionOwner.archiveAsScreenshot === true + ? link.pdf && link.pdf !== "pending" + : true) && + (collectionOwner.archiveAsPDF === true + ? link.pdf && link.pdf !== "pending" + : true) && link.readable && link.readable !== "pending" );