Merge remote-tracking branch 'origin/development'

Author: m-mohr

src/components/DataTable.vue

@@ -139,7 +139,7 @@ export default {
 					return;
 				}
 			}
-			console.log(error);
+			console.warn(error);
 			this.noDataMessage = "Sorry, an unknown error has occured.";
 		},
 		retrieveData() {
@@ -273,7 +273,7 @@ export default {
 					value = this['format' + col.format](value, col);
 				}
 				else {
-					console.log(col.format + ' is an invalid formatter.');
+					console.warn(col.format + ' is an invalid formatter.');
 				}
 			}
 			else if (typeof col.format === 'function') {

src/components/Editor.vue

@@ -55,6 +55,7 @@ export default {
 	},
 	data() {
 		return {
+			lastPgToInsert: null,
 			pgToInsert: null
 		};
 	},
@@ -124,7 +125,11 @@ export default {
 
 		transferProcessGraph() {
 			this.activeEditor.onShow();
-			this.insertProcessGraph(this.pgToInsert);
+			// Don't update process graph if it hasn' changed
+			if (!this.lastPgToInsert || JSON.stringify(this.pgToInsert) !== this.lastPgToInsert) {
+				this.insertProcessGraph(this.pgToInsert);
+				this.lastPgToInsert = JSON.stringify(this.pgToInsert);
+			}
 			this.pgToInsert = null;
 		}
 

src/components/FilePanel.vue

@@ -97,7 +97,7 @@ export default {
 					this.$set(this.uploadProgressPerFile, i, 100);
 					Utils.ok(this, 'File upload completed.', file.name);
 				}).catch(error => {
-					console.log(error);
+					console.error(error);
 					Utils.exception(this, error, file.name);
 				});
 		},
@@ -129,7 +129,7 @@ export default {
 			this.connection.subscribe(
 				'openeo.files', {},
 				(data, info) => {
-					console.log("File change: " + JSON.stringify(data));
+					console.info("File change: " + JSON.stringify(data));
 				}
 			);
 			this.subscribed = true;

src/components/JobPanel.vue

@@ -310,19 +310,19 @@ export default {
 			this.connection.subscribe(
 				'openeo.jobs.debug', params,
 				(data, info) => {
-					console.log("Debugging information for job " + id + ": " + JSON.stringify(data));
+					console.info("Debugging information for job " + id + ": " + JSON.stringify(data));
 				}
 			);
 			this.connection.subscribe(
 				'openeo.jobs.output', params,
 				(data, info) => {
-					console.log("Output from job " + id + ": " + JSON.stringify(data));
+					console.info("Output from job " + id + ": " + JSON.stringify(data));
 				}
 			);
 			this.connection.subscribe(
 				'openeo.jobs.status', params,
 				(data, info) => {
-					console.log("Status information for job " + id + ": " + JSON.stringify(data));
+					console.info("Status information for job " + id + ": " + JSON.stringify(data));
 				}
 			);
 			this.jobSubscriptions.push(id);

src/components/ParameterFields.vue

@@ -45,7 +45,7 @@ export default {
 					}
 					else if (Array.isArray(type)) {
 						Utils.info("Data type can't be detected, please select it yourself.");
-						console.log("Parameter schema is ambiguous. Potential types: " + type.join(', ') + ". Value: " + JSON.stringify(this.pass));
+						console.warn("Parameter schema is ambiguous. Potential types: " + type.join(', ') + ". Value: " + JSON.stringify(this.pass));
 						this.type = type[0];
 					}
 					else {

src/components/Tabs.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="tabs" :id="id">
+	<div :class="{tabs: true, hide: !hasEnabledTabs} " :id="id">
 		<div class="tabsHeader">
 			<button type="button" v-show="tab.enabled" :class="{'tabItem': true, 'tabActive': tab.active }" @click="selectTab(tab)" v-for="tab in tabs" :key="tab.id">
 				<i :class="['fas', tab.icon]"></i> {{ tab.name }}
@@ -25,11 +25,16 @@ export default {
 			tabs: []
 		};
 	},
-	created() {
-		this.tabs = this.$children;
-	},
 	mounted() {
-		this.resetActiveTab();
+		if (Array.isArray(this.$children)) {
+			this.tabs = this.$children;
+			this.resetActiveTab();
+		}
+	},
+	computed: {
+		hasEnabledTabs() {
+			return this.tabs.filter(t => t.enabled).length > 0;
+		}
 	},
 	methods: {
 		getTab(id) {
@@ -64,11 +69,18 @@ export default {
 			if (activeTab === selectedTab) {
 				return;
 			}
-			if (selectedTab !== null && await selectedTab.show() && activeTab !== null) {
+			if (!selectedTab || typeof selectedTab.show !== 'function') {
+				console.warn("Invalid tab", selectedTab);
+				return;
+			}
+			if (await selectedTab.show() && activeTab !== null) {
 				activeTab.hide();
 			}
 		},
 		resetActiveTab(force = false) {
+			if (this.tabs.length === 0) {
+				return;
+			}
 			if (force || this.getActiveTab() === null) {
 				this.selectTab(this.tabs[0]);
 			}
@@ -89,6 +101,9 @@ export default {
 	border: 1px solid #aaa;
 	margin-bottom: 10px;
 }
+.tabs.hide {
+	display: none;
+}
 #viewer .tabs {
 	height: 97%;
 }

src/components/TextEditor.vue

@@ -66,7 +66,7 @@ export default {
 	},
 	watch: {
 		active(newVal) {
-			if (newVal) {
+			if (newVal && this.editor !== null) {
 				this.editor.refresh();
 			}
 		}

src/components/blocks/field.js

@@ -139,9 +139,17 @@ class Field extends ProcessSchema {
                 this.hasValue = true;
             }
             else {
+                var errorMsg = "Can't determine which object property this input should be assigned to. Please specify manually in Process Graph mode.";
+                console.warn(errorMsg);
+                this.block.blocks.showError(errorMsg);
                 // ToDo: It is not quite clear what to do when multiple refs are available.
             }
         }
+        else {
+            // ToDo: This is probably of data type mixed or any, how to handle?
+            this.value = ref;
+            this.hasValue = true;
+        }
     }
 
     _removeValueForEdge(edge) {

src/main.js

@@ -9,7 +9,7 @@ Vue.use(Snotify);
 
 Vue.config.productionTip = false;
 Vue.config.errorHandler = function (err, vm, info) {
-	console.log(err, info);
+	console.error(err, info);
 	if ((err instanceof Error || typeof err === 'string') && vm && vm.$snotify) {
 		vm.$snotify.error(err.message || err, 'Fatal error', Config.snotifyDefaults);
 	}

src/processSchema.js

@@ -67,6 +67,7 @@ class ProcessSchema {
 
 	dataTypes(includeNull = false, native = false) {
 		var types = this.schemas.map(s => s.dataType(native));
+		types = types.filter((v, i, a) => a.indexOf(v) === i); // Return each type only once
 		if (!includeNull) {
 			types = types.filter(s => s !== 'null');
 		}