ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [1/5] ignite git commit: IGNITE-2451 - Fixes #457.
Date Fri, 05 Feb 2016 07:20:37 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc2 880564708 -> 386334831


http://git-wip-us.apache.org/repos/asf/ignite/blob/1905ab31/modules/control-center-web/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index 9e372bf..8c27dce 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -17,7 +17,7 @@
 
 // Controller for Clusters screen.
 consoleModule.controller('clustersController', function ($http, $timeout, $scope, $state,
$controller,
-    $common, $focus, $confirm, $clone, $preview, $loading, $unsavedChangesGuard, $cleanup,
igniteIncludeEventGroups) {
+    $common, $focus, $confirm, $clone, $loading, $unsavedChangesGuard, $cleanup, igniteIncludeEventGroups)
{
         $unsavedChangesGuard.install($scope);
 
         var __original_value;
@@ -46,21 +46,11 @@ consoleModule.controller('clustersController', function ($http, $timeout,
$scope
         $scope.widthIsSufficient = $common.widthIsSufficient;
         $scope.saveBtnTipText = $common.saveBtnTipText;
 
-        var previews = [];
-
-        $scope.previewInit = function (preview) {
-            previews.push(preview);
-
-            $preview.previewInit(preview);
-        };
-
         $scope.trustManagersConfigured = function() {
             return $scope.backupItem.sslEnabled && $common.isDefined($scope.backupItem.sslContextFactory)
&&
                 !$common.isEmptyArray($scope.backupItem.sslContextFactory.trustManagers);
         };
 
-        $scope.previewChanged = $preview.previewChanged;
-
         $scope.hidePopover = $common.hidePopover;
 
         var showPopoverMessage = $common.showPopoverMessage;
@@ -82,25 +72,6 @@ consoleModule.controller('clustersController', function ($http, $timeout,
$scope
 
         $scope.eventGroups = igniteIncludeEventGroups;
 
-        $scope.preview = {
-            general: {xml: '', java: '', allDefaults: true},
-            atomics: {xml: '', java: '', allDefaults: true},
-            binary: {xml: '', java: '', allDefaults: true},
-            communication: {xml: '', java: '', allDefaults: true},
-            connector: {xml: '', java: '', allDefaults: true},
-            deployment: {xml: '', java: '', allDefaults: true},
-            discovery: {xml: '', java: '', allDefaults: true},
-            events: {xml: '', java: '', allDefaults: true},
-            igfs: {xml: '', java: '', allDefaults: true},
-            marshaller: {xml: '', java: '', allDefaults: true},
-            metrics: {xml: '', java: '', allDefaults: true},
-            swap: {xml: '', java: '', allDefaults: true},
-            time: {xml: '', java: '', allDefaults: true},
-            pools: {xml: '', java: '', allDefaults: true},
-            transactions: {xml: '', java: '', allDefaults: true},
-            sslConfiguration: {xml: '', java: '', allDefaults: true}
-        };
-
         $scope.toggleExpanded = function () {
             $scope.ui.expanded = !$scope.ui.expanded;
 
@@ -185,90 +156,6 @@ consoleModule.controller('clustersController', function ($http, $timeout,
$scope
                         form.$setPristine();
                     else
                         form.$setDirty();
-
-                    if (val) {
-                        var clusterCaches = _.reduce($scope.caches, function(caches, cache){
-                            if (_.contains(val.caches, cache.value)) {
-                                caches.push(cache.cache);
-                            }
-
-                            return caches;
-                        }, []);
-
-                        var srcItem = $scope.selectedItem ? $scope.selectedItem : prepareNewItem();
-
-                        var igfss = _.map(_.filter($scope.igfss, function(igfs) {
-                            return _.indexOf(val.igfss, igfs.value) >= 0;
-                        }), function(igfs) {
-                            return igfs.igfs;
-                        });
-
-                        $scope.ui.checkDirty(val, srcItem);
-
-                        $scope.preview.general.xml = $generatorXml.clusterCaches(clusterCaches,
null, true, $generatorXml.clusterGeneral(val)).asString();
-                        $scope.preview.general.java = $generatorJava.clusterCaches(clusterCaches,
null, true, $generatorJava.clusterGeneral(val)).asString();
-                        $scope.preview.general.allDefaults = $common.isEmptyString($scope.preview.general.xml);
-
-                        $scope.preview.atomics.xml = $generatorXml.clusterAtomics(val).asString();
-                        $scope.preview.atomics.java = $generatorJava.clusterAtomics(val).asString();
-                        $scope.preview.atomics.allDefaults = $common.isEmptyString($scope.preview.atomics.xml);
-
-                        $scope.preview.binary.xml = $generatorXml.clusterBinary(val).asString();
-                        $scope.preview.binary.java = $generatorJava.clusterBinary(val).asString();
-                        $scope.preview.binary.allDefaults = $common.isEmptyString($scope.preview.binary.xml);
-
-                        $scope.preview.communication.xml = $generatorXml.clusterCommunication(val).asString();
-                        $scope.preview.communication.java = $generatorJava.clusterCommunication(val).asString();
-                        $scope.preview.communication.allDefaults = $common.isEmptyString($scope.preview.communication.xml);
-
-                        $scope.preview.connector.xml = $generatorXml.clusterConnector(val).asString();
-                        $scope.preview.connector.java = $generatorJava.clusterConnector(val).asString();
-                        $scope.preview.connector.allDefaults = $common.isEmptyString($scope.preview.connector.xml);
-
-                        $scope.preview.deployment.xml = $generatorXml.clusterDeployment(val).asString();
-                        $scope.preview.deployment.java = $generatorJava.clusterDeployment(val).asString();
-                        $scope.preview.deployment.allDefaults = $common.isEmptyString($scope.preview.deployment.xml);
-
-                        $scope.preview.discovery.xml = $generatorXml.clusterDiscovery(val.discovery).asString();
-                        $scope.preview.discovery.java = $generatorJava.clusterDiscovery(val.discovery).asString();
-                        $scope.preview.discovery.allDefaults = $common.isEmptyString($scope.preview.discovery.xml);
-
-                        $scope.preview.events.xml = $generatorXml.clusterEvents(val).asString();
-                        $scope.preview.events.java = $generatorJava.clusterEvents(val).asString();
-                        $scope.preview.events.allDefaults = $common.isEmptyString($scope.preview.events.xml);
-
-                        $scope.preview.igfs.xml = $generatorXml.igfss(igfss).asString();
-                        $scope.preview.igfs.java = $generatorJava.igfss(igfss, 'cfg').asString();
-                        $scope.preview.igfs.allDefaults = $common.isEmptyString($scope.preview.igfs.xml);
-
-                        $scope.preview.marshaller.xml = $generatorXml.clusterMarshaller(val).asString();
-                        $scope.preview.marshaller.java = $generatorJava.clusterMarshaller(val).asString();
-                        $scope.preview.marshaller.allDefaults = $common.isEmptyString($scope.preview.marshaller.xml);
-
-                        $scope.preview.metrics.xml = $generatorXml.clusterMetrics(val).asString();
-                        $scope.preview.metrics.java = $generatorJava.clusterMetrics(val).asString();
-                        $scope.preview.metrics.allDefaults = $common.isEmptyString($scope.preview.metrics.xml);
-
-                        $scope.preview.swap.xml = $generatorXml.clusterSwap(val).asString();
-                        $scope.preview.swap.java = $generatorJava.clusterSwap(val).asString();
-                        $scope.preview.swap.allDefaults = $common.isEmptyString($scope.preview.swap.xml);
-
-                        $scope.preview.time.xml = $generatorXml.clusterTime(val).asString();
-                        $scope.preview.time.java = $generatorJava.clusterTime(val).asString();
-                        $scope.preview.time.allDefaults = $common.isEmptyString($scope.preview.time.xml);
-
-                        $scope.preview.pools.xml = $generatorXml.clusterPools(val).asString();
-                        $scope.preview.pools.java = $generatorJava.clusterPools(val).asString();
-                        $scope.preview.pools.allDefaults = $common.isEmptyString($scope.preview.pools.xml);
-
-                        $scope.preview.transactions.xml = $generatorXml.clusterTransactions(val).asString();
-                        $scope.preview.transactions.java = $generatorJava.clusterTransactions(val).asString();
-                        $scope.preview.transactions.allDefaults = $common.isEmptyString($scope.preview.transactions.xml);
-
-                        $scope.preview.sslConfiguration.xml = $generatorXml.clusterSsl(val).asString();
-                        $scope.preview.sslConfiguration.java = $generatorJava.clusterSsl(val).asString();
-                        $scope.preview.sslConfiguration.allDefaults = $common.isEmptyString($scope.preview.sslConfiguration.xml);
-                    }
                 }, true);
             })
             .catch(function (errMsg) {
@@ -292,10 +179,6 @@ consoleModule.controller('clustersController', function ($http, $timeout,
$scope
                 }
                 catch (error) { }
 
-                _.forEach(previews, function(preview) {
-                    preview.attractAttention = false;
-                });
-
                 if (backup)
                     $scope.backupItem = backup;
                 else if (item)

http://git-wip-us.apache.org/repos/asf/ignite/blob/1905ab31/modules/control-center-web/src/main/js/package.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/package.json b/modules/control-center-web/src/main/js/package.json
index 1c655e7..fe4636b 100644
--- a/modules/control-center-web/src/main/js/package.json
+++ b/modules/control-center-web/src/main/js/package.json
@@ -104,6 +104,19 @@
       "core-js": "npm:core-js@^1.1.4"
     },
     "overrides": {
+      "github:angular/bower-angular@1.4.8": {
+        "format": "global",
+        "dependencies": {
+          "jquery": "github:components/jquery@^2.1.4"
+        },
+        "shim": {
+          "angular": {
+            "deps": [
+              "jquery"
+            ]
+          }
+        }
+      },
       "github:Stuk/jszip@2.5.0": {
         "format": "global",
         "main": "./dist/jszip"
@@ -193,18 +206,6 @@
           }
         }
       },
-      "github:angular/bower-angular@1.4.8": {
-        "dependencies": {
-          "jquery": "github:components/jquery@^2.1.4"
-        },
-        "shim": {
-          "angular": {
-            "deps": [
-              "jquery"
-            ]
-          }
-        }
-      },
       "github:darthwade/angular-loading@0.1.4": {
         "dependencies": {
           "spinjs": "github:fgnass/spin.js@^2.3.2"
@@ -218,6 +219,7 @@
       "github:akuznetsov-gridgain/angular-strap@fix-1852-2.3.6": {
         "main": "dist/angular-strap.tpl",
         "dependencies": {
+          "angular": "github:angular/bower-angular@^1.4.8",
           "angular-animate": "github:angular/bower-angular-animate@^1.4.8",
           "angular-motion": "github:mgcrea/angular-motion@^0.4.3",
           "angular-sanitize": "github:angular/bower-angular-sanitize@^1.4.8"

http://git-wip-us.apache.org/repos/asf/ignite/blob/1905ab31/modules/control-center-web/src/main/js/views/configuration/summary.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/summary.jade b/modules/control-center-web/src/main/js/views/configuration/summary.jade
index 019bef6..ce6a0cf 100644
--- a/modules/control-center-web/src/main/js/views/configuration/summary.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/summary.jade
@@ -51,15 +51,16 @@ mixin ignite-form-field-tooltip(message)
                             label Server
 
                         .panel-collapse(id='server' role='tabpanel' bs-collapse-target)
-                            .summary-tabs(bs-tabs data-bs-active-pane='tabsServer.activeTab'
template='configuration/summary-tabs.html')
-                                div(bs-pane title='XML')
-                                    ignite-ui-ace-xml(data-cluster='cluster')
-                                div(bs-pane title='Java')
-                                    ignite-ui-ace-java(data-cluster='cluster')
-                                div(bs-pane title='POM')
-                                    ignite-ui-ace-pom(data-cluster='cluster')
-                                div(bs-pane title='Dockerfile')
-                                    ignite-ui-ace-docker(data-cluster='cluster' ng-model='ctrl.data.docker')
+                            ignite-ui-ace
+                                .summary-tabs(bs-tabs data-bs-active-pane="tabsServer.activeTab"
template='configuration/summary-tabs.html')
+                                    div(bs-pane title='XML')
+                                        ignite-ui-ace-xml(data-cluster='cluster')
+                                    div(bs-pane title='Java')
+                                        ignite-ui-ace-java(data-cluster='cluster')
+                                    div(bs-pane title='POM')
+                                        ignite-ui-ace-pom(data-cluster='cluster')
+                                    div(bs-pane title='Dockerfile')
+                                        ignite-ui-ace-docker(data-cluster='cluster' ng-model='ctrl.data.docker')
 
                     .panel.panel-default
                         .panel-heading(role='tab' bs-collapse-toggle)
@@ -130,12 +131,13 @@ mixin ignite-form-field-tooltip(message)
                                                     data-placeholder='100000'
                                                 )
 
-                            .summary-tabs(bs-tabs data-bs-active-pane='tabsClient.activeTab'
template='configuration/summary-tabs.html')
-                                div(bs-pane title='XML')
-                                    ignite-ui-ace-xml(data-cluster='cluster' data-cluster-cfg='#{nearCfg}')
-                                div(bs-pane title='Java')
-                                    ignite-ui-ace-java(data-cluster='cluster' data-cluster-cfg='#{nearCfg}')
-                                div(bs-pane title='POM')
-                                    ignite-ui-ace-pom(data-cluster='cluster')
-                                div(bs-pane title='POJO' ng-show='cluster | hasPojo')
-                                    ignite-ui-ace-pojos(data-cluster='cluster' ng-model='ctrl.data.pojos')
+                            ignite-ui-ace
+                                .summary-tabs(bs-tabs data-bs-active-pane="tabsClient.activeTab"
template='configuration/summary-tabs.html')
+                                    div(bs-pane title='XML')
+                                        ignite-ui-ace-xml(data-cluster='cluster' data-cluster-cfg='#{nearCfg}')
+                                    div(bs-pane title='Java')
+                                        ignite-ui-ace-java(data-cluster='cluster' data-cluster-cfg='#{nearCfg}')
+                                    div(bs-pane title='POM')
+                                        ignite-ui-ace-pom(data-cluster='cluster')
+                                    div(bs-pane title='POJO' ng-show='cluster | hasPojo')
+                                        ignite-ui-ace-pojos(data-cluster='cluster' ng-model='ctrl.data.pojos')


Mime
View raw message