Merge pull request #4787 from bruntib/guideline_level

bruntib · web-flow · commit 93996c6d5237 · 2026-03-31T08:14:29.000+02:00
[feat] Display guideline levels in the guideline statistics table
diff --git a/web/api/js/codechecker-api-node/dist/codechecker-api-6.69.0.tgz b/web/api/js/codechecker-api-node/dist/codechecker-api-6.69.0.tgz
diff --git 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.68.0",
+  "version": "6.69.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
diff --git 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.68.0'
+api_version = '6.69.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
diff --git 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.68.0'
+api_version = '6.69.0'
 
 setup(
     name='codechecker_api_shared',
diff --git a/web/api/report_server.thrift b/web/api/report_server.thrift
@@ -572,10 +572,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<string> 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<string> checkers,  // List of checker names.
+  5: optional string level,  // Level of severity that this rule indicates.
 }
 typedef map<string, list<Rule>> GuidelineRules
 
diff --git 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: 68
+    6: 69
 }
 
 # 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
@@ -3081,7 +3081,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
diff --git 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.68.0.tgz",
+    "codechecker-api": "file:../../api/js/codechecker-api-node/dist/codechecker-api-6.69.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
@@ -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
@@ -11,7 +11,7 @@
     sort-by="checkers.severity"
     sort-desc
     @enabled-click="enabledClick"
-  />  
+  />
 </template>
 
 <script>
@@ -42,6 +42,10 @@ export default {
           text: "Title",
           value: "guidelineRuleTitle"
         },
+        {
+          text: "Level",
+          value: "guidelineLevel"
+        },
         {
           text: "Related Checker(s)",
           value: "checkers.name"
@@ -75,12 +79,18 @@ export default {
       return this.items.some(item => item.guidelineRuleTitle);
     },
 
+    hasLevel() {
+      return this.items.some(item => item.guidelineLevel);
+    },
+
     tableHeaders() {
       if (!this.headers) return;
 
       return this.headers.filter(header => {
         if (header.value === "guidelineRuleTitle") {
           return this.hasTitle;
+        } else if (header.value === "guidelineLevel") {
+          return this.hasLevel;
         }
 
         return true;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "codechecker-api",`
`3`		`- "version": "6.68.0",`
	`3`	`+ "version": "6.69.0",`
`4`	`4`	`"description": "Generated node.js compatible API stubs for CodeChecker server.",`
`5`	`5`	`"main": "lib",`
`6`	`6`	`"homepage": "https://github.com/Ericsson/codechecker",`
Original file line number	Diff line number	Diff line change
`@@ -572,10 +572,11 @@ struct Guideline {`
`572`	`572`	`}`
`573`	`573`
`574`	`574`	`struct Rule {`
`575`		`- 1: string ruleId, // The identifier of the rule.`
`576`		`- 2: string title, // The rule summary.`
`577`		`- 3: string url, // The link of the rule page.`
`578`		`- 4: list<string> checkers // List of checker names`
	`575`	`+ 1: string ruleId, // The identifier of the rule.`
	`576`	`+ 2: string title, // The rule summary.`
	`577`	`+ 3: string url, // The link of the rule page.`
	`578`	`+ 4: list<string> checkers, // List of checker names.`
	`579`	`+ 5: optional string level, // Level of severity that this rule indicates.`
`579`	`580`	`}`
`580`	`581`	`typedef map<string, list<Rule>> GuidelineRules`
`581`	`582`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`# The newest supported minor version (value) for each supported major version`
`21`	`21`	`# (key) in this particular build.`
`22`	`22`	`SUPPORTED_VERSIONS = {`
`23`		`- 6: 68`
	`23`	`+ 6: 69`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`# Used by the client to automatically identify the latest major and minor`
Original file line number	Diff line number	Diff line change
`@@ -3081,7 +3081,8 @@ def getGuidelineRules(`
`3081`	`3081`	`ruleId=rule.lower(),`
`3082`	`3082`	`title=rules[rule].get("title", ""),`
`3083`	`3083`	`url=rules[rule].get("rule_url", ""),`
`3084`		`- checkers=checkers`
	`3084`	`+ checkers=checkers,`
	`3085`	`+ level=rules[rule].get("level", "")`
`3085`	`3086`	`)`
`3086`	`3087`	`)`
`3087`	`3088`