Trails

package.json

@@ -52,7 +52,8 @@
     "ninja-util": "^1.3.1",
     "request": "^2.88.0",
     "request-promise-native": "^1.0.8",
-    "shortid": "^2.2.14"
+    "shortid": "^2.2.14",
+    "linked-list": "git+ssh://[email protected]:keg-core/linked-list.git"
   },
   "license": "MIT",
   "repository": {

src/datasource/hkdatasource.js

@@ -522,7 +522,7 @@ class HKDatasource
       }
     });
   }
-
+  
   /**
    * Get entities from a context
    *
@@ -584,6 +584,53 @@ class HKDatasource
     });
   }
 
+  /**
+ * @callback GetTrailCallback
+ * @param {string} err An error object that indicate if the operation was succesful or not
+ * @param {object} trail 
+ */
+/**
+ * Fetch trail
+ *
+ * @param {string} trailId The trail id to retrieve their nested entities.
+ * @param {GetTrailCallback} callback Callback with the entities
+ */
+
+fetchTrail(trailId, callback = () => {})
+ {
+	 let url = this.url + "repository/" + this.graphName + "/trail/" + encodeURIComponent(trailId);
+
+	 request.get(url, this.options, (err, res) =>
+	 {
+		 // console.log(res.body);
+		 if (!err)
+		 {
+			 if (requestCompletedWithSuccess(res.statusCode))
+			 {
+				 try
+				 {
+					 let entities = convertEntities(res.body);
+					 callback(null, entities[trailId]);
+				 }
+				 catch (exp)
+				 {
+					 callback(exp);
+				 }
+			 }
+
+			 else
+			 {
+				 callback(`Server responded with ${res.statusCode}. ${res.body}`);
+			 }
+		 }
+
+		 else
+		 {
+			 callback(err);
+		 }
+	 });
+ }
+
   /**
    * Filter entities using CSS pattern `(TODO: document it better)`
    *

src/hkgraph.js

@@ -13,6 +13,7 @@ const Reference = require("./reference");
 const Trail = require("./trail");
 const HKTypes = require("./types");
 const shortId = require('shortid');
+const { Action }    = require("./trail");
 const VirtualContext = require("./virtualcontext");
 const HKEntity = require("./hkentity");
 const VirtualNode = require("./virtualnode");
@@ -32,6 +33,8 @@ class HKGraph
     this.connectors = {};
     this.refs = {};
     this.trails = {};
+    this.actions = {};
+
     // Auxiliar maps
     this.bindsMap = {};
     this.linkMap = {};
@@ -55,7 +58,8 @@ class HKGraph
       this.links.hasOwnProperty(id) ||
       this.connectors.hasOwnProperty(id) ||
       this.refs.hasOwnProperty(id) ||
-      this.trails.hasOwnProperty(id);
+      this.trails.hasOwnProperty(id) ||
+      this.actions.hasOwnProperty(id);
   }
 
   /**
@@ -82,7 +86,7 @@ class HKGraph
       oldEntity.className = entity.className;
     }
 
-    if (entity.type === HKTypes.NODE || entity.type === HKTypes.REFERENCE || entity.type === HKTypes.CONTEXT || entity.type === HKTypes.VIRTUAL_NODE || entity.type === HKTypes.VIRTUAL_CONTEXT)
+    if (entity.type === HKTypes.NODE || entity.type === HKTypes.TRAIL || entity.type === HKTypes.REFERENCE || entity.type === HKTypes.CONTEXT || entity.type === HKTypes.VIRTUAL_NODE || entity.type === HKTypes.VIRTUAL_CONTEXT || entity.type === HKTypes.ACTION)
     {
       oldEntity.interfaces = entity.interfaces;
     }
@@ -218,9 +222,25 @@ class HKGraph
             {
               newEntity = new Trail(entity);
               this.trails[entity.id] = newEntity;
+              this.contextMap[entity.id] = {};
+
+              if(this.orphans.hasOwnProperty(entity.id))
+                {
+                  this.contextMap[entity.id] = this.orphans[entity.id];
+                  delete this.orphans[entity.id];
+                }
             }
             break;
           }
+        case HKTypes.ACTION:
+          {
+            if(entity instanceof Trail.Action)
+            {
+              newEntity = entity;
+              this.actions[entity.id] = newEntity;
+            }
+            break;
+            }
         case HKTypes.LINK:
           {
             if (Link.isValid(entity))
@@ -439,8 +459,13 @@ class HKGraph
           {
             /* delete children trails? */
             delete this.trails[id];
+            delete this.contextMap[entity.id];
             break;
           }
+        case Action.type:
+          {
+            delete this.actions[id];
+          }
       }
 
       if (this.orphans.hasOwnProperty(entity.parent))
@@ -612,7 +637,7 @@ class HKGraph
       c.id = null;
       return c;
     }
-    return this.nodes[id] || this.virtualNodes[id] || this.contexts[id] || this.virtualContexts[id] || this.virtualLinks[id] || this.links[id] || this.connectors[id] || this.refs[id] || this.trails[id] || null;
+    return this.nodes[id] || this.virtualNodes[id] || this.contexts[id] || this.virtualContexts[id] || this.virtualLinks[id] || this.links[id] || this.connectors[id] || this.refs[id] || this.trails[id] || this.actions[id] || null;
   }
 
   /**

src/index.js

@@ -35,6 +35,7 @@ exports.CONNECTOR_TYPE = require("./types").CONNECTOR;
 exports.BIND_TYPE = require("./types").BIND;
 exports.INTERFACE = require("./types").INTERFACE;
 exports.TRAIL_TYPE = require("./types").TRAIL;
+exports.ACTION_TYPE = require("./types").ACTION;
 exports.VIRTUAL_NODE_TYPE = require("./types").VIRTUAL_NODE;
 exports.VIRTUAL_CONTEXT_TYPE = require("./types").VIRTUAL_CONTEXT;
 exports.VIRTUAL_LINK_TYPE = require("./types").VIRTUAL_LINK;