From 75a715d002f005e327442015dc322b278f59bc8e Mon Sep 17 00:00:00 2001
From: Stixx <stixx@nostrdev.com>
Date: Tue, 10 Sep 2024 16:00:48 +0200
Subject: [PATCH] feat: Add Sigit ID as a path param

---
 src/components/DisplaySigit/index.tsx |  5 +--
 src/pages/home/index.tsx              |  1 +
 src/pages/sign/index.tsx              | 51 +++++++++++++++++++++++----
 src/routes/index.tsx                  |  5 +++
 4 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/src/components/DisplaySigit/index.tsx b/src/components/DisplaySigit/index.tsx
index 473a942..00716a3 100644
--- a/src/components/DisplaySigit/index.tsx
+++ b/src/components/DisplaySigit/index.tsx
@@ -24,11 +24,12 @@ import { useSigitMeta } from '../../hooks/useSigitMeta'
 import { extractFileExtensions } from '../../utils/file'
 
 type SigitProps = {
+  sigitKey: string
   meta: Meta
   parsedMeta: SigitCardDisplayInfo
 }
 
-export const DisplaySigit = ({ meta, parsedMeta }: SigitProps) => {
+export const DisplaySigit = ({ meta, parsedMeta, sigitKey }: SigitProps) => {
   const { title, createdAt, submittedBy, signers, signedStatus, isValid } =
     parsedMeta
 
@@ -47,7 +48,7 @@ export const DisplaySigit = ({ meta, parsedMeta }: SigitProps) => {
         to={
           signedStatus === SigitStatus.Complete
             ? appPublicRoutes.verify
-            : appPrivateRoutes.sign
+            : `${appPrivateRoutes.sign}/${sigitKey}`
         }
         state={{ meta }}
         className={styles.insetLink}
diff --git a/src/pages/home/index.tsx b/src/pages/home/index.tsx
index c93c9f8..3e333d3 100644
--- a/src/pages/home/index.tsx
+++ b/src/pages/home/index.tsx
@@ -257,6 +257,7 @@ export const HomePage = () => {
             .map((key) => (
               <DisplaySigit
                 key={`sigit-${key}`}
+                sigitKey={key}
                 parsedMeta={parsedSigits[key]}
                 meta={sigits[key]}
               />
diff --git a/src/pages/sign/index.tsx b/src/pages/sign/index.tsx
index 8720954..70d9784 100644
--- a/src/pages/sign/index.tsx
+++ b/src/pages/sign/index.tsx
@@ -7,7 +7,7 @@ import { MuiFileInput } from 'mui-file-input'
 import { Event, verifyEvent } from 'nostr-tools'
 import { useCallback, useEffect, useState } from 'react'
 import { useSelector } from 'react-redux'
-import { useLocation, useNavigate } from 'react-router-dom'
+import { useLocation, useNavigate, useParams } from 'react-router-dom'
 import { toast } from 'react-toastify'
 import { LoadingSpinner } from '../../components/LoadingSpinner'
 import { NostrController } from '../../controllers'
@@ -53,6 +53,7 @@ import {
   SigitFile
 } from '../../utils/file.ts'
 import { ARRAY_BUFFER, DEFLATE } from '../../utils/const.ts'
+import { useAppSelector } from '../../hooks/store.ts'
 enum SignedStatus {
   Fully_Signed,
   User_Is_Next_Signer,
@@ -62,17 +63,20 @@ enum SignedStatus {
 export const SignPage = () => {
   const navigate = useNavigate()
   const location = useLocation()
+  const params = useParams()
 
   /**
+   * Received from `location.state`
+   *
    * uploadedZip will be received from home page when a user uploads a sigit zip wrapper that contains keys.json
    * arrayBuffer will be received in navigation from create page in offline mode
    * meta will be received in navigation from create & home page in online mode
    */
-  const {
-    meta: metaInNavState,
-    arrayBuffer: decryptedArrayBuffer,
-    uploadedZip
-  } = location.state || {}
+  const [metaInNavState, setMetaInNavState] = useState<Meta | undefined>()
+  const [decryptedArrayBuffer, setDecryptedArrayBuffer] = useState<
+    ArrayBuffer | undefined
+  >()
+  const [uploadedZip, setUploadedZip] = useState<File | undefined>()
 
   const [displayInput, setDisplayInput] = useState(false)
 
@@ -115,6 +119,41 @@ export const SignPage = () => {
   const [isMarksCompleted, setIsMarksCompleted] = useState(false)
   const [otherUserMarks, setOtherUserMarks] = useState<Mark[]>([])
 
+  const usersAppData = useAppSelector((state) => state.userAppData)
+
+  /**
+   * When location state changes, update the states in the component
+   * If sigit id is found in the URL PARAM we will set metaInNavState manually
+   * after we do the fetching based on the ID
+   */
+  useEffect(() => {
+    if (location.state) {
+      const { meta, arrayBuffer, uploadedZip } = location.state
+
+      setMetaInNavState(meta)
+      setDecryptedArrayBuffer(arrayBuffer)
+      setUploadedZip(uploadedZip)
+    }
+  }, [location.state])
+
+  useEffect(() => {
+    // If meta in nav state is populated we will not try to fetch sigit details
+    // from the redux store
+    if (metaInNavState) return
+
+    if (usersAppData) {
+      const sigitId = params.id
+
+      if (sigitId) {
+        const sigit = usersAppData.sigits[sigitId]
+
+        if (sigit) {
+          setMetaInNavState(sigit)
+        }
+      }
+    }
+  }, [usersAppData, metaInNavState, params.id])
+
   useEffect(() => {
     if (signers.length > 0) {
       // check if all signers have signed then its fully signed
diff --git a/src/routes/index.tsx b/src/routes/index.tsx
index 2d36db1..643017f 100644
--- a/src/routes/index.tsx
+++ b/src/routes/index.tsx
@@ -19,6 +19,7 @@ export const appPrivateRoutes = {
   homePage: '/',
   create: '/create',
   sign: '/sign',
+  signId: '/sign/:id',
   settings: '/settings',
   profileSettings: '/settings/profile/:npub',
   cacheSettings: '/settings/cache',
@@ -132,6 +133,10 @@ export const privateRoutes = [
     path: appPrivateRoutes.sign,
     element: <SignPage />
   },
+  {
+    path: appPrivateRoutes.signId,
+    element: <SignPage />
+  },
   {
     path: appPrivateRoutes.settings,
     element: <SettingsPage />