Merge pull request #3929 from IntersectMBO/staging

Outcomes v1.5.3 - main

Author: bosko-m

govtool/frontend/package-lock.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.2",
+    "@intersect.mbo/govtool-outcomes-pillar-ui": "v1.5.3",
     "@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8",
     "@intersect.mbo/pdf-ui": "1.0.9-beta",
     "@mui/icons-material": "^5.14.3",

govtool/frontend/package.json

@@ -22,6 +22,7 @@ import {
   DashboardGovernanceActionsVotedOn,
 } from "@organisms";
 import { Button } from "@atoms";
+import usePrevious from "@/hooks/usePrevious";
 
 type TabPanelProps = {
   children?: React.ReactNode;
@@ -84,11 +85,17 @@ export const DashboardGovernanceActions = () => {
   const queryFilters =
     chosenFilters.length > 0 ? chosenFilters : defaultCategories;
 
+  const prevFilters = usePrevious(queryFilters);
+  const prevSorting = usePrevious(chosenSorting);
+
+  const stableFilters = isAdjusting ? prevFilters ?? queryFilters : queryFilters;
+  const stableSorting = isAdjusting ? prevSorting ?? chosenSorting : chosenSorting;
+
   const { proposals, isProposalsLoading } = useGetProposalsQuery({
-    filters: queryFilters,
-    sorting: chosenSorting,
+    filters: stableFilters,
+    sorting: stableSorting,
     searchPhrase: debouncedSearchText,
-    enabled: !isAdjusting,
+    enabled: true,
   });
   const { data: votes, areDRepVotesLoading } = useGetDRepVotesQuery(
     queryFilters,

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

@@ -33,15 +33,16 @@ export const useGetProposalsQuery = ({
     return allProposals.flatMap((proposal) => proposal.elements);
   };
 
-  const { data, isLoading } = useQuery(
-    [QUERY_KEYS.useGetProposalsKey, filters, searchPhrase, sorting, dRepID],
-    fetchProposals,
-    {
-      enabled,
-      refetchOnWindowFocus: true,
-      keepPreviousData: true,
-    },
-  );
+    const { data, isLoading } = useQuery(
+        [QUERY_KEYS.useGetProposalsKey, filters, searchPhrase, sorting, dRepID],
+        fetchProposals,
+        {
+            enabled,
+            refetchOnWindowFocus: true,
+            keepPreviousData: true,
+            staleTime: 2000,
+        },
+    );
 
   const proposals = Object.values(groupByType(data) ?? []);
 

govtool/frontend/src/hooks/queries/useGetProposalsQuery.ts

@@ -247,19 +247,22 @@ test("11E. Should view comments with count indications on a budget proposal", as
 
   const actualTotalComments =
     await budgetDiscussionDetailsPage.totalComments.textContent();
-  const expectedTotalComments =
-    proposalResponse.data.attributes.prop_comments_number.toString();
+  let expectedTotalComments =
+    proposalResponse.data.attributes.prop_comments_number;
   const isEqual = actualTotalComments === expectedTotalComments;
 
   const currentPageUrl = budgetDiscussionDetailsPage.currentPage.url();
 
   const proposalId = extractProposalIdFromUrl(currentPageUrl);
+  if (expectedTotalComments > 99) {
+    expectedTotalComments = "99+";
+  }
 
   await expect(
     budgetDiscussionDetailsPage.totalComments,
     !isEqual &&
       `Total comments do not match in ${environments.frontendUrl}/budget_discussion/${proposalId}`
-  ).toHaveText(expectedTotalComments);
+  ).toHaveText(expectedTotalComments.toString());
 });
 
 test.describe("Restricted access to interact budget proposal", () => {

tests/govtool-frontend/playwright/tests/11-proposal-budget/proposalBudget.spec.ts

@@ -292,8 +292,12 @@ test.describe("Mocked proposal", () => {
   });
 
   test("8F. Should display all comments with count indication.", async () => {
+    let commentCount = mockProposal.data.attributes.prop_comments_number;
+    if (commentCount > 99) {
+      commentCount = "99+";
+    }
     await expect(proposalDiscussionDetailsPage.commentCount).toHaveText(
-      mockProposal.data.attributes.prop_comments_number.toString(),
+      commentCount.toString(),
       { timeout: 60_000 }
     );
   });