Fixed CWE display issue with audit findings

Signed-off-by: Steve Springett <[email protected]>

Author: stevespringett

src/shared/common.js

@@ -84,6 +84,14 @@ $common.formatCweLabel = function formatCweLabel(cweId, cweName) {
   }
 };
 
+$common.formatCweShortLabel = function formatCweShortLabel(cweId, cweName) {
+  if (cweId && cweName) {
+    return "<span data-toggle='tooltip' data-placement='bottom' title='" + cweName + "'>CWE-" + cweId + "</span>";
+  } else {
+    return "";
+  }
+};
+
 /**
  * Formats and returns a specialized label for a vulnerability analyzer (OSSINDEX_ANALYZER, INTERNAL_ANALYZER, etc).
  */
@@ -338,6 +346,7 @@ module.exports = {
   formatSeverityLabel: $common.formatSeverityLabel,
   formatViolationStateLabel: $common.formatViolationStateLabel,
   formatCweLabel: $common.formatCweLabel,
+  formatCweShortLabel: $common.formatCweShortLabel,
   formatAnalyzerLabel: $common.formatAnalyzerLabel,
   makeAnalysisStateLabelFormatter: $common.makeAnalysisStateLabelFormatter,
   makeAnalysisJustificationLabelFormatter: $common.makeAnalysisJustificationLabelFormatter,

src/views/portfolio/projects/ProjectFindings.vue

@@ -50,6 +50,7 @@
   import permissionsMixin from "../../../mixins/permissionsMixin";
   import BootstrapToggle from 'vue-bootstrap-toggle';
   import ProjectUploadVexModal from "@/views/portfolio/projects/ProjectUploadVexModal";
+  import $ from "jquery";
 
   export default {
     props: {
@@ -108,13 +109,18 @@
           },
           {
             title: this.$t('message.cwe'),
-            field: "vulnerability.cweId",
+            field: "vulnerability.cwe",
             sortable: true,
             class: "expand-20",
             visible: false,
             formatter(value, row, index) {
               if (typeof value !== 'undefined') {
-                return common.formatCweLabel(value, row.vulnerability.cweName);
+                let label = "";
+                for (let i=0; i<value.length; i++) {
+                  label += common.formatCweShortLabel(value[i].cweId, value[i].name);
+                  if (i < value.length-1) label += ", "
+                }
+                return label;
               }
             }
           },
@@ -164,6 +170,7 @@
         ],
         data: [],
         options: {
+          onPostBody: this.initializeTooltips,
           search: true,
           showColumns: true,
           showRefresh: true,
@@ -429,7 +436,10 @@
       },
       tableLoaded: function(data) {
         this.$emit('total', data.total);
-      }
+      },
+      initializeTooltips: function () {
+        $('[data-toggle="tooltip"]').tooltip();
+      },
     },
     watch:{
       showSuppressedFindings() {