done

Author: Ciabas

govtool/backend/src/VVA/API.hs

@@ -245,8 +245,7 @@ proposalToResponse timeZone Types.Proposal {..} =
     proposalResponseCcAbstainVotes = proposalCcAbstainVotes,
     proposalResponsePrevGovActionIndex = proposalPrevGovActionIndex,
     proposalResponsePrevGovActionTxHash = HexText <$> proposalPrevGovActionTxHash,
-    proposalResponseAuthors = proposalAuthors
-    -- proposalResponseAuthors = ProposalAuthors <$> proposalAuthors
+    proposalResponseAuthors = ProposalAuthors <$> proposalAuthors
   }
 
 voteToResponse :: Types.Vote -> VoteParams

govtool/backend/src/VVA/API/Types.hs

@@ -401,38 +401,38 @@ data ProposalResponse
       , proposalResponseCcAbstainVotes      :: Integer
       , proposalResponsePrevGovActionIndex  :: Maybe Integer
       , proposalResponsePrevGovActionTxHash :: Maybe HexText
-      , proposalResponseAuthors             :: Maybe Value
+      , proposalResponseAuthors             :: Maybe ProposalAuthors
       }
   deriving (Generic, Show)
 
--- newtype ProposalAuthors = ProposalAuthors { getProposalAuthors :: Value }
---   deriving newtype (Show)
-
--- instance FromJSON ProposalAuthors where
---   parseJSON v@(Array _) = pure $ ProposalAuthors v
---   parseJSON _           = fail "ProposalAuthors must be a JSON array"
-
--- instance ToJSON ProposalAuthors where
---   toJSON (ProposalAuthors v) = v
-
--- instance ToSchema ProposalAuthors where
---   declareNamedSchema _ = pure $ NamedSchema (Just "ProposalAuthors") $ mempty
---     & type_ ?~ OpenApiArray
---     & description ?~ "A JSON array of proposal authors"
---     & example ?~ toJSON
---         [ object
---             [ "name" .= ("Alice" :: Text)
---             , "witness_algorithm" .= ("algo" :: Text)
---             , "public_key" .= ("key" :: Text)
---             , "signature" .= ("sig" :: Text)
---             ]
---         , object
---             [ "name" .= ("Bob" :: Text)
---             , "witness_algorithm" .= ("algo2" :: Text)
---             , "public_key" .= ("key2" :: Text)
---             , "signature" .= ("sig2" :: Text)
---             ]
---         ]
+newtype ProposalAuthors = ProposalAuthors { getProposalAuthors :: Value }
+  deriving newtype (Show)
+
+instance FromJSON ProposalAuthors where
+  parseJSON v@(Array _) = pure $ ProposalAuthors v
+  parseJSON _           = fail "ProposalAuthors must be a JSON array"
+
+instance ToJSON ProposalAuthors where
+  toJSON (ProposalAuthors v) = v
+
+instance ToSchema ProposalAuthors where
+  declareNamedSchema _ = pure $ NamedSchema (Just "ProposalAuthors") $ mempty
+    & type_ ?~ OpenApiArray
+    & description ?~ "A JSON array of proposal authors"
+    & example ?~ toJSON
+        [ object
+            [ "name" .= ("Alice" :: Text)
+            , "witness_algorithm" .= ("algo" :: Text)
+            , "public_key" .= ("key" :: Text)
+            , "signature" .= ("sig" :: Text)
+            ]
+        , object
+            [ "name" .= ("Bob" :: Text)
+            , "witness_algorithm" .= ("algo2" :: Text)
+            , "public_key" .= ("key2" :: Text)
+            , "signature" .= ("sig2" :: Text)
+            ]
+        ]
 
 deriveJSON (jsonOptions "proposalResponse") ''ProposalResponse
 

govtool/frontend/src/components/molecules/GovernanceActionCardElement.tsx

@@ -108,7 +108,7 @@ export const GovernanceActionCardElement = ({
         ...(isSemiTransparent && { opacity: 0.75 }),
       }}
     >
-      {isMarkdown ? removeMarkdown(text) : text}
+      {typeof text === "string" && isMarkdown ? removeMarkdown(text) : text}
     </Typography>
   );
 

govtool/frontend/src/components/organisms/GovernanceActionDetailsCardData.tsx

@@ -2,7 +2,7 @@ import { useMemo, useState } from "react";
 import { Box, Tabs, Tab, styled, Skeleton } from "@mui/material";
 import { useLocation } from "react-router-dom";
 
-import { CopyButton, ExternalModalButton, Typography } from "@atoms";
+import { CopyButton, ExternalModalButton, Tooltip, Typography } from "@atoms";
 import {
   GovernanceActionCardElement,
   GovernanceActionDetailsCardLinks,
@@ -76,6 +76,7 @@ export const GovernanceActionDetailsCardData = ({
   isValidating,
   proposal: {
     abstract,
+    authors,
     createdDate,
     createdEpochNo,
     details,
@@ -365,6 +366,29 @@ export const GovernanceActionDetailsCardData = ({
           />
         </>
       )}
+      <GovernanceActionCardElement
+        label={t("govActions.authors.title")}
+        text={
+          (authors ?? []).length <= 0
+            ? t("govActions.authors.noDataAvailable")
+            : (authors ?? []).map((author, idx, arr) => (
+              <>
+                <Tooltip
+                  heading={`${t("govActions.authors.witnessAlgorithm")}: ${author.witnessAlgorithm}`}
+                  paragraphOne={`${t("govActions.authors.publicKey")}: ${author.publicKey}`}
+                  paragraphTwo={`${t("govActions.authors.signature")}: ${author.signature}`}
+                  placement="bottom-end"
+                  arrow
+                >
+                  <span>{author.name}</span>
+                </Tooltip>
+                {idx < arr.length - 1 && <span>,&nbsp;</span>}
+              </>
+              ))
+        }
+        textVariant="longText"
+        dataTestId="authors"
+      />
 
       <GovernanceActionDetailsCardLinks links={references} />
     </Box>

govtool/frontend/src/hooks/queries/useGetProposalQuery.ts

@@ -16,8 +16,6 @@ export const useGetProposalQuery = (proposalId: string, enabled?: boolean) => {
     },
   );
 
-  console.log('useGetProposalQuery', { proposalId, dRepID, data, isLoading, isRefetching, error });
-
   return {
     data,
     isLoading,

govtool/frontend/src/i18n/locales/en.json

@@ -421,6 +421,13 @@
     "amount": "Amount:",
     "anchorURL": "Metadata anchor link",
     "anchorHash": "Metadata anchor hash",
+    "authors": {
+      "noDataAvailable": "No data available",
+      "title": "Authors",
+      "publicKey": "Public Key",
+      "signature": "Signature",
+      "witnessAlgorithm": "Witness Algorithm"
+    },
     "backToGovActions": "Back to Governance Actions",
     "castVote": "<0>You voted {{vote}} on this proposal</0>\non {{date}} (Epoch {{epoch}})",
     "castVoteDeadline": "You can change your vote up to {{date}} (Epoch {{epoch}})",

govtool/frontend/src/models/api.ts

@@ -234,6 +234,12 @@ export type ProposalData = {
   references?: Reference[];
   title?: string;
   protocolParams: EpochParams | null;
+  authors?: {
+    name?: string;
+    witnessAlgorithm?: string;
+    publicKey?: string;
+    signature?: string;
+  }[];
 } & SubmittedVotesData;
 
 export type NewConstitutionAnchor = {
@@ -270,8 +276,8 @@ type DRepVotingPower = {
 export type DRepVotingPowerListResponse = DRepVotingPower[];
 
 export type Account = {
-  id: number,
-  view: string,
-  isRegistered: boolean,
-  isScriptBased: boolean
-}
+  id: number;
+  view: string;
+  isRegistered: boolean;
+  isScriptBased: boolean;
+};

govtool/frontend/src/pages/GovernanceActionDetails.tsx

@@ -57,8 +57,6 @@ export const GovernanceActionDetails = () => {
     (data ?? state)?.proposal as ProposalData,
   );
 
-  console.log('GovernanceActionDetails', { extendedProposal, data, state, untypedState });
-
   useEffect(() => {
     if (data?.proposal) {
       setExtendedProposal(data.proposal);

govtool/frontend/src/services/requests/getProposal.ts

@@ -19,7 +19,5 @@ export const getProposal = async (
     `/proposal/get/${encodedHash}?drepId=${drepId}`,
   );
 
-  console.log('-------------------getProposal', { proposalId, drepId, data });
-
   return data;
 };