sigit/sigit.io
7
2
Fork 0
Code Issues 32 Pull Requests 3 Actions Packages Projects 1 Releases Wiki Activity

#215 Change Naming from PdfFileHash to FileHash #303

Merged
eugene merged 3 commits from issue-215-file-hash-naming into staging 2025-01-14 08:35:57 +00:00
Conversation 2 Commits 3 Files Changed 5 +19 -11
5 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 70e7e5305e - Show all commits

10
src/components/PDFView/index.tsx
View File

@ -38,12 +38,16 @@ const PdfView = ({
currentUserMarks: CurrentUserMark[], currentUserMarks: CurrentUserMark[],
hash: string hash: string
): CurrentUserMark[] => { ): CurrentUserMark[] => {
return currentUserMarks.filter( return currentUserMarks.filter((currentUserMark) =>
(currentUserMark) => currentUserMark.mark.pdfFileHash === hash currentUserMark.mark.pdfFileHash
? currentUserMark.mark.pdfFileHash === hash
: currentUserMark.mark.fileHash === hash
) )
} }
const filterMarksByFile = (marks: Mark[], hash: string): Mark[] => { 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 ( return (
<div className="files-wrapper"> <div className="files-wrapper">

8
src/data/metaSamples.json
View File

@ -19,7 +19,7 @@
"page": 1 "page": 1
}, },
"npub": "npub1x77qywdllzetv9ncnhlfpv62kshlgtt0uqlsq3v22uzzkk2xvvrsn6uyfy", "npub": "npub1x77qywdllzetv9ncnhlfpv62kshlgtt0uqlsq3v22uzzkk2xvvrsn6uyfy",
"pdfFileHash": "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05" "fileHash": "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05"
} }
], ],
"da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05/2.png": [ "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05/2.png": [
@ -34,7 +34,7 @@
"page": 2 "page": 2
}, },
"npub": "npub1x77qywdllzetv9ncnhlfpv62kshlgtt0uqlsq3v22uzzkk2xvvrsn6uyfy", "npub": "npub1x77qywdllzetv9ncnhlfpv62kshlgtt0uqlsq3v22uzzkk2xvvrsn6uyfy",
"pdfFileHash": "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05" "fileHash": "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05"
} }
] ]
} }
@ -54,7 +54,7 @@
"page": 1 "page": 1
}, },
"npub": "npub1x77qywdllzetv9ncnhlfpv62kshlgtt0uqlsq3v22uzzkk2xvvrsn6uyfy", "npub": "npub1x77qywdllzetv9ncnhlfpv62kshlgtt0uqlsq3v22uzzkk2xvvrsn6uyfy",
"pdfFileHash": "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05", "fileHash": "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05",
"value": "Pera Peric" "value": "Pera Peric"
}, },
{ {
@ -68,7 +68,7 @@
"page": 2 "page": 2
}, },
"npub": "npub1x77qywdllzetv9ncnhlfpv62kshlgtt0uqlsq3v22uzzkk2xvvrsn6uyfy", "npub": "npub1x77qywdllzetv9ncnhlfpv62kshlgtt0uqlsq3v22uzzkk2xvvrsn6uyfy",
"pdfFileHash": "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05", "fileHash": "da5f857e77d3aa59c461efad804116931c059b36e6b4da0b5d9452753ec70c05",
"value": "Pera Peric" "value": "Pera Peric"
} }
] ]

4
src/pages/create/index.tsx
View File

@ -636,8 +636,8 @@ export const CreatePage = () => {
width: drawnField.width width: drawnField.width
}, },
npub: drawnField.counterpart, npub: drawnField.counterpart,
pdfFileHash: fileHash, fileName: file.name,
fileName: file.name fileHash
} }
}) })
}) || [] }) || []

5
src/pages/verify/index.tsx
View File

@ -105,7 +105,10 @@ const SlimPdfView = ({
const m = parsedSignatureEvents[ const m = parsedSignatureEvents[
e as `npub1${string}` e as `npub1${string}`
].parsedContent?.marks.filter( ].parsedContent?.marks.filter(
(m) => m.pdfFileHash == hash && m.location.page == i (m) =>
(m.pdfFileHash
eugene marked this conversation as resolved
b commented 2025-01-10 10:13:04 +00:00
Review
Copy Link

comment here would be great (eg "backwards compatibility for sigits before Jan 2025")

comment here would be great (eg "backwards compatibility for sigits before Jan 2025")
👍 1
? m.pdfFileHash == hash
: m.fileHash == hash) && m.location.page == i
) )
if (m) { if (m) {
marks.push(...m) marks.push(...m)

3
src/types/mark.ts
View File

@ -11,10 +11,11 @@ export interface CurrentUserMark {
export interface Mark { export interface Mark {
id: number id: number
npub: string npub: string
pdfFileHash: string
type: MarkType type: MarkType
location: MarkLocation location: MarkLocation
fileName: string fileName: string
pdfFileHash?: string
fileHash?: string
value?: string value?: string
} }