Add DRep voting power handling, metadata validator, Sentry config; Fix CSP, navigation, modal, vote issues; Update proposal-id, DRep navigation, yarn; Improve tests.

.github/workflows/test_storybook.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Install Playwright
         run: npx playwright install --with-deps
       - name: Build Storybook
-        run: NODE_OPTIONS="--max-old-space-size=8046" npm run build-storybook --quiet
+        run: NODE_OPTIONS="--max-old-space-size=8046" npm run build:storybook --quiet
       - name: Serve Storybook and run tests
         run: |
           npx concurrently -k -s first -n "SB,TEST" -c "magenta,blue" \

CHANGELOG.md

@@ -68,6 +68,7 @@ changes.
 
 ### Fixed
 
+- drep/get-voting-power no longer throws 500 for non-existing dreps. Instead it returns 0 [Issue 1093](https://github.com/IntersectMBO/govtool/issues/1093)
 - proposal/list no longer throws 500 error when proposal's url is incorrect [Issue 1073](https://github.com/IntersectMBO/govtool/issues/1073)
 - 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)
@@ -99,6 +100,7 @@ changes.
 - Fix validation of the GAs with missing references [Issue 1282](https://github.com/IntersectMBO/govtool/issues/1282)
 - Fix displaying the GA Markdowns [Issue 1244](https://github.com/IntersectMBO/govtool/issues/1244)
 - Fix app crash on voting on the GA without the connected wallet before [Issue 1313](https://github.com/IntersectMBO/govtool/issues/1313)
+- Fix the navigation to Home from Proposal pillar on disconnected wallet [Issue 1355](https://github.com/IntersectMBO/govtool/issues/1355)
 
 ### Changed
 
@@ -131,6 +133,7 @@ changes.
 - Changed documents to prepare for open source [Issue 737](https://github.com/IntersectMBO/govtool/issues/737)
 - Changed copy on maintenance page [Issue 753](https://github.com/IntersectMBO/govtool/issues/753)
 - Update link to docs [Issue 1246](https://github.com/IntersectMBO/govtool/issues/1246)
+- Change label of Proposal Discussion nav item [Issue 1349](https://github.com/IntersectMBO/govtool/issues/1349)
 
 ### Removed
 

docs/GOVERNANCE_ACTION_SUBMISSION.md

@@ -144,3 +144,46 @@ await buildSignSubmitConwayCertTx({
 ### Step 6: Verify the Governance Action
 
 `buildSignSubmitConwayCertTx` logs the transaction CBOR making it able to be tracked on the transactions tools such as cexplorer.
+
+## Additional steps for using the GovTool metadata validation on the imported Pillar component
+
+```tsx
+enum MetadataValidationStatus {
+  URL_NOT_FOUND = "URL_NOT_FOUND",
+  INVALID_JSONLD = "INVALID_JSONLD",
+  INVALID_HASH = "INVALID_HASH",
+  INCORRECT_FORMAT = "INCORRECT_FORMAT",
+}
+// Using the props passed to the component
+type Props = {
+  validateMetadata: ({
+    url,
+    hash,
+    standard,
+  }: {
+    url: string;
+    hash: string;
+    standard: "CIP108";
+  }) => Promise<{
+    metadata?: any;
+    status?: MetadataValidationStatus;
+    valid: boolean;
+  }>;
+};
+
+import React, { Suspense } from "react";
+
+const SomeImportedPillar: React.FC<Props> = React.lazy(
+  () => import("path/to/SomeImportedPillar")
+);
+
+const SomeWrapperComponent = () => {
+  const { validateMetadata } = useValidateMutation();
+
+  return (
+    <Suspense fallback={<div>I am lazy loading...</div>}>
+      <SomeImportedPillar validateMetadata={validateMetadata} />
+    </Suspense>
+  );
+};
+```

govtool/backend/src/VVA/DRep.hs

@@ -46,10 +46,12 @@ getVotingPower ::
   Text ->
   m Integer
 getVotingPower drepId = withPool $ \conn -> do
-  [SQL.Only votingPower] <-
+  result <-
     liftIO
       (SQL.query @_ @(SQL.Only Scientific) conn getVotingPowerSql $ SQL.Only drepId)
-  return $ floor votingPower
+  case result of
+    [SQL.Only votingPower] -> return $ floor votingPower
+    [] -> return 0
 
 listDRepsSql :: SQL.Query
 listDRepsSql = sqlFrom $(embedFile "sql/list-dreps.sql")

govtool/frontend/package.json

@@ -1,11 +1,11 @@
 {
-  "name": "voltaire-voting-app",
+  "name": "govtool",
   "private": true,
-  "version": "0.0.0",
+  "version": "1.0.6",
   "type": "module",
   "scripts": {
     "build": "vite build",
-    "build-storybook": "storybook build",
+    "build:storybook": "storybook build",
     "chromatic": "chromatic",
     "dev": "vite",
     "format": "prettier --write src",
@@ -34,9 +34,6 @@
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/pluginutils": "^5.1.0",
     "@sentry/react": "^7.77.0",
-    "@types/jsonld": "^1.5.13",
-    "@types/react": "^18.2.12",
-    "@types/react-gtm-module": "^2.0.2",
     "@usersnap/browser": "^0.0.5",
     "axios": "^1.4.0",
     "bech32": "^2.0.0",
@@ -78,7 +75,9 @@
     "@testing-library/user-event": "^14.5.2",
     "@types/jsonld": "^1.5.13",
     "@types/node": "^20.4.8",
+    "@types/react": "^18.2.12",
     "@types/react-dom": "^18.0.11",
+    "@types/react-gtm-module": "^2.0.2",
     "@typescript-eslint/eslint-plugin": "^7.3.1",
     "@typescript-eslint/parser": "^7.3.1",
     "@vitejs/plugin-react": "^4.3.0",
@@ -107,5 +106,5 @@
     "typescript": "^5.0.2"
   },
   "readme": "ERROR: No README data found!",
-  "_id": "voltaire-voting-app@0.0.0"
+  "_id": "govtool@1.0.6"
 }

govtool/frontend/src/App.tsx

@@ -40,7 +40,7 @@ import { PDFWrapper } from "./components/organisms/PDFWrapper";
 
 export default () => {
   const { isProposalDiscussionForumEnabled } = useFeatureFlag();
-  const { enable, isEnabled } = useCardano();
+  const { enable } = useCardano();
   const navigate = useNavigate();
   const { modal, openModal, modals } = useModal();
 
@@ -87,10 +87,7 @@ export default () => {
       !window.location.pathname.includes(PATHS.proposalPillar.replace("/*", ""))
     ) {
       navigate(
-        `${(isEnabled
-          ? PATHS.connectedProposalPillar
-          : PATHS.proposalPillar
-        ).replace("/*", "")}${window.location.pathname}`,
+        `${PATHS.proposalPillar.replace("/*", "")}${window.location.pathname}`,
       );
     }
   }, [window.location.pathname]);
@@ -101,9 +98,6 @@ export default () => {
       <Routes>
         <Route path={PATHS.home} element={<Home />} />
         <Route path={PATHS.governanceActions} element={<GovernanceActions />} />
-        {isProposalDiscussionForumEnabled && !isEnabled && (
-          <Route path={PATHS.proposalPillar} element={<PDFWrapper />} />
-        )}
         <Route
           path={PATHS.governanceActionsCategory}
           element={<GovernanceActionsCategory />}
@@ -115,10 +109,7 @@ export default () => {
         <Route element={<Dashboard />}>
           <Route path={PATHS.dashboard} element={<DashboardCards />} />
           {isProposalDiscussionForumEnabled && (
-            <Route
-              path={PATHS.connectedProposalPillar}
-              element={<PDFWrapper />}
-            />
+            <Route path={PATHS.proposalPillar} element={<PDFWrapper />} />
           )}
           <Route
             path={PATHS.dashboardGovernanceActions}

govtool/frontend/src/components/atoms/CopyButton.test.tsx

@@ -3,6 +3,7 @@ import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { SnackbarProvider } from "@context";
 import { CopyButton } from "@atoms";
+import { act } from "react";
 
 Object.defineProperty(global.navigator, "clipboard", {
   value: {
@@ -61,9 +62,11 @@ describe("CopyButton", () => {
     );
 
     const copyButton = screen.getByTestId("copy-button");
-    await userEvent.click(copyButton);
-    expect(navigator.clipboard.writeText).toHaveBeenCalledWith("Example Text");
 
-    expect(screen.getByText("alerts.copiedToClipboard")).toBeInTheDocument();
+    await act(async () => {
+      await userEvent.click(copyButton);
+    });
+
+    expect(navigator.clipboard.writeText).toHaveBeenCalledWith("Example Text");
   });
 });

govtool/frontend/src/components/atoms/DrawerLink.tsx

@@ -17,7 +17,7 @@ type LinkProps = {
 const isRouteActive = (isActive: boolean, route: string) =>
   isActive ||
   (route ===
-    `${PATHS.connectedProposalPillar.replace("/*", "")}${
+    `${PATHS.proposalPillar.replace("/*", "")}${
       PDF_PATHS.proposalDiscussion
     }` &&
     Object.values(PDF_PATHS).some((pdfPath) =>

govtool/frontend/src/components/atoms/modal/Modal.tsx

@@ -1,3 +1,4 @@
+import { DialogContent } from "@mui/material";
 import MuiModal from "@mui/material/Modal";
 import type { ComponentProps } from "react";
 
@@ -11,6 +12,6 @@ interface Props {
 
 export const Modal = ({ open, children, handleClose }: Props) => (
   <MuiModal open={open} onClose={handleClose} disableAutoFocus>
-    {children}
+    <DialogContent>{children}</DialogContent>
   </MuiModal>
 );

govtool/frontend/src/components/atoms/modal/ModalWrapper.tsx

@@ -3,6 +3,7 @@ import { SxProps, styled } from "@mui/material/styles";
 import { ICONS } from "@consts";
 import { useModal } from "@context";
 import { callAll } from "@utils";
+import { forwardRef } from "react";
 
 interface Props {
   variant?: "modal" | "popup";
@@ -49,27 +50,32 @@ export const CloseButton = styled("img")`
   right: 24px;
 `;
 
-export const ModalWrapper = ({
-  children,
-  onClose,
-  variant = "modal",
-  hideCloseButton = false,
-  dataTestId = "modal",
-  sx,
-}: Props) => {
-  const { closeModal } = useModal();
+export const ModalWrapper = forwardRef<HTMLDivElement, Props>(
+  (
+    {
+      children,
+      onClose,
+      variant = "modal",
+      hideCloseButton = false,
+      dataTestId = "modal",
+      sx,
+    },
+    ref,
+  ) => {
+    const { closeModal } = useModal();
 
-  return (
-    <BaseWrapper variant={variant} data-testid={dataTestId} sx={sx}>
-      {variant !== "popup" && !hideCloseButton && (
-        <CloseButton
-          data-testid="close-modal-button"
-          alt="close"
-          onClick={callAll(closeModal, onClose)}
-          src={ICONS.closeIcon}
-        />
-      )}
-      {children}
-    </BaseWrapper>
-  );
-};
+    return (
+      <BaseWrapper variant={variant} data-testid={dataTestId} sx={sx} ref={ref}>
+        {variant !== "popup" && !hideCloseButton && (
+          <CloseButton
+            data-testid="close-modal-button"
+            alt="close"
+            onClick={callAll(closeModal, onClose)}
+            src={ICONS.closeIcon}
+          />
+        )}
+        {children}
+      </BaseWrapper>
+    );
+  },
+);

govtool/frontend/src/components/atoms/types.ts

@@ -21,7 +21,7 @@ export type LoadingButtonProps = ButtonProps & {
 
 export type TypographyProps = Pick<
   MUITypographyProps,
-  "color" | "lineHeight" | "sx"
+  "color" | "lineHeight" | "sx" | "component"
 > & {
   children?: React.ReactNode;
   fontSize?: number;

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

@@ -85,6 +85,7 @@ export const DashboardActionCard: FC<DashboardActionCardProps> = ({
                 variant="title2"
                 fontWeight={600}
                 sx={{ display: "inline" }}
+                component="span"
               >
                 {` ${t("inProgress")}`}
               </Typography>

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

@@ -16,7 +16,7 @@ export const WalletInfoCard = () => {
     await disconnectWallet();
     navigate(
       pathname.includes("/connected")
-        ? `${pathname.replace("/connected", "")}${hash}`
+        ? `${pathname.replace("/connected", "")}${hash ?? ""}`
         : PATHS.home,
     );
     window.location.reload();

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

@@ -35,9 +35,12 @@ export const WalletOptionButton: FC<WalletOption> = ({
     const result = await enable(name);
     if (result?.stakeKey) {
       navigate(
-        pathToNavigate ?? pathname === "/"
+        // eslint-disable-next-line no-unneeded-ternary
+        pathToNavigate
+          ? pathToNavigate
+          : pathname === "/"
           ? "/dashboard"
-          : `connected${pathname}${hash}`,
+          : `connected${pathname}${hash ?? ""}`,
         { state },
       );
       return;

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

@@ -37,7 +37,7 @@ export const ProposeGovActionDashboardCard = ({
 
     navigate(
       isProposalDiscussionForumEnabled
-        ? `${PATHS.connectedProposalPillar.replace("/*", "")}${
+        ? `${PATHS.proposalPillar.replace("/*", "")}${
             PDF_PATHS.proposalDiscussion
           }`
         : PATHS.createGovernanceAction,