From fdd99bd0ddbdf80d11bd3d97d9b9ee5876f741a1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 18 Jul 2025 19:38:58 +0000 Subject: [PATCH 1/3] chore: update @intersect.mbo/govtool-outcomes-pillar-ui to v1.5.2 --- govtool/frontend/package-lock.json | 8 ++++---- govtool/frontend/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/govtool/frontend/package-lock.json b/govtool/frontend/package-lock.json index 7d3a360d6..d9f315e67 100644 --- a/govtool/frontend/package-lock.json +++ b/govtool/frontend/package-lock.json @@ -13,7 +13,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.1", + "@intersect.mbo/govtool-outcomes-pillar-ui": "v1.5.2", "@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8", "@intersect.mbo/pdf-ui": "1.0.9-beta", "@mui/icons-material": "^5.14.3", @@ -3392,9 +3392,9 @@ } }, "node_modules/@intersect.mbo/govtool-outcomes-pillar-ui": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/@intersect.mbo/govtool-outcomes-pillar-ui/-/govtool-outcomes-pillar-ui-1.5.1.tgz", - "integrity": "sha512-Vy82YWllHcksh8ZATsQ6I3Bg29+Lstn8G5Nzlja2MFMJoQniDqKeiNyLXY3DeA8NhNFH1prSsc/gAaQLeqmONA==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@intersect.mbo/govtool-outcomes-pillar-ui/-/govtool-outcomes-pillar-ui-1.5.2.tgz", + "integrity": "sha512-nIT+GQZBTBUWfW0/hCdiQ324SIi1tC0HPOv1+ORT1RivsLWQX+JGAhAb9E001qjafS/AZuzmlAnq8srrZQDHzQ==", "license": "ISC", "dependencies": { "@fontsource/poppins": "^5.0.14", diff --git a/govtool/frontend/package.json b/govtool/frontend/package.json index 710d20de4..b58906856 100644 --- a/govtool/frontend/package.json +++ b/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.1", + "@intersect.mbo/govtool-outcomes-pillar-ui": "v1.5.2", "@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8", "@intersect.mbo/pdf-ui": "1.0.9-beta", "@mui/icons-material": "^5.14.3", From 67460bc9e681cbcd8508d998371e2a0396442bee Mon Sep 17 00:00:00 2001 From: bosko-m <88723596+bosko-m@users.noreply.github.com> Date: Sat, 19 Jul 2025 23:13:24 +0200 Subject: [PATCH 2/3] Update Proposal.hs - making sure it does exact txhash match Signed-off-by: bosko-m <88723596+bosko-m@users.noreply.github.com> --- govtool/backend/src/VVA/Proposal.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/govtool/backend/src/VVA/Proposal.hs b/govtool/backend/src/VVA/Proposal.hs index 6c31a8016..4d61ec752 100644 --- a/govtool/backend/src/VVA/Proposal.hs +++ b/govtool/backend/src/VVA/Proposal.hs @@ -87,7 +87,7 @@ getProposals mSearchTerms = withPool $ \conn -> do , "%" <> searchParam <> "%" , "%" <> searchParam <> "%" , "%" <> searchParam <> "%" - , "%" <> searchParam <> "%" + , searchParam ) case result of Left (e :: SomeException) -> do @@ -125,4 +125,4 @@ getPreviousEnactedProposal proposalType = withPool $ \conn -> do liftIO $ putStrLn $ "[DEBUG] Previous enacted proposal details: " ++ show details Nothing -> liftIO $ putStrLn "[DEBUG] No previous enacted proposal found" - return proposal \ No newline at end of file + return proposal From 8d3502bdf8e184cdbcf29320a5b83acdc8e3879a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sza=C5=82owski?= Date: Sun, 20 Jul 2025 09:55:40 +0200 Subject: [PATCH 3/3] fix(3911): ensure exact match for proposal ID to prevent multiple results for txHash#index --- govtool/backend/sql/list-proposals.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/govtool/backend/sql/list-proposals.sql b/govtool/backend/sql/list-proposals.sql index dfb54e12d..c0779c6d8 100644 --- a/govtool/backend/sql/list-proposals.sql +++ b/govtool/backend/sql/list-proposals.sql @@ -346,7 +346,7 @@ WHERE off_chain_vote_gov_action_data.abstract ILIKE ? OR off_chain_vote_gov_action_data.motivation ILIKE ? OR off_chain_vote_gov_action_data.rationale ILIKE ? OR - concat(encode(creator_tx.hash, 'hex'), '#', gov_action_proposal.index) ILIKE ?) + concat(encode(creator_tx.hash, 'hex'), '#', gov_action_proposal.index) = ?) GROUP BY gov_action_proposal.id, creator_tx.hash,