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/10/16 18:16:58 UTC
ignite git commit: IGNITE-843 Fixed load metadata logic in case of
agent not started. Tweaked loading indicator options.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 d0945a109 -> c7cf31cd3
IGNITE-843 Fixed load metadata logic in case of agent not started. Tweaked loading indicator options.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c7cf31cd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c7cf31cd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c7cf31cd
Branch: refs/heads/ignite-843-rc1
Commit: c7cf31cd3f02b42145cdf328e6ac819cb7fd73b8
Parents: d0945a1
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Oct 16 23:16:48 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Oct 16 23:16:48 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/metadata-controller.js | 25 ++++++++++++++++----
.../src/main/js/controllers/sql-controller.js | 1 +
.../js/views/configuration/metadata-load.jade | 3 +--
.../main/js/views/templates/agent-download.jade | 2 +-
4 files changed, 23 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c7cf31cd/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 6c5aec6..ba534f1 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
@@ -33,6 +33,7 @@ consoleModule.controller('metadataController', [
$scope.agentGoal = 'load metadata from database schema';
$scope.agentTestDriveOption = '--test-drive-metadata';
+ $scope.agentDownloadBackTo = 'Metadata';
$scope.joinTip = $common.joinTip;
$scope.getModel = $common.getModel;
@@ -63,6 +64,10 @@ consoleModule.controller('metadataController', [
var INFO_CONNECT_TO_DB = 'Configure connection to database';
var INFO_SELECT_SCHEMAS = 'Select schemas to load tables from';
var INFO_SELECT_TABLES = 'Select tables to import as cache type metadata';
+ var LOADING_JDBC_DRIVERS = {text: 'Loading JDBC drivers...'};
+ var LOADING_SCHEMAS = {text: 'Loading schemas...'};
+ var LOADING_TABLES = {text: 'Loading tables...'};
+ var LOADING_METADATA = {text: 'Loading metadata...'};
var previews = [];
@@ -246,16 +251,17 @@ consoleModule.controller('metadataController', [
tables: [],
allTablesSelected: false,
button: 'Next',
- info: 'Configure connection to database'
+ info: ''
};
$scope.loadMeta.action = 'drivers';
+ $scope.loadMeta.loadingOptions = LOADING_JDBC_DRIVERS;
- loadMetaModal.show();
+ $scope.startAgentListening(function (onSuccess, onException) {
+ loadMetaModal.show();
- $loading.start('loadingMetadataFromDb');
+ $loading.start('loadingMetadataFromDb');
- $scope.startAgentListening(function (onSuccess, onException) {
// Get available JDBC drivers via agent.
if ($scope.loadMeta.action == 'drivers') {
$http.post('/agent/drivers')
@@ -275,6 +281,7 @@ consoleModule.controller('metadataController', [
loadMetaModal.$promise.then(function () {
$scope.loadMeta.action = 'connect';
$scope.loadMeta.tables = [];
+ $scope.loadMeta.loadingOptions = LOADING_SCHEMAS;
$focus('jdbcUrl');
});
@@ -282,13 +289,17 @@ consoleModule.controller('metadataController', [
$common.confirmUnsavedChanges($scope.ui.isDirty(), openLoadMetadataModal);
}
- else
+ else {
$common.showError('JDBC drivers not found!');
+
+ loadMetaModal.hide();
+ }
})
.error(function (errMsg, status) {
onException(errMsg, status);
})
.finally(function () {
+ $scope.loadMeta.info = INFO_CONNECT_TO_DB;
$loading.finish('loadingMetadataFromDb');
});
}
@@ -308,6 +319,7 @@ consoleModule.controller('metadataController', [
})
.finally(function() {
$scope.loadMeta.info = INFO_SELECT_SCHEMAS;
+ $scope.loadMeta.loadingOptions = LOADING_TABLES;
$loading.finish('loadingMetadataFromDb');
});
@@ -341,6 +353,7 @@ consoleModule.controller('metadataController', [
})
.finally(function() {
$scope.loadMeta.info = INFO_SELECT_TABLES;
+ $scope.loadMeta.loadingOptions = LOADING_METADATA;
$loading.finish('loadingMetadataFromDb');
});
@@ -647,10 +660,12 @@ consoleModule.controller('metadataController', [
$scope.loadMeta.action = 'schemas';
$scope.loadMeta.button = 'Next';
$scope.loadMeta.info = INFO_SELECT_SCHEMAS;
+ $scope.loadMeta.loadingOptions = LOADING_TABLES;
}
else if ($scope.loadMeta.action == 'schemas') {
$scope.loadMeta.action = 'connect';
$scope.loadMeta.info = INFO_CONNECT_TO_DB;
+ $scope.loadMeta.loadingOptions = LOADING_SCHEMAS;
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/c7cf31cd/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index 960575c..6b48495 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -24,6 +24,7 @@ consoleModule.controller('sqlController',
$scope.agentGoal = 'execute sql statements';
$scope.agentTestDriveOption = '--test-drive-sql';
+ $scope.agentDownloadBackTo = 'Configuration';
$scope.joinTip = $common.joinTip;
http://git-wip-us.apache.org/repos/asf/ignite/blob/c7cf31cd/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade b/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
index 4712e25..57adb68 100644
--- a/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/metadata-load.jade
@@ -21,12 +21,11 @@ mixin chk(mdl, change, tip)
.modal.center(role='dialog')
.modal-dialog
- .modal-content(dw-loading='loadingMetadataFromDb' dw-loading-options='{text: ""}')
+ .modal-content(dw-loading='loadingMetadataFromDb' dw-loading-options='loadMeta.loadingOptions')
#errors-container.modal-header.header
button.close(ng-click='$hide()' aria-hidden='true') ×
h4.modal-title Load metadata from database
.metadata-content(ng-show='loadMeta.action == "drivers"' style='margin-bottom: 60px')
- label.labelField Loading JDBC drivers...
.metadata-content(ng-show='loadMeta.action == "connect"' style='margin-bottom: 60px')
form.form-horizontal(name='loadForm' novalidate)
.settings-row(ng-repeat='field in metadataDb')
http://git-wip-us.apache.org/repos/asf/ignite/blob/c7cf31cd/modules/control-center-web/src/main/js/views/templates/agent-download.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/agent-download.jade b/modules/control-center-web/src/main/js/views/templates/agent-download.jade
index 8bcda60..c0ee9b0 100644
--- a/modules/control-center-web/src/main/js/views/templates/agent-download.jade
+++ b/modules/control-center-web/src/main/js/views/templates/agent-download.jade
@@ -44,5 +44,5 @@
i.tipLabel.fa.fa-clipboard(ng-click-copy='{{user.token}}' bs-tooltip='' data-title='Copy security token to clipboard')
i.tipLabel.fa.fa-question-circle(ng-if=lines bs-tooltip='' data-title='The security token is used for authorization of web agent')
.modal-footer
- button.btn.btn-default(ng-click='goHome()') Back to Configuration
+ button.btn.btn-default(ng-click='goHome()') Back to {{::agentDownloadBackTo}}
button.btn.btn-primary(ng-click='downloadAgent()') Download zip