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/09 07:47:25 UTC
ignite git commit: IGNITE-9809 Web Console: Minor code style changes.
Repository: ignite
Updated Branches:
refs/heads/master d6400c69f -> 149b6c127
IGNITE-9809 Web Console: Minor code style changes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/149b6c12
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/149b6c12
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/149b6c12
Branch: refs/heads/master
Commit: 149b6c1272b4a9d5250cc105e55b3fba9e97c60c
Parents: d6400c6
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Oct 9 14:47:26 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Oct 9 14:47:26 2018 +0700
----------------------------------------------------------------------
modules/web-console/backend/app/agentSocket.js | 3 +-
.../web-console/e2e/testcafe/testcafe-runner.js | 3 +-
.../page-configure/services/ConfigureState.js | 3 +-
.../app/components/page-landing/index.js | 3 +-
.../queries-notebooks-list/controller.js | 42 ++++++++++----------
.../app/modules/agent/AgentManager.service.js | 5 ++-
.../test/check-doc-links/check-doc-links.js | 3 +-
7 files changed, 34 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/149b6c12/modules/web-console/backend/app/agentSocket.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/app/agentSocket.js b/modules/web-console/backend/app/agentSocket.js
index 0c7e6b2..dfebda0 100644
--- a/modules/web-console/backend/app/agentSocket.js
+++ b/modules/web-console/backend/app/agentSocket.js
@@ -127,7 +127,8 @@ module.exports.factory = function() {
const top = this.restResultParse(res);
_.forEach(this.demo.browserSockets, (sock) => sock.emit('topology', top));
- } catch (err) {
+ }
+ catch (err) {
_.forEach(this.demo.browserSockets, (sock) => sock.emit('topology:err', err));
}
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/149b6c12/modules/web-console/e2e/testcafe/testcafe-runner.js
----------------------------------------------------------------------
diff --git a/modules/web-console/e2e/testcafe/testcafe-runner.js b/modules/web-console/e2e/testcafe/testcafe-runner.js
index 681ee2e..eab767c 100644
--- a/modules/web-console/e2e/testcafe/testcafe-runner.js
+++ b/modules/web-console/e2e/testcafe/testcafe-runner.js
@@ -42,7 +42,8 @@ const startTestcafe = (config) => {
.browsers(config.browsers)
.reporter(config.reporter)
.run({ skipJsErrors: true });
- } catch (err) {
+ }
+ catch (err) {
console.log(err);
process.exit(1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/149b6c12/modules/web-console/frontend/app/components/page-configure/services/ConfigureState.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-configure/services/ConfigureState.js b/modules/web-console/frontend/app/components/page-configure/services/ConfigureState.js
index 27e227d..ed911be 100644
--- a/modules/web-console/frontend/app/components/page-configure/services/ConfigureState.js
+++ b/modules/web-console/frontend/app/components/page-configure/services/ConfigureState.js
@@ -30,7 +30,8 @@ export default class ConfigureState {
const reducer = (state = {}, action) => {
try {
return this._combinedReducer(state, action);
- } catch (e) {
+ }
+ catch (e) {
console.error(e);
return state;
http://git-wip-us.apache.org/repos/asf/ignite/blob/149b6c12/modules/web-console/frontend/app/components/page-landing/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-landing/index.js b/modules/web-console/frontend/app/components/page-landing/index.js
index ff6ee59..8f678f3 100644
--- a/modules/web-console/frontend/app/components/page-landing/index.js
+++ b/modules/web-console/frontend/app/components/page-landing/index.js
@@ -54,7 +54,8 @@ export default angular
const restored = trans.router.stateService.target(name, params);
return restored.valid() ? restored : 'default-state';
- } catch (ignored) {
+ }
+ catch (ignored) {
return 'default-state';
}
})
http://git-wip-us.apache.org/repos/asf/ignite/blob/149b6c12/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 2e5ac39..9b9b1c2 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
@@ -98,11 +98,11 @@ export class NotebooksListCtrl {
this.IgniteLoading.start('notebooksLoading');
this.notebooks = await this.IgniteNotebook.read();
this.gridOptions.data = this._preprocessNotebooksList(this.notebooks);
-
- } catch (err) {
+ }
+ catch (err) {
this.IgniteMessages.showError(err);
-
- } finally {
+ }
+ finally {
this.$scope.$applyAsync();
await this.IgniteLoading.finish('notebooksLoading');
@@ -135,18 +135,18 @@ export class NotebooksListCtrl {
async createNotebook() {
try {
- const newNotebookName = await this.IgniteInput.input('New query notebook', 'Notebook name');
+ 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._loadAllNotebooks();
-
- } catch (err) {
+ }
+ catch (err) {
this.IgniteMessages.showError(err);
-
- } finally {
+ }
+ finally {
await this.IgniteLoading.finish('notebooksLoading');
if (this.createNotebookModal)
@@ -156,19 +156,19 @@ export class NotebooksListCtrl {
async renameNotebok() {
try {
- const currentNotebook = this.gridApi.selection.legacyGetSelectedRows()[0];
- const newNotebookName = await this.IgniteInput.input('Rename notebook', 'Notebook name', currentNotebook.name);
+ const currentNotebook = this.gridApi.selection.legacyGetSelectedRows()[0];
+ const newNotebookName = await this.IgniteInput.input('Rename notebook', 'Notebook name', currentNotebook.name);
if (this.getNotebooksNames().find((name) => newNotebookName === name))
throw Error(`Notebook with name "${newNotebookName}" already exists!`);
this.IgniteLoading.start('notebooksLoading');
await this.IgniteNotebook.save(Object.assign(currentNotebook, {name: newNotebookName}));
-
- } catch (err) {
+ }
+ catch (err) {
this.IgniteMessages.showError(err);
-
- } finally {
+ }
+ finally {
await this.IgniteLoading.finish('notebooksLoading');
this._loadAllNotebooks();
}
@@ -184,11 +184,11 @@ export class NotebooksListCtrl {
await this.IgniteLoading.finish('notebooksLoading');
this._loadAllNotebooks();
-
- } catch (err) {
+ }
+ catch (err) {
this.IgniteMessages.showError(err);
-
- } finally {
+ }
+ finally {
await this.IgniteLoading.finish('notebooksLoading');
if (this.createNotebookModal)
@@ -207,8 +207,8 @@ export class NotebooksListCtrl {
await this.IgniteLoading.finish('notebooksLoading');
this._loadAllNotebooks();
-
- } catch (err) {
+ }
+ catch (err) {
this.IgniteMessages.showError(err);
await this.IgniteLoading.finish('notebooksLoading');
http://git-wip-us.apache.org/repos/asf/ignite/blob/149b6c12/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
index 8dbab0c..e44ac9b 100644
--- a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
+++ b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
@@ -18,7 +18,7 @@
import _ from 'lodash';
import {nonEmpty, nonNil} from 'app/utils/lodashMixins';
-import { BehaviorSubject } from 'rxjs/BehaviorSubject';
+import {BehaviorSubject} from 'rxjs/BehaviorSubject';
import 'rxjs/add/operator/first';
import 'rxjs/add/operator/partition';
import 'rxjs/add/operator/takeUntil';
@@ -239,7 +239,8 @@ export default class AgentManager {
saveToStorage(cluster = this.connectionSbj.getValue().cluster) {
try {
localStorage.cluster = JSON.stringify(cluster);
- } catch (ignore) {
+ }
+ catch (ignore) {
// No-op.
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/149b6c12/modules/web-console/frontend/test/check-doc-links/check-doc-links.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/test/check-doc-links/check-doc-links.js b/modules/web-console/frontend/test/check-doc-links/check-doc-links.js
index e8f3d16..4ab64ed 100644
--- a/modules/web-console/frontend/test/check-doc-links/check-doc-links.js
+++ b/modules/web-console/frontend/test/check-doc-links/check-doc-links.js
@@ -66,7 +66,8 @@ const findLinks = (acc, ast) => {
try {
acc.push([JSON.parse(compiledAttr).href, ast.filePath]);
- } catch (e) {
+ }
+ catch (e) {
console.log(ast.filePath, e);
}
}