Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 076fd4935 -> 2fd92226d
# ignite-850 WIP Discovery details. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2fd92226 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2fd92226 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2fd92226 Branch: refs/heads/ignite-843 Commit: 2fd92226d08aea2704319b4eb9f586dc19e0f1cb Parents: 076fd49 Author: Andrey <anovi...@gridgain.com> Authored: Mon Jun 8 10:44:31 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Mon Jun 8 10:44:31 2015 +0700 ---------------------------------------------------------------------- .../nodejs/public/form-models/clusters.json | 19 ++++++++++--------- .../public/javascripts/controllers/clusters.js | 18 ++++++++++++++++-- .../nodejs/views/includes/controls.jade | 19 ++++++++----------- 3 files changed, 34 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2fd92226/modules/webconfig/nodejs/public/form-models/clusters.json ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/public/form-models/clusters.json b/modules/webconfig/nodejs/public/form-models/clusters.json index b76c076..105635e 100644 --- a/modules/webconfig/nodejs/public/form-models/clusters.json +++ b/modules/webconfig/nodejs/public/form-models/clusters.json @@ -8,7 +8,8 @@ { "label": "Discovery", "type": "dropdown-details", - "model": "discovery.kind", + "group": "discovery", + "model": "kind", "placeholder": "Choose discovery", "items": "discoveries", "tip": ["Discovery allows to discover remote nodes in grid."], @@ -99,13 +100,13 @@ "placeholder": "" }, { - "label": "Service account private key path", + "label": "Private key path", "type": "text", "model": "serviceAccountP12FilePath", "placeholder": "" }, { - "label": "Service account id", + "label": "Account id", "type": "text", "model": "addrReqAttempts", "placeholder": "" @@ -134,7 +135,7 @@ "label": "Atomic data structures", "fields": [ { - "label": "Number of backup nodes", + "label": "Backups", "type": "text", "model": "atomic.backups", "placeholder": "0" @@ -147,7 +148,7 @@ "items": "cacheModes" }, { - "label": "Sequence reserve size", + "label": "Sequence reserve", "type": "text", "model": "atomic.seqReserveSize", "placeholder": "1,000" @@ -222,7 +223,7 @@ "placeholder": "60,000" }, { - "label": "Metrics update frequency", + "label": "Update frequency", "type": "text", "model": "metricsUpdateFreq", "placeholder": "60,000" @@ -304,10 +305,10 @@ ] }, { - "label": "Transactions configuration", + "label": "Transactions", "fields": [ { - "label": "Default transaction timeout", + "label": "Default timeout", "type": "text", "model": "dfltTxTimeout", "placeholder": "0" @@ -319,7 +320,7 @@ "placeholder": "10,000" }, { - "label": "Pessimistic transactions log size", + "label": "Pessimistic log size", "type": "text", "model": "pessimisticTxLogSize", "placeholder": "0" http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2fd92226/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js b/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js index 302b45b..7223d4f 100644 --- a/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js +++ b/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js @@ -18,8 +18,8 @@ configuratorModule.controller('clustersController', ['$scope', '$modal', '$http', function($scope, $modal, $http) { $scope.templates = [ {value: {}, label: 'None'}, - {value: {discovery: {kind: 'Vm', addresses: ['127.0.0.1:47500..47510']}}, label: 'Local'}, - {value: {discovery: {kind: 'Multicast'}}, label: 'Basic'} + {value: {discovery: {kind: 'Vm', Vm: {addresses: ['127.0.0.1:47500..47510']}}}, label: 'Local'}, + {value: {discovery: {kind: 'Multicast', Multicast: {}}}, label: 'Basic'} ]; $scope.discoveries = [ @@ -61,6 +61,20 @@ configuratorModule.controller('clustersController', ['$scope', '$modal', '$http' $scope.advanced = data.advanced; }); + $scope.ss = function (o, s) { + var a = s.split('.'); + + for (var i = 0, n = a.length; i < n; ++i) { + var k = a[i]; + + if (!(k in o)) + o[k] = {}; + + o = o[k]; + } + return o; + }; + // Create popup for discovery advanced settings. var discoveryModal = $modal({scope: $scope, template: '/discovery', show: false}); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2fd92226/modules/webconfig/nodejs/views/includes/controls.jade ---------------------------------------------------------------------- diff --git a/modules/webconfig/nodejs/views/includes/controls.jade b/modules/webconfig/nodejs/views/includes/controls.jade index b102465..aa209f1 100644 --- a/modules/webconfig/nodejs/views/includes/controls.jade +++ b/modules/webconfig/nodejs/views/includes/controls.jade @@ -20,29 +20,26 @@ mixin tip mixin tip-detail i.tip.fa.fa-question-circle(ng-if='detail.tip' bs-tooltip='detail.tip.join("")' type='button') -mixin edt(mdl, ph) - input.form-control(type='text' ng-model=mdl placeholder=ph) - mixin details-row div(ng-switch='detail.type') div(ng-switch-when='check') - input(type='checkbox' ng-model='backupItem[detail.model]') - label(ng-click='backupItem[detail.model] = !backupItem[detail.model]') {{detail.label}} + input(type='checkbox' ng-model='backupItem[field.group][backupItem[field.group][field.model]][detail.model]') + label(ng-click='backupItem[field.group][backupItem[field.group][field.model]][detail.model] = !backupItem[field.group][backupItem[field.group][field.model]][detail.model]') {{detail.label}} +tip-detail div(ng-switch-when='text') label.col-sm-2 {{detail.label}}: .col-sm-3 - +edt('backupItem[detail.model]', '{{detail.placeholder}}') + input.form-control(type='text' ng-model='backupItem[field.group][backupItem[field.group][field.model]][detail.model]' placeholder='{{field.model}}{{detail.model}}') +tip-detail div(ng-switch-when='dropdown') label.col-sm-2 {{detail.label}}: .col-sm-3 - button.form-control(bs-select ng-model='backupItem[detail.model]' data-template='/select' data-placeholder='{{detail.placeholder}}' bs-options='item.value as item.label for item in {{detail.items}}') + button.form-control(bs-select ng-model='backupItem[field.group][backupItem[field.group][field.model]][detail.model]' data-template='/select' data-placeholder='{{detail.placeholder}}' bs-options='item.value as item.label for item in {{detail.items}}') +tip-detail div(ng-switch-when='dropdown-multiple') label.col-sm-2 {{detail.label}}: .col-sm-3 - button.form-control(bs-select ng-model='backupItem[detail.model]' data-multiple='1' data-template='/select' data-placeholder='{{detail.placeholder}}' bs-options='item.value as item.label for item in {{detail.items}}') + button.form-control(bs-select ng-model='backupItem[field.group][backupItem[field.group][field.model]][detail.model]' data-multiple='1' data-template='/select' data-placeholder='{{detail.placeholder}}' bs-options='item.value as item.label for item in {{detail.items}}') +tip-detail mixin form-row @@ -54,7 +51,7 @@ mixin form-row div(ng-switch-when='text') label.col-sm-2 {{field.label}}: .col-sm-3 - +edt('backupItem[field.model]', '{{field.placeholder}}') + input.form-control(type='text' ng-model='backupItem[field.model]' placeholder='{{field.placeholder}}') +tip div(ng-switch-when='dropdown') label.col-sm-2 {{field.label}}: @@ -69,7 +66,7 @@ mixin form-row div(ng-switch-when='dropdown-details') label.col-sm-2 {{field.label}}: .col-sm-3 - button.form-control(bs-select ng-model='backupItem[field.model]' data-template='/select' data-placeholder='{{field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}') + button.form-control(bs-select ng-model='backupItem[field.group][field.model]' data-template='/select' data-placeholder='{{field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}') +tip - .details-row(ng-repeat='detail in field.details[backupItem[field.model]]') + .details-row(ng-repeat='detail in field.details[backupItem[field.group][field.model]]') +details-row \ No newline at end of file
