You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/06/16 09:42:36 UTC
[40/50] ignite git commit: IGNITE-5402 Web Console: Fixed client mode
generation.
IGNITE-5402 Web Console: Fixed client mode generation.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2d875e00
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2d875e00
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2d875e00
Branch: refs/heads/ignite-5267-1
Commit: 2d875e00185f168ce524d3ce654cf29127f106a8
Parents: 5eaf41a
Author: Andrey Novikov <an...@gridgain.com>
Authored: Fri Jun 16 13:25:28 2017 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Fri Jun 16 13:25:28 2017 +0700
----------------------------------------------------------------------
.../directives/ui-ace-java/ui-ace-java.controller.js | 2 +-
.../ui-ace-spring/ui-ace-spring.controller.js | 14 +++++++-------
.../configuration/generator/ConfigurationGenerator.js | 6 +++---
.../frontend/public/stylesheets/style.scss | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2d875e00/modules/web-console/frontend/app/directives/ui-ace-java/ui-ace-java.controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/ui-ace-java/ui-ace-java.controller.js b/modules/web-console/frontend/app/directives/ui-ace-java/ui-ace-java.controller.js
index 66a10af..4275401 100644
--- a/modules/web-console/frontend/app/directives/ui-ace-java/ui-ace-java.controller.js
+++ b/modules/web-console/frontend/app/directives/ui-ace-java/ui-ace-java.controller.js
@@ -29,7 +29,7 @@ export default ['IgniteVersion', 'JavaTransformer', function(Version, java) {
case 'igniteConfiguration':
const clsName = client ? 'ClientConfigurationFactory' : 'ServerConfigurationFactory';
- ctrl.generate = (cluster) => java.cluster(cluster, Version.current, 'config', clsName, client);
+ ctrl.generate = (cluster) => java.cluster(cluster, Version.currentSbj.getValue(), 'config', clsName, client);
break;
case 'clusterCaches':
http://git-wip-us.apache.org/repos/asf/ignite/blob/2d875e00/modules/web-console/frontend/app/directives/ui-ace-spring/ui-ace-spring.controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/ui-ace-spring/ui-ace-spring.controller.js b/modules/web-console/frontend/app/directives/ui-ace-spring/ui-ace-spring.controller.js
index 92b0ae8..f14c781 100644
--- a/modules/web-console/frontend/app/directives/ui-ace-spring/ui-ace-spring.controller.js
+++ b/modules/web-console/frontend/app/directives/ui-ace-spring/ui-ace-spring.controller.js
@@ -20,12 +20,12 @@ export default ['IgniteVersion', 'SpringTransformer', function(Version, spring)
delete ctrl.data;
- const targetSince = Version.available.bind(Version);
+ const available = Version.available.bind(Version);
// Setup generator.
switch (ctrl.generator) {
case 'igniteConfiguration':
- ctrl.generate = (cluster) => spring.cluster(cluster, Version.current, ctrl.client === 'true');
+ ctrl.generate = (cluster) => spring.cluster(cluster, Version.currentSbj.getValue(), ctrl.client === 'true');
break;
case 'clusterCaches':
@@ -37,9 +37,9 @@ export default ['IgniteVersion', 'SpringTransformer', function(Version, spring)
return acc;
}, []);
- const cfg = spring.generator.clusterGeneral(cluster, targetSince);
+ const cfg = spring.generator.clusterGeneral(cluster, available);
- spring.generator.clusterCaches(cluster, clusterCaches, null, targetSince, false, cfg);
+ spring.generator.clusterCaches(cluster, clusterCaches, null, available, false, cfg);
return spring.toSection(cfg);
};
@@ -55,7 +55,7 @@ export default ['IgniteVersion', 'SpringTransformer', function(Version, spring)
return acc;
}, []);
- return spring[ctrl.generator](cache, cacheDomains, targetSince);
+ return spring[ctrl.generator](cache, cacheDomains, available);
};
break;
@@ -93,11 +93,11 @@ export default ['IgniteVersion', 'SpringTransformer', function(Version, spring)
return acc;
}, []);
- return spring.clusterIgfss(clusterIgfss, targetSince);
+ return spring.clusterIgfss(clusterIgfss, available);
};
break;
default:
- ctrl.generate = (master) => spring[ctrl.generator](master, targetSince);
+ ctrl.generate = (master) => spring[ctrl.generator](master, available);
}
}];
http://git-wip-us.apache.org/repos/asf/ignite/blob/2d875e00/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
index 7b4e25a..f4eeb9c 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
@@ -64,12 +64,12 @@ export default class IgniteConfigurationGenerator {
* Function to generate ignite configuration.
*
* @param {Object} cluster Cluster to process.
- * @param {String} version Target version of configuration.
+ * @param {Object} targetVer Target version of configuration.
* @param {Boolean} client Is client configuration.
* @return {Bean} Generated ignite configuration.
*/
- static igniteConfiguration(cluster, version, client) {
- const available = versionService.since.bind(versionService, version);
+ static igniteConfiguration(cluster, targetVer, client) {
+ const available = versionService.since.bind(versionService, targetVer.ignite);
const cfg = this.igniteConfigurationBean(cluster);
http://git-wip-us.apache.org/repos/asf/ignite/blob/2d875e00/modules/web-console/frontend/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/public/stylesheets/style.scss b/modules/web-console/frontend/public/stylesheets/style.scss
index 95208c9..dd2fc05 100644
--- a/modules/web-console/frontend/public/stylesheets/style.scss
+++ b/modules/web-console/frontend/public/stylesheets/style.scss
@@ -1462,7 +1462,7 @@ th[st-sort] {
}
}
-.preview-panel {
+.preview-panel, .summary-tabs {
.ace_hidden-cursors {
opacity: 0;
}