Fix LinkSet/LinkList issue when editing/creating #478

orientechnologies · Jul 4, 2017 · b93081f · b93081f
1 parent 9c87de7
commit b93081f
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 6 deletions.
diff --git a/src/app/util/graph/d3-graph/OGraph.ts b/src/app/util/graph/d3-graph/OGraph.ts
@@ -550,7 +550,7 @@ export class OGraph {
 
   transform(d) {
     if(!d) {
-      console.log("Fuck!");
+      console.log("Duck!");
     }
     return "translate(" + d.x + "," + d.y + ")";
   }

diff --git a/src/controllers/document-controller.js b/src/controllers/document-controller.js
@@ -106,7 +106,7 @@ DocController.controller("DocumentModalController", ['$scope', '$routeParams', '
   $scope.database = $scope.db;
   $scope.reload = function () {
     $scope.doc = DocumentApi.get({database: $scope.db, document: $scope.rid}, function () {
-      $scope.headers = Database.getPropertyFromDoc($scope.doc);
+      $scope.headers = Database.getPropertyFromDoc($scope.doc,true);
       $scope.onReload();
     }, function (error) {
       Notification.push({content: JSON.stringify(error)});

diff --git a/src/controllers/graph-controller.js b/src/controllers/graph-controller.js
@@ -118,12 +118,13 @@ GraphModule.controller("VertexEditController", ['$scope', '$injector', '$routePa
   if (!$scope.doc) {
     $scope.reload();
   } else {
-    $scope.headers = Database.getPropertyFromDoc($scope.doc);
+    $scope.headers = Database.getPropertyFromDoc($scope.doc, true);
+
     $scope.isGraph = Database.isGraph($scope.doc['@class']);
     $scope.incomings = Database.getEdge($scope.doc, 'in_');
     $scope.outgoings = Database.getEdge($scope.doc, 'out_');
     $scope.exclude = $scope.outgoings.concat($scope.incomings);
-    $scope.outgoings = $scope.outgoings.concat((Database.getLink($scope.doc, $scope.exclude)));
+
 
     $scope.label = Database.isEdge($scope.doc['@class']) ? "Edge" : "Vertex";
 
@@ -1363,7 +1364,7 @@ GraphModule.controller("VertexAsideController", ['$scope', '$routeParams', '$loc
     $scope.icons = data;
 
 
-    $scope.headers = Database.getPropertyFromDoc($scope.doc);
+    $scope.headers = Database.getPropertyFromDoc($scope.doc,true);
     $scope.headers.unshift("@class");
     $scope.headers.unshift("@rid");
     $scope.active = 'properties';

diff --git a/src/directives/widget.js b/src/directives/widget.js
@@ -6,6 +6,8 @@ import '../views/widget/string.html';
 import '../views/widget/short.html';
 import '../views/widget/embedded.html';
 import '../views/widget/embeddedmap.html';
+import '../views/widget/linklist.html';
+import '../views/widget/linkset.html';
 import '../views/widget/boolean.html';
 import '../views/widget/binary.html';
 import '../views/widget/byte.html';

diff --git a/src/services/database-services.js b/src/services/database-services.js
@@ -340,17 +340,23 @@ database.factory('Database', ["DatabaseApi", "localStorageService", "SchemaServi
      * @param {doc} OrientDB Document.
      * @return {Array} Property name Array.
      */
-    getPropertyFromDoc: function (doc) {
+    getPropertyFromDoc: function (doc, includeLinks) {
       var c = doc['@class'];
       var isGraph = this.isGraph(c);
       var fixedHeader = this.header.concat(this.exclude);
+
+
       var self = this;
       var fields = this.listField(c);
       var all = Object.keys(doc).filter(function (element, index, array) {
         var type = self.getFieldType(c, element);
         if (isGraph) {
           return (fixedHeader.indexOf(element) == -1 && (!element.startsWith("in_") && !element.startsWith("out_")) && !self.isLink(type));
         } else {
+
+          if (includeLinks === true) {
+            return true;
+          }
           return (fixedHeader.indexOf(element) == -1 && !self.isLink(type));
         }
       });
@@ -361,6 +367,9 @@ database.factory('Database', ["DatabaseApi", "localStorageService", "SchemaServi
           var bool = true;
           if (isGraph) {
             bool = (fixedHeader.indexOf(elem) == -1 && (!elem.startsWith("in_") && !elem.startsWith("out_")) && !self.isLink(type));
+            if (self.isLink(type) && includeLinks === true) {
+              bool = true;
+            }
           } else {
             bool = (fixedHeader.indexOf(elem) == -1 && !self.isLink(type));
           }

diff --git a/src/views/widget/linklist.html b/src/views/widget/linklist.html
@@ -0,0 +1,3 @@
+<div ng-controller="EmbeddedController">
+    <div jsontext ui-codemirror="viewerOptions" ng-required='isRequired(header)' ng-model='doc[header]'></div>
+</div>
diff --git a/src/views/widget/linkset.html b/src/views/widget/linkset.html
@@ -0,0 +1,3 @@
+<div ng-controller="EmbeddedController">
+    <div jsontext ui-codemirror="viewerOptions" ng-required='isRequired(header)' ng-model='doc[header]'></div>
+</div>