fixed bug with woql errors not being reported

Author: kevinchekovfeeney

lib/dispatchRequest.js

@@ -84,7 +84,11 @@ function DispatchRequest(url, action, payload) {
 		return axios.get(url, options)
 			.then((response => response.data))
 			.catch((err) => {
-				throw new Error(ErrorMessage.getAPIErrorMessage(url, options, err));
+				let e = new Error(ErrorMessage.getAPIErrorMessage(url, options, err));
+				if(err.response && err.response.data){
+					e.data = err.response.data;
+				}
+				throw e; 
 			});
 	}
 }

lib/errorMessage.js

@@ -1,10 +1,10 @@
 function getErrorAsMessage(url, api, err) {
-	// console.log('getErrorAsMessage');
 	let str = '';
 	if (err.response) {
 		err = err.response;
 		if (err.data) str += `${formatErrorMessage(err.data)}`;
-	} else if (err.body) str += `${formatErrorMessage(err.data)}`;
+	} else if (err.body) str += `${formatErrorMessage(err.body)}`;
+	url = url.split("?")[0];
 
 	if (err.status) str += `Code: ${err.status}`;
 	if (err.action) str += `, Action: ${err.action}`;
@@ -18,6 +18,7 @@ function formatErrorMessage(msg) {
 	if (typeof msg === 'object') {
 		let nmsg = '';
 		for (const key of Object.keys(msg)) {
+			if(msg[key] && typeof msg[key] != "object")
 			nmsg += `${key} ${msg[key]} `;
 		}
 		return nmsg;

lib/objectFrame.js

@@ -100,12 +100,12 @@ ObjectFrame.prototype.loadDataFrames = function (frames) {
 	for (let i = 0; i < frames.length; i += 1) {
 		if (frames[i]['@context']) this.jsonld_context = frames[i]['@context'];
 		let cframe = this.getPropertyClassFrame(frames[i].property, frames[i]);
-		if (cframe.isClassChoice()) {
+		if (cframe && cframe.isClassChoice()) {
 			cframe = cframe.getChosenClassFrame(frames[i].range);
 			if (!cframe) {
 				console.log(`no choice frame ${frames[i].range}`);
 			}
-		} else if (cframe.isLogic()) {
+		} else if (cframe && cframe.isLogic()) {
 			cframe = cframe.getChosenFrame(frames[i]);
 		}
 		if (cframe) {
@@ -246,7 +246,12 @@ ObjectFrame.prototype.getMissingPropertyList = function () {
 	const nmissing = [];
 	for (let i = 0; i < missing.length; i++) {
 		const cframe = this.getPropertyClassFrame(missing[i]);
-		const newb = { label: cframe.getLabel(), value: missing[i] };
+		if(cframe){
+			var newb = { label: cframe.getLabel(), value: missing[i] };
+		}
+		else {
+			var newb = { label: missing[i], value: missing[i]};
+		}
 		nmissing.push(newb);
 	}
 	return nmissing;
@@ -260,7 +265,12 @@ ObjectFrame.prototype.getFilledPropertyList = function () {
 	const filled = [];
 	for (let i = 0; i < props.length; i++) {
 		const cframe = this.getPropertyClassFrame(props[i]);
-		const newb = { label: cframe.getLabel(), value: props[i] };
+		if(cframe){
+			var newb = { label: cframe.getLabel(), value: props[i] };
+		}
+		else {
+			var newb = { label: props[i], value: props[i]};
+		}
 		filled.push(newb);
 	}
 	return filled;
@@ -546,7 +556,7 @@ PropertyFrame.prototype.addFrame = function (frame) {
 		var df = new DataFrame(frame, this, this.values.length);
 		this.values.push(df);
 	} else {
-		const kid = new ObjectFrame(this.range(), cframe.frame, frame.frame, this, frame);
+		const kid = new ObjectFrame(this.range(), this.cframe.frame, frame.frame, this, frame);
 		this.values.push(kid);
 	}
 };