Merge pull request #1030 from IntersectMBO/develop

Sync test with develop: #957, #1028, #928, #1019
IntersectMBO · May 16, 2024 · f307ebd · f307ebd
2 parents 45a50e5 + 899edbe
commit f307ebd
Show file tree

Hide file tree

Showing 50 changed files with 737 additions and 184 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -63,6 +63,7 @@ changes.
 
 ### Fixed
 
+- drep/list sql fix (now the drep type is correct) [Issue 957](https://github.com/IntersectMBO/govtool/issues/957)
 - drep/list sql fix (now the latest tx date is correct) [Issue 826](https://github.com/IntersectMBO/govtool/issues/826)
 - drep/info no longer returns null values [Issue 720](https://github.com/IntersectMBO/govtool/issues/720)
 - drep/getVotes no longer returns 500 [Issue 685](https://github.com/IntersectMBO/govtool/issues/685)
@@ -86,6 +87,7 @@ changes.
 - Fix all the existing eslint errors [Issue 514](https://github.com/IntersectMBO/govtool/issues/514)
 - Fix all the existing typescript errors [Issue 514](https://github.com/IntersectMBO/govtool/issues/514)
 - Fix endless spinner on a dashboard [Issue 539](https://github.com/IntersectMBO/govtool/issues/539)
+- Remove wrongly appended `Yourself` filter on DRep Directory [Issue 1028](https://github.com/IntersectMBO/govtool/issues/1028)
 
 ### Changed
 

diff --git a/govtool/backend/sql/list-dreps.sql b/govtool/backend/sql/list-dreps.sql
@@ -26,9 +26,10 @@ SELECT
   dr_deposit.deposit,
   DRepDistr.amount,
 (DRepActivity.epoch_no - Max(coalesce(block.epoch_no, block_first_register.epoch_no))) <= DRepActivity.drep_activity AS active,
-  second_to_newest_drep_registration.voting_anchor_id IS NOT NULL AS has_voting_anchor,
   encode(dr_voting_anchor.tx_hash, 'hex') AS tx_hash,
-  newestRegister.time AS last_register_time
+  newestRegister.time AS last_register_time,
+  COALESCE(latestDeposit.deposit, 0),
+  non_deregister_voting_anchor.url IS NOT NULL AS has_non_deregister_voting_anchor
 FROM
   drep_hash dh
   JOIN (
@@ -42,6 +43,15 @@ FROM
     WHERE
       dr.deposit IS NOT NULL) AS dr_deposit ON dr_deposit.drep_hash_id = dh.id
   AND dr_deposit.rn = 1
+    JOIN (
+    SELECT
+      dr.id,
+      dr.drep_hash_id,
+      dr.deposit,
+      ROW_NUMBER() OVER (PARTITION BY dr.drep_hash_id ORDER BY dr.tx_id DESC) AS rn
+    FROM
+      drep_registration dr) AS latestDeposit ON latestDeposit.drep_hash_id = dh.id
+  AND latestDeposit.rn = 1
   LEFT JOIN (
     SELECT
       dr.id,
@@ -53,6 +63,19 @@ FROM
       drep_registration dr
       JOIN tx ON tx.id = dr.tx_id) AS dr_voting_anchor ON dr_voting_anchor.drep_hash_id = dh.id
     AND dr_voting_anchor.rn = 1
+    LEFT JOIN (
+    SELECT
+      dr.id,
+      dr.drep_hash_id,
+      dr.voting_anchor_id,
+      ROW_NUMBER() OVER (PARTITION BY dr.drep_hash_id ORDER BY dr.tx_id DESC) AS rn,
+      tx.hash AS tx_hash
+    FROM
+      drep_registration dr
+      JOIN tx ON tx.id = dr.tx_id
+      WHERE dr.deposit is not null
+      AND dr.deposit >= 0) AS dr_non_deregister_voting_anchor ON dr_non_deregister_voting_anchor.drep_hash_id = dh.id
+    AND dr_non_deregister_voting_anchor.rn = 1
   LEFT JOIN (
     SELECT
       dr.id,
@@ -65,6 +88,7 @@ FROM
   LEFT JOIN DRepDistr ON DRepDistr.hash_id = dh.id
     AND DRepDistr.rn = 1
   LEFT JOIN voting_anchor va ON va.id = dr_voting_anchor.voting_anchor_id
+  LEFT JOIN voting_anchor non_deregister_voting_anchor on non_deregister_voting_anchor.id = dr_non_deregister_voting_anchor.voting_anchor_id
   CROSS JOIN DRepActivity
   LEFT JOIN voting_procedure AS voting_procedure ON voting_procedure.drep_voter = dh.id
   LEFT JOIN tx AS tx ON tx.id = voting_procedure.tx_id
@@ -102,4 +126,6 @@ GROUP BY
   DRepActivity.epoch_no,
   DRepActivity.drep_activity,
   dr_voting_anchor.tx_hash,
-  newestRegister.time
+  newestRegister.time,
+  latestDeposit.deposit,
+  non_deregister_voting_anchor.url
diff --git a/govtool/backend/src/VVA/DRep.hs b/govtool/backend/src/VVA/DRep.hs
@@ -62,13 +62,16 @@ listDReps = withPool $ \conn -> do
   timeZone <- liftIO getCurrentTimeZone
   return
     [ DRepRegistration drepHash drepView url dataHash (floor @Scientific deposit) votingPower status drepType txHash (localTimeToUTC timeZone date)
-    | (drepHash, drepView, url, dataHash, deposit, votingPower, isActive, wasDRep, txHash, date) <- results
+    | (drepHash, drepView, url, dataHash, deposit, votingPower, isActive, txHash, date, latestDeposit, latestNonDeregisterVotingAnchorWasNotNull) <- results
     , let status = case (isActive, deposit) of
                       (_, d)        | d < 0 -> Retired
                       (isActive, d) | d >= 0 && isActive -> Active
                                     | d >= 0 && not isActive -> Inactive
-    , let drepType | isNothing url && wasDRep = DRep
-                   | isNothing url && not wasDRep = SoleVoter
+    , let latestDeposit' = floor @Scientific latestDeposit :: Integer
+    , let drepType | latestDeposit' >= 0 && isNothing url = SoleVoter
+                   | latestDeposit' >= 0 && not (isNothing url) = DRep
+                   | latestDeposit' < 0 && not latestNonDeregisterVotingAnchorWasNotNull = SoleVoter
+                   | latestDeposit' < 0 && latestNonDeregisterVotingAnchorWasNotNull = DRep
                    | Data.Maybe.isJust url = DRep
     ]
 

diff --git a/govtool/frontend/src/components/molecules/EmptyStateDrepDirectory.tsx b/govtool/frontend/src/components/molecules/EmptyStateDrepDirectory.tsx
@@ -0,0 +1,30 @@
+import { useTranslation } from "@hooks";
+
+import { Card } from "./Card";
+import { Typography } from "../atoms";
+
+export const EmptyStateDrepDirectory = () => {
+  const { t } = useTranslation();
+
+  return (
+    <Card
+      border
+      elevation={0}
+      sx={{
+        alignItems: "center",
+        display: "flex",
+        flexDirection: "column",
+        gap: 1,
+        py: 5,
+        width: "-webkit-fill-available",
+      }}
+    >
+      <Typography fontSize={22}>
+        {t("dRepDirectory.noResultsForTheSearchTitle")}
+      </Typography>
+      <Typography fontWeight={400}>
+        {t("dRepDirectory.noResultsForTheSearchDescription")}
+      </Typography>
+    </Card>
+  );
+};
diff --git a/govtool/frontend/src/components/molecules/GovernanceActionDetailsCardLinks.tsx b/govtool/frontend/src/components/molecules/GovernanceActionDetailsCardLinks.tsx
@@ -9,7 +9,7 @@ import { LinkWithIcon } from "@molecules";
 export const GovernanceActionDetailsCardLinks = ({
   links,
 }: {
-  links?: string[];
+  links?: GovernanceActionLink[];
 }) => {
   const { isMobile } = useScreenDimension();
   const { t } = useTranslation();
@@ -43,13 +43,13 @@ export const GovernanceActionDetailsCardLinks = ({
         >
           {links.map((link) => (
             <LinkWithIcon
-              key={link}
-              label={link}
+              key={link.uri}
+              label={link.uri}
               onClick={() => {
                 openModal({
                   type: "externalLink",
                   state: {
-                    externalLink: link,
+                    externalLink: link.uri,
                   },
                 });
               }}

diff --git a/govtool/frontend/src/components/molecules/index.ts b/govtool/frontend/src/components/molecules/index.ts
@@ -12,6 +12,7 @@ export * from "./DataActionsSorting";
 export * from "./DataMissingInfoBox";
 export * from "./DelegationAction";
 export * from "./DRepInfoCard";
+export * from "./EmptyStateDrepDirectory";
 export * from "./EmptyStateGovernanceActionsCategory";
 export * from "./Field";
 export * from "./GovActionDetails";

diff --git a/govtool/frontend/src/components/organisms/GovernanceActionDetailsCard.tsx b/govtool/frontend/src/components/organisms/GovernanceActionDetailsCard.tsx
@@ -24,7 +24,7 @@ type GovernanceActionDetailsCardProps = {
   motivation?: string;
   rationale?: string;
   yesVotes: number;
-  links?: string[];
+  links?: GovernanceActionLink[];
   govActionId: string;
   isDataMissing: boolean | MetadataValidationStatus;
   isDashboard?: boolean;

diff --git a/govtool/frontend/src/components/organisms/GovernanceActionDetailsCardData.tsx b/govtool/frontend/src/components/organisms/GovernanceActionDetailsCardData.tsx
@@ -26,7 +26,7 @@ type GovernanceActionDetailsCardDataProps = {
   isInProgress?: boolean;
   isOneColumn: boolean;
   isSubmitted?: boolean;
-  links?: string[];
+  links?: GovernanceActionLink[];
   motivation?: string;
   rationale?: string;
   title?: string;

diff --git a/govtool/frontend/src/consts/dRepDirectory/filters.test.ts b/govtool/frontend/src/consts/dRepDirectory/filters.test.ts
@@ -0,0 +1,27 @@
+import { DREP_DIRECTORY_FILTERS } from "./filters";
+
+describe("DREP_DIRECTORY_FILTERS", () => {
+  it("should exclude 'Yourself' from filters", () => {
+    // Arrange
+    const expectedFilters = [
+      {
+        key: "Active",
+        label: "Active",
+      },
+      {
+        key: "Inactive",
+        label: "Inactive",
+      },
+      {
+        key: "Retired",
+        label: "Retired",
+      },
+    ];
+
+    // Act
+    const actualFilters = DREP_DIRECTORY_FILTERS;
+
+    // Assert
+    expect(actualFilters).toEqual(expectedFilters);
+  });
+});
diff --git a/govtool/frontend/src/consts/dRepDirectory/filters.ts b/govtool/frontend/src/consts/dRepDirectory/filters.ts
@@ -1,6 +1,9 @@
 import { DRepStatus } from "@/models";
 
-export const DREP_DIRECTORY_FILTERS = Object.values(DRepStatus).map((status) => ({
-  key: status,
-  label: status,
-}));
+export const DREP_DIRECTORY_FILTERS = Object.values(DRepStatus)
+  // `Yourself` should be excluded from filters
+  .filter((status) => status !== DRepStatus.Yourself)
+  .map((status) => ({
+    key: status,
+    label: status,
+  }));
diff --git a/govtool/frontend/src/pages/DRepDetails.tsx b/govtool/frontend/src/pages/DRepDetails.tsx
@@ -1,10 +1,5 @@
 import { PropsWithChildren } from "react";
-import {
-  Navigate,
-  useLocation,
-  useNavigate,
-  useParams,
-} from "react-router-dom";
+import { useLocation, useNavigate, useParams } from "react-router-dom";
 import { Box, ButtonBase, Chip, CircularProgress } from "@mui/material";
 
 import { Button, StatusPill, Typography } from "@atoms";
@@ -17,7 +12,7 @@ import {
   useScreenDimension,
   useTranslation,
 } from "@hooks";
-import { Card, LinkWithIcon, Share } from "@molecules";
+import { Card, EmptyStateDrepDirectory, LinkWithIcon, Share } from "@molecules";
 import {
   correctAdaFormat,
   isSameDRep,
@@ -55,7 +50,7 @@ export const DRepDetails = ({ isConnected }: DRepDetailsProps) => {
   });
   const dRep = dRepData?.[0];
 
-  if (dRep === undefined || isDRepListLoading)
+  if (isDRepListLoading)
     return (
       <Box
         sx={{
@@ -70,7 +65,19 @@ export const DRepDetails = ({ isConnected }: DRepDetailsProps) => {
       </Box>
     );
 
-  if (!dRep) return <Navigate to={PATHS.error} />;
+  if (!dRep)
+    return (
+      <Box
+        sx={{
+          alignItems: "center",
+          display: "flex",
+          flex: 1,
+          justifyContent: "center",
+        }}
+      >
+        <EmptyStateDrepDirectory />
+      </Box>
+    );
 
   const { view, status, votingPower, type } = dRep;
 

diff --git a/govtool/frontend/src/pages/DRepDirectoryContent.tsx b/govtool/frontend/src/pages/DRepDirectoryContent.tsx
@@ -11,7 +11,7 @@ import {
   useGetAdaHolderVotingPowerQuery,
   useGetDRepListInfiniteQuery,
 } from "@hooks";
-import { Card, DataActionsBar } from "@molecules";
+import { DataActionsBar, EmptyStateDrepDirectory } from "@molecules";
 import { AutomatedVotingOptions, DRepCard } from "@organisms";
 import { correctAdaFormat, formHexToBech32, isSameDRep } from "@utils";
 import { DRepListSort, DRepStatus } from "@models";
@@ -65,7 +65,12 @@ export const DRepDirectoryContent: FC<DRepDirectoryContentProps> = ({
   const { dRepData: yourselfDRepList } = useGetDRepListInfiniteQuery({
     searchPhrase: myDRepId,
   });
-  const yourselfDRep = yourselfDRepList?.[0];
+
+  const yourselfDRep =
+    !!isConnected &&
+    (debouncedSearchText === myDRepId || debouncedSearchText === "")
+      ? yourselfDRepList?.[0]
+      : undefined;
 
   const {
     dRepData: dRepList,
@@ -194,26 +199,7 @@ export const DRepDirectoryContent: FC<DRepDirectoryContentProps> = ({
             flex: 1,
           }}
         >
-          {dRepList?.length === 0 && (
-            <Card
-              border
-              elevation={0}
-              sx={{
-                alignItems: "center",
-                display: "flex",
-                flexDirection: "column",
-                gap: 1,
-                py: 5,
-              }}
-            >
-              <Typography fontSize={22}>
-                {t("dRepDirectory.noResultsForTheSearchTitle")}
-              </Typography>
-              <Typography fontWeight={400}>
-                {t("dRepDirectory.noResultsForTheSearchDescription")}
-              </Typography>
-            </Card>
-          )}
+          {dRepList?.length === 0 && <EmptyStateDrepDirectory />}
           {dRepListToDisplay?.map((dRep) => {
             if (
               isSameDRep(dRep, myDrep?.view) ||

diff --git a/govtool/frontend/src/types/global.d.ts b/govtool/frontend/src/types/global.d.ts
@@ -75,4 +75,10 @@ declare global {
 
   type ArrayElement<ArrayType extends readonly unknown[]> =
     ArrayType extends readonly (infer ElementType)[] ? ElementType : never;
+
+  type GovernanceActionLink = {
+    "@type": string;
+    label: string;
+    uri: string;
+  };
 }
diff --git a/tests/govtool-frontend/playwright/lib/datafactory/createAuth.ts b/tests/govtool-frontend/playwright/lib/datafactory/createAuth.ts
@@ -22,7 +22,7 @@ export async function createTempDRepAuth(page: Page, wallet: ShelleyWallet) {
 
 export async function createTempAdaHolderAuth(
   page: Page,
-  wallet: ShelleyWallet
+  wallet: ShelleyWallet,
 ) {
   await importWallet(page, wallet.json());
 

diff --git a/tests/govtool-frontend/playwright/lib/fixtures/createWallet.ts b/tests/govtool-frontend/playwright/lib/fixtures/createWallet.ts
@@ -7,7 +7,7 @@ import { Page } from "@playwright/test";
 
 export default async function createWallet(
   page: Page,
-  config?: CardanoTestWalletConfig
+  config?: CardanoTestWalletConfig,
 ) {
   const wallet = (await ShelleyWallet.generate()).json();
 

diff --git a/tests/govtool-frontend/playwright/lib/fixtures/importWallet.ts b/tests/govtool-frontend/playwright/lib/fixtures/importWallet.ts
@@ -4,7 +4,7 @@ import { StaticWallet } from "@types";
 
 export async function importWallet(
   page: Page,
-  wallet: StaticWallet | CardanoTestWallet
+  wallet: StaticWallet | CardanoTestWallet,
 ) {
   await page.addInitScript((wallet) => {
     // @ts-ignore

diff --git a/tests/govtool-frontend/playwright/lib/fixtures/loadExtension.ts b/tests/govtool-frontend/playwright/lib/fixtures/loadExtension.ts
@@ -6,11 +6,11 @@ import path = require("path");
 
 export default async function loadDemosExtension(
   page: Page,
-  enableStakeSigning = false
+  enableStakeSigning = false,
 ) {
   const demosBundleScriptPath = path.resolve(
     __dirname,
-    "../../node_modules/@cardanoapi/cardano-test-wallet/script.js"
+    "../../node_modules/@cardanoapi/cardano-test-wallet/script.js",
   );
   let walletConfig: CardanoTestWalletConfig = {
     enableStakeSigning,

diff --git a/tests/govtool-frontend/playwright/lib/helpers/cardano.ts b/tests/govtool-frontend/playwright/lib/helpers/cardano.ts
@@ -0,0 +1,5 @@
+export function lovelaceToAda(lovelace: number) {
+  if (lovelace === 0) return 0;
+
+  return lovelace / 1e6;
+}