Merge remote-tracking branch 'origin/showing-closed-reports' into sho…

…wing-closed-reports
cservakt · May 15, 2024 · 0423656 · 0423656
2 parents 73982bf + 837fdf2
commit 0423656
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 41 deletions.
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_shared/dist/codechecker_api_shared.tar.gz b/web/api/py/codechecker_api_shared/dist/codechecker_api_shared.tar.gz
diff --git a/web/server/codechecker_server/api/report_server.py b/web/server/codechecker_server/api/report_server.py
@@ -302,24 +302,26 @@ def process_report_filter(
         AND.append(or_(*OR))
 
     if report_filter.reportStatus:
-        print("itt")
-        #  DetectionStatus.NEW DetectionStatus.RESOLVED DetectionStatus.UNRESOLVED DetectionStatus.REOPENED DetectionStatus.OFF DetectionStatus.UNAVAILABLE:
-        # ReviewStatus.UNREVIEWED ReviewStatus.CONFIRMED ReviewStatus.FALSE_POSITIVE ReviewStatus.INTENTIONAL:
         dst = list(map(detection_status_str,
                        (DetectionStatus.NEW,
                         DetectionStatus.UNRESOLVED,
                         DetectionStatus.REOPENED)))
         rst = list(map(review_status_str,
-                       (ReviewStatus.UNREVIEWED,
-                        ReviewStatus.CONFIRMED)))
-
+                       (API_ReviewStatus.UNREVIEWED,
+                        API_ReviewStatus.CONFIRMED)))
+
+        OR = []
+        filter_query = and_(
+            Report.review_status.in_(rst),
+            Report.detection_status.in_(dst)
+        )
         if ReportStatus.OUTSTANDING in report_filter.reportStatus:                      
-            AND.append(and_(Report.review_status.in_(rst), Report.detection_status.in_(dst)))
+            OR.append(filter_query)
 
         if ReportStatus.CLOSED in report_filter.reportStatus:
-            AND.append(not_(and_(Report.review_status.in_(rst), Report.detection_status.in_(dst))))
-        print("teszt")
-        print(*AND)
+            OR.append(not_(filter_query))
+
+        AND.append(or_(*OR))
 
     if report_filter.detectionStatus and not report_filter.reportStatus:
         dst = list(map(detection_status_str,
@@ -1887,9 +1889,6 @@ def getDiffResultsHash(self, run_ids, report_hashes, diff_type,
     @timeit
     def getRunResults(self, run_ids, limit, offset, sort_types,
                       report_filter, cmp_data, get_details):
-        if report_filter.detectionStatus:
-            print("report_filter")
-            print(report_filter.detectionStatus)
         self.__require_view()
 
         limit = verify_limit_range(limit)
@@ -3308,19 +3307,19 @@ def getReportStatusCounts(self, run_ids, report_filter, cmp_data):
 
             extended_table = extended_table.subquery()
 
-            is_opened_case = get_is_opened_case(extended_table)
-
+            is_outstanding_case = get_is_opened_case(extended_table)
+            case_label = "isOutstanding"
 
             if report_filter.isUnique:
                 q = session.query(
-                    is_opened_case.label("isOpened"),
+                    is_outstanding_case.label(case_label),
                     func.count(extended_table.c.bug_id.distinct())) \
-                    .group_by(is_opened_case)
+                    .group_by(is_outstanding_case)
             else:
                 q = session.query(
-                    is_opened_case.label("isOpened"),
+                    is_outstanding_case.label(case_label),
                     func.count(extended_table.c.bug_id)) \
-                    .group_by(is_opened_case)
+                    .group_by(is_outstanding_case)
 
             # return {ReportStatus.OUTSTANDING if isOutstanding
             #         else ReportStatus.CLOSED: count
@@ -3329,8 +3328,7 @@ def getReportStatusCounts(self, run_ids, report_filter, cmp_data):
                 report_status_enum("outstanding" if isOutstanding
                                    else "closed"): count
                                    for isOutstanding, count in q}
-            print("results")
-            print(results)
+
             return results
 
 

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/src/components/Report/ReportFilter/Filters/ReportStatusFilter.vue b/web/server/vue-cli/src/components/Report/ReportFilter/Filters/ReportStatusFilter.vue
@@ -95,7 +95,6 @@ export default {
       this.loading = true;
 
       const reportFilter = new ReportFilter(this.reportFilter);
-      reportFilter.reportStatus = null;
 
       return new Promise(resolve => {
         ccService.getClient().getReportStatusCounts(this.runIds, reportFilter,

diff --git a/web/server/vue-cli/src/components/Statistics/BaseStatisticsTable.vue b/web/server/vue-cli/src/components/Statistics/BaseStatisticsTable.vue
@@ -296,7 +296,18 @@
     </template>
 
     <template #item.closed="{ item }">
-      <span>
+      <span v-if="item.closed">
+        <router-link
+          :to="{ name: 'reports', query: {
+            ...$router.currentRoute.query,
+            ...getBaseQueryParams(item),
+            'report-status': reportStatusFromCodeToString(ReportStatus.CLOSED)
+          }}"
+        >
+          {{ item.closed }}
+        </router-link>
+      </span>
+      <span v-else>
         {{ item.closed }}
       </span>
     </template>
@@ -307,15 +318,18 @@
           :to="{ name: 'reports', query: {
             ...$router.currentRoute.query,
             ...getBaseQueryParams(item),
-            'review-status': [
-              reviewStatusFromCodeToString(ReviewStatus.UNREVIEWED),
-              reviewStatusFromCodeToString(ReviewStatus.CONFIRMED)
-            ],
-            'detection-status': [
-              detectionStatusFromCodeToString(DetectionStatus.NEW),
-              detectionStatusFromCodeToString(DetectionStatus.REOPENED),
-              detectionStatusFromCodeToString(DetectionStatus.UNRESOLVED)
-            ]
+            // 'review-status': [
+            //   reviewStatusFromCodeToString(ReviewStatus.UNREVIEWED),
+            //   reviewStatusFromCodeToString(ReviewStatus.CONFIRMED)
+            // ],
+            // 'detection-status': [
+            //   detectionStatusFromCodeToString(DetectionStatus.NEW),
+            //   detectionStatusFromCodeToString(DetectionStatus.REOPENED),
+            //   detectionStatusFromCodeToString(DetectionStatus.UNRESOLVED)
+            // ]
+            'report-status': reportStatusFromCodeToString(
+              ReportStatus.OUTSTANDING
+            )
           }}"
         >
           {{ item.outstanding }}
@@ -351,14 +365,19 @@
 </template>
 
 <script>
-import { DetectionStatus, ReviewStatus } from "@cc/report-server-types";
+import {
+  DetectionStatus,
+  ReportStatus,
+  ReviewStatus
+} from "@cc/report-server-types";
 import {
   DetectionStatusIcon,
   ReviewStatusIcon,
   SeverityIcon
 } from "@/components/Icons";
 import {
   DetectionStatusMixin,
+  ReportStatusMixin,
   ReviewStatusMixin,
   SeverityMixin
 } from "@/mixins";
@@ -376,7 +395,12 @@ export default {
     SeverityIcon,
     SourceComponentTooltip
   },
-  mixins: [ DetectionStatusMixin, ReviewStatusMixin, SeverityMixin ],
+  mixins: [
+    DetectionStatusMixin,
+    ReportStatusMixin,
+    ReviewStatusMixin,
+    SeverityMixin
+  ],
   props: {
     items: { type: Array, required: true },
     colspan: { type: Number, default: 2 },
@@ -389,8 +413,9 @@ export default {
   },
   data() {
     return {
-      ReviewStatus,
-      DetectionStatus
+      DetectionStatus,
+      ReportStatus,
+      ReviewStatus
     };
   },
   computed: {

diff --git a/web/server/vue-cli/src/views/Reports.vue b/web/server/vue-cli/src/views/Reports.vue
@@ -490,9 +490,7 @@ export default {
       const offset = limit * (this.pagination.page - 1);
       const sortType = this.getSortMode();
       const getDetails = false;
-      this.reportFilter.detectionStatus = [ 1 ];
-      console.log(this.reportFilter.reportStatus);
-      console.log(this.reportFilter.detectionStatus);
+
       ccService.getClient().getRunResults(this.runIds, limit, offset, sortType,
         this.reportFilter, this.cmpData, getDetails,
         handleThriftError(reports => {