Merge branch 'develop' of https://github.com/mitre-attack/attack-navi…

…gator into fix/#326-handle-empty-tactic-names

CHANGELOG.md

@@ -9,6 +9,12 @@
     The creation of the tag can be disabled with the --no-git-tag-version if desired.
 -->
 
+# v4.6.1 - 26 April 2022
+
+## Fixes
+
+- Fixed a versioning error that occurred when loading a local layer with a previous version of ATT&CK.
+
 # v4.6.0 - 25 April 2022
 
 Adds support for ATT&CK v11.

nav-app/package.json

@@ -5,7 +5,7 @@
     "type": "git",
     "url": "https://github.com/mitre-attack/attack-navigator.git"
   },
-  "version": "4.6.0",
+  "version": "4.6.1",
   "license": "Apache-2.0",
   "scripts": {
     "ng": "ng",

nav-app/src/app/data.service.ts

@@ -24,7 +24,7 @@ export class DataService {
         "mitre-mobile": "mobile-attack"
     }
     public domains: Domain[] = [];
-    public versions: any[] = [];
+    public versions: Version[] = [];
 
     public subtechniquesEnabled: boolean = true;
 
@@ -206,7 +206,7 @@ export class DataService {
      */
     setUpURLs(versions: []){
         versions.forEach( (version: any) => {
-            let v: Version = new Version(version["name"], version["version"]);
+            let v: Version = new Version(version["name"], version["version"].match(/[0-9]+/g)[0]);
             this.versions.push(v);
             version["domains"].forEach( (domain: any) => {
                 let identifier = domain["identifier"];
@@ -330,7 +330,9 @@ export class DataService {
      * Is the given version supported?
      */
     isSupported(version: string) {
-        return version.match(/[0-9]+/g)[0] < this.versions[this.versions.length - 1].number.match(/[0-9]+/g)[0] ? false : true;
+        let supported = this.versions.map(v => v.number);
+        let match = version.match(/[0-9]+/g)[0];
+        return supported.includes(match);
     }
 
     /**

nav-app/src/app/tabs/tabs.component.ts

@@ -589,7 +589,7 @@ export class TabsComponent implements AfterContentInit, AfterViewInit {
                     }
                 })
                 .catch( (err) => {
-                    console.error(err.message);
+                    console.error(err);
                     alert("ERROR parsing file, check the javascript console for more information.");
                     resolve(null);
                 });