Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove json resolving causing unfinished validation service build #1882

Merged
merged 6 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
321 changes: 321 additions & 0 deletions govtool/frontend/junit-report.xml

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions govtool/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -109,5 +109,6 @@
"typescript": "^5.0.2"
},
"readme": "ERROR: No README data found!",
"_id": "govtool@1.0.6"
"_id": "govtool@1.0.6",
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
}
2 changes: 1 addition & 1 deletion govtool/frontend/src/context/featureFlag.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const FeatureFlagProvider = ({ children }: PropsWithChildren) => {
*/
const isVotingOnGovernanceActionEnabled = useCallback(
(governanceActionType: GovernanceActionType) =>
(epochParams?.protocol_major || 0) >
(epochParams?.protocol_major || 0) >=
govActionVotingEnabledSinceProtocolVersion[governanceActionType],
[isAppInitializing],
);
Expand Down
28 changes: 14 additions & 14 deletions govtool/frontend/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
// },
},
});

Expand Down
3 changes: 1 addition & 2 deletions govtool/metadata-validation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,5 @@
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.1.3"
},
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
}
}
3 changes: 1 addition & 2 deletions govtool/metadata-validation/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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, {
Expand All @@ -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);
Expand Down
1 change: 0 additions & 1 deletion govtool/metadata-validation/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"strictBindCallApply": false,
"forceConsistentCasingInFileNames": false,
"noFallthroughCasesInSwitch": false,
"resolveJsonModule": true,
"paths": {
"@/*": ["src/*"],
"@dto": ["src/dto"],
Expand Down
Loading