Skip to content

Commit cfbc770

Browse files
m-mohrm-mohr
committed
Merge remote-tracking branch 'origin/development'
2 parents cd34dfa + 652d928 commit cfbc770

11 files changed

+37
-27
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# openEO Web Editor
22
A web-based editor for interactive usage of the openEO API.
33

4-
The web editor currently **supports openEO API versions v0.4.0**.
4+
The web editor currently **supports openEO API version v0.4**.
55

66
## Getting Started
77
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

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"name": "@openeo/web-editor",
33
"version": "0.4.0-beta.1",
44
"apiVersions": [
5-
"0.4.0"
5+
"0.4.0",
6+
"0.4.1"
67
],
78
"author": "openEO Consortium",
89
"contributors": [
@@ -34,7 +35,7 @@
3435
"build": "vue-cli-service build"
3536
},
3637
"dependencies": {
37-
"@openeo/js-client": "^0.4.0-beta.1",
38+
"@openeo/js-client": "^0.4.0-beta.2",
3839
"@openeo/js-commons": "^0.4.0-beta.2",
3940
"@openeo/vue-components": "^0.3.5",
4041
"ajv": "^6.10.0",

‎src/Page.vue

+5-1
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,10 @@ button {
180180
}
181181
182182
#container .snotifyToast__title {
183-
font-size: 1.2em;
183+
font-size: 1em;
184+
font-weight: bold;
185+
}
186+
#container .snotifyToast__body {
187+
font-size: 0.9em;
184188
}
185189
</style>

‎src/components/EditorToolbar.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export default {
105105
Utils.info(this, 'Data requested. Please wait...');
106106
this.connection.computeResult(script)
107107
.then(data => EventBus.$emit('showInViewer', data))
108-
.catch(error => Utils.exception(this, error, 'Sorry, could not execute process graph.'));
108+
.catch(error => Utils.exception(this, error, 'Computation failed'));
109109
});
110110
},
111111
}

‎src/components/FilePanel.vue

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

‎src/components/JobPanel.vue

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<button title="Cancel processing" @click="cancelJob(p.row)" v-show="supports('stopJob') && isJobActive(p.row)"><i class="fas fa-stop-circle"></i></button>
1616
<button title="Download" @click="downloadResults(p.row)" v-show="supports('downloadResults') && hasResults(p.row)"><i class="fas fa-download"></i></button>
1717
<button title="View results" @click="viewResults(p.row, true)" v-show="supports('downloadResults') && hasResults(p.row)"><i class="fas fa-eye"></i></button>
18-
<button title="Subscribe" @click="subscribeToJob(p.row)" v-show="supports('subscribe') && !jobSubscriptions.includes(p.row)"><i class="fas fa-bell"></i></button>
19-
<button title="Unsubscribe" @click="unsubscribeFromJob(p.row)" v-show="supports('unsubscribe') && jobSubscriptions.includes(p.row)"><i class="fas fa-bell-slash"></i></button>
18+
<!--<button title="Subscribe" @click="subscribeToJob(p.row)" v-show="supports('subscribe') && !jobSubscriptions.includes(p.row)"><i class="fas fa-bell"></i></button>
19+
<button title="Unsubscribe" @click="unsubscribeFromJob(p.row)" v-show="supports('unsubscribe') && jobSubscriptions.includes(p.row)"><i class="fas fa-bell-slash"></i></button>-->
2020
</template>
2121
</DataTable>
2222
</template>
@@ -91,7 +91,7 @@ export default {
9191
}
9292
this.updateJobData(updatedJob);
9393
})
94-
.catch(error => Utils.exception(this, error, "Sorry, could not load job information."));
94+
.catch(error => Utils.exception(this, error, "Loading job failed"));
9595
},
9696
showInEditor(job) {
9797
this.refreshJob(job, updatedJob => {
@@ -216,7 +216,7 @@ export default {
216216
.then(estimate => {
217217
EventBus.$emit('showModal', 'Job Estimate', estimate);
218218
})
219-
.catch(error => Utils.exception(this, error, "Sorry, could not load job estimate."));
219+
.catch(error => Utils.exception(this, error, "Loading estimate failed"));
220220
},
221221
replaceProcessGraph(job) {
222222
EventBus.$emit('getProcessGraph', script => {
@@ -244,23 +244,23 @@ export default {
244244
Utils.ok(this, "Job successfully updated.");
245245
this.updateJobData(updatedJob);
246246
})
247-
.catch(error => Utils.exception(this, error, "Sorry, could not update job."));;
247+
.catch(error => Utils.exception(this, error, "Updating job failed"));;
248248
},
249249
queueJob(job) {
250250
job.startJob()
251251
.then(updatedJob => {
252252
Utils.ok(this, "Job successfully queued.");
253253
this.updateJobData(updatedJob);
254254
})
255-
.catch(error => Utils.exception(this, error, "Sorry, could not queue job."));
255+
.catch(error => Utils.exception(this, error, "Queueing job failed"));
256256
},
257257
cancelJob(job) {
258258
job.stopJob()
259259
.then(updatedJob => {
260260
Utils.ok(this, "Job successfully canceled.");
261261
this.updateJobData(updatedJob);
262262
})
263-
.catch(error => Utils.exception(this, error, "Sorry, could not cancel job."));
263+
.catch(error => Utils.exception(this, error, "Canceling job failed"));
264264
},
265265
viewResults(job) {
266266
job.listResults().then(info => {

‎src/components/ParameterField.vue

+6-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
</select>
1515
<select class="fieldValue" v-else-if="type === 'billing-plan'" :name="fieldName" v-model="value" ref="selectFirst" :disabled="!editable">
1616
<option v-for="plan in capabilities.listPlans()" :key="plan.name" :value="plan.name">{{ plan.name }} ({{ plan.paid ? 'paid' : 'free' }})</option>
17-
<!-- ToDo: Select the default plan if no value is set -->
1817
</select>
1918
<template v-else-if="type === 'temporal-interval'">
2019
<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 {
198197
v = null;
199198
}
200199
}
200+
else if (this.type === 'billing-plan') {
201+
var defaultPlans = this.capabilities.listPlans().filter(plan => plan.default);
202+
if (defaultPlans.length === 1) {
203+
v = defaultPlans[0].name;
204+
}
205+
}
201206
else if (this.type === 'budget') {
202207
v = this.$props.pass;
203208
this.hasBudget = typeof v === 'number';

‎src/components/ProcessGraphPanel.vue

+5-5
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export default {
5656
}
5757
this.updateProcessGraphData(updatedPg);
5858
})
59-
.catch(error => Utils.exception(this, error, 'Sorry, could not load process graph.'));
59+
.catch(error => Utils.exception(this, error, 'Loading process graph failed'));
6060
},
6161
showInEditor(pg) {
6262
this.refreshProcessGraph(pg, updatedPg => {
@@ -92,8 +92,8 @@ export default {
9292
this.connection.createProcessGraph(script, data.title, data.description)
9393
.then(data => {
9494
this.$refs.table.addData(data);
95-
Utils.ok(this, 'Process Graph successfully stored!');
96-
}).catch(error => Utils.exception(this, error, 'Sorry, could not save the process graph.'));
95+
Utils.ok(this, 'Process graph successfully stored!');
96+
}).catch(error => Utils.exception(this, error, 'Storing process graph failed.'));
9797
},
9898
graphInfo(pg) {
9999
this.refreshProcessGraph(pg, updatedPg => {
@@ -122,14 +122,14 @@ export default {
122122
Utils.ok(this, "Process graph successfully updated.");
123123
this.updateProcessGraphData(updatePg);
124124
})
125-
.catch(error => Utils.exception(this, error, "Sorry, could not update process graph."));
125+
.catch(error => Utils.exception(this, error, "Updating process graph failed"));
126126
},
127127
deleteGraph(pg) {
128128
pg.deleteProcessGraph()
129129
.then(() => {
130130
this.$refs.table.removeData(pg.processGraphId);
131131
})
132-
.catch(error => Utils.exception(this, error, 'Sorry, could not delete process graph.'));
132+
.catch(error => Utils.exception(this, error, 'Deleting process graph failed'));
133133
},
134134
updateProcessGraphData(updatePg) {
135135
this.$refs.table.replaceData(updatePg);

‎src/components/ServicePanel.vue

+5-5
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ export default {
8888
}
8989
this.updateServiceData(updatedService);
9090
})
91-
.catch(error => Utils.exception(this, error, "Sorry, could not load service information."));
91+
.catch(error => Utils.exception(this, error, "Loading service failed"));
9292
},
9393
showInEditor(service) {
9494
this.refreshService(service, updatedService => {
@@ -161,7 +161,7 @@ export default {
161161
.then(service => {
162162
EventBus.$emit('serviceCreated', service);
163163
}).catch(error => {
164-
Utils.exception(this, error, 'Sorry, could not create the web service.');
164+
Utils.exception(this, error, 'Creating service failed');
165165
});
166166
},
167167
createServiceFromScript() {
@@ -203,7 +203,7 @@ export default {
203203
Utils.ok(this, "Service process graph successfully updated.");
204204
this.updateServiceData(updatedService);
205205
})
206-
.catch(error => Utils.exception(this, error, "Sorry, could not update service process graph."));
206+
.catch(error => Utils.exception(this, error, "Replacing process graph failed"));
207207
}, false);
208208
},
209209
updateTitle(service, newTitle) {
@@ -219,7 +219,7 @@ export default {
219219
Utils.ok(this, "Service successfully updated web service.");
220220
this.updateServiceData(updatedService);
221221
})
222-
.catch(error => Utils.exception(this, error, "Sorry, could not update web service."));
222+
.catch(error => Utils.exception(this, error, "Updating service failed"));
223223
},
224224
deleteService(service) {
225225
service.deleteService()
@@ -228,7 +228,7 @@ export default {
228228
EventBus.$emit('removeWebService', service.serviceId);
229229
})
230230
.catch(error => {
231-
Utils.exception(this, error, 'Sorry, could not delete service.');
231+
Utils.exception(this, error, 'Deleting service failed');
232232
});
233233
},
234234
viewService(service) {

‎src/components/UserMenu.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export default {
9696
this.connection.describeAccount()
9797
.then(data => this.me = data)
9898
.catch(error => {
99-
Utils.exception(this, error, "Sorry, could not load account information.");
99+
Utils.exception(this, error, "Loading account information failed");
100100
});
101101
}
102102
},

‎src/components/blocks/blocks.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ Blocks.prototype.setResultNode = function(block, result = true) {
283283
}
284284
}
285285
// If we have no new potential result node, communicate to the user.
286-
if (!result && !foundNewResultNode) {
286+
if (this.getBlockCount() > 0 && !result && !foundNewResultNode) {
287287
this.showError("No result node available, please specify one.");
288288
}
289289
this.redraw();

0 commit comments

Comments
 (0)