Merge pull request #85 from gchq/gh-63-update-schema-builder

update package versions to angular 4
gchq · Mar 30, 2017 · 9bccd9f · 9bccd9f
2 parents 0a7d74b + 6b624b5
commit 9bccd9f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 21 deletions.
diff --git a/schema-builder/schema-builder-ui/package.json b/schema-builder/schema-builder-ui/package.json
@@ -12,38 +12,42 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/common": "2.4.10",
-    "@angular/compiler": "2.4.10",
-    "@angular/core": "2.4.10",
+    "@angular/animations": "^4.0.0",
+    "@angular/common": "^4.0.0",
+    "@angular/compiler": "^4.0.0",
+    "@angular/compiler-cli": "^4.0.0",
+    "@angular/core": "^4.0.0",
     "@angular/flex-layout": "2.0.0-rc.1",
-    "@angular/forms": "2.4.10",
-    "@angular/http": "2.4.10",
+    "@angular/forms": "^4.0.0",
+    "@angular/http": "^4.0.0",
     "@angular/material": "2.0.0-beta.2",
-    "@angular/platform-browser": "2.4.10",
-    "@angular/platform-browser-dynamic": "2.4.10",
-    "@angular/router": "3.4.10",
-    "@types/lodash": "4.14.55",
-    "angular2-prettyjson": "2.0.4",
+    "@angular/platform-browser": "^4.0.0",
+    "@angular/platform-browser-dynamic": "^4.0.0",
+    "@angular/platform-server": "^4.0.0",
+    "@angular/router": "^4.0.0",
+    "@types/lodash": "4.14.58",
+    "angular2-prettyjson": "2.0.5",
     "angular2-uuid": "1.1.1",
     "core-js": "2.4.1",
     "hammerjs": "2.0.8",
-    "jquery": "3.2.0",
+    "jquery": "3.2.1",
     "lodash": "4.17.4",
     "ng2-config": "1.1.2-final",
     "ng2-webstorage": "1.5.1",
     "rxjs": "5.2.0",
     "ts-helpers": "1.1.2",
-    "vis": "4.18.1",
-    "zone.js": "^0.8.4"
+    "typescript": "^2.2.2",
+    "vis": "4.19.1",
+    "zone.js": "^0.8.5"
   },
   "devDependencies": {
-    "@angular/cli": "^1.0.0-rc.2",
-    "@angular/compiler-cli": "^2.4.9",
+    "@angular/cli": "^1.0.0",
+    "@angular/compiler-cli": "^4.0.0",
     "@types/hammerjs": "2.0.34",
     "@types/jasmine": "2.5.46",
-    "@types/node": "7.0.8",
+    "@types/node": "7.0.12",
     "awesome-typescript-loader": "3.1.2",
-    "codelyzer": "3.0.0-beta.3",
+    "codelyzer": "3.0.0-beta.4",
     "jasmine-core": "2.5.2",
     "jasmine-spec-reporter": "3.2.0",
     "karma": "1.5.0",
@@ -52,9 +56,9 @@
     "karma-jasmine": "1.1.0",
     "karma-remap-istanbul": "0.6.0",
     "protractor": "5.1.1",
-    "ts-node": "2.1.0",
+    "ts-node": "3.0.2",
     "tslint": "4.5.1",
-    "typescript": "2.2.1",
+    "typescript": "2.2.2",
     "webdriver-manager": "12.0.4"
   }
 }
diff --git a/schema-builder/schema-builder-ui/src/app/app.module.ts b/schema-builder/schema-builder-ui/src/app/app.module.ts
@@ -16,6 +16,7 @@
 
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule, ApplicationRef } from '@angular/core';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { FormsModule } from '@angular/forms';
 import { MaterialModule } from '@angular/material';
 import { HttpModule } from '@angular/http';
@@ -65,6 +66,7 @@ export function configFactory() {
     MaterialModule.forRoot(),
     ReactiveFormsModule,
     Ng2Webstorage,
+    BrowserAnimationsModule,
     RouterModule,
     routing,
     ConfigModule.forRoot({

diff --git a/schema-builder/schema-builder-ui/src/app/graph/graph.component.ts b/schema-builder/schema-builder-ui/src/app/graph/graph.component.ts
@@ -33,8 +33,8 @@ export class GraphComponent implements OnInit {
     events: any;
     data: any;
     options: any;
-    selectedNode: Observable<any>;
-    selectedEdge: Observable<any>;
+    selectedNode: Observable<string>;
+    selectedEdge: Observable<string>;
 
     constructor(private storage: LocalStorageService) { }