Merge branch 'feature/queries-validation'

app/components/behaviors/behavior-graph.js

@@ -27,8 +27,7 @@ import globals from "ajan-editor/helpers/global-parameters";
 import nodeDefs from "ajan-editor/helpers/RDFServices/node-definitions/common";
 import rdfGraph from "ajan-editor/helpers/RDFServices/RDF-graph";
 import rdfManager from "ajan-editor/helpers/RDFServices/RDF-manager";
-import utility from "ajan-editor/helpers/RDFServices/utility";
-import { AGENTS, XSD, RDF, RDFS } from "ajan-editor/helpers/RDFServices/vocabulary";
+import { AGENTS } from "ajan-editor/helpers/RDFServices/vocabulary";
 import Split from "npm:split.js";
 
 let $ = Ember.$;

app/components/behaviors/manipulation/bt-selection.js

@@ -36,7 +36,6 @@ export default Component.extend({
 
 
 	selectedBTChange: observer("selectedValue", function() {
-
 		localStorage.setItem("bt-selected", this.get("selectedValue"));
 		selectBT(this);
 	}),

app/components/behaviors/properties-pane.js

@@ -41,15 +41,15 @@ export default Component.extend({
 
     $("#node-properties").on("sendNodeData", function (e, nodeData) {
       let node = Node.create(nodeData);
-			that.set("node", node);
+      that.set("node", node);
 			that.set("showProperties", true);
 			that.get("queryInsertion").set("nodeType", node.nodeType);
 			that.get("queryInsertion").set("uri", node.uri);
 		});
 
 		$("#node-properties").on("blurProperties", function() {
 			that.set("showProperties", false);
-		});
+    });
 	},
 
 	advancedMode: computed(function() {
@@ -62,7 +62,7 @@ export default Component.extend({
 		localStorage.setItem(modeId, this.advancedMode);
 	}),
 
-	labelChange: observer("node.label", function() {
+  labelChange: observer("node.label", function () {
 		this.get("nodeProperties").updateLabel(this.get("node"));
 	}),
 

app/components/behaviors/properties/parameter-structure.js

@@ -19,7 +19,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 import {computed, observer} from "@ember/object";
-import {ND, XSD} from "ajan-editor/helpers/RDFServices/vocabulary";
+import {ND, BT, XSD} from "ajan-editor/helpers/RDFServices/vocabulary";
 import Component from "@ember/component";
 import rdfGraph from "ajan-editor/helpers/RDFServices/RDF-graph";
 
@@ -87,13 +87,14 @@ export default Component.extend({
 });
 
 function getValue(that) {
-  let structure = that.get("parameter");
-	let value = rdfGraph.getObjectValue(that.get("uri"), structure.mapping);
+  let parameter = that.get("parameter");
+
+  let value = rdfGraph.getObjectValue(that.get("uri"), parameter.mapping);
 	if (!value && typeof value !== "boolean")
 		console.warn(
 			"Value not defined, using default",
 			that.get("uri"),
-			structure
+      parameter
     );
-  return value || structure.default;
+  return value || parameter.default;
 }

app/components/behaviors/properties/parameter/actn-field.js

@@ -30,9 +30,10 @@ let that;
 
 export default Component.extend({
   ajax: Ember.inject.service(),
-
+  nodeProperties: Ember.inject.service("behaviors/node-properties"),
   availableACTNs: null,
   selected: undefined,
+  validation: undefined,
   uri: null,
 
   init() {
@@ -42,12 +43,22 @@ export default Component.extend({
     loadActionsRdfGraphData();
   },
 
+  didUpdateAttrs() {
+    initErrorsList(this);
+    validateActionField(this);
+  },
+
   selectedChanged: observer("selected", function () {
     this.set("selected", this.selected);
     setBase(this.get("uri"), this.get("structure.mapping"), this.selected);
+    let base = getSelected(that.get("availableACTNs"), this.selected);
+    this.set("selectedBaseValue", base);
+    initErrorsList(this);
+    validateActionField(this);
   }),
 
   uriChange: observer("uri", function () {
+    that = this;
     setAvailableActions();
   })
 });
@@ -78,6 +89,7 @@ function setAvailableActions() {
   that.set("availableACTNs", allActions);
   var base = getSelected(that.get("availableACTNs"), that.get("value"));
   that.set("selectedBaseValue", base);
+  validateActionField(that);
 }
 
 function getSelected(ele, uri) {
@@ -87,3 +99,18 @@ function getSelected(ele, uri) {
 function setBase(uri, basePredicate, value) {
   rdfGraph.setObject(uri, basePredicate, rdfFact.toNode(value));
 }
+
+function initErrorsList(comp) {
+  let node = getNode(comp);
+  if (node && !node.errors) {
+    getNode(comp).errors = new Array();
+  }
+}
+
+function validateActionField(comp) {
+  comp.get("nodeProperties").validateEventGoalActionField(comp, "No Action Definition is selected!");
+}
+
+function getNode(comp) {
+  return comp.get("nodeProperties").getNode(comp);
+}

app/components/behaviors/properties/parameter/event-field.js

@@ -30,24 +30,37 @@ let that;
 
 export default Component.extend({
   ajax: Ember.inject.service(),
-
+  nodeProperties: Ember.inject.service("behaviors/node-properties"),
   availableEvents: null,
   selected: undefined,
+  validation: undefined,
+
   uri: null,
 
   init() {
     this._super(...arguments);
     that = this;
     initializeGlobals(this);
-    loadAgentsRdfGraphData();
+    initErrorsList(this);
+    loadAvailableEventsRdfGraphData();
+  },
+
+  didUpdateAttrs() {
+    initErrorsList(this);
+    validateEventGoalField(this);
   },
 
   selectedChanged: observer("selected", function () {
     this.set("selected", this.selected);
     setBase(this.get("uri"), this.get("structure.mapping"), this.selected);
+    let base = getSelected(that.get("availableEvents"), this.selected);
+    this.set("selectedBaseValue", base);
+    initErrorsList(this);
+    validateEventGoalField(this);
   }),
 
   uriChange: observer("uri", function () {
+    that = this;
     setAvailableEvents();
   })
 });
@@ -66,7 +79,7 @@ function initializeAjax() {
   globals.ajax = ajax;
 }
 
-function loadAgentsRdfGraphData() {
+function loadAvailableEventsRdfGraphData() {
   let repo = (localStorage.currentStore || "http://localhost:8090/rdf4j/repositories")
     + globals.agentsRepository;
   actionsAgnt.getFromServer(ajax, repo).then(setAvailableEvents);
@@ -77,6 +90,7 @@ function setAvailableEvents() {
   that.set("availableEvents", eventLists);
   var base = getSelected(that.get("availableEvents"), that.get("value"));
   that.set("selectedBaseValue", base);
+  validateEventGoalField(that);
 }
 
 function getSelected(ele, uri) {
@@ -86,3 +100,18 @@ function getSelected(ele, uri) {
 function setBase(uri, basePredicate, value) {
   rdfGraph.setObject(uri, basePredicate, rdfFact.toNode(value));
 }
+
+function initErrorsList(comp) {
+  let node = getNode(comp);
+  if (node && !node.errors) {
+    getNode(comp).errors = new Array();
+  }
+}
+
+function validateEventGoalField(comp) {
+  comp.get("nodeProperties").validateEventGoalActionField(comp, "No Event is selected!");
+}
+
+function getNode(comp) {
+  return comp.get("nodeProperties").getNode(comp);
+}

app/components/behaviors/properties/parameter/event-goal-field.js

@@ -30,24 +30,41 @@ let that;
 
 export default Component.extend({
   ajax: Ember.inject.service(),
-
+  nodeProperties: Ember.inject.service("behaviors/node-properties"),
   availableEventsGoals: null,
   selected: undefined,
+  validation: undefined,
+  value: null,
   uri: null,
 
   init() {
     this._super(...arguments);
     that = this;
     initializeGlobals(this);
-    loadActionsRdfGraphData();
+    initErrorsList(this);
+    loadAvailableEventsRdfGraphData();
+  },
+
+  didInsertElement() {
+
+  },
+
+  didUpdateAttrs() {
+    initErrorsList(this);
+    validateEventGoalField(this);
   },
 
   selectedChanged: observer("selected", function () {
     this.set("selected", this.selected);
     setBase(this.get("uri"), this.get("structure.mapping"), this.selected);
+    let base = getSelected(that.get("availableEventsGoals"), this.selected);
+    this.set("selectedBaseValue", base);
+    initErrorsList(this);
+    validateEventGoalField(this);
   }),
 
   uriChange: observer("uri", function () {
+    that = this;
     setAvailableEvents();
   })
 });
@@ -66,7 +83,7 @@ function initializeAjax() {
   globals.ajax = ajax;
 }
 
-function loadActionsRdfGraphData() {
+function loadAvailableEventsRdfGraphData() {
   let repo = (localStorage.currentStore || "http://localhost:8090/rdf4j/repositories")
     + globals.agentsRepository;
   actionsAgnt.getFromServer(ajax, repo).then(setAvailableEvents);
@@ -78,8 +95,9 @@ function setAvailableEvents() {
   eventLists = eventLists.concat(actionsAgnt.getEvents());
   eventLists = eventLists.concat(actionsAgnt.getGoals());
   that.set("availableEventsGoals", eventLists);
-  var base = getSelected(that.get("availableEventsGoals"), that.get("value"));
+  let base = getSelected(that.get("availableEventsGoals"), that.get("value"));
   that.set("selectedBaseValue", base);
+  validateEventGoalField(that);
 }
 
 function getSelected(ele, uri) {
@@ -89,3 +107,18 @@ function getSelected(ele, uri) {
 function setBase(uri, basePredicate, value) {
   rdfGraph.setObject(uri, basePredicate, rdfFact.toNode(value));
 }
+
+function initErrorsList(comp) {
+  let node = getNode(comp);
+  if (node && !node.errors) {
+    getNode(comp).errors = new Array();
+  }
+}
+
+function validateEventGoalField(comp) {
+  comp.get("nodeProperties").validateEventGoalActionField(comp, "No Event/Goal is selected!");
+}
+
+function getNode(comp) {
+  return comp.get("nodeProperties").getNode(comp);
+}

app/components/behaviors/properties/parameter/goal-field.js

@@ -30,25 +30,36 @@ let that;
 
 export default Component.extend({
   ajax: Ember.inject.service(),
-
+  nodeProperties: Ember.inject.service("behaviors/node-properties"),
   availableGoals: null,
   selected: undefined,
+  validation: undefined,
   uri: null,
 
   didInsertElement() {
-    console.log("didInsertElement");
     this._super(...arguments);
     that = this;
     initializeGlobals(this);
-    loadActionsRdfGraphData();
+    loadAvailableEventsRdfGraphData();
+  },
+
+  didUpdateAttrs() {
+    initErrorsList(this);
+    validateEventGoalField(this);
   },
 
+
   selectedChanged: observer("selected", function () {
     this.set("selected", this.selected);
     setBase(this.get("uri"), this.get("structure.mapping"), this.selected);
+    let base = getSelected(that.get("availableGoals"), this.selected);
+    this.set("selectedBaseValue", base);
+    initErrorsList(this);
+    validateEventGoalField(this);
   }),
 
   uriChange: observer("uri", function () {
+    that = this;
     setAvailableGoals();
   })
 });
@@ -67,7 +78,7 @@ function initializeAjax() {
   globals.ajax = ajax;
 }
 
-function loadActionsRdfGraphData() {
+function loadAvailableEventsRdfGraphData() {
   let repo = (localStorage.currentStore || "http://localhost:8090/rdf4j/repositories")
     + globals.agentsRepository;
   actionsAgnt.getFromServer(ajax, repo).then(setAvailableGoals);
@@ -78,6 +89,7 @@ function setAvailableGoals() {
   that.set("availableGoals", goalsLists);
   var base = getSelected(that.get("availableGoals"), that.get("value"));
   that.set("selectedBaseValue", base);
+  validateEventGoalField(that);
 }
 
 function getSelected(ele, uri) {
@@ -87,3 +99,18 @@ function getSelected(ele, uri) {
 function setBase(uri, basePredicate, value) {
   rdfGraph.setObject(uri, basePredicate, rdfFact.toNode(value));
 }
+
+function initErrorsList(comp) {
+  let node = getNode(comp);
+  if (node && !node.errors) {
+    getNode(comp).errors = new Array();
+  }
+}
+
+function validateEventGoalField(comp) {
+  comp.get("nodeProperties").validateEventGoalActionField(comp, "No Goal is selected!");
+}
+
+function getNode(comp) {
+  return comp.get("nodeProperties").getNode(comp);
+}