[Fix] Add sorting feature and fix filter for testcase.

The sorting feature was not available for the 'testcase' column since it first appeared in CodeChecker 6.22.2. The new PR gives a support to sort the reports on the Testcase column.

The testcase titles were truncated at the end in the filtering configuration modal if they were too long. In most cases, the unique part of the title is located at the end. The new modification allows the last part to remain intact while cutting characters at the beginning, similar to the filepath filter.

The testcase section of the report filter has listed all values from the report annotation table. With the new PR, those names appear only that belong to the given run and satisfy the filter conditions. It is also possible to search precisely for a testcase, similar to the filepath filter.

web/api/js/codechecker-api-node/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codechecker-api",
-  "version": "6.56.0",
+  "version": "6.57.0",
   "description": "Generated node.js compatible API stubs for CodeChecker server.",
   "main": "lib",
   "homepage": "https://github.com/Ericsson/codechecker",

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.56.0'
+api_version = '6.57.0'
 
 setup(
     name='codechecker_api',

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.56.0'
+api_version = '6.57.0'
 
 setup(
     name='codechecker_api_shared',

web/api/report_server.thrift

@@ -73,6 +73,7 @@ enum SortType {
   DETECTION_STATUS,
   BUG_PATH_LENGTH,
   TIMESTAMP,
+  TESTCASE
 }
 
 enum RunSortType {
@@ -613,7 +614,9 @@ service codeCheckerDBAccess {
   // Get report annotation values belonging to the given key.
   // The "key" parameter is optional. If not given then the list of keys returns.
   // PERMISSION: PRODUCT_VIEW
-  list<string> getReportAnnotations(1: optional string key),
+  list<string> getReportAnnotations(2: list<i64>    runIds,
+                                    3: ReportFilter reportFilter,
+                                    4: CompareData  cmpData),
 
   // Count the results separately for multiple runs.
   // If an empty run id list is provided the report

web/codechecker_web/shared/version.py

@@ -18,7 +18,7 @@
 # The newest supported minor version (value) for each supported major version
 # (key) in this particular build.
 SUPPORTED_VERSIONS = {
-    6: 56
+    6: 57
 }
 
 # Used by the client to automatically identify the latest major and minor

web/server/codechecker_server/api/report_server.py

@@ -382,7 +382,10 @@ def process_report_filter(
             else:
                 OR.append(and_(
                     ReportAnnotations.key == key,
-                    ReportAnnotations.value.in_(values)))
+                    or_(*[ReportAnnotations.value.ilike(conv(v))
+                          for v in values])) if values else and_(
+                              ReportAnnotations.key == key))
+
         AND.append(or_(*OR))
 
     filter_expr = and_(*AND)
@@ -1001,7 +1004,8 @@ def get_sort_map(sort_types, is_unique=False):
         SortType.SEVERITY: [(Checker.severity, 'severity')],
         SortType.REVIEW_STATUS: [(Report.review_status, 'rw_status')],
         SortType.DETECTION_STATUS: [(Report.detection_status, 'dt_status')],
-        SortType.TIMESTAMP: [('annotation_timestamp', 'annotation_timestamp')]}
+        SortType.TIMESTAMP: [('annotation_timestamp', 'annotation_timestamp')],
+        SortType.TESTCASE: [('annotation_testcase', 'annotation_testcase')]}
 
     if is_unique:
         sort_type_map[SortType.FILENAME] = [(File.filename, 'filename')]
@@ -2155,20 +2159,44 @@ def getRunResults(self, run_ids, limit, offset, sort_types,
 
     @exc_to_thrift_reqfail
     @timeit
-    def getReportAnnotations(self, key):
+    def getReportAnnotations(self, run_ids, report_filter, cmp_data):
         self.__require_view()
 
         with DBSession(self._Session) as session:
-            if key:
-                result = session \
-                    .query(ReportAnnotations.value) \
+            filter_expression, join_tables = process_report_filter(
+                session, run_ids, report_filter, cmp_data)
+
+            extended_table = session.query(Report.id)
+
+            extended_table = apply_report_filter(
+                extended_table, filter_expression, join_tables)
+
+            if report_filter.annotations is not None:
+                extended_table = extended_table.outerjoin(
+                    ReportAnnotations,
+                    ReportAnnotations.report_id == Report.id)
+                extended_table = extended_table.group_by(Report.id)
+                extended_table = extended_table.add_columns(
+                    ReportAnnotations.key.label('annotations_key'),
+                    ReportAnnotations.value.label('annotations_value')
+                )
+
+                extended_table = extended_table.subquery()
+
+                result = session.query(extended_table.c.annotations_value) \
                     .distinct() \
-                    .filter(ReportAnnotations.key == key) \
+                    .filter(
+                        *(extended_table.c.annotations_key == annotation.first
+                          for annotation in report_filter.annotations)) \
                     .all()
             else:
-                result = session \
-                    .query(ReportAnnotations.key) \
+                extended_table = extended_table.subquery()
+
+                result = session.query(ReportAnnotations.value) \
                     .distinct() \
+                    .join(
+                        extended_table,
+                        ReportAnnotations.report_id == extended_table.c.id) \
                     .all()
 
         return list(map(lambda x: x[0], result))