|
@@ -259,15 +259,15 @@ export default class Executable {
|
|
|
|
|
|
|
|
this.cancellables.push(
|
|
this.cancellables.push(
|
|
|
apiHelper.checkExecutionStatus({ executable: this }).done(async queryStatus => {
|
|
apiHelper.checkExecutionStatus({ executable: this }).done(async queryStatus => {
|
|
|
- switch (queryStatus) {
|
|
|
|
|
|
|
+ switch (queryStatus.status) {
|
|
|
case EXECUTION_STATUS.success:
|
|
case EXECUTION_STATUS.success:
|
|
|
this.executeEnded = Date.now();
|
|
this.executeEnded = Date.now();
|
|
|
- this.setStatus(queryStatus);
|
|
|
|
|
|
|
+ this.setStatus(queryStatus.status);
|
|
|
this.setProgress(99); // TODO: why 99 here (from old code)?
|
|
this.setProgress(99); // TODO: why 99 here (from old code)?
|
|
|
break;
|
|
break;
|
|
|
case EXECUTION_STATUS.available:
|
|
case EXECUTION_STATUS.available:
|
|
|
this.executeEnded = Date.now();
|
|
this.executeEnded = Date.now();
|
|
|
- this.setStatus(queryStatus);
|
|
|
|
|
|
|
+ this.setStatus(queryStatus.status);
|
|
|
this.setProgress(100);
|
|
this.setProgress(100);
|
|
|
if (!this.result && this.handle.has_result_set) {
|
|
if (!this.result && this.handle.has_result_set) {
|
|
|
this.result = new ExecutionResult(this);
|
|
this.result = new ExecutionResult(this);
|
|
@@ -283,12 +283,15 @@ export default class Executable {
|
|
|
case EXECUTION_STATUS.canceled:
|
|
case EXECUTION_STATUS.canceled:
|
|
|
case EXECUTION_STATUS.expired:
|
|
case EXECUTION_STATUS.expired:
|
|
|
this.executeEnded = Date.now();
|
|
this.executeEnded = Date.now();
|
|
|
- this.setStatus(queryStatus);
|
|
|
|
|
|
|
+ this.setStatus(queryStatus.status);
|
|
|
break;
|
|
break;
|
|
|
case EXECUTION_STATUS.running:
|
|
case EXECUTION_STATUS.running:
|
|
|
|
|
+ if (queryStatus.data) {
|
|
|
|
|
+ huePubSub.publish('editor.ws.query.fetch_result', queryStatus);
|
|
|
|
|
+ }
|
|
|
case EXECUTION_STATUS.starting:
|
|
case EXECUTION_STATUS.starting:
|
|
|
case EXECUTION_STATUS.waiting:
|
|
case EXECUTION_STATUS.waiting:
|
|
|
- this.setStatus(queryStatus);
|
|
|
|
|
|
|
+ this.setStatus(queryStatus.status);
|
|
|
checkStatusTimeout = window.setTimeout(
|
|
checkStatusTimeout = window.setTimeout(
|
|
|
() => {
|
|
() => {
|
|
|
this.checkStatus(statusCheckCount);
|
|
this.checkStatus(statusCheckCount);
|
|
@@ -298,11 +301,11 @@ export default class Executable {
|
|
|
break;
|
|
break;
|
|
|
case EXECUTION_STATUS.failed:
|
|
case EXECUTION_STATUS.failed:
|
|
|
this.executeEnded = Date.now();
|
|
this.executeEnded = Date.now();
|
|
|
- this.setStatus(queryStatus);
|
|
|
|
|
|
|
+ this.setStatus(queryStatus.status);
|
|
|
break;
|
|
break;
|
|
|
default:
|
|
default:
|
|
|
this.executeEnded = Date.now();
|
|
this.executeEnded = Date.now();
|
|
|
- console.warn('Got unknown status ' + queryStatus);
|
|
|
|
|
|
|
+ console.warn('Got unknown status ' + queryStatus.status);
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
);
|
|
);
|