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 2016/02/25 12:44:38 UTC
[1/3] ignite git commit: IGNITE-2711 Fixed insert in editor.
Repository: ignite
Updated Branches:
refs/heads/ignite-2612 fedd9b190 -> 6ae55f983
IGNITE-2711 Fixed insert in editor.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2d178a56
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2d178a56
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2d178a56
Branch: refs/heads/ignite-2612
Commit: 2d178a56f84a84364da64c296c04e6bc64b0ca53
Parents: 9aa0a57
Author: Andrey <an...@gridgain.com>
Authored: Thu Feb 25 18:13:10 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Feb 25 18:13:10 2016 +0700
----------------------------------------------------------------------
.../control-center-web/src/main/js/views/includes/controls.jade | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2d178a56/modules/control-center-web/src/main/js/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade
index 557f121..1b607d8 100644
--- a/modules/control-center-web/src/main/js/views/includes/controls.jade
+++ b/modules/control-center-web/src/main/js/views/includes/controls.jade
@@ -566,7 +566,7 @@ mixin preview-content(preview, state, mode)
-var previewMode = 'group.preview'
.preview-content(ng-if='!preview[#{preview}].allDefaults && #{previewMode} == #{state}' id='#{id}'
- ui-ace='{onLoad: previewInit, onChange: previewChanged, mode: "#{mode}", rendererOptions: {minLines: group.previewMinLines || 3}}' ng-model='preview[#{preview}].#{mode}')
+ ignite-ace='{onLoad: previewInit, onChange: previewChanged, mode: "#{mode}", rendererOptions: {minLines: group.previewMinLines || 3}}' ng-model='preview[#{preview}].#{mode}')
mixin preview(preview, id)
-var previewMode = 'group.preview'
[3/3] ignite git commit: IGNITE-2612 WIP reworking caches screen to
Angular directives.
Posted by ak...@apache.org.
IGNITE-2612 WIP reworking caches screen to Angular directives.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6ae55f98
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6ae55f98
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6ae55f98
Branch: refs/heads/ignite-2612
Commit: 6ae55f9831b0bc771bd3ae6c5d7fb3e9720c49e6
Parents: 41bad43
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Feb 25 18:45:04 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Feb 25 18:45:04 2016 +0700
----------------------------------------------------------------------
.../app/modules/form/field/field.directive.js | 3 +-
.../states/configuration/caches/query.jade | 78 ++++++++++++++
.../states/configuration/clusters/ssl.jade | 103 +++++++++----------
3 files changed, 126 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ae55f98/modules/control-center-web/src/main/js/app/modules/form/field/field.directive.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/form/field/field.directive.js b/modules/control-center-web/src/main/js/app/modules/form/field/field.directive.js
index e02bebe..0e3fe8d 100644
--- a/modules/control-center-web/src/main/js/app/modules/form/field/field.directive.js
+++ b/modules/control-center-web/src/main/js/app/modules/form/field/field.directive.js
@@ -31,7 +31,8 @@ export default ['igniteFormField', [() => {
bindToController: {
for: '@',
label: '@',
- type: '@'
+ type: '@',
+ name: '@'
},
template,
controller,
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ae55f98/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade
index 20a976d..1bfff6d 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/caches/query.jade
@@ -15,6 +15,41 @@
limitations under the License.
- var model = 'backupItem'
+- var form = 'querySqlFunctionClasses';
+- var sqlFunctionClasses = model + '.sqlFunctionClasses';
+
+mixin sqlFxField(field, save, newItem)
+ - var reset = (newItem ? 'group.add = []' : 'field.edit = false')
+ - var resetOnEnter = (newItem ? '(stopblur = true) && (group.add = [{}])' : '(field.edit = false)')
+ - var resetOnBlure = (newItem ? '!stopblur && (group.add = [])' : 'field.edit = false')
+
+ ignite-form-field-java-class(
+ data-name='#{field}'
+ data-ng-model='#{field}'
+ data-ng-required='true'
+ data-ignite-unique='#{sqlFunctionClasses}'
+ data-ignite-form-field-input-autofocus='true'
+ on-enter='#{valid} && (#{save}); #{valid} && #{resetOnEnter};'
+ on-escape='#{reset}'
+ ng-blur='#{valid} && (#{save}); #{resetOnBlure};'
+ )
+ block
+
+
+mixin sqlFxSaveBtn(valid, save, reset)
+ i.fa.fa-floppy-o(
+ ng-show='#{valid}'
+ ng-click='#{valid} && #{save}; #{valid} && (#{reset});'
+ bs-tooltip
+ data-title='Click icon or press [Enter] to save item'
+ )
+
+mixin sqlFxFeedbackUnique(field)
+ i.fa.fa-exclamation-triangle.form-control-feedback(
+ ng-show='!#{form}.#{field}.$pristine && #{form}.#{field}.$error.igniteUnique'
+ bs-tooltip
+ data-title='SQL function with such class name already exists!'
+ )
form.panel.panel-default(name='query' novalidate)
.panel-heading(bs-collapse-toggle)
@@ -50,6 +85,49 @@ form.panel.panel-default(name='query' novalidate)
data-min='1'
)
.settings-row
+ ignite-form-group(ng-model='#{sqlFunctionClasses}' ng-form='#{form}')
+ ignite-form-field-label
+ | SQL functions
+ ignite-form-group-tooltip
+ | Collections of classes with user-defined functions for SQL queries
+ ignite-form-group-add(ng-click='group.add = [{}]')
+ | Add new user-defined functions for SQL queries
+
+ .group-content(ng-if='#{sqlFunctionClasses}.length')
+ - var field = 'edit'
+ - var valid = form + '.' + field + '.$valid'
+ - var save = sqlFunctionClasses + '[$index] = ' + field
+ - var reset = 'field.edit = false'
+
+ ignite-form-field(ng-repeat='model in #{sqlFunctionClasses} track by $index' type='internal' name='SQL function')
+ .indexField
+ | {{ $index+1 }})
+ i.tipField.fa.fa-remove(
+ ng-hide='field.edit'
+ bs-tooltip='"Remove user-defined function"'
+ ng-click='#{sqlFunctionClasses}.splice(#{sqlFunctionClasses}.indexOf(model), 1)'
+ )
+
+ span(ng-hide='field.edit')
+ a.labelFormField(ng-click='field.edit = true') {{ model }}
+ span(ng-if='field.edit' ng-init='#{field} = model')
+ +sqlFxField(field, save, false)
+ +sqlFxSaveBtn(valid, save, reset)
+ +sqlFxFeedbackUnique(field)
+
+ .group-content(ng-repeat='field in group.add')
+ - var field = 'new'
+ - var valid = form + '.' + field + '.$valid'
+ - var save = sqlFunctionClasses + '.push(' + field + ')'
+ - var reset = 'group.add = []'
+
+ ignite-form-field(type='internal' name='SQL function')
+ +sqlFxField(field, save, true)
+ +sqlFxSaveBtn(valid, save, reset)
+ +sqlFxFeedbackUnique(field)
+ .group-content-empty(ng-if='!(#{sqlFunctionClasses}.length) && !group.add.length')
+ | Not defined
+ .settings-row
ignite-form-field
ignite-form-field-label
| Long query timeout:
http://git-wip-us.apache.org/repos/asf/ignite/blob/6ae55f98/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
index 2a91f83..0a06801 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/clusters/ssl.jade
@@ -20,11 +20,36 @@
- var trust = model + '.trustManagers'
- var form = 'trustManagers'
-mixin feedback(field, error, message)
+mixin trstMgrField(field, save, newItem)
+ - var reset = (newItem ? 'group.add = []' : 'field.edit = false')
+ - var resetOnEnter = (newItem ? '(stopblur = true) && (group.add = [{}])' : '(field.edit = false)')
+ - var resetOnBlure = (newItem ? '!stopblur && (group.add = [])' : 'field.edit = false')
+
+ ignite-form-field-java-class(
+ data-name='#{field}'
+ data-ng-model='#{field}'
+ data-ng-required='true'
+ data-ignite-unique='#{trust}'
+ data-ignite-form-field-input-autofocus='true'
+ on-enter='#{valid} && (#{save}); #{valid} && #{resetOnEnter};'
+ on-escape='#{reset}'
+ ng-blur='#{valid} && (#{save}); #{resetOnBlure};'
+ )
+ block
+
+mixin trstMgrSaveBtn(valid, save, reset)
+ i.fa.fa-floppy-o(
+ ng-show='#{valid}'
+ ng-click='#{valid} && (#{save}); #{valid} && (#{reset});'
+ bs-tooltip
+ data-title='Click icon or press [Enter] to save item'
+ )
+
+mixin trstMgrFeedbackUnique(field)
i.fa.fa-exclamation-triangle.form-control-feedback(
- ng-show='!#{form}.$pristine && #{form}.#{field}.$error.#{error}'
+ ng-show='!#{form}.#{field}.$pristine && #{form}.#{field}.$error.igniteUnique'
bs-tooltip
- data-title='#{message}'
+ data-title='Such trust manager already exists!'
)
form.panel.panel-default(name='#{form}' novalidate)
@@ -119,12 +144,13 @@ form.panel.panel-default(name='#{form}' novalidate)
ignite-form-group-add(ng-show='#{enabled}' ng-click='(group.add = [{}])')
| Add new trust manager.
- - var field = 'edit'
- - var valid = form + '.' + field + '.$valid'
- - var save = trust + '[$index] = ' + field
-
.group-content(ng-if='#{trust}.length')
- ignite-form-field(ng-repeat='model in #{trust} track by $index' type='internal')
+ - var field = 'edit'
+ - var valid = form + '.' + field + '.$valid'
+ - var save = trust + '[$index] = ' + field
+ - var reset = 'field.edit = false'
+
+ ignite-form-field(ng-repeat='model in #{trust} track by $index' type='internal' name='Trust manager')
.indexField
| {{ $index+1 }})
i.tipField.fa.fa-remove(
@@ -136,57 +162,20 @@ form.panel.panel-default(name='#{form}' novalidate)
span(ng-hide='field.edit')
a.labelFormField(ng-click='#{enabled} && (field.edit = true)') {{ model }}
span(ng-if='field.edit' ng-init='#{field} = model')
- ignite-form-field-java-class(
- data-name='#{field}'
- data-ng-model='#{field}'
- data-ng-required='true'
- data-ignite-unique='#{trust}'
- data-ignite-form-field-input-autofocus='true'
- on-enter='#{valid} && (#{save}); #{valid} && (field.edit = false);'
- on-escape='field.edit = false'
- ng-blur='#{valid} && (#{save}); (field.edit = false)'
- )
- i.fa.fa-floppy-o(
- ng-show='#{valid}'
- ng-click='#{valid} && (#{save}); #{valid} && (field.edit = false);'
- bs-tooltip
- data-title='Click icon or press [Enter] to save item'
- )
-
- i.fa.fa-exclamation-triangle.form-control-feedback(
- ng-show='!#{form}.#{field}.$pristine && #{form}.#{field}.$error.igniteUnique'
- bs-tooltip
- data-title='Such trust manager already exists!'
- )
-
- - var field = 'new'
- - var valid = form + '.' + field + '.$valid'
- - var push = trust + '.push(' + field + ')'
+ +trstMgrField(field, save, false)
+ +trstMgrSaveBtn(valid, save, reset)
+ +trstMgrFeedbackUnique(field)
.group-content(ng-repeat='field in group.add')
- ignite-form-field(type='internal')
- ignite-form-field-java-class(
- data-name='#{field}'
- data-ng-model='#{field}'
- data-ng-required='true'
- data-ignite-unique='#{trust}'
- data-ignite-form-field-input-autofocus='true'
- on-enter='#{valid} && #{push}; #{valid} && (stopblur = true) && (group.add = [{}])'
- on-escape='group.add = []'
- ng-blur='#{valid} && #{push}; !stopblur && (group.add = [])'
- )
- i.fa.fa-floppy-o(
- ng-show='#{valid}'
- ng-click='#{valid} && #{push}; #{valid} && (group.add = [])'
- bs-tooltip
- data-title='Click icon or press [Enter] to save item'
- )
-
- i.fa.fa-exclamation-triangle.form-control-feedback(
- ng-show='!#{form}.#{field}.$pristine && #{form}.#{field}.$error.igniteUnique'
- bs-tooltip
- data-title='Such trust manager already exists!'
- )
+ - var field = 'new'
+ - var valid = form + '.' + field + '.$valid'
+ - var save = trust + '.push(' + field + ')'
+ - var reset = 'group.add = []'
+
+ ignite-form-field(type='internal' name='Trust manager')
+ +trstMgrField(field, save, true)
+ +trstMgrSaveBtn(valid, save, reset)
+ +trstMgrFeedbackUnique(field)
.group-content-empty(ng-if='!(#{trust}.length) && !group.add.length')
| Not defined
[2/3] ignite git commit: Merge branch 'ignite-843-rc2' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-2612
Posted by ak...@apache.org.
Merge branch 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-2612
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/41bad43f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/41bad43f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/41bad43f
Branch: refs/heads/ignite-2612
Commit: 41bad43f0e72eefdaf84e93d12adef3cb2b53832
Parents: fedd9b1 2d178a5
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Feb 25 18:18:08 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Feb 25 18:18:08 2016 +0700
----------------------------------------------------------------------
.../control-center-web/src/main/js/views/includes/controls.jade | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------