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/06/18 13:58:23 UTC
incubator-ignite git commit: # IGNITE-843 Fixes on review.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 cd8d9a5e4 -> be2b81df0
# IGNITE-843 Fixes on review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/be2b81df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/be2b81df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/be2b81df
Branch: refs/heads/ignite-843
Commit: be2b81df0ef9c11a27b71f1f1838f0102966e2e1
Parents: cd8d9a5
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu Jun 18 18:58:17 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu Jun 18 18:58:17 2015 +0700
----------------------------------------------------------------------
.../nodejs/public/form-models/caches.json | 116 +++++++++----------
.../nodejs/public/form-models/clusters.json | 22 ++--
.../public/javascripts/controllers/clusters.js | 2 +-
.../nodejs/views/includes/controls.jade | 49 ++++----
4 files changed, 94 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be2b81df/modules/webconfig/nodejs/public/form-models/caches.json
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/public/form-models/caches.json b/modules/webconfig/nodejs/public/form-models/caches.json
index 0862c78..625502c 100644
--- a/modules/webconfig/nodejs/public/form-models/caches.json
+++ b/modules/webconfig/nodejs/public/form-models/caches.json
@@ -31,6 +31,15 @@
"<ul><li>Transactional - in this mode specified fully ACID-compliant transactional cache behavior.</li>",
"<li>Atomic - in this mode distributed transactions and distributed locking are not supported.</li></ul>"
]
+ },
+ {
+ "label": "Backups",
+ "type": "text",
+ "model": "backups",
+ "placeholder": "0",
+ "tip": [
+ "Number of nodes used to back up single partition for partitioned cache"
+ ]
}
],
"advanced": [
@@ -38,15 +47,6 @@
"label": "Memory",
"fields": [
{
- "label": "Backups",
- "type": "text",
- "model": "backups",
- "placeholder": "0",
- "tip": [
- "Number of nodes used to back up single partition for partitioned cache"
- ]
- },
- {
"label": "Mode",
"type": "dropdown",
"model": "memoryMode",
@@ -149,55 +149,6 @@
]
},
{
- "label": "Misc",
- "fields": [
- {
- "label": "Statistics enabled",
- "type": "check",
- "model": "statisticsEnabled",
- "tip": [
- "Flag indicating whether statistics gathering is enabled on a cache"
- ]
- },
- {
- "label": "Management enabled",
- "type": "check",
- "model": "managementEnabled",
- "tip": [
- "Flag indicating whether management is enabled on this cache"
- ]
- },
- {
- "label": "Read from backup",
- "type": "check",
- "model": "readFromBackup",
- "tip": [
- "Flag indicating whether data can be read from backup.<br/>",
- "If not set then always get data from primary node (never from backup)"
- ]
- },
- {
- "label": "Copy on read",
- "type": "check",
- "model": "copyOnRead",
- "tip": [
- "Flag indicating whether copy of of the value stored in cache should be created for cache operation implying return value.<br/>",
- " Also if this flag is set copies are created for values passed to CacheInterceptor and to CacheEntryProcessor"
- ]
- },
- {
- "label": "Max concurreny",
- "type": "text",
- "model": "maxConcurrentAsyncOperations",
- "placeholder": "500",
- "tip": [
- "Maximum number of allowed concurrent asynchronous operations.<br/>",
- "If 0 returned then number of concurrent asynchronous operations is unlimited"
- ]
- }
- ]
- },
- {
"label": "Near cache",
"model": "nearConfiguration",
"fields": [
@@ -450,6 +401,55 @@
]
}
]
+ },
+ {
+ "label": "Misc",
+ "fields": [
+ {
+ "label": "Statistics enabled",
+ "type": "check",
+ "model": "statisticsEnabled",
+ "tip": [
+ "Flag indicating whether statistics gathering is enabled on a cache"
+ ]
+ },
+ {
+ "label": "Management enabled",
+ "type": "check",
+ "model": "managementEnabled",
+ "tip": [
+ "Flag indicating whether management is enabled on this cache"
+ ]
+ },
+ {
+ "label": "Read from backup",
+ "type": "check",
+ "model": "readFromBackup",
+ "tip": [
+ "Flag indicating whether data can be read from backup.<br/>",
+ "If not set then always get data from primary node (never from backup)"
+ ]
+ },
+ {
+ "label": "Copy on read",
+ "type": "check",
+ "model": "copyOnRead",
+ "tip": [
+ "Flag indicating whether copy of of the value stored in cache should be created for cache operation implying return value.<br/>",
+ " Also if this flag is set copies are created for values passed to CacheInterceptor and to CacheEntryProcessor"
+ ]
+ },
+ {
+ "label": "Max async concurrency",
+ "type": "text",
+ "model": "maxConcurrentAsyncOperations",
+ "placeholder": "500",
+ "tip": [
+ "Maximum number of allowed concurrent asynchronous operations.<br/>",
+ "If 0 returned then number of concurrent asynchronous operations is unlimited"
+ ]
+ }
+ ]
}
]
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be2b81df/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 4236192..5155241 100644
--- a/modules/webconfig/nodejs/public/form-models/clusters.json
+++ b/modules/webconfig/nodejs/public/form-models/clusters.json
@@ -8,6 +8,16 @@
"placeholder": "Input name"
},
{
+ "label": "Caches",
+ "type": "dropdown-multiple",
+ "model": "caches",
+ "placeholder": "Choose caches",
+ "items": "caches",
+ "tip": [
+ "Select caches to start in cluster"
+ ]
+ },
+ {
"label": "Discovery",
"type": "dropdown-details",
"group": "discovery",
@@ -29,7 +39,7 @@
"model": "addresses",
"editIdx": -1,
"reordering": true,
- "placeholder": "IP address",
+ "placeholder": "IP address:port",
"tip": [
"Addresses may be represented as follows:",
"<ul>",
@@ -230,16 +240,6 @@
]
}
}
- },
- {
- "label": "Caches",
- "type": "dropdown-multiple",
- "model": "caches",
- "placeholder": "Choose caches",
- "items": "caches",
- "tip": [
- "Select caches to start in cluster"
- ]
}
],
"advanced": [
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be2b81df/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 6e75313..27d710c 100644
--- a/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
+++ b/modules/webconfig/nodejs/public/javascripts/controllers/clusters.js
@@ -23,7 +23,7 @@ configuratorModule.controller('clustersController', ['$scope', '$alert', '$http'
$scope.templates = [
{value: {}, label: 'none'},
{value: {discovery: {kind: 'Vm', Vm: {addresses: ['127.0.0.1:47500..47510']}}}, label: 'local'},
- {value: {discovery: {kind: 'Multicast', Multicast: {}}}, label: 'basic'}
+ {value: {discovery: {kind: 'Multicast', Multicast: {}}}, label: 'multicast'}
];
$scope.discoveries = [
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be2b81df/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 6d16d19..d341b75 100644
--- a/modules/webconfig/nodejs/views/includes/controls.jade
+++ b/modules/webconfig/nodejs/views/includes/controls.jade
@@ -56,10 +56,10 @@ mixin details-row
tr(ng-repeat='item in #{detailMdl}')
td.col-sm-11
div(ng-show='detail.editIdx != {{$index}}')
- a(ng-click='detail.editIdx = $index; curValue = #{detailMdl}[$index]') {{$index + 1}}. {{item}}
+ a(ng-click='detail.editIdx = $index; curValue = #{detailMdl}[$index]') {{$index + 1}}) {{item}}
i.tipField.fa.fa-remove(ng-click='detail.editIdx = -1; #{detailMdl}.splice($index, 1)')
div(ng-show='detail.editIdx == {{$index}}')
- label.labelField {{$index + 1}}.
+ label.labelField {{$index + 1}})
i.tipField.fa.fa-floppy-o(ng-click='detail.editIdx = -1; #{detailMdl}[$index]=curValue')
.input-tip
input.form-control(type='text' ng-model='curValue' placeholder='{{detail.placeholder}}')
@@ -68,7 +68,7 @@ mixin details-row
i.fa.fa-arrow-down(ng-show='$index < #{detailMdl}.length - 1' ng-click='swapSimpleItems(#{detailMdl}, $index, $index + 1); detail.editIdx = -1;')
button.btn.btn-primary.fieldButton(ng-disabled='!newValue || #{detailMdl}.indexOf(newValue) >= 0' ng-click='detail.editIdx = -1; addDetailSimpleItem(backupItem, field, detail.model, newValue)') Add
.input-tip
- input.form-control(type='text' ng-model='newValue' placeholder='{{detail.placeholder}}')
+ input.form-control(type='text' ng-model='newValue' ng-focus='detail.editIdx = -1' placeholder='{{detail.placeholder}}')
mixin form-row
- var lblClasses = ['col-sm-2']
@@ -114,51 +114,50 @@ mixin form-row
.col-sm-6.panel-details(ng-show='#{expanded} && #{masterMdl}')
.details-row(ng-repeat='detail in field.details[#{masterMdl}].fields')
+details-row
- div(ng-switch-when='indexedTypes')
- - var tblMdl = 'backupItem.indexedTypes'
+ div(ng-switch-when='table-simple')
+ - var tblMdl = 'backupItem[field.model]'
div
- label Indexed types: {{#{tblMdl}.length}}
+ label {{field.tableLabel}}: {{#{tblMdl}.length}}
+tipLabel('field.tip')
table.links-edit.col-sm-12(st-table=tblMdl ng-show='#{tblMdl}.length > 0')
tbody
tr.col-sm-12(ng-repeat='item in #{tblMdl}')
td.col-sm-6
div(ng-show='field.editIdx != {{$index}}')
- a(ng-click='field.editIdx = $index; curValue = #{tblMdl}[$index]') {{$index + 1}}. {{item.keyClass}}, {{item.valueClass}}
+ a(ng-click='field.editIdx = $index; curValue = #{tblMdl}[$index]') {{$index + 1}}. {{item | compact}}
i.tipField.fa.fa-remove(ng-click='field.editIdx = -1; #{tblMdl}.splice($index, 1)')
div(ng-show='field.editIdx == {{$index}}')
label.labelField {{$index + 1}}.
i.tipField.fa.fa-floppy-o(ng-click='field.editIdx = -1; #{tblMdl}[$index]=curValue')
.input-tip
- input.form-control.settings-row(type='text' ng-model='curKeyClass' placeholder='Key class full name')
- input.form-control.settings-row(type='text' ng-model='curValueClass' placeholder='Value class full name')
+ input.form-control(type='text' ng-model='curValue' placeholder='{{field.placeholder}}')
+ td.col-sm-1(ng-if='field.reordering')
+ i.fa.fa-arrow-up(ng-show='$index > 0' ng-click='swapSimpleItems(#{tblMdl}, $index, $index - 1); field.editIdx = -1;')
+ i.fa.fa-arrow-down(ng-show='$index < #{tblMdl}.length - 1' ng-click='swapSimpleItems(#{tblMdl}, $index, $index + 1); field.editIdx = -1;')
.col-sm-6
- input.form-control(type='text' ng-model='newKeyClass' placeholder='Key class full name')
- .settings-row
- input.form-control(type='text' ng-model='newValueClass' placeholder='Value class full name')
- button.btn.btn-primary.fieldButton(ng-click='field.editIdx = -1; addIndexedTypes(newKeyClass, newValueClass)') Add
- div(ng-switch-when='table-simple')
- - var tblMdl = 'backupItem[field.model]'
+ button.btn.btn-primary.fieldButton(ng-disabled='!newValue || #{tblMdl}.indexOf(newValue) >= 0' ng-click='field.editIdx = -1; addSimpleItem(backupItem, field.model, newValue)') Add
+ .input-tip
+ input.form-control(type='text' ng-model='newValue' ng-focus='field.editIdx = -1' placeholder='{{field.placeholder}}')
+ div(ng-switch-when='indexedTypes')
+ - var tblMdl = 'backupItem.indexedTypes'
div
- label {{field.tableLabel}}: {{#{tblMdl}.length}}
+ label Indexed types: {{#{tblMdl}.length}}
+tipLabel('field.tip')
table.links-edit.col-sm-12(st-table=tblMdl ng-show='#{tblMdl}.length > 0')
tbody
tr.col-sm-12(ng-repeat='item in #{tblMdl}')
td.col-sm-6
div(ng-show='field.editIdx != {{$index}}')
- a(ng-click='field.editIdx = $index; curValue = #{tblMdl}[$index]') {{$index + 1}}. {{item | compact}}
+ a(ng-click='field.editIdx = $index; curValue = #{tblMdl}[$index]') {{$index + 1}}. {{item.keyClass}}, {{item.valueClass}}
i.tipField.fa.fa-remove(ng-click='field.editIdx = -1; #{tblMdl}.splice($index, 1)')
div(ng-show='field.editIdx == {{$index}}')
label.labelField {{$index + 1}}.
i.tipField.fa.fa-floppy-o(ng-click='field.editIdx = -1; #{tblMdl}[$index]=curValue')
.input-tip
- input.form-control(type='text' ng-model='curValue' placeholder='{{field.placeholder}}')
- td.col-sm-1(ng-if='field.reordering')
- i.fa.fa-arrow-up(ng-show='$index > 0' ng-click='swapSimpleItems(#{tblMdl}, $index, $index - 1); field.editIdx = -1;')
- i.fa.fa-arrow-down(ng-show='$index < #{tblMdl}.length - 1' ng-click='swapSimpleItems(#{tblMdl}, $index, $index + 1); field.editIdx = -1;')
+ input.form-control.settings-row(type='text' ng-model='curKeyClass' placeholder='Key class full name')
+ input.form-control.settings-row(type='text' ng-model='curValueClass' placeholder='Value class full name')
.col-sm-6
- button.btn.btn-primary.fieldButton(ng-disabled='!newValue || #{tblMdl}.indexOf(newValue) >= 0' ng-click='field.editIdx = -1; addSimpleItem(backupItem, field.model, newValue)') Add
- .input-tip
- input.form-control(type='text' ng-model='newValue' placeholder='{{field.placeholder}}')
-
+ input.form-control(type='text' ng-model='newKeyClass' ng-focus='field.editIdx = -1' placeholder='Key class full name')
+ .settings-row
+ input.form-control(type='text' ng-model='newValueClass' ng-focus='field.editIdx = -1' placeholder='Value class full name')
+ button.btn.btn-primary.fieldButton(ng-click='field.editIdx = -1; addIndexedTypes(newKeyClass, newValueClass)') Add