Merge pull request #55 from derek-sappington/main

Fix issue with undefined macroVector on 'show details'

app.js

@@ -14,6 +14,7 @@ const app = Vue.createApp({
             cvssSelected: null,
             header_height: 0,
             lookup: cvssLookup_global,
+            macroVector: null
         }
     },
     methods: {
@@ -106,6 +107,8 @@ const app = Vue.createApp({
             for (key in toSelect) {
                 this.cvssSelected[key] = toSelect[key]
             }
+            this.macroVector = macroVector(this.cvssSelected)
+
         },
         onReset() {
             window.location.hash = ""
@@ -145,7 +148,8 @@ const app = Vue.createApp({
             return cvss_score(
                 this.cvssSelected,
                 this.lookup,
-                this.maxSeverityData)
+                this.maxSeverityData,
+                this.macroVector)
         },
         qualScore() {
             if (this.score == 0) {

cvss_score.js

@@ -1,4 +1,4 @@
-function cvss_score(cvssSelected, lookup, maxSeverityData) {
+function cvss_score(cvssSelected, lookup, maxSeverityData, macroVectorResult) {
     // The following defines the index of each metric's values.
     // It is used when looking for the highest vector part of the
     // combinations produced by the MacroVector respective highest vectors.
@@ -23,7 +23,6 @@ function cvss_score(cvssSelected, lookup, maxSeverityData) {
 
     E_levels = {'U': 0.2, 'P': 0.1, 'A': 0}
 
-    macroVectorResult = macroVector(cvssSelected)
 
     // Exception for no impact on system (shortcut)
     if (["VC", "VI", "VA", "SC", "SI", "SA"].every((metric) => m(cvssSelected, metric) == "N")) {