Merge pull request #590 from IntersectMBO/develop

Fixes and Additions: Dashboard Loading Issue Resolved, Search Improvements, and Vote Response Enhancement

CHANGELOG.md

@@ -31,6 +31,7 @@ changes.
 
 ### Added
 
+- added `epochNo` and `date` to `drep/getVotes` and `proposal/get`
 - Added `isRegisteredAsSoleVoter` and `wasRegisteredAsSoleVoter` fields to the drep/info response [Issue 212](https://github.com/IntersectMBO/govtool/issues/212)
 - Abandoning registration as DRep [Issue 151](https://github.com/IntersectMBO/govtool/issues/151)
 - Abandoning GA creation [Issue 359](https://github.com/IntersectMBO/govtool/issues/359)
@@ -44,6 +45,7 @@ changes.
 
 ### Fixed
 
+- proposal/list search is case insensitive now [Issue 582](https://github.com/IntersectMBO/govtool/issues/582)
 - proposal/list now takes optional `search` query param [Issue 566](https://github.com/IntersectMBO/govtool/issues/566)
 - Fix possible sql error when there would be no predefined drep voting pwoer [Issue 501](https://github.com/IntersectMBO/govtool/issues/501)
 - Fix drep type detection when changing metadata [Issue 333](https://github.com/IntersectMBO/govtool/issues/333)

govtool/backend/sql/get-votes.sql

@@ -1,4 +1,4 @@
-select DISTINCT ON (voting_procedure.gov_action_proposal_id, voting_procedure.drep_voter) voting_procedure.gov_action_proposal_id, concat(encode(tx.hash,'hex'),'#',gov_action_proposal.index), encode(drep_hash.raw, 'hex'), voting_procedure.vote::text, voting_anchor.url, encode(voting_anchor.data_hash, 'hex')
+select DISTINCT ON (voting_procedure.gov_action_proposal_id, voting_procedure.drep_voter) voting_procedure.gov_action_proposal_id, concat(encode(tx.hash,'hex'),'#',gov_action_proposal.index), encode(drep_hash.raw, 'hex'), voting_procedure.vote::text, voting_anchor.url, encode(voting_anchor.data_hash, 'hex'), block.epoch_no as epoch_no, block.time as time
 from voting_procedure
 join gov_action_proposal
 on gov_action_proposal.id = voting_procedure.gov_action_proposal_id
@@ -8,5 +8,7 @@ left join voting_anchor
 on voting_anchor.id = voting_procedure.voting_anchor_id
 join tx
 on tx.id = gov_action_proposal.tx_id
+join block
+on block.id = tx.block_id
 where drep_hash.raw = decode(?, 'hex')
 order by voting_procedure.gov_action_proposal_id, voting_procedure.drep_voter, voting_procedure.id desc

govtool/backend/src/VVA/API.hs

@@ -149,7 +149,9 @@ voteToResponse Types.Vote {..} =
     voteParamsDrepId = HexText voteDrepId,
     voteParamsVote = voteVote,
     voteParamsUrl = voteUrl,
-    voteParamsMetadataHash = HexText <$> voteDocHash
+    voteParamsMetadataHash = HexText <$> voteDocHash,
+    voteParamsEpochNo = voteEpochNo,
+    voteParamsDate = voteDate
   }
 
 
@@ -242,13 +244,13 @@ listProposals selectedTypes sortMode mPage mPageSize mDrepRaw mSearchQuery = do
 
 
 
-  let filterF ProposalResponse{..} = case mSearchQuery of
+  let filterF ProposalResponse{..} = case Text.toLower <$> mSearchQuery of
         Nothing -> True
         Just searchQuery -> fromMaybe False $ do
-          title <- proposalResponseTitle
-          about <- proposalResponseAbout
-          motivation <- proposalResponseMotivation
-          rationale <- proposalResponseRationale
+          title <- Text.toLower <$> proposalResponseTitle
+          about <- Text.toLower <$> proposalResponseAbout
+          motivation <- Text.toLower <$> proposalResponseMotivation
+          rationale <- Text.toLower <$> proposalResponseRationale
 
           let result = searchQuery `isInfixOf` title
                       || searchQuery `isInfixOf` about

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

@@ -370,6 +370,8 @@ data VoteParams
       , voteParamsVote         :: Text
       , voteParamsUrl          :: Maybe Text
       , voteParamsMetadataHash :: Maybe HexText
+      , voteParamsEpochNo      :: Integer
+      , voteParamsDate         :: UTCTime
       }
   deriving (Generic, Show)
 
@@ -381,7 +383,9 @@ exampleVoteParams =
   <> "\"drepId\": \"b4e4184bfedf920fec53cdc327de4da661ae427784c0ccca9e3c2f50\","
   <> "\"vote\": \"yes\","
   <> "\"url\": \"https://vote.metadata.xyz\","
-  <> "\"metadataHash\": \"9af10e89979e51b8cdc827c963124a1ef4920d1253eef34a1d5cfe76438e3f11\" }"
+  <> "\"metadataHash\": \"9af10e89979e51b8cdc827c963124a1ef4920d1253eef34a1d5cfe76438e3f11\","
+  <> "\"epochNo\": 0,"
+  <> "\"date\": \"1970-01-01T00:00:00Z\"}"
 
 instance ToSchema VoteParams where
   declareNamedSchema proxy = do

govtool/backend/src/VVA/DRep.hs

@@ -23,6 +23,7 @@ import           Data.Scientific
 import           Data.String                (fromString)
 import           Data.Text                  (Text, pack, unpack)
 import qualified Data.Text.Encoding         as Text
+import           Data.Time
 
 import qualified Database.PostgreSQL.Simple as SQL
 
@@ -81,13 +82,14 @@ getVotes ::
 getVotes drepId selectedProposals = withPool $ \conn -> do
   results <- liftIO $ SQL.query conn getVotesSql (SQL.Only drepId)
   let proposalsToSelect = if null selectedProposals
-                          then [ govActionId | (_, govActionId, _, _, _, _) <- results]
+                          then [ govActionId | (_, govActionId, _, _, _, _, _, _) <- results]
                           else selectedProposals
   proposals <- Proposal.getProposals (Just proposalsToSelect)
   let proposalMap = M.fromList $ map (\x -> (proposalId x, x)) proposals
+  timeZone <- liftIO getCurrentTimeZone
   return
-    ([ Vote proposalId' drepId' vote' url' docHash'
-      | (proposalId', govActionId', drepId', vote', url', docHash') <- results
+    ([ Vote proposalId' drepId' vote' url' docHash' epochNo' (localTimeToUTC timeZone date')
+      | (proposalId', govActionId', drepId', vote', url', docHash', epochNo', date') <- results
       , govActionId' `elem` proposalsToSelect
     ], proposals)
 

govtool/backend/src/VVA/Types.hs

@@ -60,6 +60,8 @@ data Vote
       , voteVote       :: Text
       , voteUrl        :: Maybe Text
       , voteDocHash    :: Maybe Text
+      , voteEpochNo    :: Integer
+      , voteDate       :: UTCTime
       }
 
 data DRepInfo

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

@@ -26,7 +26,11 @@ export const DashboardCards = () => {
   const { votingPower } = useGetAdaHolderVotingPowerQuery(stakeKey);
   const { voter } = useGetVoterInfo();
 
-  if (!currentDelegation || !voter || !votingPower) {
+  if (
+    currentDelegation === undefined
+    || votingPower === undefined
+    || voter === undefined
+  ) {
     return (
       <Box
         sx={{

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

@@ -102,6 +102,7 @@ export const Slider = ({
           alignItems: "center",
           gap: "10px",
           mb: 3.5,
+          height: "46px",
         }}
       >
         <Box