diff --git a/web/api/js/codechecker-api-node/dist/codechecker-api-6.67.0.tgz b/web/api/js/codechecker-api-node/dist/codechecker-api-6.67.0.tgz deleted file mode 100644 index 6e556b6c0d..0000000000 Binary files a/web/api/js/codechecker-api-node/dist/codechecker-api-6.67.0.tgz and /dev/null differ diff --git a/web/api/js/codechecker-api-node/dist/codechecker-api-6.68.0.tgz b/web/api/js/codechecker-api-node/dist/codechecker-api-6.68.0.tgz new file mode 100644 index 0000000000..48fc9d8386 Binary files /dev/null and b/web/api/js/codechecker-api-node/dist/codechecker-api-6.68.0.tgz differ diff --git a/web/api/js/codechecker-api-node/package.json b/web/api/js/codechecker-api-node/package.json index eb304081d8..4baeb61da2 100644 --- a/web/api/js/codechecker-api-node/package.json +++ b/web/api/js/codechecker-api-node/package.json @@ -1,6 +1,6 @@ { "name": "codechecker-api", - "version": "6.67.0", + "version": "6.68.0", "description": "Generated node.js compatible API stubs for CodeChecker server.", "main": "lib", "homepage": "https://github.com/Ericsson/codechecker", diff --git a/web/api/py/codechecker_api/dist/codechecker_api.tar.gz b/web/api/py/codechecker_api/dist/codechecker_api.tar.gz index eb0ebd793c..4506154de1 100644 Binary files a/web/api/py/codechecker_api/dist/codechecker_api.tar.gz and b/web/api/py/codechecker_api/dist/codechecker_api.tar.gz differ diff --git a/web/api/py/codechecker_api/setup.py b/web/api/py/codechecker_api/setup.py index 4face1d377..2fab47a581 100644 --- a/web/api/py/codechecker_api/setup.py +++ b/web/api/py/codechecker_api/setup.py @@ -8,7 +8,7 @@ with open('README.md', encoding='utf-8', errors="ignore") as f: long_description = f.read() -api_version = '6.67.0' +api_version = '6.68.0' setup( name='codechecker_api', diff --git a/web/api/py/codechecker_api_shared/dist/codechecker_api_shared.tar.gz b/web/api/py/codechecker_api_shared/dist/codechecker_api_shared.tar.gz index 2490b13225..acf8d249a6 100644 Binary files a/web/api/py/codechecker_api_shared/dist/codechecker_api_shared.tar.gz and b/web/api/py/codechecker_api_shared/dist/codechecker_api_shared.tar.gz differ diff --git a/web/api/py/codechecker_api_shared/setup.py b/web/api/py/codechecker_api_shared/setup.py index 2986c3eeb2..a7a6dd74d2 100644 --- a/web/api/py/codechecker_api_shared/setup.py +++ b/web/api/py/codechecker_api_shared/setup.py @@ -8,7 +8,7 @@ with open('README.md', encoding='utf-8', errors="ignore") as f: long_description = f.read() -api_version = '6.67.0' +api_version = '6.68.0' setup( name='codechecker_api_shared', diff --git a/web/api/report_server.thrift b/web/api/report_server.thrift index 94d2597838..c2df4e4925 100644 --- a/web/api/report_server.thrift +++ b/web/api/report_server.thrift @@ -566,10 +566,11 @@ struct Guideline { } struct Rule { - 1: string ruleId, // The identifier of the rule. - 2: string title, // The rule summary. - 3: string url, // The link of the rule page. - 4: list checkers // List of checker names + 1: string ruleId, // The identifier of the rule. + 2: string title, // The rule summary. + 3: string url, // The link of the rule page. + 4: list checkers, // List of checker names, + 5: optional string level, } typedef map> GuidelineRules diff --git a/web/codechecker_web/shared/version.py b/web/codechecker_web/shared/version.py index fa2de94d4c..8d8171bc34 100644 --- a/web/codechecker_web/shared/version.py +++ b/web/codechecker_web/shared/version.py @@ -20,7 +20,7 @@ # The newest supported minor version (value) for each supported major version # (key) in this particular build. SUPPORTED_VERSIONS = { - 6: 67 + 6: 68 } # Used by the client to automatically identify the latest major and minor diff --git a/web/server/codechecker_server/api/report_server.py b/web/server/codechecker_server/api/report_server.py index 26613ce721..478c44571e 100644 --- a/web/server/codechecker_server/api/report_server.py +++ b/web/server/codechecker_server/api/report_server.py @@ -2839,7 +2839,8 @@ def getGuidelineRules( ruleId=rule.lower(), title=rules[rule].get("title", ""), url=rules[rule].get("rule_url", ""), - checkers=checkers + checkers=checkers, + level=rules[rule].get("level", "") ) ) diff --git a/web/server/vue-cli/package-lock.json b/web/server/vue-cli/package-lock.json index 6d7066acfd..9895a112cd 100644 --- a/web/server/vue-cli/package-lock.json +++ b/web/server/vue-cli/package-lock.json @@ -11,7 +11,7 @@ "@mdi/font": "^6.5.95", "chart.js": "^2.9.4", "chartjs-plugin-datalabels": "^0.7.0", - "codechecker-api": "file:../../api/js/codechecker-api-node/dist/codechecker-api-6.67.0.tgz", + "codechecker-api": "file:../../api/js/codechecker-api-node/dist/codechecker-api-6.68.0.tgz", "codemirror": "^5.65.0", "date-fns": "^2.28.0", "js-cookie": "^3.0.1", @@ -5059,9 +5059,9 @@ } }, "node_modules/codechecker-api": { - "version": "6.67.0", - "resolved": "file:../../api/js/codechecker-api-node/dist/codechecker-api-6.67.0.tgz", - "integrity": "sha512-zwk1Zxq3z2bYQL8HbCFuCAx0mFu1dB5aPFspErNFTKw5MISG5CpZiBtAo0v5TjIjmeu6CFvWqcPvUW+1oe7iWw==", + "version": "6.68.0", + "resolved": "file:../../api/js/codechecker-api-node/dist/codechecker-api-6.68.0.tgz", + "integrity": "sha512-ra9nLOP8u6hezsJFmJFgNxumLMO7NZ+99Qcvw/ux5eHaHlYjG9iXt3MjfFglei+5UeZUWWivvrB0l1OLzRVm2Q==", "license": "SEE LICENSE IN LICENSE", "dependencies": { "thrift": "0.13.0-hotfix.1" diff --git a/web/server/vue-cli/package.json b/web/server/vue-cli/package.json index 1a3966529d..d9302df279 100644 --- a/web/server/vue-cli/package.json +++ b/web/server/vue-cli/package.json @@ -29,7 +29,7 @@ "@mdi/font": "^6.5.95", "chart.js": "^2.9.4", "chartjs-plugin-datalabels": "^0.7.0", - "codechecker-api": "file:../../api/js/codechecker-api-node/dist/codechecker-api-6.67.0.tgz", + "codechecker-api": "file:../../api/js/codechecker-api-node/dist/codechecker-api-6.68.0.tgz", "codemirror": "^5.65.0", "date-fns": "^2.28.0", "js-cookie": "^3.0.1", diff --git a/web/server/vue-cli/src/components/Statistics/Guideline/GuidelineStatistics.vue b/web/server/vue-cli/src/components/Statistics/Guideline/GuidelineStatistics.vue index e2890a356f..760819126a 100644 --- a/web/server/vue-cli/src/components/Statistics/Guideline/GuidelineStatistics.vue +++ b/web/server/vue-cli/src/components/Statistics/Guideline/GuidelineStatistics.vue @@ -263,6 +263,7 @@ export default { guidelineRule: rule.ruleId, guidelineUrl: rule.url, guidelineRuleTitle: rule.title, + guidelineLevel: rule.level, checkers: filtered_stat.length ? filtered_stat.map(checkerId => { return { @@ -391,7 +392,8 @@ export default { title: rule.title, url: rule.url, checkers: checkers_with_severity.filter( - cws => rule.checkers.includes(cws.checkerName)) + cws => rule.checkers.includes(cws.checkerName)), + level: rule.level }; }); } diff --git a/web/server/vue-cli/src/components/Statistics/Guideline/GuidelineStatisticsTable.vue b/web/server/vue-cli/src/components/Statistics/Guideline/GuidelineStatisticsTable.vue index 26cca736a0..aaf307fec9 100644 --- a/web/server/vue-cli/src/components/Statistics/Guideline/GuidelineStatisticsTable.vue +++ b/web/server/vue-cli/src/components/Statistics/Guideline/GuidelineStatisticsTable.vue @@ -11,7 +11,7 @@ sort-by="checkers.severity" sort-desc @enabled-click="enabledClick" - /> + />