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 2015/09/24 06:20:17 UTC
[1/2] ignite git commit: IGNITE-843: More info.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 7405b125a -> ccda6644e
IGNITE-843: More info.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9277519d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9277519d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9277519d
Branch: refs/heads/ignite-843
Commit: 9277519def742d08f83847e1c877aae58919ae74
Parents: e5b7d5a
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Sep 24 11:19:55 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Sep 24 11:19:55 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/caches-controller.js | 14 +++++++----
.../main/js/controllers/clusters-controller.js | 9 +++----
.../src/main/js/controllers/common-module.js | 16 ++++++++++++
.../main/js/controllers/metadata-controller.js | 11 +++++----
.../src/main/js/controllers/models/caches.json | 6 +++++
.../main/js/controllers/models/clusters.json | 5 ++++
.../main/js/controllers/models/metadata.json | 6 +++++
.../src/main/js/controllers/models/summary.json | 9 +++++++
.../main/js/controllers/summary-controller.js | 9 ++++---
.../src/main/js/routes/public.js | 5 ++++
.../src/main/js/views/includes/controls.jade | 2 +-
.../src/main/js/views/templates/message.jade | 26 ++++++++++++++++++++
12 files changed, 98 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9277519d/modules/control-center-web/src/main/js/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js
index d732755..5fbb03d 100644
--- a/modules/control-center-web/src/main/js/controllers/caches-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js
@@ -17,8 +17,8 @@
// Controller for Caches screen.
controlCenterModule.controller('cachesController', [
- '$scope', '$controller', '$http', '$timeout', '$common', '$focus', '$confirm', '$clone', '$table', '$preview', '$loading', '$unsavedChangesGuard',
- function ($scope, $controller, $http, $timeout, $common, $focus, $confirm, $clone, $table, $preview, $loading, $unsavedChangesGuard) {
+ '$scope', '$controller', '$http', '$timeout', '$common', '$focus', '$confirm', '$message', '$clone', '$table', '$preview', '$loading', '$unsavedChangesGuard',
+ function ($scope, $controller, $http, $timeout, $common, $focus, $confirm, $message, $clone, $table, $preview, $loading, $unsavedChangesGuard) {
$unsavedChangesGuard.install($scope);
// Initialize the super class and extend it.
@@ -26,9 +26,7 @@ controlCenterModule.controller('cachesController', [
$scope.ui = $common.formUI();
- $scope.showMoreInfo = function () {
- $common.showInfo('TODO: show modal with more info');
- };
+ $scope.showMoreInfo = $message.message;
$scope.joinTip = $common.joinTip;
$scope.getModel = $common.getModel;
@@ -246,6 +244,7 @@ controlCenterModule.controller('cachesController', [
$http.get('/models/caches.json')
.success(function (data) {
$scope.screenTip = data.screenTip;
+ $scope.moreInfo = data.moreInfo;
$scope.general = data.general;
$scope.advanced = data.advanced;
@@ -413,6 +412,11 @@ controlCenterModule.controller('cachesController', [
return showPopoverMessage($scope.panels, 'memory', 'offHeapMaxMemory',
'Off-heap max memory should be specified');
+ if (item.memoryMode == 'ONHEAP_TIERED' && item.offHeapMaxMemory > 0 &&
+ !$common.isDefined(item.evictionPolicy.kind)) {
+ return showPopoverMessage($scope.panels, 'memory', 'evictionPolicy', 'Eviction policy should not be configured');
+ }
+
var cacheStoreFactorySelected = item.cacheStoreFactory && item.cacheStoreFactory.kind;
if (cacheStoreFactorySelected) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/9277519d/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 2b3b584..0c141b9 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,8 +17,8 @@
// Controller for Clusters screen.
controlCenterModule.controller('clustersController', [
- '$scope', '$controller', '$http', '$timeout', '$common', '$focus', '$confirm', '$clone', '$table', '$preview', '$loading', '$unsavedChangesGuard',
- function ($scope, $controller, $http, $timeout, $common, $focus, $confirm, $clone, $table, $preview, $loading, $unsavedChangesGuard) {
+ '$scope', '$controller', '$http', '$timeout', '$common', '$focus', '$confirm', '$message', '$clone', '$table', '$preview', '$loading', '$unsavedChangesGuard',
+ function ($scope, $controller, $http, $timeout, $common, $focus, $confirm, $message, $clone, $table, $preview, $loading, $unsavedChangesGuard) {
$unsavedChangesGuard.install($scope);
// Initialize the super class and extend it.
@@ -26,9 +26,7 @@ controlCenterModule.controller('clustersController', [
$scope.ui = $common.formUI();
- $scope.showMoreInfo = function () {
- $common.showInfo('TODO: show modal with more info');
- };
+ $scope.showMoreInfo = $message.message;
$scope.joinTip = $common.joinTip;
$scope.getModel = $common.getModel;
@@ -172,6 +170,7 @@ controlCenterModule.controller('clustersController', [
$http.get('/models/clusters.json')
.success(function (data) {
$scope.screenTip = data.screenTip;
+ $scope.moreInfo = data.moreInfo;
$scope.general = data.general;
$scope.advanced = data.advanced;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9277519d/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index e051739..b33ce67 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -895,6 +895,22 @@ controlCenterModule.service('$confirm', function ($modal, $rootScope, $q) {
return confirmModal;
});
+// Show modal message service.
+controlCenterModule.service('$message', function ($modal, $rootScope) {
+ var scope = $rootScope.$new();
+
+ var messageModal = $modal({templateUrl: '/message', scope: scope, placement: 'center', show: false});
+
+ messageModal.message = function (title, content) {
+ scope.title = title || 'Message';
+ scope.content = content.join('<br/>') || '...';
+
+ messageModal.show();
+ };
+
+ return messageModal;
+});
+
// Confirm change location.
controlCenterModule.service('$unsavedChangesGuard', function () {
return {
http://git-wip-us.apache.org/repos/asf/ignite/blob/9277519d/modules/control-center-web/src/main/js/controllers/metadata-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
index 103c0ef..b1ed91a 100644
--- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
@@ -17,8 +17,8 @@
// Controller for Metadata screen.
controlCenterModule.controller('metadataController', [
- '$scope', '$controller', '$http', '$modal', '$common', '$timeout', '$focus', '$confirm', '$confirmBatch', '$clone', '$table', '$preview', '$loading', '$unsavedChangesGuard',
- function ($scope, $controller, $http, $modal, $common, $timeout, $focus, $confirm, $confirmBatch, $clone, $table, $preview, $loading, $unsavedChangesGuard) {
+ '$scope', '$controller', '$http', '$modal', '$common', '$timeout', '$focus', '$confirm', '$confirmBatch', '$message', '$clone', '$table', '$preview', '$loading', '$unsavedChangesGuard',
+ function ($scope, $controller, $http, $modal, $common, $timeout, $focus, $confirm, $confirmBatch, $message, $clone, $table, $preview, $loading, $unsavedChangesGuard) {
$unsavedChangesGuard.install($scope);
// Initialize the super class and extend it.
@@ -29,9 +29,7 @@ controlCenterModule.controller('metadataController', [
$scope.ui = $common.formUI();
- $scope.showMoreInfo = function () {
- $common.showInfo('TODO: show modal with more info');
- };
+ $scope.showMoreInfo = $message.message;
$scope.agentGoal = 'load metadata from database schema';
$scope.agentTestDriveOption = '--test-drive-metadata';
@@ -377,6 +375,8 @@ controlCenterModule.controller('metadataController', [
$scope.selectItem(lastItem);
$common.showInfo('Cache type metadata loaded from database.');
+
+ $scope.panels.activePanels = [0, 1, 2];
})
.error(function (errMsg) {
$common.showError(errMsg);
@@ -599,6 +599,7 @@ controlCenterModule.controller('metadataController', [
$http.get('/models/metadata.json')
.success(function (data) {
$scope.screenTip = data.screenTip;
+ $scope.moreInfo = data.moreInfo;
$scope.metadata = data.metadata;
$scope.metadataDb = data.metadataDb;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9277519d/modules/control-center-web/src/main/js/controllers/models/caches.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/caches.json b/modules/control-center-web/src/main/js/controllers/models/caches.json
index 987cada..40b4520 100644
--- a/modules/control-center-web/src/main/js/controllers/models/caches.json
+++ b/modules/control-center-web/src/main/js/controllers/models/caches.json
@@ -14,6 +14,12 @@
"Back to <a href='/configuration/clusters'>Clusters</a>"
]
},
+ "moreInfo": {
+ "title": "Caches page",
+ "content": ["Manage you cluster's caches on current page.",
+ "Caches can be linked with specified <a href='/configuration/clusters'>clusters</a> and <a href='/configuration/metadata'>metadata</a>",
+ "Generated cluster with caches configuration available on <a href='/configuration/summary'>summary</a> page."]
+ },
"general": [
{
"label": "General",
http://git-wip-us.apache.org/repos/asf/ignite/blob/9277519d/modules/control-center-web/src/main/js/controllers/models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/clusters.json b/modules/control-center-web/src/main/js/controllers/models/clusters.json
index d5a3c08..30eb8c5 100644
--- a/modules/control-center-web/src/main/js/controllers/models/clusters.json
+++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json
@@ -12,6 +12,11 @@
"Continue to <a href='/configuration/summary'>Summary</a>"
]
},
+ "moreInfo": {
+ "title": "Clusters page",
+ "content": ["Manage you clusters on current page.",
+ "Generated clusters configuration available on <a href='/configuration/summary'>summary</a> page."]
+ },
"general": [
{
"label": "General",
http://git-wip-us.apache.org/repos/asf/ignite/blob/9277519d/modules/control-center-web/src/main/js/controllers/models/metadata.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/metadata.json b/modules/control-center-web/src/main/js/controllers/models/metadata.json
index 8d3287e..28a5c56 100644
--- a/modules/control-center-web/src/main/js/controllers/models/metadata.json
+++ b/modules/control-center-web/src/main/js/controllers/models/metadata.json
@@ -13,6 +13,12 @@
"Back to <a href='/configuration/clusters'>Clusters</a>"
]
},
+ "moreInfo": {
+ "title": "Metadata page",
+ "content": ["Manage you type metadata on current page.",
+ "Metadata can be assigned to specified <a href='/configuration/caches'>caches</a>.",
+ "Generated cluster with caches with metadata configuration available on <a href='/configuration/summary'>summary</a> page."]
+ },
"metadata": [
{
"label": "Metadata common",
http://git-wip-us.apache.org/repos/asf/ignite/blob/9277519d/modules/control-center-web/src/main/js/controllers/models/summary.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/summary.json b/modules/control-center-web/src/main/js/controllers/models/summary.json
index 9ddf3ad..e5c8687 100644
--- a/modules/control-center-web/src/main/js/controllers/models/summary.json
+++ b/modules/control-center-web/src/main/js/controllers/models/summary.json
@@ -14,6 +14,15 @@
"Analyze with SQL"
]
},
+ "moreInfo": {
+ "title": "Summary page",
+ "content": ["Generated cluster's configuration showed on this page.",
+ "Configurations available in XML, Java and Dockerfile format for Server and Client mode.",
+ "Database table POJO classes for cluster's metadatas available on \"POJO\" tab.",
+ "Use \"Download\" button to receive configurations in ZIP file.",
+ "Go back to change configuration on <a href='/configuration/clusters'>clusters</a>, <a href='/configuration/caches'>caches</a> or <a href='/configuration/metadata'>metadata</a> pages."
+ ]
+ },
"clientFields": [
{
"label": "Near cache start size",
http://git-wip-us.apache.org/repos/asf/ignite/blob/9277519d/modules/control-center-web/src/main/js/controllers/summary-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/summary-controller.js b/modules/control-center-web/src/main/js/controllers/summary-controller.js
index b91ed09..a41ee35 100644
--- a/modules/control-center-web/src/main/js/controllers/summary-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/summary-controller.js
@@ -16,13 +16,13 @@
*/
// Controller for Summary screen.
-controlCenterModule.controller('summaryController', ['$scope', '$http', '$common', '$loading', function ($scope, $http, $common, $loading) {
+controlCenterModule.controller('summaryController', [
+ '$scope', '$http', '$common', '$loading', '$message',
+ function ($scope, $http, $common, $loading, $message) {
$scope.joinTip = $common.joinTip;
$scope.getModel = $common.getModel;
- $scope.showMoreInfo = function () {
- $common.showInfo('TODO: show modal with more info');
- };
+ $scope.showMoreInfo = $message.message;
$scope.javaClassItems = [
{label: 'snippet', value: 1},
@@ -57,6 +57,7 @@ controlCenterModule.controller('summaryController', ['$scope', '$http', '$common
$http.get('/models/summary.json')
.success(function (data) {
$scope.screenTip = data.screenTip;
+ $scope.moreInfo = data.moreInfo;
$scope.clientFields = data.clientFields;
})
.error(function (errMsg) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/9277519d/modules/control-center-web/src/main/js/routes/public.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/public.js b/modules/control-center-web/src/main/js/routes/public.js
index 1b76cae..c73204f 100644
--- a/modules/control-center-web/src/main/js/routes/public.js
+++ b/modules/control-center-web/src/main/js/routes/public.js
@@ -34,6 +34,11 @@ router.get('/validation-error', function (req, res) {
});
// GET confirmation dialog.
+router.get('/message', function (req, res) {
+ res.render('templates/message', {});
+});
+
+// GET confirmation dialog.
router.get('/confirm', function (req, res) {
res.render('templates/confirm', {});
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/9277519d/modules/control-center-web/src/main/js/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade
index 3c2edd1..095c9f4 100644
--- a/modules/control-center-web/src/main/js/views/includes/controls.jade
+++ b/modules/control-center-web/src/main/js/views/includes/controls.jade
@@ -26,7 +26,7 @@ mixin block-callout(workflowTitle, workflowContent, whatsNextTitle, whatsNextCon
li(ng-repeat='item in #{workflowContent}')
div(ng-switch='item')
div(ng-switch-when='more-info')
- a(ng-click='showMoreInfo()') More info...
+ a(ng-click='showMoreInfo(moreInfo.title, moreInfo.content)') More info...
div(ng-switch-default) {{::item}}
td.block-callout-right(width='50%')
i.fa.fa-check-square.block-callout-header-right
http://git-wip-us.apache.org/repos/asf/ignite/blob/9277519d/modules/control-center-web/src/main/js/views/templates/message.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/message.jade b/modules/control-center-web/src/main/js/views/templates/message.jade
new file mode 100644
index 0000000..c5ad288
--- /dev/null
+++ b/modules/control-center-web/src/main/js/views/templates/message.jade
@@ -0,0 +1,26 @@
+//-
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+.modal(tabindex='-1' role='dialog')
+ .modal-dialog
+ .modal-content
+ .modal-header
+ button.close(type='button' ng-click='$hide()' aria-hidden='true') ×
+ h4.modal-title {{title}}
+ .modal-body(ng-show='content')
+ p(ng-bind-html='content' style='text-align: left;')
+ .modal-footer
+ button.btn.btn-primary(id='confirm-btn-confirm' type='button' ng-click='$hide()') Ok
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843' into ignite-843
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ccda6644
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ccda6644
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ccda6644
Branch: refs/heads/ignite-843
Commit: ccda6644e5546b32ed81d2c660cde9b1beaabf54
Parents: 9277519 7405b12
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Sep 24 11:20:17 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Sep 24 11:20:17 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 20 +++++++++++++-------
modules/control-center-web/src/main/js/db.js | 5 +----
2 files changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------