refactor: renames to fileHash

src/components/PDFView/index.tsx

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

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"
         }
       ]

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
               }
             })
           }) || []

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)

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
 }