Fixed #466

orientechnologies · Apr 18, 2017 · 01fae59 · 01fae59
1 parent 5ee15f0
commit 01fae59
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 3 deletions.
diff --git a/src/app/core/services/graph.service.ts b/src/app/core/services/graph.service.ts
@@ -6,7 +6,7 @@ import {downgradeInjectable} from '@angular/upgrade/static';
  *
  *  Holds the Graph Editor info in Memory (Query + Data)
  */
-declare var angular : any;
+declare var angular: any;
 let GraphService = Class({
   constructor: [function () {
     this.databases = {}
@@ -32,6 +32,19 @@ let GraphService = Class({
     this.databases[db][user].data.edges = this.databases[db][user].data.edges.concat(data.edges);
     this.databases[db][user].data.vertices = this.databases[db][user].data.vertices.concat(data.vertices);
   },
+
+  removeEdge(db, user, e){
+    this.init(db, user);
+    this.databases[db][user].data.edges = this.databases[db][user].data.edges.filter((edge) => {
+      return edge["@rid"] !== e.edge["@rid"];
+    })
+  },
+  removeVertex(db, user, v){
+    this.init(db, user);
+    this.databases[db][user].data.vertices = this.databases[db][user].data.vertices.filter((vertex) => {
+      return vertex["@rid"] !== v["@rid"];
+    })
+  },
   data(db, user){
     this.init(db, user);
     return this.databases[db][user].data;

diff --git a/src/controllers/graph-controller.js b/src/controllers/graph-controller.js
@@ -925,6 +925,10 @@ GraphModule.controller("GraphController", ['$scope', '$routeParams', '$location'
                 verbose: false
               }, function (data) {
                 $scope.graph.removeEdge(e);
+
+                $timeout(function () {
+                  GraphService.removeEdge($scope.database, $scope.currentUser, e);
+                }, 100)
               });
             }
           });
@@ -1053,6 +1057,9 @@ GraphModule.controller("GraphController", ['$scope', '$routeParams', '$location'
                         verbose: false
                       }, function (data) {
                         $scope.graph.removeVertex(v);
+                        $timeout(function () {
+                          GraphService.removeVertex($scope.database, $scope.currentUser, v);
+                        }, 100);
                       });
                     }
                   });
@@ -1178,6 +1185,11 @@ GraphModule.controller("GraphController", ['$scope', '$routeParams', '$location'
     modalScope.confirmSave = function (docs) {
       $scope.graph.endEdgeCreation();
       $scope.graph.data({edges: docs}).redraw();
+      $timeout(function () {
+        GraphService.add($scope.database, $scope.currentUser,
+          {vertices: [], edges: docs}
+        );
+      }, 100)
     }
     modalScope.cancelSave = function (error) {
 
@@ -1207,6 +1219,13 @@ GraphModule.controller("GraphController", ['$scope', '$routeParams', '$location'
     modalScope.confirmSave = function (doc) {
 
       $scope.graph.data({vertices: [doc]}).redraw();
+
+
+      $timeout(function () {
+        GraphService.add($scope.database, $scope.currentUser,
+          {vertices: [doc], edges: []}
+        );
+      }, 100)
     }
     $modal({
       template: 'views/database/modalNew.html',
@@ -1308,8 +1327,7 @@ GraphModule.controller("GraphController", ['$scope', '$routeParams', '$location'
         GraphService.query($scope.database, $scope.currentUser, $scope.queryText);
         GraphService.add($scope.database, $scope.currentUser,
           data.graph
-        )
-        ;
+        );
       }, 1000);
     }).catch(function (err) {
       Spinner.stopSpinner();