Merge pull request #2646 from IntersectMBO/test

GovTool - v2.0.6

Author: MSzalowski

CHANGELOG.md

@@ -26,6 +26,27 @@ changes.
 
 -
 
+## [v2.0.6](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.6) 2025-01-16
+
+### Added
+
+- Add support for base64 encoded images [Issue 2633](https://github.com/IntersectMBO/govtool/issues/2633)
+- Add searching for metadata [Issue 2634](https://github.com/IntersectMBO/govtool/issues/2634)
+- Allow delegation to inactive DRep [Issue 2589](https://github.com/IntersectMBO/govtool/issues/2589)
+
+### Fixed
+
+- Fix searching by full DRep IDs on wrong prefix cut [Issue 2639](https://github.com/IntersectMBO/govtool/issues/2639)
+- Trim whitespace from search bar input [Issue 2472](https://github.com/IntersectMBO/govtool/issues/2472)
+
+### Changed
+
+-
+
+### Removed
+
+-
+
 ## [v2.0.5](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.5) 2025-01-10
 
 ### Added

govtool/backend/Dockerfile

@@ -4,4 +4,4 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
 WORKDIR /src
 COPY . .
 RUN cabal build
-RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.5/x/vva-be/build/vva-be/vva-be /usr/local/bin
+RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.6/x/vva-be/build/vva-be/vva-be /usr/local/bin

govtool/backend/Dockerfile.qovery

@@ -4,7 +4,7 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
 WORKDIR /src
 COPY . .
 RUN cabal build
-RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.5/x/vva-be/build/vva-be/vva-be /usr/local/bin
+RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.6/x/vva-be/build/vva-be/vva-be /usr/local/bin
 
 # Expose the necessary port
 EXPOSE 9876

govtool/backend/sql/list-dreps.sql

@@ -167,7 +167,11 @@ WHERE
     COALESCE(?, '') = '' OR
     (CASE WHEN LENGTH(?) % 2 = 0 AND ? ~ '^[0-9a-fA-F]+$' THEN dh.raw = decode(?, 'hex') ELSE false END) OR
     dh.view ILIKE ? OR
-    off_chain_vote_drep_data.given_name ILIKE ?
+    off_chain_vote_drep_data.given_name ILIKE ? OR
+    off_chain_vote_drep_data.payment_address ILIKE ? OR
+    off_chain_vote_drep_data.objectives ILIKE ? OR
+    off_chain_vote_drep_data.motivations ILIKE ? OR
+    off_chain_vote_drep_data.qualifications ILIKE ?
   )
 GROUP BY
   block_first_register.epoch_no,

govtool/backend/src/VVA/API.hs

@@ -144,17 +144,17 @@ drepList mSearchQuery statuses mSortMode mPage mPageSize = do
 
   let filterDRepsByQuery = case mSearchQuery of
         Nothing -> filter $ \Types.DRepRegistration {..} ->
-          dRepRegistrationType == Types.DRep
+          dRepRegistrationType /= Types.SoleVoter
         Just query -> filter $ \Types.DRepRegistration {..} ->
           let searchLower = Text.toLower query
               viewLower = Text.toLower dRepRegistrationView
               hashLower = Text.toLower dRepRegistrationDRepHash
-              nameLower = maybe "" Text.toLower dRepRegistrationGivenName
-          in  case dRepRegistrationType of
-                Types.SoleVoter -> searchLower == viewLower || searchLower == hashLower
-                Types.DRep      -> searchLower `isInfixOf` viewLower
-                                  || searchLower `isInfixOf` hashLower
-                                  || searchLower `isInfixOf` nameLower
+          in case dRepRegistrationType of
+              Types.SoleVoter -> 
+                searchLower == viewLower || searchLower == hashLower
+              Types.DRep -> 
+                True
+
 
   let filterDRepsByStatus = case statuses of
         [] -> id
@@ -187,7 +187,6 @@ drepList mSearchQuery statuses mSortMode mPage mPageSize = do
       total = length allValidDReps :: Int
 
   let elements = take pageSize $ drop (page * pageSize) allValidDReps
-
   return $ ListDRepsResponse
     { listDRepsResponsePage = fromIntegral page
     , listDRepsResponsePageSize = fromIntegral pageSize

govtool/backend/src/VVA/DRep.hs

@@ -44,13 +44,18 @@ listDReps ::
 listDReps mSearchQuery = withPool $ \conn -> do
   let searchParam = fromMaybe "" mSearchQuery
   results <- liftIO $ SQL.query conn listDRepsSql
-    ( searchParam 
-    , searchParam
-    , searchParam
-    , searchParam
-    , "%" <> searchParam <> "%"
-    , "%" <> searchParam <> "%"
+    ( searchParam -- COALESCE(?, '')
+    , searchParam -- LENGTH(?)
+    , searchParam -- AND ?
+    , searchParam -- decode(?, 'hex')
+    , "%" <> searchParam <> "%" -- dh.view
+    , "%" <> searchParam <> "%" -- given_name
+    , "%" <> searchParam <> "%" -- payment_address
+    , "%" <> searchParam <> "%" -- objectives
+    , "%" <> searchParam <> "%" -- motivations
+    , "%" <> searchParam <> "%" -- qualifications
     )
+
   timeZone <- liftIO getCurrentTimeZone
   return
     [ DRepRegistration drepHash drepView isScriptBased url dataHash (floor @Scientific deposit) votingPower status drepType txHash (localTimeToUTC timeZone date) metadataError paymentAddress givenName objectives motivations qualifications imageUrl imageHash

govtool/backend/src/VVA/Types.hs

@@ -95,9 +95,9 @@ data DRepInfo
       , dRepInfoImageHash                :: Maybe Text
       }
 
-data DRepStatus = Active | Inactive | Retired deriving (Eq, Ord)
+data DRepStatus = Active | Inactive | Retired deriving (Show, Eq, Ord)
 
-data DRepType = DRep | SoleVoter deriving (Eq)
+data DRepType = DRep | SoleVoter deriving (Show, Eq)
 
 data DRepRegistration
   = DRepRegistration
@@ -121,6 +121,7 @@ data DRepRegistration
       , dRepRegistrationImageUrl               :: Maybe Text
       , dRepRegistrationImageHash              :: Maybe Text
       }
+  deriving (Show)
 
 data Proposal 
   = Proposal

govtool/backend/vva-be.cabal

@@ -1,6 +1,6 @@
 cabal-version:      3.6
 name:               vva-be
-version:            2.0.5
+version:            2.0.6
 
 -- A short (one-line) description of the package.
 -- synopsis:

govtool/frontend/package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@govtool/frontend",
   "private": true,
-  "version": "2.0.5",
+  "version": "2.0.6",
   "type": "module",
   "scripts": {
     "build": "vite build",