Merge pull request #2290 from IntersectMBO/staging

GovTool v1.0.24
IntersectMBO · Oct 31, 2024 · 9550c2b · 9550c2b
2 parents 5b9d144 + 64bf465
commit 9550c2b
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,24 @@ changes.
 
 -
 
+## [v1.0.24](https://github.com/IntersectMBO/govtool/releases/tag/v1.0.24) 2024-10-31
+
+### Added
+
+-
+
+### Fixed
+
+- Fix infinite DRep list loading [Issue 2285](https://github.com/IntersectMBO/govtool/issues/2285)
+
+### Changed
+
+-
+
+### Removed
+
+-
+
 ## [v1.0.23](https://github.com/IntersectMBO/govtool/releases/tag/v1.0.23) 2024-10-29
 
 ### Added

diff --git a/govtool/backend/Dockerfile b/govtool/backend/Dockerfile
@@ -4,4 +4,4 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
 WORKDIR /src
 COPY . .
 RUN cabal build
-RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-1.0.23/x/vva-be/build/vva-be/vva-be /usr/local/bin
+RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-1.0.24/x/vva-be/build/vva-be/vva-be /usr/local/bin
diff --git a/govtool/backend/Dockerfile.qovery b/govtool/backend/Dockerfile.qovery
@@ -4,7 +4,7 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
 WORKDIR /src
 COPY . .
 RUN cabal build
-RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-1.0.23/x/vva-be/build/vva-be/vva-be /usr/local/bin
+RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-1.0.24/x/vva-be/build/vva-be/vva-be /usr/local/bin
 
 # Expose the necessary port
 EXPOSE 9876

diff --git a/govtool/backend/vva-be.cabal b/govtool/backend/vva-be.cabal
@@ -1,6 +1,6 @@
 cabal-version:      3.6
 name:               vva-be
-version:            1.0.23
+version:            1.0.24
 
 -- A short (one-line) description of the package.
 -- synopsis:

diff --git a/govtool/frontend/package-lock.json b/govtool/frontend/package-lock.json
diff --git a/govtool/frontend/package.json b/govtool/frontend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@govtool/frontend",
   "private": true,
-  "version": "1.0.23",
+  "version": "1.0.24",
   "type": "module",
   "scripts": {
     "build": "vite build",
@@ -109,5 +109,5 @@
     "typescript": "^5.0.2"
   },
   "readme": "ERROR: No README data found!",
-  "_id": "[email protected].23"
+  "_id": "[email protected].24"
 }
diff --git a/govtool/frontend/src/context/dataActionsBar.tsx b/govtool/frontend/src/context/dataActionsBar.tsx
@@ -75,7 +75,9 @@ const DataActionsBarProvider: FC<ProviderProps> = ({ children }) => {
 
   useEffect(() => {
     if (
-      (userMovedToDifferentAppArea && !userOpenedGADetailsFromCategoryPage) ||
+      (!pathname.includes("drep_directory") &&
+        userMovedToDifferentAppArea &&
+        !userOpenedGADetailsFromCategoryPage) ||
       userMovedFromGAListToCategoryPage
     ) {
       resetState();
@@ -116,7 +118,7 @@ const DataActionsBarProvider: FC<ProviderProps> = ({ children }) => {
   );
 
   return (
-    <DataActionsBarContext.Provider value={contextValue}>
+    <DataActionsBarContext.Provider value={contextValue} key={pathname}>
       {children}
     </DataActionsBarContext.Provider>
   );

diff --git a/govtool/frontend/src/hooks/queries/useGetDRepListQuery.ts b/govtool/frontend/src/hooks/queries/useGetDRepListQuery.ts
@@ -33,7 +33,7 @@ export const useGetDRepListInfiniteQuery = (
         pendingTransaction.registerAsDrep ||
         pendingTransaction.retireAsDirectVoter ||
         pendingTransaction.retireAsDrep
-      )?.transactionHash ?? 'noPendingTransaction',
+      )?.transactionHash ?? "noPendingTransaction",
       filters.length ? filters : "",
       searchPhrase ?? "",
       sorting ?? "",

diff --git a/govtool/metadata-validation/package-lock.json b/govtool/metadata-validation/package-lock.json
diff --git a/govtool/metadata-validation/package.json b/govtool/metadata-validation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@govtool/metadata-validation",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "description": "",
   "author": "",
   "private": true,

diff --git a/govtool/metadata-validation/src/main.ts b/govtool/metadata-validation/src/main.ts
@@ -13,7 +13,7 @@ async function bootstrap() {
   const config = new DocumentBuilder()
     .setTitle('Metadata Validation Tool')
     .setDescription('The Metadata Validation Tool API description')
-    .setVersion('1.0.23')
+    .setVersion('1.0.24')
     .build();
 
   const document = SwaggerModule.createDocument(app, config);