From 70e7e5305efe697eba88998b462d456de7cf5294 Mon Sep 17 00:00:00 2001 From: Eugene Date: Thu, 9 Jan 2025 12:58:23 +0200 Subject: [PATCH] refactor: renames to fileHash --- src/components/PDFView/index.tsx | 10 +++++++--- src/data/metaSamples.json | 8 ++++---- src/pages/create/index.tsx | 4 ++-- src/pages/verify/index.tsx | 5 ++++- src/types/mark.ts | 3 ++- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/components/PDFView/index.tsx b/src/components/PDFView/index.tsx index 95d577e..88a8983 100644 --- a/src/components/PDFView/index.tsx +++ b/src/components/PDFView/index.tsx @@ -38,12 +38,16 @@ const PdfView = ({ currentUserMarks: CurrentUserMark[], hash: string ): CurrentUserMark[] => { - return currentUserMarks.filter( - (currentUserMark) => currentUserMark.mark.pdfFileHash === hash + return currentUserMarks.filter((currentUserMark) => + currentUserMark.mark.pdfFileHash + ? currentUserMark.mark.pdfFileHash === hash + : currentUserMark.mark.fileHash === hash ) } const filterMarksByFile = (marks: Mark[], hash: string): Mark[] => { - return marks.filter((mark) => mark.pdfFileHash === hash) + return marks.filter((mark) => + mark.pdfFileHash ? mark.pdfFileHash === hash : mark.fileHash === hash + ) } return (
diff --git a/src/data/metaSamples.json b/src/data/metaSamples.json index 66f6536..69f595e 100644 --- a/src/data/metaSamples.json +++ b/src/data/metaSamples.json @@ -19,7 +19,7 @@ "page": 1 }, "npub": "npub1x77qywdllzetv9ncnhlfpv62kshlgtt0uqlsq3v22uzzkk2xvvrsn6uyfy", - "pdfFileHash": "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05" + "fileHash": "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05" } ], "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05/2.png": [ @@ -34,7 +34,7 @@ "page": 2 }, "npub": "npub1x77qywdllzetv9ncnhlfpv62kshlgtt0uqlsq3v22uzzkk2xvvrsn6uyfy", - "pdfFileHash": "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05" + "fileHash": "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05" } ] } @@ -54,7 +54,7 @@ "page": 1 }, "npub": "npub1x77qywdllzetv9ncnhlfpv62kshlgtt0uqlsq3v22uzzkk2xvvrsn6uyfy", - "pdfFileHash": "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05", + "fileHash": "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05", "value": "Pera Peric" }, { @@ -68,7 +68,7 @@ "page": 2 }, "npub": "npub1x77qywdllzetv9ncnhlfpv62kshlgtt0uqlsq3v22uzzkk2xvvrsn6uyfy", - "pdfFileHash": "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05", + "fileHash": "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05", "value": "Pera Peric" } ] diff --git a/src/pages/create/index.tsx b/src/pages/create/index.tsx index de9c3d3..ce249b7 100644 --- a/src/pages/create/index.tsx +++ b/src/pages/create/index.tsx @@ -636,8 +636,8 @@ export const CreatePage = () => { width: drawnField.width }, npub: drawnField.counterpart, - pdfFileHash: fileHash, - fileName: file.name + fileName: file.name, + fileHash } }) }) || [] diff --git a/src/pages/verify/index.tsx b/src/pages/verify/index.tsx index e39ca44..6b16207 100644 --- a/src/pages/verify/index.tsx +++ b/src/pages/verify/index.tsx @@ -105,7 +105,10 @@ const SlimPdfView = ({ const m = parsedSignatureEvents[ e as `npub1${string}` ].parsedContent?.marks.filter( - (m) => m.pdfFileHash == hash && m.location.page == i + (m) => + (m.pdfFileHash + ? m.pdfFileHash == hash + : m.fileHash == hash) && m.location.page == i ) if (m) { marks.push(...m) diff --git a/src/types/mark.ts b/src/types/mark.ts index df733d6..4d67f5d 100644 --- a/src/types/mark.ts +++ b/src/types/mark.ts @@ -11,10 +11,11 @@ export interface CurrentUserMark { export interface Mark { id: number npub: string - pdfFileHash: string type: MarkType location: MarkLocation fileName: string + pdfFileHash?: string + fileHash?: string value?: string }