You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2018/10/15 08:12:42 UTC
ignite git commit: IGNITE-9059 Web Console: Removed not needed
"await" on loader.
Repository: ignite
Updated Branches:
refs/heads/master 3ebc740f1 -> 55e034ab6
IGNITE-9059 Web Console: Removed not needed "await" on loader.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/55e034ab
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/55e034ab
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/55e034ab
Branch: refs/heads/master
Commit: 55e034ab6a3f2e34d8eb3902e41f47dcb8ec775b
Parents: 3ebc740
Author: Alexander Kalinin <ve...@yandex.ru>
Authored: Mon Oct 15 15:12:37 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon Oct 15 15:12:37 2018 +0700
----------------------------------------------------------------------
.../queries-notebooks-list/controller.js | 24 +++++++++++++-------
1 file changed, 16 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/55e034ab/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js b/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js
index 9b9b1c2..379f974 100644
--- a/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js
+++ b/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js
@@ -105,7 +105,7 @@ export class NotebooksListCtrl {
finally {
this.$scope.$applyAsync();
- await this.IgniteLoading.finish('notebooksLoading');
+ this.IgniteLoading.finish('notebooksLoading');
}
}
@@ -138,8 +138,10 @@ export class NotebooksListCtrl {
const newNotebookName = await this.IgniteInput.input('New query notebook', 'Notebook name');
this.IgniteLoading.start('notebooksLoading');
+
await this.IgniteNotebook.create(newNotebookName);
- await this.IgniteLoading.finish('notebooksLoading');
+
+ this.IgniteLoading.finish('notebooksLoading');
this._loadAllNotebooks();
}
@@ -147,7 +149,7 @@ export class NotebooksListCtrl {
this.IgniteMessages.showError(err);
}
finally {
- await this.IgniteLoading.finish('notebooksLoading');
+ this.IgniteLoading.finish('notebooksLoading');
if (this.createNotebookModal)
this.createNotebookModal.$promise.then(this.createNotebookModal.hide);
@@ -163,13 +165,15 @@ export class NotebooksListCtrl {
throw Error(`Notebook with name "${newNotebookName}" already exists!`);
this.IgniteLoading.start('notebooksLoading');
+
await this.IgniteNotebook.save(Object.assign(currentNotebook, {name: newNotebookName}));
}
catch (err) {
this.IgniteMessages.showError(err);
}
finally {
- await this.IgniteLoading.finish('notebooksLoading');
+ this.IgniteLoading.finish('notebooksLoading');
+
this._loadAllNotebooks();
}
}
@@ -180,8 +184,10 @@ export class NotebooksListCtrl {
const newNotebookName = await this.IgniteInput.clone(clonedNotebook.name, this.getNotebooksNames());
this.IgniteLoading.start('notebooksLoading');
+
await this.IgniteNotebook.clone(newNotebookName, clonedNotebook);
- await this.IgniteLoading.finish('notebooksLoading');
+
+ this.IgniteLoading.finish('notebooksLoading');
this._loadAllNotebooks();
}
@@ -189,7 +195,7 @@ export class NotebooksListCtrl {
this.IgniteMessages.showError(err);
}
finally {
- await this.IgniteLoading.finish('notebooksLoading');
+ this.IgniteLoading.finish('notebooksLoading');
if (this.createNotebookModal)
this.createNotebookModal.$promise.then(this.createNotebookModal.hide);
@@ -203,15 +209,17 @@ export class NotebooksListCtrl {
async deleteNotebooks() {
try {
this.IgniteLoading.start('notebooksLoading');
+
await this.IgniteNotebook.removeBatch(this.gridApi.selection.legacyGetSelectedRows());
- await this.IgniteLoading.finish('notebooksLoading');
+
+ this.IgniteLoading.finish('notebooksLoading');
this._loadAllNotebooks();
}
catch (err) {
this.IgniteMessages.showError(err);
- await this.IgniteLoading.finish('notebooksLoading');
+ this.IgniteLoading.finish('notebooksLoading');
}
}