Merge remote-tracking branch 'origin/development'

Author: m-mohr

README.md

@@ -1,7 +1,7 @@
 # openEO Web Editor
 A web-based editor for interactive usage of the openEO API.
 
-The web editor currently **supports openEO API versions v0.4.0**.
+The web editor currently **supports openEO API version v0.4**.
 
 ## Getting Started
 You can use the online **[demo](https://open-eo.github.io/openeo-web-editor/demo/)** or build the files yourself and deploy them to any web host.

package.json

@@ -2,7 +2,8 @@
   "name": "@openeo/web-editor",
   "version": "0.4.0-beta.1",
   "apiVersions": [
-    "0.4.0"
+    "0.4.0",
+    "0.4.1"
   ],
   "author": "openEO Consortium",
   "contributors": [
@@ -34,7 +35,7 @@
     "build": "vue-cli-service build"
   },
   "dependencies": {
-    "@openeo/js-client": "^0.4.0-beta.1",
+    "@openeo/js-client": "^0.4.0-beta.2",
     "@openeo/js-commons": "^0.4.0-beta.2",
     "@openeo/vue-components": "^0.3.5",
     "ajv": "^6.10.0",

src/Page.vue

@@ -180,6 +180,10 @@ button {
 }
 
 #container .snotifyToast__title {
-	font-size: 1.2em;
+	font-size: 1em;
+	font-weight: bold;
+}
+#container .snotifyToast__body {
+	font-size: 0.9em;
 }
 </style>

src/components/EditorToolbar.vue

@@ -105,7 +105,7 @@ export default {
 				Utils.info(this, 'Data requested. Please wait...');
 				this.connection.computeResult(script)
 					.then(data => EventBus.$emit('showInViewer', data))
-					.catch(error => Utils.exception(this, error, 'Sorry, could not execute process graph.'));
+					.catch(error => Utils.exception(this, error, 'Computation failed'));
 			});
 		},
 	}

src/components/FilePanel.vue

@@ -8,8 +8,8 @@
 		<DataTable ref="table" :dataSource="listFiles" :columns="columns">
 			<template slot="toolbar">
 				<button title="Refresh files" @click="updateData()"><i class="fas fa-sync-alt"></i></button> <!-- ToDo: Should be done automatically later -->
-				<button v-show="!subscribed" title="Subscribe to all changes to the file directory" @click="subscribeToFileChanges()"><i class="fas fa-bell"></i></button>
-				<button v-show="subscribed" title="Unsubscribe from all changes to the file directory" @click="unsubscribeFromFileChanges()"><i class="fas fa-bell-slash"></i></button>
+			<!--<button v-show="!subscribed" title="Subscribe to all changes to the file directory" @click="subscribeToFileChanges()"><i class="fas fa-bell"></i></button>
+				<button v-show="subscribed" title="Unsubscribe from all changes to the file directory" @click="unsubscribeFromFileChanges()"><i class="fas fa-bell-slash"></i></button> -->
 			</template>
 			<template slot="actions" slot-scope="p">
 				<button title="Download" @click="downloadFile(p.row)" v-show="supports('downloadFile')"><i class="fas fa-download"></i></button>

src/components/JobPanel.vue

@@ -15,8 +15,8 @@
 			<button title="Cancel processing" @click="cancelJob(p.row)" v-show="supports('stopJob') && isJobActive(p.row)"><i class="fas fa-stop-circle"></i></button>
 			<button title="Download" @click="downloadResults(p.row)" v-show="supports('downloadResults') && hasResults(p.row)"><i class="fas fa-download"></i></button>
 			<button title="View results" @click="viewResults(p.row, true)" v-show="supports('downloadResults') && hasResults(p.row)"><i class="fas fa-eye"></i></button>
-			<button title="Subscribe" @click="subscribeToJob(p.row)" v-show="supports('subscribe') && !jobSubscriptions.includes(p.row)"><i class="fas fa-bell"></i></button>
-			<button title="Unsubscribe" @click="unsubscribeFromJob(p.row)" v-show="supports('unsubscribe') && jobSubscriptions.includes(p.row)"><i class="fas fa-bell-slash"></i></button>
+		<!--<button title="Subscribe" @click="subscribeToJob(p.row)" v-show="supports('subscribe') && !jobSubscriptions.includes(p.row)"><i class="fas fa-bell"></i></button>
+			<button title="Unsubscribe" @click="unsubscribeFromJob(p.row)" v-show="supports('unsubscribe') && jobSubscriptions.includes(p.row)"><i class="fas fa-bell-slash"></i></button>-->
 		</template>
 	</DataTable>
 </template>
@@ -91,7 +91,7 @@ export default {
 					}
 					this.updateJobData(updatedJob);
 				})
-				.catch(error => Utils.exception(this, error, "Sorry, could not load job information."));
+				.catch(error => Utils.exception(this, error, "Loading job failed"));
 		},
 		showInEditor(job) {
 			this.refreshJob(job, updatedJob => {
@@ -216,7 +216,7 @@ export default {
 				.then(estimate => {
 					EventBus.$emit('showModal', 'Job Estimate', estimate);
 				})
-				.catch(error => Utils.exception(this, error, "Sorry, could not load job estimate."));
+				.catch(error => Utils.exception(this, error, "Loading estimate failed"));
 		},
 		replaceProcessGraph(job) {
 			EventBus.$emit('getProcessGraph', script => {
@@ -244,23 +244,23 @@ export default {
 					Utils.ok(this, "Job successfully updated.");
 					this.updateJobData(updatedJob);
 				})
-				.catch(error => Utils.exception(this, error, "Sorry, could not update job."));;
+				.catch(error => Utils.exception(this, error, "Updating job failed"));;
 		},
 		queueJob(job) {
 			job.startJob()
 				.then(updatedJob => {
 					Utils.ok(this, "Job successfully queued.");
 					this.updateJobData(updatedJob);
 				})
-				.catch(error => Utils.exception(this, error, "Sorry, could not queue job."));
+				.catch(error => Utils.exception(this, error, "Queueing job failed"));
 		},
 		cancelJob(job) {
 			job.stopJob()
 				.then(updatedJob => {
 					Utils.ok(this, "Job successfully canceled.");
 					this.updateJobData(updatedJob);
 				})
-				.catch(error => Utils.exception(this, error, "Sorry, could not cancel job."));
+				.catch(error => Utils.exception(this, error, "Canceling job failed"));
 		},
 		viewResults(job) {			
 			job.listResults().then(info => {

src/components/ParameterField.vue

@@ -14,7 +14,6 @@
 		</select>
 		<select class="fieldValue" v-else-if="type === 'billing-plan'" :name="fieldName" v-model="value" ref="selectFirst" :disabled="!editable">
 			<option v-for="plan in capabilities.listPlans()" :key="plan.name" :value="plan.name">{{ plan.name }} ({{ plan.paid ? 'paid' : 'free' }})</option>
-			<!-- ToDo: Select the default plan if no value is set -->
 		</select>
 		<template v-else-if="type === 'temporal-interval'">
 			<VueCtkDateTimePicker v-model="value" :disabled="!editable" :range="true" label="Select start and end time" format="YYYY-MM-DD[T]HH:mm:ss[Z]"></VueCtkDateTimePicker>
@@ -198,6 +197,12 @@ export default {
 					v = null;
 				}
 			}
+			else if (this.type === 'billing-plan') {
+				var defaultPlans = this.capabilities.listPlans().filter(plan => plan.default);
+				if (defaultPlans.length === 1) {
+					v = defaultPlans[0].name;
+				}
+			}
 			else if (this.type === 'budget') {
 				v = this.$props.pass;
 				this.hasBudget = typeof v === 'number';

src/components/ProcessGraphPanel.vue

@@ -56,7 +56,7 @@ export default {
 					}
 					this.updateProcessGraphData(updatedPg);
 				})
-				.catch(error => Utils.exception(this, error, 'Sorry, could not load process graph.'));
+				.catch(error => Utils.exception(this, error, 'Loading process graph failed'));
 		},
 		showInEditor(pg) {
 			this.refreshProcessGraph(pg, updatedPg => {
@@ -92,8 +92,8 @@ export default {
 			this.connection.createProcessGraph(script, data.title, data.description)
 				.then(data => {
 					this.$refs.table.addData(data);
-					Utils.ok(this, 'Process Graph successfully stored!');
-				}).catch(error => Utils.exception(this, error, 'Sorry, could not save the process graph.'));
+					Utils.ok(this, 'Process graph successfully stored!');
+				}).catch(error => Utils.exception(this, error, 'Storing process graph failed.'));
 		},
 		graphInfo(pg) {
 			this.refreshProcessGraph(pg, updatedPg => {
@@ -122,14 +122,14 @@ export default {
 					Utils.ok(this, "Process graph successfully updated.");
 					this.updateProcessGraphData(updatePg);
 				})
-				.catch(error => Utils.exception(this, error, "Sorry, could not update process graph."));
+				.catch(error => Utils.exception(this, error, "Updating process graph failed"));
 		},
 		deleteGraph(pg) {
 			pg.deleteProcessGraph()
 				.then(() => {
 					this.$refs.table.removeData(pg.processGraphId);
 				})
-				.catch(error => Utils.exception(this, error, 'Sorry, could not delete process graph.'));
+				.catch(error => Utils.exception(this, error, 'Deleting process graph failed'));
 		},
 		updateProcessGraphData(updatePg) {
 			this.$refs.table.replaceData(updatePg);

src/components/ServicePanel.vue

@@ -88,7 +88,7 @@ export default {
 					}
 					this.updateServiceData(updatedService);
 				})
-				.catch(error => Utils.exception(this, error, "Sorry, could not load service information."));
+				.catch(error => Utils.exception(this, error, "Loading service failed"));
 		},
 		showInEditor(service) {
 			this.refreshService(service, updatedService => {
@@ -161,7 +161,7 @@ export default {
 				.then(service => {
 					EventBus.$emit('serviceCreated', service);
 				}).catch(error => {
-					Utils.exception(this, error, 'Sorry, could not create the web service.');
+					Utils.exception(this, error, 'Creating service failed');
 				});
 		},
 		createServiceFromScript() {
@@ -203,7 +203,7 @@ export default {
 						Utils.ok(this, "Service process graph successfully updated.");
 						this.updateServiceData(updatedService);
 					})
-					.catch(error => Utils.exception(this, error, "Sorry, could not update service process graph."));
+					.catch(error => Utils.exception(this, error, "Replacing process graph failed"));
 			}, false);
 		},
 		updateTitle(service, newTitle) {
@@ -219,7 +219,7 @@ export default {
 					Utils.ok(this, "Service successfully updated web service.");
 					this.updateServiceData(updatedService);
 				})
-				.catch(error => Utils.exception(this, error, "Sorry, could not update web service."));
+				.catch(error => Utils.exception(this, error, "Updating service failed"));
 		},
 		deleteService(service) {
 			service.deleteService()
@@ -228,7 +228,7 @@ export default {
 					EventBus.$emit('removeWebService', service.serviceId);
 				})
 				.catch(error => {
-					Utils.exception(this, error, 'Sorry, could not delete service.');
+					Utils.exception(this, error, 'Deleting service failed');
 				});
 		},
 		viewService(service) {

src/components/UserMenu.vue

@@ -96,7 +96,7 @@ export default {
 				this.connection.describeAccount()
 					.then(data => this.me = data)
 					.catch(error => {
-						Utils.exception(this, error, "Sorry, could not load account information.");
+						Utils.exception(this, error, "Loading account information failed");
 					});
 			}
 		},