|
@@ -1863,13 +1863,13 @@ class ApiHelper {
|
|
|
if (response && response.query_status && response.query_status.status) {
|
|
if (response && response.query_status && response.query_status.status) {
|
|
|
const status = response.query_status.status;
|
|
const status = response.query_status.status;
|
|
|
if (status === 'available') {
|
|
if (status === 'available') {
|
|
|
- deferred.resolve();
|
|
|
|
|
|
|
+ deferred.resolve(response.query_status);
|
|
|
} else if (status === 'running' || status === 'starting' || status === 'waiting') {
|
|
} else if (status === 'running' || status === 'starting' || status === 'waiting') {
|
|
|
waitTimeout = window.setTimeout(() => {
|
|
waitTimeout = window.setTimeout(() => {
|
|
|
waitForAvailable();
|
|
waitForAvailable();
|
|
|
}, 500);
|
|
}, 500);
|
|
|
} else {
|
|
} else {
|
|
|
- deferred.reject();
|
|
|
|
|
|
|
+ deferred.reject(response.query_status);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
@@ -2427,13 +2427,18 @@ class ApiHelper {
|
|
|
compute: options.compute,
|
|
compute: options.compute,
|
|
|
silenceErrors: options.silenceErrors
|
|
silenceErrors: options.silenceErrors
|
|
|
})
|
|
})
|
|
|
- .done(() => {
|
|
|
|
|
|
|
+ .done(resultStatus => {
|
|
|
|
|
+ if (resultStatus) {
|
|
|
|
|
+ $.extend(true, queryResult.result, {
|
|
|
|
|
+ handle: resultStatus
|
|
|
|
|
+ });
|
|
|
|
|
+ }
|
|
|
const resultRequest = self
|
|
const resultRequest = self
|
|
|
.simplePost(
|
|
.simplePost(
|
|
|
'/notebook/api/fetch_result_data',
|
|
'/notebook/api/fetch_result_data',
|
|
|
{
|
|
{
|
|
|
notebook: notebookJson,
|
|
notebook: notebookJson,
|
|
|
- snippet: snippetJson,
|
|
|
|
|
|
|
+ snippet: JSON.stringify(queryResult),
|
|
|
rows: options.sampleCount || 100,
|
|
rows: options.sampleCount || 100,
|
|
|
startOver: 'false'
|
|
startOver: 'false'
|
|
|
},
|
|
},
|