v2.0.35

govtool/backend/app/Main.hs

@@ -115,6 +115,7 @@ startApp vvaConfig sentryService = do
           $ setOnException (exceptionHandler vvaConfig sentryService) defaultSettings
   cacheEnv <- do
     let newCache = Cache.newCache (Just $ TimeSpec (fromIntegral (cacheDurationSeconds vvaConfig)) 0)
+    let newDRepListCache = Cache.newCache (Just $ TimeSpec (fromIntegral (dRepListCacheDurationSeconds vvaConfig)) 0)
     proposalListCache <- newCache
     getProposalCache <- newCache
     currentEpochCache <- newCache
@@ -123,7 +124,7 @@ startApp vvaConfig sentryService = do
     dRepGetVotesCache <- newCache
     dRepInfoCache <- newCache
     dRepVotingPowerCache <- newCache
-    dRepListCache <- newCache
+    dRepListCache <- newDRepListCache
     networkMetricsCache <- newCache
     networkInfoCache <- newCache
     networkTotalStakeCache <- newCache

govtool/backend/example-config.json

@@ -10,6 +10,7 @@
   "port" : 9999,
   "host" : "localhost",
   "cachedurationseconds": 20,
+  "dreplistcachedurationseconds": 600,
   "sentrydsn": "https://username:password@senty.host/id",
   "sentryenv": "dev"
 }

govtool/backend/sql/list-dreps.sql

@@ -32,6 +32,16 @@ LatestVoteEpoch AS (
     JOIN tx ON tx.id = lvp.tx_id
     JOIN block ON block.id = tx.block_id
 ),
+VotesLastYear AS (
+  SELECT
+    vp.drep_voter AS drep_id,
+    COUNT(DISTINCT vp.gov_action_proposal_id) AS votes_last_year
+  FROM voting_procedure vp
+    JOIN tx    ON tx.id = vp.tx_id
+    JOIN block ON block.id = tx.block_id
+  WHERE block.time >= now() - INTERVAL '1 year'
+  GROUP BY vp.drep_voter
+),
 RankedDRepRegistration AS (
   SELECT DISTINCT ON (dr.drep_hash_id)
       dr.id,
@@ -127,6 +137,7 @@ DRepData AS (
     off_chain_vote_drep_data.qualifications,
     off_chain_vote_drep_data.image_url,
     off_chain_vote_drep_data.image_hash,
+    COALESCE(vly.votes_last_year, 0) AS votes_last_year,
     COALESCE(
       (
         SELECT jsonb_agg(
@@ -239,6 +250,7 @@ DRepData AS (
     LEFT JOIN tx AS tx_first_register ON tx_first_register.id = dr_first_register.tx_id
     LEFT JOIN block AS block_first_register ON block_first_register.id = tx_first_register.block_id
     LEFT JOIN LatestVoteEpoch lve ON lve.drep_id = dh.id
+    LEFT JOIN VotesLastYear vly ON vly.drep_id = dh.id
     CROSS JOIN DRepActivity
   GROUP BY
     dh.raw,
@@ -265,6 +277,7 @@ DRepData AS (
     off_chain_vote_drep_data.qualifications,
     off_chain_vote_drep_data.image_url,
     off_chain_vote_drep_data.image_hash,
+    vly.votes_last_year,
     (
       SELECT jsonb_agg(
         jsonb_build_object(
@@ -317,10 +330,6 @@ WHERE
   (
     COALESCE(?, '') = '' OR
     (CASE WHEN LENGTH(?) % 2 = 0 AND ? ~ '^[0-9a-fA-F]+$' THEN drep_hash = ? ELSE false END) OR
-    view ILIKE ? OR
-    given_name ILIKE ? OR
-    payment_address ILIKE ? OR
-    objectives ILIKE ? OR
-    motivations ILIKE ? OR
-    qualifications ILIKE ?
+    (CASE WHEN lower(?) ~ '^drep1[qpzry9x8gf2tvdw0s3jn54khce6mua7l]+$' THEN view = lower(?) ELSE FALSE END) OR
+    given_name ILIKE ?
   )

govtool/backend/src/VVA/API.hs

@@ -160,6 +160,7 @@ drepRegistrationToDrep Types.DRepRegistration {..} =
       dRepQualifications = dRepRegistrationQualifications,
       dRepImageUrl = dRepRegistrationImageUrl,
       dRepImageHash = HexText <$> dRepRegistrationImageHash,
+      dRepVotesLastYear = dRepRegistrationVotesLastYear,
       dRepIdentityReferences = DRepReferences <$> dRepRegistrationIdentityReferences,
       dRepLinkReferences = DRepReferences <$> dRepRegistrationLinkReferences
     }
@@ -205,6 +206,8 @@ drepList mSearchQuery statuses mSortMode mPage mPageSize = do
         Just Random -> fmap snd . sortOn fst . Prelude.zip randomizedOrderList
         Just VotingPower -> sortOn $ \Types.DRepRegistration {..} ->
           Down dRepRegistrationVotingPower
+        Just Activity -> sortOn $ \Types.DRepRegistration {..} ->
+          Down dRepRegistrationVotesLastYear
         Just RegistrationDate -> sortOn $ \Types.DRepRegistration {..} ->
           Down dRepRegistrationLatestRegistrationDate
         Just Status -> sortOn $ \Types.DRepRegistration {..} ->

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

@@ -205,7 +205,7 @@ instance ToParamSchema GovernanceActionType where
       & enum_ ?~ map toJSON (enumFromTo minBound maxBound :: [GovernanceActionType])
 
 
-data DRepSortMode = Random | VotingPower | RegistrationDate | Status deriving
+data DRepSortMode = Random | VotingPower | Activity | RegistrationDate | Status deriving
     ( Bounded
     , Enum
     , Eq
@@ -917,6 +917,7 @@ data DRep
       , dRepQualifications         :: Maybe Text
       , dRepImageUrl               :: Maybe Text
       , dRepImageHash              :: Maybe HexText
+      , dRepVotesLastYear          :: Maybe Integer
       , dRepIdentityReferences     :: Maybe DRepReferences
       , dRepLinkReferences         :: Maybe DRepReferences
       }
@@ -944,6 +945,7 @@ exampleDrep =
   <> "\"qualifications\": \"Some Qualifications\","
   <> "\"qualifications\": \"Some Qualifications\","
   <> "\"imageUrl\": \"https://image.url\","
+  <> "\"votesLastYear\": 15,"
   <> "\"imageHash\": \"9198b1b204273ba5c67a13310b5a806034160f6a063768297e161d9b759cad61\"}"
 
 -- ToSchema instance for DRep

govtool/backend/src/VVA/Config.hs

@@ -68,19 +68,21 @@ instance DefaultConfig DBConfig where
 data VVAConfigInternal
   = VVAConfigInternal
       { -- | db-sync database access.
-        vVAConfigInternalDbsyncconfig         :: DBConfig
+        vVAConfigInternalDbsyncconfig                 :: DBConfig
         -- | Server port.
-      , vVAConfigInternalPort                 :: Int
+      , vVAConfigInternalPort                         :: Int
         -- | Server host.
-      , vVAConfigInternalHost                 :: Text
+      , vVAConfigInternalHost                         :: Text
         -- | Request cache duration
-      , vVaConfigInternalCacheDurationSeconds :: Int
+      , vVaConfigInternalCacheDurationSeconds         :: Int
+        -- | DRep List request cache duration
+      , vVaConfigInternalDRepListCacheDurationSeconds :: Int
         -- | Sentry DSN
-      , vVAConfigInternalSentrydsn            :: String
+      , vVAConfigInternalSentrydsn                    :: String
         -- | Sentry environment
-      , vVAConfigInternalSentryEnv            :: String
+      , vVAConfigInternalSentryEnv                    :: String
         -- | Pinata API JWT
-      , vVAConfigInternalPinataApiJwt         :: Maybe Text
+      , vVAConfigInternalPinataApiJwt                 :: Maybe Text
       }
   deriving (FromConfig, Generic, Show)
 
@@ -92,6 +94,7 @@ instance DefaultConfig VVAConfigInternal where
         vVAConfigInternalPort = 3000,
         vVAConfigInternalHost = "localhost",
         vVaConfigInternalCacheDurationSeconds = 20,
+        vVaConfigInternalDRepListCacheDurationSeconds = 600,
         vVAConfigInternalSentrydsn = "https://username:password@senty.host/id",
         vVAConfigInternalSentryEnv = "development",
         vVAConfigInternalPinataApiJwt = Nothing
@@ -101,19 +104,21 @@ instance DefaultConfig VVAConfigInternal where
 data VVAConfig
   = VVAConfig
       { -- | db-sync database credentials.
-        dbSyncConnectionString :: Text
+        dbSyncConnectionString       :: Text
         -- | Server port.
-      , serverPort             :: Int
+      , serverPort                   :: Int
         -- | Server host.
-      , serverHost             :: Text
+      , serverHost                   :: Text
         -- | Request cache duration
-      , cacheDurationSeconds   :: Int
+      , cacheDurationSeconds         :: Int
+        -- | DRep List request cache duration
+      , dRepListCacheDurationSeconds :: Int
         -- | Sentry DSN
-      , sentryDSN              :: String
+      , sentryDSN                    :: String
         -- | Sentry environment
-      , sentryEnv              :: String
+      , sentryEnv                    :: String
         -- | Pinata API JWT
-      , pinataApiJwt           :: Maybe Text
+      , pinataApiJwt                 :: Maybe Text
       }
   deriving (Generic, Show, ToJSON)
 
@@ -153,6 +158,7 @@ convertConfig VVAConfigInternal {..} =
       serverPort = vVAConfigInternalPort,
       serverHost = vVAConfigInternalHost,
       cacheDurationSeconds = vVaConfigInternalCacheDurationSeconds,
+      dRepListCacheDurationSeconds = vVaConfigInternalDRepListCacheDurationSeconds,
       sentryDSN = vVAConfigInternalSentrydsn,
       sentryEnv = vVAConfigInternalSentryEnv,
       pinataApiJwt = vVAConfigInternalPinataApiJwt

govtool/backend/src/VVA/DRep.hs

@@ -59,6 +59,7 @@ data DRepQueryResult
       , queryQualifications                            :: Maybe Text
       , queryImageUrl                                  :: Maybe Text
       , queryImageHash                                 :: Maybe Text
+      , queryVotesLastYear                             :: Maybe Integer
       , queryIdentityReferences                        :: Maybe Value
       , queryLinkReferences                            :: Maybe Value
       }
@@ -69,7 +70,7 @@ instance FromRow DRepQueryResult where
     <$> field <*> field <*> field <*> field <*> field <*> field
     <*> field <*> field <*> field <*> field <*> field <*> field
     <*> field <*> field <*> field <*> field <*> field <*> field
-    <*> field <*> field <*> field <*> field
+    <*> field <*> field <*> field <*> field <*> field
 
 sqlFrom :: ByteString -> SQL.Query
 sqlFrom bs = fromString $ unpack $ Text.decodeUtf8 bs
@@ -86,12 +87,9 @@ listDReps mSearchQuery = withPool $ \conn -> do
     , searchParam -- LENGTH(?)
     , searchParam -- AND ?
     , searchParam -- decode(?, 'hex')
-    , "%" <> searchParam <> "%" -- dh.view
+    , searchParam -- lower(?)
+    , searchParam -- lower(?)
     , "%" <> searchParam <> "%" -- given_name
-    , "%" <> searchParam <> "%" -- payment_address
-    , "%" <> searchParam <> "%" -- objectives
-    , "%" <> searchParam <> "%" -- motivations
-    , "%" <> searchParam <> "%" -- qualifications
     ) :: IO [DRepQueryResult])
 
   timeZone <- liftIO getCurrentTimeZone
@@ -116,6 +114,7 @@ listDReps mSearchQuery = withPool $ \conn -> do
       (queryQualifications result)
       (queryImageUrl result)
       (queryImageHash result)
+      (queryVotesLastYear result)
       (queryIdentityReferences result)
       (queryLinkReferences result)
     | result <- results

govtool/backend/src/VVA/Types.hs

@@ -160,6 +160,7 @@ data DRepRegistration
       , dRepRegistrationQualifications         :: Maybe Text
       , dRepRegistrationImageUrl               :: Maybe Text
       , dRepRegistrationImageHash              :: Maybe Text
+      , dRepRegistrationVotesLastYear          :: Maybe Integer
       , dRepRegistrationIdentityReferences     :: Maybe Value
       , dRepRegistrationLinkReferences         :: Maybe Value
       }
@@ -187,6 +188,7 @@ instance FromRow DRepRegistration where
       <*> field -- dRepRegistrationQualifications
       <*> field -- dRepRegistrationImageUrl
       <*> field -- dRepRegistrationImageHash
+      <*> field -- dRepRegistrationVotesLastYear
       <*> field -- dRepRegistrationIdentityReferences
       <*> field -- dRepRegistrationLinkReferences
 

govtool/frontend/package.json

@@ -27,7 +27,7 @@
     "@emotion/styled": "^11.11.0",
     "@emurgo/cardano-serialization-lib-asmjs": "^14.1.1",
     "@hookform/resolvers": "^3.3.1",
-    "@intersect.mbo/govtool-outcomes-pillar-ui": "v1.5.6",
+    "@intersect.mbo/govtool-outcomes-pillar-ui": "v1.5.7",
     "@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8",
     "@intersect.mbo/pdf-ui": "1.0.13-beta",
     "@mui/icons-material": "^5.14.3",

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

@@ -107,7 +107,7 @@ export const DRepDataForm = ({ control, errors, register, watch }: Props) => {
             subtitle={t("forms.dRepData.imageHelpfulText")}
           />
           <UncontrolledImageInput
-            data-testid="image-input"
+            dataTestId="image-input"
             control={control}
             name="image"
             rules={Rules.IMAGE_URL}

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

@@ -1,6 +1,7 @@
 import { Dispatch, FC, SetStateAction } from "react";
-import { Box, InputBase } from "@mui/material";
+import { Box, InputBase, IconButton } from "@mui/material";
 import Search from "@mui/icons-material/Search";
+import CloseIcon from "@mui/icons-material/Close";
 
 import { DataActionsFilters, DataActionsSorting } from "@molecules";
 import { OrderActionsChip } from "./OrderActionsChip";
@@ -20,6 +21,7 @@ type DataActionsBarProps = {
   filtersTitle?: string;
   isFiltering?: boolean;
   searchText: string;
+  placeholder?: string;
   setChosenFilters?: Dispatch<SetStateAction<string[]>>;
   setChosenSorting: Dispatch<SetStateAction<string>>;
   setFiltersOpen?: Dispatch<SetStateAction<boolean>>;
@@ -51,6 +53,7 @@ export const DataActionsBar: FC<DataActionsBarProps> = ({ ...props }) => {
     setSortOpen,
     sortOpen,
     sortOptions = [],
+    placeholder = "Search...",
   } = props;
   const {
     palette: { boxShadow2 },
@@ -61,7 +64,7 @@ export const DataActionsBar: FC<DataActionsBarProps> = ({ ...props }) => {
       <InputBase
         inputProps={{ "data-testid": "search-input" }}
         onChange={(e) => setSearchText(e.target.value)}
-        placeholder="Search..."
+        placeholder={placeholder}
         value={searchText}
         startAdornment={
           <Search
@@ -73,6 +76,17 @@ export const DataActionsBar: FC<DataActionsBarProps> = ({ ...props }) => {
             }}
           />
         }
+        endAdornment={
+          searchText && (
+            <IconButton
+              size="small"
+              onClick={() => setSearchText("")}
+              sx={{ ml: 1 }}
+            >
+              <CloseIcon fontSize="small" />
+            </IconButton>
+          )
+        }
         sx={{
           bgcolor: "white",
           border: 1,