Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 0631417a8 -> f4e3a14f7
IGNITE-843: WIP on metadata screen. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c4a6ad5b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c4a6ad5b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c4a6ad5b Branch: refs/heads/ignite-843 Commit: c4a6ad5b283e71c5796215fa2dca80bcf0aab7c9 Parents: 419dde3 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Jul 23 16:39:07 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Jul 23 16:39:07 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/metadata-controller.js | 45 +++++++++++++------- .../main/js/views/configuration/metadata.jade | 2 +- 2 files changed, 30 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4a6ad5b/modules/web-control-center/src/main/js/controllers/metadata-controller.js ---------------------------------------------------------------------- diff --git a/modules/web-control-center/src/main/js/controllers/metadata-controller.js b/modules/web-control-center/src/main/js/controllers/metadata-controller.js index bf58fe2..21af931 100644 --- a/modules/web-control-center/src/main/js/controllers/metadata-controller.js +++ b/modules/web-control-center/src/main/js/controllers/metadata-controller.js @@ -267,6 +267,20 @@ controlCenterModule.controller('metadataController', ['$scope', '$http', '$commo $common.showError(errMsg); }); + function selectFirstItem() { + if ($scope.metadatas.length > 0) + $scope.selectItem($scope.metadatas[0]); + } + + function setSelectedAndBackupItem(sel, bak) { + $table.tableReset(); + + $scope.selectedItem = sel; + $scope.backupItem = bak; + + $scope.panels.activePanel = [0]; + } + // When landing on the page, get metadatas and show them. $http.post('metadata/list') .success(function (data) { @@ -275,21 +289,25 @@ controlCenterModule.controller('metadataController', ['$scope', '$http', '$commo var restoredItem = angular.fromJson(sessionStorage.metadataBackupItem); - if (restoredItem && restoredItem._id) { - var idx = _.findIndex($scope.metadatas, function (metadata) { - return metadata._id == restoredItem._id; - }); + if (restoredItem) { + if (restoredItem._id) { + var idx = _.findIndex($scope.metadatas, function (metadata) { + return metadata._id == restoredItem._id; + }); - if (idx >= 0) { - $scope.selectedItem = $scope.metadatas[idx]; + if (idx >= 0) + setSelectedAndBackupItem($scope.metadatas[idx], restoredItem); + else { + sessionStorage.removeItem('metadataBackupItem'); - $scope.backupItem = restoredItem; + selectFirstItem(); + } } else - sessionStorage.removeItem('metadataBackupItem'); + setSelectedAndBackupItem(undefined, restoredItem); } else - $scope.backupItem = restoredItem; + selectFirstItem(); $scope.$watch('backupItem', function (val) { if (val) @@ -301,12 +319,7 @@ controlCenterModule.controller('metadataController', ['$scope', '$http', '$commo }); $scope.selectItem = function (item) { - $table.tableReset(); - - $scope.selectedItem = item; - $scope.backupItem = angular.copy(item); - - $scope.panels.activePanel = [0]; + setSelectedAndBackupItem(item, angular.copy(item)); }; // Add new metadata. @@ -317,7 +330,7 @@ controlCenterModule.controller('metadataController', ['$scope', '$http', '$commo $scope.backupItem.space = $scope.spaces[0]._id; }; - // Check cache type metadata logical consistency. + // Check metadata logical consistency. function validate(item) { return true; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4a6ad5b/modules/web-control-center/src/main/js/views/configuration/metadata.jade ---------------------------------------------------------------------- diff --git a/modules/web-control-center/src/main/js/views/configuration/metadata.jade b/modules/web-control-center/src/main/js/views/configuration/metadata.jade index d5bac06..1197795 100644 --- a/modules/web-control-center/src/main/js/views/configuration/metadata.jade +++ b/modules/web-control-center/src/main/js/views/configuration/metadata.jade @@ -42,7 +42,7 @@ block content i.tiplabel.fa.fa-question-circle(bs-tooltip data-title='{{joinTip(templateTip)}}' type='button') hr .panel-group(bs-collapse ng-model='panels.activePanel' data-allow-multiple="false") - .panel.panel-default + .panel.panel-default(ng-show='selectedItem || backupItem') .panel-heading h3 a(bs-collapse-toggle) Manual
