remove duplicate examples of threat models

TheRealKANi · Sep 8, 2022 · 48ce6b6 · 48ce6b6
2 parents 41999d3 + 3e98882
commit 48ce6b6
Show file tree

Hide file tree

Showing 14 changed files with 1,159 additions and 3,401 deletions.
diff --git a/...agonModels/legacy_model/legacy_model.json → ThreatDragonModels/demo-threat-model.json b/...agonModels/legacy_model/legacy_model.json → ThreatDragonModels/demo-threat-model.json
diff --git a/ThreatDragonModels/demo-threat-model/demo-threat-model.json b/ThreatDragonModels/demo-threat-model/demo-threat-model.json
diff --git a/ThreatDragonModels/legacy_desktop_model/legacy_desktop_model.json b/ThreatDragonModels/legacy_desktop_model/legacy_desktop_model.json
diff --git a/ThreatDragonModels/legacy_model_1/legacy_model_1.json b/ThreatDragonModels/legacy_model_1/legacy_model_1.json
diff --git a/ThreatDragonModels/legacy_model_2/legacy_model_2.json b/ThreatDragonModels/legacy_model_2/legacy_model_2.json
diff --git a/ThreatDragonModels/new-model/new-model.json → ThreatDragonModels/new-model.json b/ThreatDragonModels/new-model/new-model.json → ThreatDragonModels/new-model.json
diff --git a/ThreatDragonModels/v2-new-model.json b/ThreatDragonModels/v2-new-model.json
@@ -0,0 +1,10 @@
+{
+  "version": "2.0",
+  "summary": {
+    "title":"New threat model"
+  },
+  "detail": {
+    "contributors": [],
+    "diagrams": []
+  }
+}
diff --git a/ThreatDragonModels/v2-threat-model.json b/ThreatDragonModels/v2-threat-model.json
diff --git a/td.vue/.gitignore b/td.vue/.gitignore
@@ -27,8 +27,9 @@ pnpm-debug.log*
 *.log
 tests/e2e/reports/
 tests/e2e/videos
+tests/e2e/screenshots/
 log/
 results/
 
 #Electron-builder output
-/dist-desktop
+/dist-desktop
diff --git a/td.vue/src/desktop/desktop.menu.js b/td.vue/src/desktop/desktop.menu.js
@@ -24,10 +24,10 @@ export const menuTemplate = [
                         ]
                     }).then(result => {
                         if (result.canceled === false) {
-                            console.log(result.filePaths)
+                            console.log(result.filePaths);
                         }
                     }).catch(err => {
-                        console.log(err)
+                        console.log(err);
                     });
                 }
             },
@@ -57,10 +57,10 @@ export const menuTemplate = [
                         ]
                     }).then(result => {
                         if (result.canceled === false) {
-                            console.log(result.filePath)
+                            console.log(result.filePath);
                         }
                     }).catch(err => {
-                        console.log(err)
+                        console.log(err);
                     });
                 }
             },

diff --git a/td.vue/src/service/demo/index.js b/td.vue/src/service/demo/index.js
@@ -1,15 +1,11 @@
 import demoThreatModel from './demo-threat-model.js';
-import legacyDesktopModel from './legacy-desktop-model.js';
-import legacyModel2 from './legacy-model-2.js';
-import legacyModel from './legacy-model.js';
-import v2Model from './v2-threat-model.js';
+import v2NewModel from './v2-new-model.js';
+import v2ThreatModel from './v2-threat-model.js';
 
 const models = [
     { name: 'Demo Threat Model', model: demoThreatModel },
-    { name: 'Legacy Desktop Model', model: legacyDesktopModel },
-    { name: 'Legacy Model', model: legacyModel },
-    { name: 'Legacy Model 2', model: legacyModel2 },
-    { name: 'Version 2 Demo Model', model: v2Model }
+    { name: 'Version 2 New Model', model: v2NewModel },
+    { name: 'Version 2 Demo Model', model: v2ThreatModel }
 ];
 
 export default {

diff --git a/td.vue/src/service/demo/v2-new-model.js b/td.vue/src/service/demo/v2-new-model.js
@@ -0,0 +1,15 @@
+export default{
+    'tdVersion': '2.0',
+    'summary': {
+        'title': 'New Threat Model',
+        'owner': '',
+        'description': '',
+        'id': 0
+    },
+    'detail': {
+        'contributors': [],
+        'diagrams': [],
+        'reviewer': ''
+    }
+};
+
diff --git a/td.vue/tests/e2e/specs/demo.js b/td.vue/tests/e2e/specs/demo.js
@@ -13,12 +13,8 @@ describe('demo', () => {
         cy.contains('Demo Threat Model');
     });
 
-    it('has the legacy desktop model', () => {
-        cy.contains('Legacy Desktop Model');
-    });
-
-    it('has the Legacy Model', () => {
-        cy.contains('Legacy Model');
+    it('has the V2 New Model', () => {
+        cy.contains('Version 2 New Model');
     });
 
     it('opens the v2 demo threat model', () => {

diff --git a/td.vue/tests/e2e/specs/upgrade.js b/td.vue/tests/e2e/specs/upgrade.js
@@ -13,12 +13,8 @@ describe('upgrade', () => {
         cy.contains('Demo Threat Model');
     });
 
-    it('has the legacy desktop model', () => {
-        cy.contains('Legacy Desktop Model');
-    });
-
-    it('has the Legacy Model', () => {
-        cy.contains('Legacy Model');
+    it('has the V2 New Model', () => {
+        cy.contains('Version 2 New Model');
     });
 
     it('opens the demo threat model', () => {