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 2017/12/13 03:58:35 UTC
ignite git commit: IGNITE-6390 Web Console: Fixed cluster selector on
topology changed.
Repository: ignite
Updated Branches:
refs/heads/master e3bbc984c -> e6489ea18
IGNITE-6390 Web Console: Fixed cluster selector on topology changed.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e6489ea1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e6489ea1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e6489ea1
Branch: refs/heads/master
Commit: e6489ea18fe4aee37ee8c4ade4c24167038ddd73
Parents: e3bbc98
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Dec 13 10:58:22 2017 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Dec 13 10:58:22 2017 +0700
----------------------------------------------------------------------
.../frontend/app/components/page-queries/controller.js | 5 +----
.../frontend/app/modules/agent/AgentManager.service.js | 6 ++++++
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e6489ea1/modules/web-console/frontend/app/components/page-queries/controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-queries/controller.js b/modules/web-console/frontend/app/components/page-queries/controller.js
index dba0269..bd03b22 100644
--- a/modules/web-console/frontend/app/components/page-queries/controller.js
+++ b/modules/web-console/frontend/app/components/page-queries/controller.js
@@ -929,9 +929,6 @@ export default class {
const awaitClusters$ = fromPromise(
agentMgr.startClusterWatch('Back to Configuration', 'base.configuration.tabs.advanced.clusters'));
- const currentCluster$ = agentMgr.connectionSbj
- .distinctUntilChanged((n, o) => n.cluster === o.cluster);
-
const finishLoading$ = defer(() => {
if (!$root.IgniteDemoMode)
Loading.finish('sqlLoading');
@@ -942,7 +939,7 @@ export default class {
};
this.refresh$ = awaitClusters$
- .mergeMap(() => currentCluster$)
+ .mergeMap(() => agentMgr.currentCluster$)
.do(() => Loading.start('sqlLoading'))
.do(() => {
_.forEach($scope.notebook.paragraphs, (paragraph) => {
http://git-wip-us.apache.org/repos/asf/ignite/blob/e6489ea1/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 7668132..7bc23a9 100644
--- a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
+++ b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js
@@ -112,6 +112,12 @@ export default class IgniteAgentManager {
this.connectionSbj = new BehaviorSubject(new ConnectionState(cluster));
+ let prevCluster;
+
+ this.currentCluster$ = this.connectionSbj
+ .distinctUntilChanged(({ cluster }) => prevCluster === cluster)
+ .do(({ cluster }) => prevCluster = cluster);
+
this.clusterVersion = '2.1.0';
if (!this.isDemoMode()) {