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/11 12:44:42 UTC
[1/2] ignite git commit: IGNITE-843 Added validation for cache: POJO
store requires metadata .
Repository: ignite
Updated Branches:
refs/heads/ignite-843 4abfd551e -> f931b10b6
IGNITE-843 Added validation for cache: POJO store requires metadata .
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0bd1ec0d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0bd1ec0d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0bd1ec0d
Branch: refs/heads/ignite-843
Commit: 0bd1ec0dcf7c0caa98bea01420a99b2a583c719f
Parents: c86d24f
Author: vsisko <vs...@gridgain.com>
Authored: Fri Sep 11 17:44:58 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Sep 11 17:44:58 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/caches-controller.js | 38 +++++++++++++-------
.../src/main/js/controllers/common-module.js | 6 ++--
.../js/views/templates/validation-error.jade | 8 +++--
3 files changed, 34 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bd1ec0d/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 437772c..44b077d 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
@@ -227,6 +227,16 @@ controlCenterModule.controller('cachesController', [
$scope.selectItem($scope.caches[0]);
}
+ function cacheMetadatas(item) {
+ return _.reduce($scope.metadatas, function (memo, meta) {
+ if (item && _.contains(item.metadatas, meta.value)) {
+ memo.push(meta.meta);
+ }
+
+ return memo;
+ }, []);
+ }
+
// When landing on the page, get caches and show them.
$http.post('caches/list')
.success(function (data) {
@@ -257,16 +267,6 @@ controlCenterModule.controller('cachesController', [
else
selectFirstItem();
- function cacheMetadatas(item) {
- return _.reduce($scope.metadatas, function (memo, meta) {
- if (item && _.contains(item.metadatas, meta.value)) {
- memo.push(meta.meta);
- }
-
- return memo;
- }, []);
- }
-
$scope.$watch('backupItem', function (val, old) {
if (val) {
var metas = cacheMetadatas();
@@ -430,9 +430,21 @@ controlCenterModule.controller('cachesController', [
return showPopoverMessage($scope.panels, 'store', 'cacheStoreFactory',
'Write behind enabled but store is not configured!');
- if (cacheStoreFactorySelected && !(item.readThrough || item.writeThrough))
- return showPopoverMessage($scope.panels, 'store', 'readThrough',
- 'Store is configured but read/write through are not enabled!');
+ if (cacheStoreFactorySelected) {
+ if (!item.readThrough && !item.writeThrough)
+ return showPopoverMessage($scope.panels, 'store', 'readThrough',
+ 'Store is configured but read/write through are not enabled!');
+
+ if (item.cacheStoreFactory.kind == 'CacheJdbcPojoStoreFactory') {
+ if ($common.isDefined(item.metadatas)) {
+ var metadatas = cacheMetadatas($scope.backupItem);
+
+ if (_.findIndex(metadatas, $common.metadataForStoreConfigured) < 0)
+ return showPopoverMessage($scope.panels, 'general', 'metadata',
+ 'Cache with configured JDBC POJO store factory should contain at least one metadata with store configuration');
+ }
+ }
+ }
return true;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bd1ec0d/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 813457f..430c78e 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
@@ -491,7 +491,7 @@ controlCenterModule.service('$common', [
popover = newPopover;
}, 100);
- $timeout(function () { newPopover.hide() }, 3000);
+ $timeout(function () { newPopover.hide() }, 5000);
return false;
}
@@ -614,7 +614,7 @@ controlCenterModule.service('$common', [
return true;
},
metadataForQueryConfigured: function (meta) {
- return meta
+ return isDefined(meta)
&& !(isEmptyArray(meta.queryFields)
&& isEmptyArray(meta.ascendingFields)
&& isEmptyArray(meta.descendingFields)
@@ -622,7 +622,7 @@ controlCenterModule.service('$common', [
&& isEmptyArray(meta.groups))
},
metadataForStoreConfigured: function (meta) {
- return meta
+ return isDefined(meta)
&& !(isEmptyString(meta.databaseSchema)
&& isEmptyString(meta.databaseTable)
&& isEmptyArray(meta.keyFields)
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bd1ec0d/modules/control-center-web/src/main/js/views/templates/validation-error.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/validation-error.jade b/modules/control-center-web/src/main/js/views/templates/validation-error.jade
index 41d77bc..8b483fb 100644
--- a/modules/control-center-web/src/main/js/views/templates/validation-error.jade
+++ b/modules/control-center-web/src/main/js/views/templates/validation-error.jade
@@ -17,5 +17,9 @@
.popover.validation-error
.arrow
.popover-content
- label {{content}}  
- button.close(id='popover-btn-close' type='button' ng-click='$hide()') ×
+ table
+ tr
+ td
+ label {{content}}  
+ td
+ button.close(id='popover-btn-close' type='button' ng-click='$hide()') ×
[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/f931b10b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f931b10b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f931b10b
Branch: refs/heads/ignite-843
Commit: f931b10b6450578784994d8bcaada8accedb1efb
Parents: 0bd1ec0 4abfd55
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Sep 11 17:45:20 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Sep 11 17:45:20 2015 +0700
----------------------------------------------------------------------
.../public/stylesheets/_bootstrap-variables.scss | 4 ++--
.../src/main/js/public/stylesheets/style.scss | 19 ++++++++++++-------
2 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------