Merge pull request #1883 from IntersectMBO/staging

fix: remove json resolving causing unfinished validation service build
IntersectMBO · Aug 30, 2024 · a313fdc · a313fdc
2 parents 79a7b92 + ed741d3
commit a313fdc
Show file tree

Hide file tree

Showing 8 changed files with 342 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@ changes.
 - Fix modal content invisible on ios [Issue 1842](https://github.com/IntersectMBO/govtool/issues/1842)
 - Fix counting votes by CC committee members and SPOs [Issue 1838](https://github.com/IntersectMBO/govtool/issues/1838)
 - Fix displaying non relevant data in protocol parameter change Governance Action [Issue 1601](https://github.com/IntersectMBO/govtool/issues/1601)
+- Fix voting on info actions in bootstrapping phase [Issue 1876](https://github.com/IntersectMBO/govtool/issues/1876)
 
 ### Changed
 

diff --git a/govtool/frontend/junit-report.xml b/govtool/frontend/junit-report.xml
diff --git a/govtool/frontend/package.json b/govtool/frontend/package.json
@@ -13,7 +13,7 @@
     "postinstall": "patch-package",
     "preview": "vite preview",
     "storybook": "storybook dev -p 6006",
-    "test": "vitest",
+    "test": "NODE_OPTIONS=--max_old_space_size=8192 vitest",
     "test:coverage": "vitest --coverage",
     "test:make-badges": "npx istanbul-badges-readme --readmeDir='../../'",
     "test:verbose": "vitest --reporter=verbose",
@@ -109,5 +109,6 @@
     "typescript": "^5.0.2"
   },
   "readme": "ERROR: No README data found!",
-  "_id": "[email protected]"
+  "_id": "[email protected]",
+  "packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }
diff --git a/govtool/frontend/src/context/featureFlag.tsx b/govtool/frontend/src/context/featureFlag.tsx
@@ -50,7 +50,7 @@ const FeatureFlagProvider = ({ children }: PropsWithChildren) => {
    */
   const isVotingOnGovernanceActionEnabled = useCallback(
     (governanceActionType: GovernanceActionType) =>
-      (epochParams?.protocol_major || 0) >
+      (epochParams?.protocol_major || 0) >=
       govActionVotingEnabledSinceProtocolVersion[governanceActionType],
     [isAppInitializing],
   );

diff --git a/govtool/frontend/vite.config.ts b/govtool/frontend/vite.config.ts
@@ -81,20 +81,20 @@ const vitestConfig = defineVitestConfig({
       junit: "./junit-report.xml",
       json: "./json-report.json",
     },
-    coverage: {
-      include: [
-        "src/components/**/*",
-        "src/consts/**/*",
-        "src/context/**/*",
-        "src/hooks/**/*",
-        "src/services/**/*",
-        "src/utils/**/*",
-      ],
-      provider: "v8",
-      reporter: ["json-summary", "lcov"],
-      reportOnFailure: true,
-      enabled: true,
-    },
+    // coverage: {
+    //   include: [
+    //     "src/components/**/*",
+    //     "src/consts/**/*",
+    //     "src/context/**/*",
+    //     "src/hooks/**/*",
+    //     "src/services/**/*",
+    //     "src/utils/**/*",
+    //   ],
+    //   provider: "v8",
+    //   reporter: ["json-summary", "lcov"],
+    //   reportOnFailure: true,
+    //   enabled: true,
+    // },
   },
 });
 

diff --git a/govtool/metadata-validation/package.json b/govtool/metadata-validation/package.json
@@ -58,6 +58,5 @@
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.1.3"
-  },
-  "packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+  }
 }
diff --git a/govtool/metadata-validation/src/main.ts b/govtool/metadata-validation/src/main.ts
@@ -3,7 +3,6 @@ import { ValidationPipe } from '@nestjs/common';
 import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
 
 import { AppModule } from './app.module';
-import { version } from '../package.json';
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule, {
@@ -14,7 +13,7 @@ async function bootstrap() {
   const config = new DocumentBuilder()
     .setTitle('Metadata Validation Tool')
     .setDescription('The Metadata Validation Tool API description')
-    .setVersion(version)
+    .setVersion('1.0.14')
     .build();
 
   const document = SwaggerModule.createDocument(app, config);

diff --git a/govtool/metadata-validation/tsconfig.json b/govtool/metadata-validation/tsconfig.json
@@ -17,7 +17,6 @@
     "strictBindCallApply": false,
     "forceConsistentCasingInFileNames": false,
     "noFallthroughCasesInSwitch": false,
-    "resolveJsonModule": true,
     "paths": {
       "@/*": ["src/*"],
       "@dto": ["src/dto"],