You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/08/21 08:40:45 UTC

[36/50] [abbrv] ignite git commit: IGNITE-6105 Web console: Fixed missed cache name in preview for cache checkpoint SPI.

IGNITE-6105 Web console: Fixed missed cache name in preview for cache checkpoint SPI.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bb326d19
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bb326d19
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bb326d19

Branch: refs/heads/ignite-5578
Commit: bb326d19c5f71b0ba3148bb8baa8a35b511c51ed
Parents: ef055fe
Author: Vasiliy Sisko <vs...@gridgain.com>
Authored: Fri Aug 18 11:12:27 2017 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Aug 18 11:12:27 2017 +0700

----------------------------------------------------------------------
 .../directives/ui-ace-java/ui-ace-java.controller.js   | 13 +++++++++++++
 .../ui-ace-spring/ui-ace-spring.controller.js          | 13 +++++++++++++
 .../configuration/generator/AbstractTransformer.js     |  2 +-
 3 files changed, 27 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/bb326d19/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 4275401..e50ac6c 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
@@ -88,6 +88,19 @@ export default ['IgniteVersion', 'JavaTransformer', function(Version, java) {
             };
 
             break;
+        case 'clusterCheckpoint':
+            ctrl.generate = (cluster, caches) => {
+                const clusterCaches = _.reduce(caches, (acc, cache) => {
+                    if (_.includes(cluster.caches, cache.value))
+                        acc.push(cache.cache);
+
+                    return acc;
+                }, []);
+
+                return java.clusterCheckpoint(cluster, clusterCaches);
+            };
+
+            break;
         case 'igfss':
             ctrl.generate = (cluster, igfss) => {
                 const clusterIgfss = _.reduce(igfss, (acc, igfs) => {

http://git-wip-us.apache.org/repos/asf/ignite/blob/bb326d19/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 f14c781..17da1fd 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
@@ -84,6 +84,19 @@ export default ['IgniteVersion', 'SpringTransformer', function(Version, spring)
             };
 
             break;
+        case 'clusterCheckpoint':
+            ctrl.generate = (cluster, caches) => {
+                const clusterCaches = _.reduce(caches, (acc, cache) => {
+                    if (_.includes(cluster.caches, cache.value))
+                        acc.push(cache.cache);
+
+                    return acc;
+                }, []);
+
+                return spring.clusterCheckpoint(cluster, clusterCaches);
+            };
+
+            break;
         case 'igfss':
             ctrl.generate = (cluster, igfss) => {
                 const clusterIgfss = _.reduce(igfss, (acc, igfs) => {

http://git-wip-us.apache.org/repos/asf/ignite/blob/bb326d19/modules/web-console/frontend/app/modules/configuration/generator/AbstractTransformer.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/generator/AbstractTransformer.js b/modules/web-console/frontend/app/modules/configuration/generator/AbstractTransformer.js
index 4d66a64..7e89fbd 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/AbstractTransformer.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/AbstractTransformer.js
@@ -294,7 +294,7 @@ export default class AbstractTransformer {
     }
 
     // Generate caches configs.
-    static clusterCheckpoint(cluster, available, caches) {
+    static clusterCheckpoint(cluster, caches) {
         return this.toSection(this.generator.clusterCheckpoint(cluster, caches));
     }