wip 4

IntersectMBO · Mar 26, 2024 · f8b14a2 · f8b14a2
1 parent 28a7998
commit f8b14a2
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 10 deletions.
diff --git a/govtool/frontend/src/components/molecules/VoteActionForm.tsx b/govtool/frontend/src/components/molecules/VoteActionForm.tsx
@@ -125,7 +125,7 @@ export const VoteActionForm = ({
     [confirmVote, areFormErrors, vote, isVoteLoading],
   );
 
-  const receiveVote = (hash?: string, url: string) => {
+  const receiveVote = (url: string, hash?: string | null) => {
     console.log("RECEIVED");
     console.log(hash, url);
   };

diff --git a/govtool/frontend/src/components/organisms/VoteContext/VoteContextModal.tsx b/govtool/frontend/src/components/organisms/VoteContext/VoteContextModal.tsx
@@ -14,16 +14,27 @@ import { VoteContextFormValues } from "@/hooks/forms/useVoteContextForm";
 type VoteContextModalState = {
   onContinue?: () => void;
   onCancel?: () => void;
-  onSubmit?: () => void;
+  onSubmit?: (url: string, hash: string | null) => void;
 };
 
 export const VoteContextModal = () => {
   const [step, setStep] = useState(1);
+  const [savedHash, setSavedHash] = useState<string | null>("");
+
+  console.log("savedHash", savedHash);
 
   const { state, closeModal } = useModal<VoteContextModalState>();
 
   const methods = useForm<VoteContextFormValues>({ mode: "onChange" });
 
+  const submitVoteContext = () => {
+    if (state?.onSubmit) {
+      console.log("savedHash2222", savedHash);
+
+      state.onSubmit(methods.getValues("storingURL"), savedHash);
+    }
+  };
+
   return (
     <ModalWrapper
       dataTestId="vote-context-modal"
@@ -35,12 +46,15 @@ export const VoteContextModal = () => {
       <FormProvider {...methods}>
         {step === 1 && <VoteContextText setStep={setStep} />}
         {step === 2 && <VoteContextTerms setStep={setStep} />}
-        {step === 3 && <VoteContextStoringInformation setStep={setStep} />}
-        {step === 4 && (
-          <VoteContextSuccess
-            submitVoteContext={state?.onSubmit ? state?.onSubmit : closeModal}
+        {step === 3 && (
+          <VoteContextStoringInformation
+            setSavedHash={setSavedHash}
+            setStep={setStep}
           />
         )}
+        {step === 4 && (
+          <VoteContextSuccess submitVoteContext={submitVoteContext} />
+        )}
       </FormProvider>
     </ModalWrapper>
   );

diff --git a/govtool/frontend/src/components/organisms/VoteContext/VoteContextStoringInformation.tsx b/govtool/frontend/src/components/organisms/VoteContext/VoteContextStoringInformation.tsx
@@ -11,10 +11,12 @@ import { URL_REGEX, openInNewTab } from "@utils";
 
 type VoteContextStoringInformationProps = {
   setStep: Dispatch<SetStateAction<number>>;
+  setSavedHash: Dispatch<SetStateAction<string | null>>;
 };
 
 export const VoteContextStoringInformation = ({
   setStep,
+  setSavedHash,
 }: VoteContextStoringInformationProps) => {
   const { t } = useTranslation();
   const {
@@ -26,7 +28,7 @@ export const VoteContextStoringInformation = ({
     generateMetadata,
     onClickDownloadJson,
     // isLoading,
-  } = useVoteContextForm(setStep);
+  } = useVoteContextForm(setSavedHash, setStep);
   const { screenWidth } = useScreenDimension();
 
   //   const fileName = getValues("governance_action_type");
@@ -41,6 +43,8 @@ export const VoteContextStoringInformation = ({
   //   const onClickBack = () => setStep(5);
 
   useEffect(() => {
+    console.log("GENERATE");
+
     generateMetadata();
   }, []);
 

diff --git a/govtool/frontend/src/components/organisms/VoteContext/VoteContextSuccess.tsx b/govtool/frontend/src/components/organisms/VoteContext/VoteContextSuccess.tsx
@@ -1,4 +1,4 @@
-import { Dispatch, SetStateAction } from "react";
+import { Dispatch, SetStateAction, useState } from "react";
 
 import { ICONS, IMAGES } from "@consts";
 import { Button, Typography } from "@atoms";
@@ -8,7 +8,7 @@ import { ControlledField } from "..";
 import { Box } from "@mui/material";
 
 type VoteContextSuccessProps = {
-  submitVoteContext: (hash?: string, url: string) => void;
+  submitVoteContext: () => void;
 };
 
 export const VoteContextSuccess = ({
@@ -55,7 +55,7 @@ export const VoteContextSuccess = ({
           console.log("hash", hash);
           console.log("getValues", getValues("storingURL"));
 
-          submitVoteContext(hash, getValues("storingURL"));
+          submitVoteContext();
         }}
         sx={{
           borderRadius: 50,

diff --git a/govtool/frontend/src/hooks/forms/useCreateGovernanceActionForm.ts b/govtool/frontend/src/hooks/forms/useCreateGovernanceActionForm.ts
@@ -106,6 +106,7 @@ export const useCreateGovernanceActionForm = (
 
     const canonizedJson = await canonizeJSON(jsonld);
     const canonizedJsonHash = blake2bHex(canonizedJson, undefined, 32);
+    console.log("canonizedJsonHash2222", canonizedJsonHash);
 
     // That allows to validate metadata hash
     setHash(canonizedJsonHash);

diff --git a/govtool/frontend/src/hooks/forms/useVoteContextForm.tsx b/govtool/frontend/src/hooks/forms/useVoteContextForm.tsx
@@ -29,12 +29,16 @@ export type VoteContextFormValues = {
 };
 
 export const useVoteContextForm = (
+  setSavedHash?: Dispatch<SetStateAction<string | null>>,
   setStep?: Dispatch<SetStateAction<number>>,
 ) => {
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const [hash, setHash] = useState<string | null>(null);
   const [json, setJson] = useState<NodeObject | null>(null);
 
+  console.log("stateHash", hash);
+  console.log("stateJson", json);
+
   const { openModal, closeModal } = useModal();
   const { t } = useTranslation();
 
@@ -81,9 +85,16 @@ export const useVoteContextForm = (
 
     const jsonld = await generateJsonld(body, VOTE_TEST_CONTEXT);
 
+    console.log("jsonld", jsonld);
+
     const canonizedJson = await canonizeJSON(jsonld);
+
+    console.log("canonizedJson", canonizedJson);
+
     const canonizedJsonHash = blake2bHex(canonizedJson, undefined, 32);
 
+    console.log("canonizedJsonHash", canonizedJsonHash);
+
     // That allows to validate metadata hash
     setHash(canonizedJsonHash);
     setJson(jsonld);
@@ -155,6 +166,8 @@ export const useVoteContextForm = (
       try {
         setIsLoading(true);
 
+        console.log("hash przed validate", hash);
+
         await validateHash(data.storingURL, hash);
         // const govActionBuilder = await buildTransaction(data);
         // await buildSignSubmitConwayCertTx({
@@ -170,6 +183,13 @@ export const useVoteContextForm = (
         setIsLoading(false);
         console.log("weszło");
 
+        console.log("hash na koniec", hash);
+
+        if (setSavedHash) {
+          console.log("hash ustawiany", hash);
+
+          setSavedHash(hash);
+        }
         if (setStep) setStep(4);
       }
     },

diff --git a/govtool/frontend/src/utils/generateJsonld.ts b/govtool/frontend/src/utils/generateJsonld.ts
@@ -24,7 +24,11 @@ export const generateJsonld = async <
     [`${CIP_100}authors`]: [],
   };
 
+  console.log("doc", doc);
+
   const json = await jsonld.compact(doc, context);
 
+  console.log("json", json);
+
   return json;
 };