remove hard-coded version strings

ThreatDragonModels/v2-new-model.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0",
+  "version": "2.0.0",
   "summary": {
     "title":"New threat model"
   },

td.vue/src/service/demo/index.js

@@ -1,11 +1,13 @@
+import newThreatModel from './new-model.js';
 import demoThreatModel from './demo-threat-model.js';
-import v2NewModel from './v2-new-model.js';
-import v2ThreatModel from './v2-threat-model.js';
+import v2NewThreaModel from './v2-new-model.js';
+import v2DemoThreatModel from './v2-threat-model.js';
 
 const models = [
+    { name: 'New Model', model: newThreatModel },
     { name: 'Demo Threat Model', model: demoThreatModel },
-    { name: 'Version 2 New Model', model: v2NewModel },
-    { name: 'Version 2 Demo Model', model: v2ThreatModel }
+    { name: 'Version 2 New Model', model: v2NewThreaModel },
+    { name: 'Version 2 Demo Model', model: v2DemoThreatModel }
 ];
 
 export default {

td.vue/src/service/demo/new-model.js

@@ -0,0 +1,10 @@
+export default{
+    'version': '1.6.1',
+    'summary': {
+        'title':'New threat model'
+    },
+    'detail': {
+        'contributors': [],
+        'diagrams': []
+    }
+};

td.vue/src/service/demo/v2-new-model.js

@@ -1,5 +1,5 @@
 export default{
-    'tdVersion': '2.0',
+    'version': '2.0.0',
     'summary': {
         'title': 'New Threat Model',
         'owner': '',
@@ -12,4 +12,3 @@ export default{
         'reviewer': ''
     }
 };
-

td.vue/src/service/migration/diagram.js

@@ -21,14 +21,14 @@ const drawV1 = (diagram, graph) => {
 };
 
 const upgradeAndDraw = (diagram, graph) => {
-    if (diagram.version === '2.0') {
+    if (diagram.version != null && diagram.version.startsWith('2.')) {
         graph.fromJSON(diagram);
         return;
     }
 
     drawV1(diagram, graph);
     const updated = graph.toJSON();
-    updated.version = '2.0';
+    updated.version = store.packageBuildVersion;
     updated.title = diagram.title;
     updated.thumbnail = diagram.thumbnail;
     updated.id = diagram.id;

td.vue/src/store/modules/threatmodel.js

@@ -147,7 +147,7 @@ const getters = {
         return contribs.map(x => x.name);
     },
     modelChanged: (state) => JSON.stringify(state.data) !== state.immutableCopy,
-    isV1Model: (state) => Object.keys(state.data).length > 0 && state.data.version !== '2.0'
+    isV1Model: (state) => Object.keys(state.data).length > 0 && (state.data.version == null || state.data.version.startsWith('1.'))
 };
 
 export default {

td.vue/src/views/NewThreatModel.vue

@@ -11,12 +11,13 @@ import tmActions from '@/store/actions/threatmodel.js';
 export default {
     name: 'NewThreatModel',
     computed: mapState({
-        providerType: state => getProviderType(state.provider.selected)
+        providerType: state => getProviderType(state.provider.selected),
+        version: 'packageBuildVersion'
     }),
     mounted() {
         this.$store.dispatch(tmActions.clear);
         const newTm = {
-            version: '2.0',
+            version: this.version,
             summary: {
                 title: 'New Threat Model',
                 owner: '',
@@ -29,7 +30,7 @@ export default {
                 reviewer: ''
             }
         };
-        
+
         this.$store.dispatch(tmActions.selected, newTm);
         const params = Object.assign({}, this.$route.params, {
             threatmodel: newTm.summary.title