http://git-wip-us.apache.org/repos/asf/ignite/blob/68719446/modules/web-console/frontend/app/components/page-configure-advanced/components/model-edit-form/templates/query.pug
----------------------------------------------------------------------
diff --git 
a/modules/web-console/frontend/app/components/page-configure-advanced/components/model-edit-form/templates/query.pug
 
b/modules/web-console/frontend/app/components/page-configure-advanced/components/model-edit-form/templates/query.pug
new file mode 100644
index 0000000..ed91ec4
--- /dev/null
+++ 
b/modules/web-console/frontend/app/components/page-configure-advanced/components/model-edit-form/templates/query.pug
@@ -0,0 +1,255 @@
+//-
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+include /app/helpers/jade/mixins
+
+-var form = 'query'
+-var model = 'backupItem'
+-var queryKeyFields = `${model}.queryKeyFields`
+-var queryFields = `${model}.fields`
+-var queryAliases = `${model}.aliases`
+-var queryIndexes = `${model}.indexes`
+
+panel-collapsible(ng-form=form opened=`!!${model}.queryMetadata`)
+    panel-title#query-title Domain model for SQL query
+    panel-description
+        | Domain model properties for fields queries. 
+        
a.link-success(href='https://apacheignite.readme.io/docs/cache-queries' 
target='_blank') More info
+    panel-content.pca-form-row
+        .pca-form-column-6.pc-form-grid-row
+            .content-not-available(
+                ng-if=`${model}.queryMetadata === 'Annotations'`
+                style='margin-top: 10px'
+            )
+                label Not available for annotated types
+
+            .pc-form-grid-col-60(ng-if-start=`${model}.queryMetadata === 
'Configuration'`)
+                +text('Table name:', `${model}.tableName`, '"tableName"', 
'false', 'Enter table name')
+
+            .pc-form-grid-col-30(ng-if-start='$ctrl.available("2.0.0")')
+                +text('Key field name:', `${model}.keyFieldName`, 
'"keyFieldName"', 'false', 'Enter key field name',
+                    'Key name.<br/>' +
+                    'Can be used in field list to denote the key as a whole')
+            .pc-form-grid-col-30(ng-if-end)
+                +text('Value field name:', `${model}.valueFieldName`, 
'"valueFieldName"', 'false', 'Enter value field name',
+                    'Value name.<br/>' +
+                    'Can be used in field list to denote the entire value')
+
+            .pc-form-grid-col-60
+                mixin domains-query-fields
+                    .ignite-form-field
+                        +ignite-form-field__label('Fields:', '"fields"')
+                            +tooltip(`Collection of name-to-type mappings to 
be queried, in addition to indexed fields`)
+                        .ignite-form-field__control
+                            -let items = queryFields
+                            list-editable(
+                                ng-model=items
+                                name='queryFields'
+                                ng-change=`$ctrl.onQueryFieldsChange(${model})`
+                            )
+                                list-editable-item-view
+                                    | {{ $item.name}} / {{ $item.className}}
+
+                                list-editable-item-edit
+                                    - form = '$parent.form'
+                                    .pc-form-grid-row
+                                        .pc-form-grid-col-30(divider='/')
+                                            +ignite-form-field-text('Field 
name:', '$item.name', '"name"', false, true, 'Enter field name')(
+                                                data-ignite-unique=items
+                                                
data-ignite-unique-property='name'
+                                                ignite-auto-focus
+                                            )
+                                                +unique-feedback('"name"', 
'Property with such name already exists!')
+                                        .pc-form-grid-col-30
+                                            +java-class-typeahead('Field full 
class name:', `$item.className`, '"className"', '$ctrl.queryFieldTypes', true, 
true, 'Enter field full class name')(
+                                                
ng-model-options='{allowInvalid: true}'
+                                                
extra-valid-java-identifiers='$ctrl.queryFieldTypes'
+                                            )
+
+                                list-editable-no-items
+                                    list-editable-add-item-button(
+                                        add-item=`$editLast((${items} = 
${items} || []).push({}))`
+                                        label-single='field to query'
+                                        label-multiple='fields'
+                                    )
+
+                +domains-query-fields
+
+            .pc-form-grid-col-60
+                +sane-ignite-form-field-dropdown({
+                    label: 'Key fields:',
+                    model: queryKeyFields,
+                    name: '"queryKeyFields"',
+                    multiple: true,
+                    placeholder: 'Select key fields',
+                    placeholderEmpty: 'Configure available fields',
+                    options: `$ctrl.fields('cur', ${queryKeyFields})`,
+                    tip: 'Query fields that belongs to the key.<br/>\
+                     Used to build / modify keys and values during SQL DML 
operations when no key - value classes are present on cluster nodes.'
+                })
+            .pc-form-grid-col-60
+                mixin domains-query-aliases
+                    .ignite-form-field
+                        +ignite-form-field__label('Aliases:', '"aliases"')
+                            +tooltip(`Mapping from full property name in dot 
notation to an alias that will be used as SQL column name<br />
+                                For example: "parent.name" as "parentName"`)
+                        .ignite-form-field__control
+                            -let items = queryAliases
+
+                            list-editable(ng-model=items name='queryAliases')
+                                list-editable-item-view
+                                    | {{ $item.field }} &rarr; {{ $item.alias 
}}
+
+                                list-editable-item-edit
+                                    - form = '$parent.form'
+                                    .pc-form-grid-row
+                                        .pc-form-grid-col-30(divider='/')
+                                            +ignite-form-field-text('Field 
name', '$item.field', '"field"', false, true, 'Enter field name')(
+                                                data-ignite-unique=items
+                                                
data-ignite-unique-property='field'
+                                                ignite-auto-focus
+                                            )
+                                                +unique-feedback('"field"', 
'Such field already exists!')
+                                        .pc-form-grid-col-30
+                                            +ignite-form-field-text('Field 
alias', '$item.alias', '"alias"', false, true, 'Enter field alias')
+
+                                list-editable-no-items
+                                    list-editable-add-item-button(
+                                        add-item=`$editLast((${items} = 
${items} || []).push({}))`
+                                        label-single='alias to query'
+                                        label-multiple='aliases'
+                                    )
+
+                +domains-query-aliases
+
+            .pc-form-grid-col-60(ng-if-end)
+                .ignite-form-field
+                    +ignite-form-field__label('Indexes:', '"indexes"')
+                    .ignite-form-field__control
+                        list-editable(
+                            ng-model=queryIndexes
+                            ng-model-options='{allowInvalid: true}'
+                            name='queryIndexes'
+                            ui-validate=`{
+                                complete: 
'$ctrl.Models.queryIndexes.complete($value)',
+                                fieldsExist: 
'$ctrl.Models.queryIndexes.fieldsExist($value, ${queryFields})',
+                                indexFieldsHaveUniqueNames: 
'$ctrl.Models.queryIndexes.indexFieldsHaveUniqueNames($value)'
+                            }`
+                            ui-validate-watch=`"[${queryIndexes}, 
${queryFields}]"`
+                            ui-validate-watch-object-equality='true'
+                        )
+                            list-editable-item-view(item-name='queryIndex')
+                                div {{ queryIndex.name }} [{{ 
queryIndex.indexType }}]
+                                div(ng-repeat='field in queryIndex.fields 
track by field._id')
+                                    span {{ field.name }}
+                                    span(ng-if='queryIndex.indexType == 
"SORTED"')
+                                        |  / {{ field.direction ? 'ASC' : 
'DESC'}}
+
+                            list-editable-item-edit(item-name='queryIndex')
+                                .pc-form-grid-row
+                                    .pc-form-grid-col-30(divider='/')
+                                        +sane-ignite-form-field-text({
+                                            label: 'Index name:',
+                                            model: 'queryIndex.name',
+                                            name: '"name"',
+                                            required: true,
+                                            placeholder: 'Enter index name'
+                                        })(
+                                            ignite-unique=queryIndexes
+                                            ignite-unique-property='name'
+                                            
ignite-form-field-input-autofocus='true'
+                                        )
+                                            +unique-feedback(_, 'Such index 
already exists!')
+                                    .pc-form-grid-col-30
+                                        +sane-ignite-form-field-dropdown({
+                                            label: 'Index type:',
+                                            model: `queryIndex.indexType`,
+                                            name: '"indexType"',
+                                            required: true,
+                                            placeholder: 'Select index type',
+                                            options: 
'::$ctrl.Models.indexType.values'
+                                        })
+                                    .pc-form-grid-col-60
+                                        .ignite-form-field
+                                            +ignite-form-field__label('Index 
fields:', '"indexFields"', true)
+                                            .ignite-form-field__control
+                                                list-editable(
+                                                    
ng-model='queryIndex.fields'
+                                                    
ng-model-options='{allowInvalid: true}'
+                                                    name='indexFields'
+                                                    ng-required='true'
+                                                )
+                                                    
list-editable-item-view(item-name='indexField')
+                                                        | {{ indexField.name 
}} 
+                                                        
span(ng-if='queryIndex.indexType === "SORTED"')
+                                                            |  / {{ 
indexField.direction ? "ASC" : "DESC" }}
+
+                                                    
list-editable-item-edit(item-name='indexField')
+                                                        .pc-form-grid-row
+                                                            
.pc-form-grid-col-60
+                                                                
+sane-ignite-form-field-dropdown({
+                                                                    label: 
'Index field:',
+                                                                    model: 
'indexField.name',
+                                                                    name: 
'"indexName"',
+                                                                    
placeholder: `{{ ${queryFields}.length > 0 ? 'Choose index field' : 'No fields 
configured' }}`,
+                                                                    options: 
queryFields
+                                                                })(
+                                                                    
bs-options=`queryField.name as queryField.name for queryField in ${queryFields}`
+                                                                    
ng-disabled=`${queryFields}.length === 0`
+                                                                    
ng-model-options='{allowInvalid: true}'
+                                                                    
ignite-unique='queryIndex.fields'
+                                                                    
ignite-unique-property='name'
+                                                                    
ignite-auto-focus
+                                                                )
+                                                                    
+unique-feedback(_, 'Such field already exists!')
+                                                            
.pc-form-grid-col-60(
+                                                                
ng-if='queryIndex.indexType === "SORTED"'
+                                                            )
+                                                                
+sane-ignite-form-field-dropdown({
+                                                                    label: 
'Sort direction:',
+                                                                    model: 
'indexField.direction',
+                                                                    name: 
'"indexDirection"',
+                                                                    required: 
true,
+                                                                    options: 
'::$ctrl.Models.indexSortDirection.values'
+                                                                })
+                                                    list-editable-no-items
+                                                        
list-editable-add-item-button(
+                                                            
add-item=`$edit($ctrl.Models.addIndexField(queryIndex.fields))`
+                                                            
label-single='field to index'
+                                                            
label-multiple='fields in index'
+                                                        )
+                                            .ignite-form-field__errors(
+                                                
ng-messages=`$form.indexFields.$error`
+                                                
ng-show=`$form.indexFields.$invalid`
+                                            )
+                                                +form-field-feedback(_, 
'required', 'Index fields should be configured')
+
+                            list-editable-no-items
+                                list-editable-add-item-button(
+                                    
add-item=`$edit($ctrl.Models.addIndex(${model}))`
+                                    label-single='index'
+                                    label-multiple='fields'
+                                )
+                    .ignite-form-field__errors(
+                        ng-messages=`query.queryIndexes.$error`
+                        ng-show=`query.queryIndexes.$invalid`
+                    )
+                        +form-field-feedback(_, 'complete', 'Some indexes are 
incomplete')
+                        +form-field-feedback(_, 'fieldsExist', 'Some indexes 
use unknown fields')
+                        +form-field-feedback(_, 'indexFieldsHaveUniqueNames', 
'Each query index field name should be unique')
+
+        .pca-form-column-6
+            +preview-xml-java(model, 'domainModelQuery')

http://git-wip-us.apache.org/repos/asf/ignite/blob/68719446/modules/web-console/frontend/app/components/page-configure-advanced/components/model-edit-form/templates/store.pug
----------------------------------------------------------------------
diff --git 
a/modules/web-console/frontend/app/components/page-configure-advanced/components/model-edit-form/templates/store.pug
 
b/modules/web-console/frontend/app/components/page-configure-advanced/components/model-edit-form/templates/store.pug
new file mode 100644
index 0000000..811c0d7
--- /dev/null
+++ 
b/modules/web-console/frontend/app/components/page-configure-advanced/components/model-edit-form/templates/store.pug
@@ -0,0 +1,123 @@
+//-
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+include /app/helpers/jade/mixins
+
+-var form = 'store'
+-var model = 'backupItem'
+-var keyFields = `${model}.keyFields`
+-var valueFields = `${model}.valueFields`
+
+mixin list-db-field-edit({ items, itemName, itemsName })
+    list-editable(
+        ng-model=items
+        ng-model-options='{allowInvalid: true}'
+        ui-validate=`{
+            dbFieldUnique: '$ctrl.Models.storeKeyDBFieldsUnique($value)'
+        }`
+        ui-validate-watch=`"${items}"`
+        ui-validate-watch-object-equality='true'
+    )&attributes(attributes)
+        list-editable-item-view
+            | {{ $item.databaseFieldName }} / {{ $item.databaseFieldType }} / 
{{ $item.javaFieldName }} / {{ $item.javaFieldType }}
+
+        list-editable-item-edit
+            .pc-form-grid-row
+                .pc-form-grid-col-30(divider='/')
+                    +sane-ignite-form-field-text({
+                        label: 'DB name:',
+                        model: '$item.databaseFieldName',
+                        name: '"databaseFieldName"',
+                        required: true,
+                        placeholder: 'Enter DB name'
+                    })(
+                        ng-model-options='{allowInvalid: true}'
+                        ignite-auto-focus
+                        ignite-unique=items
+                        ignite-unique-property='databaseFieldName'
+                    )
+                        +unique-feedback(_, 'DB name should be unique')
+                .pc-form-grid-col-30
+                    +dropdown-required('DB type:', '$item.databaseFieldType', 
'"databaseFieldType"', true, true, 'Choose DB type', 'supportedJdbcTypes')
+                .pc-form-grid-col-30(divider='/')
+                    +sane-ignite-form-field-text({
+                        label: 'Java name:',
+                        model: '$item.javaFieldName',
+                        name: '"javaFieldName"',
+                        required: true,
+                        placeholder: 'Enter Java name'
+                    })(
+                        ng-model-options='{allowInvalid: true}'
+                        ignite-unique=items
+                        ignite-unique-property='javaFieldName'
+                    )
+                        +unique-feedback(_, 'Java name should be unique')
+                .pc-form-grid-col-30
+                    +dropdown-required('Java type:', '$item.javaFieldType', 
'"javaFieldType"', true, true, 'Choose Java type', 'supportedJavaTypes')
+
+        list-editable-no-items
+            list-editable-add-item-button(
+                add-item=`$editLast((${items} = ${items} || []).push({}))`
+                label-single=itemName
+                label-multiple=itemsName
+            )
+
+panel-collapsible(ng-form=form on-open=`ui.loadPanel('${form}')`)
+    panel-title#store-title Domain model for cache store
+    panel-description
+        | Domain model properties for binding database with cache via POJO 
cache store. 
+        
a.link-success(href="https://apacheignite.readme.io/docs/3rd-party-store"; 
target="_blank") More info
+    panel-content.pca-form-row(ng-if=`ui.isPanelLoaded('${form}')`)
+        .pca-form-column-6.pc-form-grid-row
+            .pc-form-grid-col-30
+                +text('Database schema:', model + '.databaseSchema', 
'"databaseSchema"', 'false', 'Input DB schema name', 'Schema name in database')
+            .pc-form-grid-col-30
+                +text('Database table:', model + '.databaseTable', 
'"databaseTable"', 'false', 'Input DB table name', 'Table name in database')
+            .pc-form-grid-col-60
+                .ignite-form-field
+                    +ignite-form-field__label('Key fields:', '"keyFields"')
+                        +tooltip(`Collection of key fields descriptions for 
CacheJdbcPojoStore`)
+                    .ignite-form-field__control
+                        +list-db-field-edit({
+                            items: keyFields,
+                            itemName: 'key field',
+                            itemsName: 'key fields'
+                        })(name='keyFields')
+                    .ignite-form-field__errors(
+                        ng-messages=`store.keyFields.$error`
+                        ng-show=`store.keyFields.$invalid`
+                    )
+                        +form-field-feedback(_, 'dbFieldUnique', 'Each key 
field DB name and Java name should be unique')
+
+            .pc-form-grid-col-60
+                .ignite-form-field
+                    +ignite-form-field__label('Value fields:', '"valueFields"')
+                        +tooltip(`Collection of value fields descriptions for 
CacheJdbcPojoStore`)
+                    .ignite-form-field__control
+                        +list-db-field-edit({
+                            items: valueFields,
+                            itemName: 'value field',
+                            itemsName: 'value fields'
+                        })(name='valueFields')
+                    .ignite-form-field__errors(
+                        ng-messages=`store.valueFields.$error`
+                        ng-show=`store.valueFields.$invalid`
+                    )
+                        +form-field-feedback(_, 'dbFieldUnique', 'Each value 
field DB name and Java name should be unique')
+
+        .pca-form-column-6
+            +preview-xml-java(model, 'domainStore')
+

http://git-wip-us.apache.org/repos/asf/ignite/blob/68719446/modules/web-console/frontend/app/components/page-configure-basic/template.pug
----------------------------------------------------------------------
diff --git 
a/modules/web-console/frontend/app/components/page-configure-basic/template.pug 
b/modules/web-console/frontend/app/components/page-configure-basic/template.pug
index 7714c81..3bcb216 100644
--- 
a/modules/web-console/frontend/app/components/page-configure-basic/template.pug
+++ 
b/modules/web-console/frontend/app/components/page-configure-basic/template.pug
@@ -15,15 +15,15 @@
     limitations under the License.
 
 include /app/helpers/jade/mixins
-include /app/modules/states/configuration/clusters/general/discovery/cloud
-include /app/modules/states/configuration/clusters/general/discovery/google
-include /app/modules/states/configuration/clusters/general/discovery/jdbc
-include /app/modules/states/configuration/clusters/general/discovery/multicast
-include /app/modules/states/configuration/clusters/general/discovery/s3
-include /app/modules/states/configuration/clusters/general/discovery/shared
-include /app/modules/states/configuration/clusters/general/discovery/vm
-include /app/modules/states/configuration/clusters/general/discovery/zookeeper
-include /app/modules/states/configuration/clusters/general/discovery/kubernetes
+include 
./../page-configure-advanced/components/cluster-edit-form/templates/general/discovery/cloud
+include 
./../page-configure-advanced/components/cluster-edit-form/templates/general/discovery/google
+include 
./../page-configure-advanced/components/cluster-edit-form/templates/general/discovery/jdbc
+include 
./../page-configure-advanced/components/cluster-edit-form/templates/general/discovery/multicast
+include 
./../page-configure-advanced/components/cluster-edit-form/templates/general/discovery/s3
+include 
./../page-configure-advanced/components/cluster-edit-form/templates/general/discovery/shared
+include 
./../page-configure-advanced/components/cluster-edit-form/templates/general/discovery/vm
+include 
./../page-configure-advanced/components/cluster-edit-form/templates/general/discovery/zookeeper
+include 
./../page-configure-advanced/components/cluster-edit-form/templates/general/discovery/kubernetes
 
 - const model = '$ctrl.clonedCluster'
 - const modelDiscoveryKind = `${model}.discovery.kind`

http://git-wip-us.apache.org/repos/asf/ignite/blob/68719446/modules/web-console/frontend/app/modules/states/configuration/caches/affinity.pug
----------------------------------------------------------------------
diff --git 
a/modules/web-console/frontend/app/modules/states/configuration/caches/affinity.pug
 
b/modules/web-console/frontend/app/modules/states/configuration/caches/affinity.pug
deleted file mode 100644
index ce2cad5..0000000
--- 
a/modules/web-console/frontend/app/modules/states/configuration/caches/affinity.pug
+++ /dev/null
@@ -1,86 +0,0 @@
-//-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-include /app/helpers/jade/mixins
-
--var form = 'affinity'
--var model = '$ctrl.clonedCache'
--var affModel = model + '.affinity'
--var affMapModel = model + '.affinityMapper'
--var rendezvousAff = affModel + '.kind === "Rendezvous"'
--var fairAff = affModel + '.kind === "Fair"'
--var customAff = affModel + '.kind === "Custom"'
--var customAffMapper = affMapModel + '.kind === "Custom"'
--var rendPartitionsRequired = rendezvousAff + ' && ' + affModel + 
'.Rendezvous.affinityBackupFilter'
--var fairPartitionsRequired = fairAff + ' && ' + affModel + 
'.Fair.affinityBackupFilter'
-
-panel-collapsible(ng-form=form on-open=`ui.loadPanel('${form}')`)
-    panel-title Affinity Collocation
-    panel-description
-        | Collocate data with data to improve performance and scalability of 
your application. 
-        
a.link-success(href="https://apacheignite.readme.io/docs/affinity-collocation"; 
target="_blank") More info
-    panel-content.pca-form-row(ng-if=`ui.isPanelLoaded('${form}')`)
-        .pca-form-column-6.pc-form-grid-row
-            .pc-form-grid-col-60(ng-if='$ctrl.available(["1.0.0", "2.0.0"])')
-                +dropdown('Function:', `${affModel}.kind`, '"AffinityKind"', 
'true', 'Default', 'affinityFunction',
-                    'Key topology resolver to provide mapping from keys to 
nodes<br/>\
-                    <ul>\
-                        <li>Rendezvous - Based on Highest Random Weight 
algorithm</li>\
-                        <li>Fair - Tries to ensure that all nodes get equal 
number of partitions with minimum amount of reassignments between existing 
nodes</li>\
-                        <li>Custom - Custom implementation of key affinity 
fynction</li>\
-                        <li>Default - By default rendezvous affinity function  
with 1024 partitions is used</li>\
-                    </ul>')
-            .pc-form-grid-col-60(ng-if='$ctrl.available("2.0.0")')
-                +dropdown('Function:', `${affModel}.kind`, '"AffinityKind"', 
'true', 'Default', 'affinityFunction',
-                    'Key topology resolver to provide mapping from keys to 
nodes<br/>\
-                    <ul>\
-                        <li>Rendezvous - Based on Highest Random Weight 
algorithm</li>\
-                        <li>Custom - Custom implementation of key affinity 
fynction</li>\
-                        <li>Default - By default rendezvous affinity function  
with 1024 partitions is used</li>\
-                    </ul>')
-            .pc-form-group
-                .pc-form-grid-row(ng-if=rendezvousAff)
-                    .pc-form-grid-col-60
-                        +number-required('Partitions', 
`${affModel}.Rendezvous.partitions`, '"RendPartitions"', 'true', 
rendPartitionsRequired, '1024', '1', 'Number of partitions')
-                    .pc-form-grid-col-60
-                        +java-class('Backup filter', 
`${affModel}.Rendezvous.affinityBackupFilter`, '"RendAffinityBackupFilter"', 
'true', 'false',
-                            'Backups will be selected from all nodes that pass 
this filter')
-                    .pc-form-grid-col-60
-                        +checkbox('Exclude neighbors', 
`${affModel}.Rendezvous.excludeNeighbors`, '"RendExcludeNeighbors"',
-                            'Exclude same - host - neighbors from being 
backups of each other and specified number of backups')
-                .pc-form-grid-row(ng-if=fairAff)
-                    .pc-form-grid-col-60
-                        +number-required('Partitions', 
`${affModel}.Fair.partitions`, '"FairPartitions"', 'true', 
fairPartitionsRequired, '256', '1', 'Number of partitions')
-                    .pc-form-grid-col-60
-                        +java-class('Backup filter', 
`${affModel}.Fair.affinityBackupFilter`, '"FairAffinityBackupFilter"', 'true', 
'false',
-                            'Backups will be selected from all nodes that pass 
this filter')
-                    .pc-form-grid-col-60
-                        +checkbox('Exclude neighbors', 
`${affModel}.Fair.excludeNeighbors`, '"FairExcludeNeighbors"',
-                            'Exclude same - host - neighbors from being 
backups of each other and specified number of backups')
-                .pc-form-grid-row(ng-if=customAff)
-                    .pc-form-grid-col-60
-                        +java-class('Class name:', 
`${affModel}.Custom.className`, '"AffCustomClassName"', 'true', customAff,
-                            'Custom key affinity function implementation class 
name')
-            .pc-form-grid-col-60
-                +java-class('Mapper:', model + '.affinityMapper', 
'"AffMapCustomClassName"', 'true', 'false',
-                    'Provide custom affinity key for any given key')
-
-            //- Since ignite 2.0
-            .pc-form-grid-col-60(ng-if='$ctrl.available("2.0.0")')
-                +java-class('Topology validator:', model + 
'.topologyValidator', '"topologyValidator"', 'true', 'false')
-
-        .pca-form-column-6
-            +preview-xml-java(model, 'cacheAffinity')

http://git-wip-us.apache.org/repos/asf/ignite/blob/68719446/modules/web-console/frontend/app/modules/states/configuration/caches/concurrency.pug
----------------------------------------------------------------------
diff --git 
a/modules/web-console/frontend/app/modules/states/configuration/caches/concurrency.pug
 
b/modules/web-console/frontend/app/modules/states/configuration/caches/concurrency.pug
deleted file mode 100644
index d99f894..0000000
--- 
a/modules/web-console/frontend/app/modules/states/configuration/caches/concurrency.pug
+++ /dev/null
@@ -1,64 +0,0 @@
-//-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-include /app/helpers/jade/mixins
-
--var form = 'concurrency'
--var model = '$ctrl.clonedCache'
-
-panel-collapsible(ng-form=form on-open=`ui.loadPanel('${form}')`)
-    panel-title Concurrency control
-    panel-description
-        | Cache concurrent asynchronous operations settings.
-    panel-content.pca-form-row(ng-if=`ui.isPanelLoaded('${form}')`)
-        .pca-form-column-6.pc-form-grid-row
-            .pc-form-grid-col-30
-                +number('Max async operations:', 
`${model}.maxConcurrentAsyncOperations`, '"maxConcurrentAsyncOperations"', 
'true', '500', '0',
-                    'Maximum number of allowed concurrent asynchronous 
operations<br/>\
-                    If <b>0</b> then number of concurrent asynchronous 
operations is unlimited')
-            .pc-form-grid-col-30
-                +number('Default lock timeout:', 
`${model}.defaultLockTimeout`, '"defaultLockTimeout"', 'true', '0', '0',
-                    'Default lock acquisition timeout in milliseconds<br/>\
-                    If <b>0</b> then lock acquisition will never timeout')
-
-            //- Removed in ignite 2.0
-            .pc-form-grid-col-60(ng-if='$ctrl.available(["1.0.0", "2.0.0"])' 
ng-hide=`${model}.atomicityMode === 'TRANSACTIONAL'`)
-                +dropdown('Entry versioning:', 
`${model}.atomicWriteOrderMode`, '"atomicWriteOrderMode"', 'true', 'Choose 
versioning',
-                    '[\
-                        {value: "CLOCK", label: "CLOCK"},\
-                        {value: "PRIMARY", label: "PRIMARY"}\
-                    ]',
-                    'Write ordering mode determines which node assigns the 
write version, sender or the primary node\
-                    <ul>\
-                        <li>CLOCK - in this mode write versions are assigned 
on a sender node which generally leads to better performance</li>\
-                        <li>PRIMARY - in this mode version is assigned only on 
primary node. This means that sender will only send write request to primary 
node, which in turn will assign write version and forward it to backups</li>\
-                    </ul>')
-
-            .pc-form-grid-col-60
-                +dropdown('Write synchronization mode:', 
`${model}.writeSynchronizationMode`, '"writeSynchronizationMode"', 'true', 
'PRIMARY_SYNC',
-                    '[\
-                        {value: "FULL_SYNC", label: "FULL_SYNC"},\
-                        {value: "FULL_ASYNC", label: "FULL_ASYNC"},\
-                        {value: "PRIMARY_SYNC", label: "PRIMARY_SYNC"}\
-                    ]',
-                    'Write synchronization mode\
-                    <ul>\
-                        <li>FULL_SYNC - Ignite will wait for write or commit 
replies from all nodes</li>\
-                        <li>FULL_ASYNC - Ignite will not wait for write or 
commit responses from participating nodes</li>\
-                        <li>PRIMARY_SYNC - Makes sense for PARTITIONED mode. 
Ignite will wait for write or commit to complete on primary node</li>\
-                    </ul>')
-        .pca-form-column-6
-            +preview-xml-java(model, 'cacheConcurrency')

http://git-wip-us.apache.org/repos/asf/ignite/blob/68719446/modules/web-console/frontend/app/modules/states/configuration/caches/general.pug
----------------------------------------------------------------------
diff --git 
a/modules/web-console/frontend/app/modules/states/configuration/caches/general.pug
 
b/modules/web-console/frontend/app/modules/states/configuration/caches/general.pug
deleted file mode 100644
index 29977be..0000000
--- 
a/modules/web-console/frontend/app/modules/states/configuration/caches/general.pug
+++ /dev/null
@@ -1,113 +0,0 @@
-//-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-include /app/helpers/jade/mixins
-
--var form = 'general'
--var model = '$ctrl.clonedCache'
-
-panel-collapsible(opened=`::true` ng-form=form)
-    panel-title General
-    panel-description
-        | Common cache configuration. 
-        a.link-success(href="https://apacheignite.readme.io/docs/data-grid"; 
target="_blank") More info
-    panel-content.pca-form-row
-        .pca-form-column-6.pc-form-grid-row
-            .pc-form-grid-col-60
-                +sane-ignite-form-field-text({
-                    label: 'Name:',
-                    model: `${model}.name`,
-                    name: '"cacheName"',
-                    placeholder: 'Input name',
-                    required: true
-                })(
-                    ignite-unique='$ctrl.caches'
-                    ignite-unique-property='name'
-                    ignite-unique-skip=`["_id", ${model}]`
-                )
-                    +unique-feedback(`${model}.name`, 'Cache name should be 
unique')
-            .pc-form-grid-col-60
-                +sane-ignite-form-field-dropdown({
-                    label: 'Domain models:',
-                    model: `${model}.domains`,
-                    name: '"domains"',
-                    multiple: true,
-                    placeholder: 'Choose domain models',
-                    placeholderEmpty: 'No valid domain models configured',
-                    options: '$ctrl.modelsMenu',
-                    tip: 'Select domain models to describe types in cache'
-                })
-            .pc-form-grid-col-60(ng-if='$ctrl.available("2.1.0")')
-                +text('Group:', `${model}.groupName`, '"groupName"', 'false', 
'Input group name',
-                    'Cache group name.<br/>\
-                    Caches with the same group name share single underlying 
"physical" cache (partition set), but are logically isolated.')
-            .pc-form-grid-col-30
-                +cacheMode('Mode:', `${model}.cacheMode`, '"cacheMode"', 
'PARTITIONED')
-
-            .pc-form-grid-col-30
-                +dropdown('Atomicity:', `${model}.atomicityMode`, 
'"atomicityMode"', 'true', 'ATOMIC',
-                    '[\
-                        {value: "ATOMIC", label: "ATOMIC"},\
-                        {value: "TRANSACTIONAL", label: "TRANSACTIONAL"}\
-                    ]',
-                    'Atomicity:\
-                    <ul>\
-                        <li>ATOMIC - in this mode distributed transactions and 
distributed locking are not supported</li>\
-                        <li>TRANSACTIONAL - in this mode specified fully 
ACID-compliant transactional cache behavior</li>\
-                    </ul>')
-            .pc-form-grid-col-30(ng-is=`${model}.cacheMode === 'PARTITIONED'`)
-                +number('Backups:', `${model}.backups`, '"backups"', 'true', 
'0', '0', 'Number of nodes used to back up single partition for partitioned 
cache')
-            //- Since ignite 2.0
-            .pc-form-grid-col-30(ng-if='$ctrl.available("2.0.0")')
-                +dropdown('Partition loss policy:', 
`${model}.partitionLossPolicy`, '"partitionLossPolicy"', 'true', 'IGNORE',
-                '[\
-                    {value: "READ_ONLY_SAFE", label: "READ_ONLY_SAFE"},\
-                    {value: "READ_ONLY_ALL", label: "READ_ONLY_ALL"},\
-                    {value: "READ_WRITE_SAFE", label: "READ_WRITE_SAFE"},\
-                    {value: "READ_WRITE_ALL", label: "READ_WRITE_ALL"},\
-                    {value: "IGNORE", label: "IGNORE"}\
-                ]',
-                'Partition loss policies:\
-                <ul>\
-                    <li>READ_ONLY_SAFE - in this mode all writes to the cache 
will be failed with an exception,\
-                        reads will only be allowed for keys in  non-lost 
partitions.\
-                        Reads from lost partitions will be failed with an 
exception.</li>\
-                    <li>READ_ONLY_ALL - in this mode all writes to the cache 
will be failed with an exception.\
-                        All reads will proceed as if all partitions were in a 
consistent state.\
-                        The result of reading from a lost partition is 
undefined and may be different on different nodes in the cluster.</li>\
-                    <li>READ_WRITE_SAFE - in this mode all reads and writes 
will be allowed for keys in valid partitions.\
-                        All reads and writes for keys in lost partitions will 
be failed with an exception.</li>\
-                    <li>READ_WRITE_ALL - in this mode all reads and writes 
will proceed as if all partitions were in a consistent state.\
-                        The result of reading from a lost partition is 
undefined and may be different on different nodes in the cluster.</li>\
-                    <li>IGNORE - in this mode if partition is lost, reset it 
state and do not clear intermediate data.\
-                        The result of reading from a previously lost and not 
cleared partition is undefined and may be different\
-                        on different nodes in the cluster.</li>\
-                </ul>')
-            .pc-form-grid-col-60(ng-show=`${model}.cacheMode === 'PARTITIONED' 
&& ${model}.backups`)
-                +checkbox('Read from backup', `${model}.readFromBackup`, 
'"readFromBackup"',
-                    'Flag indicating whether data can be read from backup<br/>\
-                    If not set then always get data from primary node (never 
from backup)')
-            .pc-form-grid-col-60
-                +checkbox('Copy on read', `${model}.copyOnRead`, 
'"copyOnRead"',
-                    'Flag indicating whether copy 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')
-            .pc-form-grid-col-60(ng-show=`${model}.cacheMode === 'PARTITIONED' 
&& ${model}.atomicityMode === 'TRANSACTIONAL'`)
-                +checkbox('Invalidate near cache', `${model}.isInvalidate`, 
'"isInvalidate"',
-                    'Invalidation flag for near cache entries in 
transaction<br/>\
-                    If set then values will be invalidated (nullified) upon 
commit in near cache')
-
-        .pca-form-column-6
-            +preview-xml-java(model, 'cacheGeneral')

http://git-wip-us.apache.org/repos/asf/ignite/blob/68719446/modules/web-console/frontend/app/modules/states/configuration/caches/memory.pug
----------------------------------------------------------------------
diff --git 
a/modules/web-console/frontend/app/modules/states/configuration/caches/memory.pug
 
b/modules/web-console/frontend/app/modules/states/configuration/caches/memory.pug
deleted file mode 100644
index 10eb488..0000000
--- 
a/modules/web-console/frontend/app/modules/states/configuration/caches/memory.pug
+++ /dev/null
@@ -1,158 +0,0 @@
-//-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-include /app/helpers/jade/mixins
-
--var form = 'memory'
--var model = '$ctrl.clonedCache'
-
-panel-collapsible(ng-form=form on-open=`ui.loadPanel('${form}')`)
-    panel-title Memory
-    panel-description
-        | Cache memory settings. 
-        a.link-success(
-            href="https://apacheignite.readme.io/v1.9/docs/off-heap-memory";
-            target="_blank"
-            ng-show='$ctrl.available(["1.0.0", "2.0.0"])'
-        ) More info
-        a.link-success(
-            href="https://apacheignite.readme.io/docs/evictions";
-            target="_blank"
-            ng-show='$ctrl.available("2.0.0")'
-        ) More info
-    panel-content.pca-form-row(ng-if=`ui.isPanelLoaded('${form}')`)
-        .pca-form-column-6.pc-form-grid-row
-            //- Since ignite 2.0
-            .pc-form-grid-col-60(ng-if='$ctrl.available("2.0.0")')
-                +checkbox('Onheap cache enabled', model + 
'.onheapCacheEnabled', '"OnheapCacheEnabled"', 'Checks if the on-heap cache is 
enabled for the off-heap based page memory')
-
-            //- Since ignite 2.0 deprecated in ignite 2.3
-            .pc-form-grid-col-60(ng-if='$ctrl.available(["2.0.0", "2.3.0"])')
-                +text('Memory policy name:', model + '.memoryPolicyName', 
'"MemoryPolicyName"', 'false', 'default',
-                    'Name of memory policy configuration for this cache')
-
-            //- Since ignite 2.3
-            .pc-form-grid-col-60(ng-if='$ctrl.available("2.3.0")')
-                +text('Data region name:', model + '.dataRegionName', 
'"DataRegionName"', 'false', 'default',
-                    'Name of data region configuration for this cache')
-
-            //- Removed in ignite 2.0
-            .pc-form-grid-col-60(ng-if-start='$ctrl.available(["1.0.0", 
"2.0.0"])')
-                +sane-ignite-form-field-dropdown({
-                    label: 'Mode:',
-                    model: `${model}.memoryMode`,
-                    name: '"memoryMode"',
-                    placeholder: '{{ ::$ctrl.Caches.memoryMode.default }}',
-                    options: '::$ctrl.Caches.memoryModes',
-                    tip: `Memory modes control whether value is stored in 
on-heap memory, off-heap memory, or swap space
-                    <ul>
-                        <li>
-                            ONHEAP_TIERED - entries are cached on heap memory 
first<br/>
-                            <ul>
-                                <li>
-                                    If offheap memory is enabled and eviction 
policy evicts an entry from heap memory, entry will be moved to offheap 
memory<br/>
-                                    If offheap memory is disabled, then entry 
is simply discarded
-                                </li>
-                                <li>
-                                    If swap space is enabled and offheap 
memory fills up, then entry will be evicted into swap space<br/>
-                                    If swap space is disabled, then entry will 
be discarded. If swap is enabled and offheap memory is disabled, then entry 
will be evicted directly from heap memory into swap
-                                </li>
-                            </ul>
-                        </li>
-                        <li>
-                            OFFHEAP_TIERED - works the same as ONHEAP_TIERED, 
except that entries never end up in heap memory and get stored in offheap 
memory right away<br/>
-                            Entries get cached in offheap memory first and 
then get evicted to swap, if one is configured
-                        </li>
-                        <li>
-                            OFFHEAP_VALUES - entry keys will be stored on heap 
memory, and values will be stored in offheap memory<br/>
-                            Note that in this mode entries can be evicted only 
to swap
-                        </li>
-                    </ul>`
-                })(
-                    ui-validate=`{
-                        offheapAndDomains: 
'$ctrl.Caches.memoryMode.offheapAndDomains(${model})'
-                    }`
-                    ui-validate-watch=`"${model}.domains.length"`
-                    ng-model-options='{allowInvalid: true}'
-                )
-                    +form-field-feedback(null, 'offheapAndDomains', 'Query 
indexing could not be enabled while values are stored off-heap')
-            .pc-form-grid-col-60(ng-if=`${model}.memoryMode !== 
'OFFHEAP_VALUES'`)
-                +sane-ignite-form-field-dropdown({
-                    label: 'Off-heap memory:',
-                    model: `${model}.offHeapMode`,
-                    name: '"offHeapMode"',
-                    required: `$ctrl.Caches.offHeapMode.required(${model})`,
-                    placeholder: '{{::$ctrl.Caches.offHeapMode.default}}',
-                    options: '{{::$ctrl.Caches.offHeapModes}}',
-                    tip: `Off-heap storage mode
-                    <ul>
-                        <li>Disabled - Off-heap storage is disabled</li>
-                        <li>Limited - Off-heap storage has limited size</li>
-                        <li>Unlimited - Off-heap storage grow infinitely (it 
is up to user to properly add and remove entries from cache to ensure that 
off-heap storage does not grow infinitely)</li>
-                    </ul>`
-                })(
-                    ng-change=`$ctrl.Caches.offHeapMode.onChange(${model})`
-                    ui-validate=`{
-                        offheapDisabled: 
'$ctrl.Caches.offHeapMode.offheapDisabled(${model})'
-                    }`
-                    ui-validate-watch=`'${model}.memoryMode'`
-                    ng-model-options='{allowInvalid: true}'
-                )
-                    +form-field-feedback(null, 'offheapDisabled', 'Off-heap 
storage can\'t be disabled when memory mode is OFFHEAP_TIERED')
-            .pc-form-grid-col-60(
-                ng-if=`${model}.offHeapMode === 1 && ${model}.memoryMode !== 
'OFFHEAP_VALUES'`
-                ng-if-end
-            )
-                pc-form-field-size(
-                    label='Off-heap memory max size:'
-                    ng-model=`${model}.offHeapMaxMemory`
-                    name='offHeapMaxMemory'
-                    placeholder='Enter off-heap memory size'
-                    min='{{ ::$ctrl.Caches.offHeapMaxMemory.min }}'
-                    tip='Maximum amount of memory available to off-heap 
storage'
-                    size-scale-label='mb'
-                    size-type='bytes'
-                    required='true'
-                )
-            +evictionPolicy(`${model}.evictionPolicy`, '"evictionPolicy"', 
'true',
-                `$ctrl.Caches.evictionPolicy.required(${model})`,
-                'Optional cache eviction policy<br/>\
-                Must be set for entries to be evicted from on-heap to off-heap 
or swap\
-                <ul>\
-                    <li>Least Recently Used(LRU) - Eviction policy based on 
LRU algorithm and supports batch eviction</li>\
-                    <li>First In First Out (FIFO) - Eviction policy based on 
FIFO algorithm and supports batch eviction</li>\
-                    <li>SORTED - Eviction policy which will select the minimum 
cache entry for eviction</li>\
-                </ul>')
-
-            //- Since ignite 2.0
-            .pc-form-grid-col-60(ng-if='$ctrl.available("2.0.0")')
-                +java-class('Eviction filter:', model + '.evictionFilter', 
'"EvictionFilter"', 'true', 'false', 'Eviction filter to specify which entries 
should not be evicted')
-
-            //- Removed in ignite 2.0
-            .pc-form-grid-col-60(ng-if-start='$ctrl.available(["1.0.0", 
"2.0.0"])')
-                +number('Start size:', `${model}.startSize`, '"startSize"', 
'true', '1500000', '0',
-                    'In terms of size and capacity, Ignite internal cache map 
acts exactly like a normal Java HashMap: it has some initial capacity\
-                    (which is pretty small by default), which doubles as data 
arrives. The process of internal cache map resizing is CPU-intensive\
-                    and time-consuming, and if you load a huge dataset into 
cache (which is a normal use case), the map will have to resize a lot of times.\
-                    To avoid that, you can specify the initial cache map 
capacity, comparable to the expected size of your dataset.\
-                    This will save a lot of CPU resources during the load 
time, because the map would not have to resize.\
-                    For example, if you expect to load 10 million entries into 
cache, you can set this property to 10 000 000.\
-                    This will save you from cache internal map resizes.')
-            .pc-form-grid-col-60(ng-if-end)
-                +checkbox('Swap enabled', `${model}.swapEnabled`, 
'"swapEnabled"', 'Flag indicating whether swap storage is enabled or not for 
this cache')
-
-        .pca-form-column-6
-            +preview-xml-java(model, 'cacheMemory')

http://git-wip-us.apache.org/repos/asf/ignite/blob/68719446/modules/web-console/frontend/app/modules/states/configuration/caches/near-cache-client.pug
----------------------------------------------------------------------
diff --git 
a/modules/web-console/frontend/app/modules/states/configuration/caches/near-cache-client.pug
 
b/modules/web-console/frontend/app/modules/states/configuration/caches/near-cache-client.pug
deleted file mode 100644
index 2b6705d..0000000
--- 
a/modules/web-console/frontend/app/modules/states/configuration/caches/near-cache-client.pug
+++ /dev/null
@@ -1,50 +0,0 @@
-//-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-include /app/helpers/jade/mixins
-
--var form = 'clientNearCache'
--var model = '$ctrl.clonedCache'
-
-panel-collapsible(
-    ng-form=form
-    on-open=`ui.loadPanel('${form}')`
-    ng-show=`${model}.cacheMode === 'PARTITIONED'`
-)
-    panel-title Near cache on client node
-    panel-description
-        | Near cache settings for client nodes. 
-        | Near cache is a small local cache that stores most recently or most 
frequently accessed data. 
-        | Should be used in case when it is impossible to send computations to 
remote nodes.
-    panel-content.pca-form-row(ng-if=`ui.isPanelLoaded('${form}')`)
-        .pca-form-column-6.pc-form-grid-row
-            -var nearCfg = `${model}.clientNearConfiguration`
-            -var enabled = `${nearCfg}.enabled`
-
-            .pc-form-grid-col-60
-                +checkbox('Enabled', enabled, '"clientNearEnabled"', 'Flag 
indicating whether to configure near cache')
-            .pc-form-grid-col-60
-                +number('Start size:', `${nearCfg}.nearStartSize`, 
'"clientNearStartSize"', enabled, '375000', '0',
-                    'Initial cache size for near cache which will be used to 
pre-create internal hash table after start')
-            +evictionPolicy(`${nearCfg}.nearEvictionPolicy`, 
'"clientNearCacheEvictionPolicy"', enabled, 'false',
-                'Near cache eviction policy\
-                <ul>\
-                    <li>Least Recently Used (LRU) - Eviction policy based on 
LRU algorithm and supports batch eviction</li>\
-                    <li>First In First Out (FIFO) - Eviction policy based on 
FIFO algorithm and supports batch eviction</li>\
-                    <li>SORTED - Eviction policy which will select the minimum 
cache entry for eviction</li>\
-                </ul>')
-        .pca-form-column-6
-            +preview-xml-java(model, 'cacheNearClient')

http://git-wip-us.apache.org/repos/asf/ignite/blob/68719446/modules/web-console/frontend/app/modules/states/configuration/caches/near-cache-server.pug
----------------------------------------------------------------------
diff --git 
a/modules/web-console/frontend/app/modules/states/configuration/caches/near-cache-server.pug
 
b/modules/web-console/frontend/app/modules/states/configuration/caches/near-cache-server.pug
deleted file mode 100644
index 3a91fd2..0000000
--- 
a/modules/web-console/frontend/app/modules/states/configuration/caches/near-cache-server.pug
+++ /dev/null
@@ -1,51 +0,0 @@
-//-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-include /app/helpers/jade/mixins
-
--var form = 'serverNearCache'
--var model = '$ctrl.clonedCache'
-
-panel-collapsible(
-    ng-form=form
-    on-open=`ui.loadPanel('${form}')`
-    ng-show=`${model}.cacheMode === 'PARTITIONED'`
-)
-    panel-title Near cache on server node
-    panel-description
-        | Near cache settings. 
-        | Near cache is a small local cache that stores most recently or most 
frequently accessed data. 
-        | Should be used in case when it is impossible to send computations to 
remote nodes. 
-        a.link-success(href="https://apacheignite.readme.io/docs/near-caches"; 
target="_blank") More info
-    panel-content.pca-form-row(ng-if=`ui.isPanelLoaded('${form}')`)
-        .pca-form-column-6.pc-form-grid-row
-            -var nearCfg = `${model}.nearConfiguration`
-            -var enabled = `${nearCfg}.enabled`
-
-            .pc-form-grid-col-60
-                +checkbox('Enabled', enabled, '"nearCacheEnabled"', 'Flag 
indicating whether to configure near cache')
-            .pc-form-grid-col-60
-                +number('Start size:', `${nearCfg}.nearStartSize`, 
'"nearStartSize"', enabled, '375000', '0',
-                    'Initial cache size for near cache which will be used to 
pre-create internal hash table after start')
-            +evictionPolicy(`${model}.nearConfiguration.nearEvictionPolicy`, 
'"nearCacheEvictionPolicy"', enabled, 'false',
-                'Near cache eviction policy\
-                <ul>\
-                    <li>Least Recently Used (LRU) - Eviction policy based on 
LRU algorithm and supports batch eviction</li>\
-                    <li>First In First Out (FIFO) - Eviction policy based on 
FIFO algorithm and supports batch eviction</li>\
-                    <li>SORTED - Eviction policy which will select the minimum 
cache entry for eviction</li>\
-                </ul>')
-        .pca-form-column-6
-            +preview-xml-java(model, 'cacheNearServer')

http://git-wip-us.apache.org/repos/asf/ignite/blob/68719446/modules/web-console/frontend/app/modules/states/configuration/caches/node-filter.pug
----------------------------------------------------------------------
diff --git 
a/modules/web-console/frontend/app/modules/states/configuration/caches/node-filter.pug
 
b/modules/web-console/frontend/app/modules/states/configuration/caches/node-filter.pug
deleted file mode 100644
index 11938f9..0000000
--- 
a/modules/web-console/frontend/app/modules/states/configuration/caches/node-filter.pug
+++ /dev/null
@@ -1,53 +0,0 @@
-//-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-include /app/helpers/jade/mixins
-
--var form = 'nodeFilter'
--var model = '$ctrl.clonedCache'
--var nodeFilter = model + '.nodeFilter';
--var nodeFilterKind = nodeFilter + '.kind';
--var igfsFilter = nodeFilterKind + ' === "IGFS"'
--var customFilter = nodeFilterKind + ' === "Custom"'
-
-panel-collapsible(ng-form=form on-open=`ui.loadPanel('${form}')`)
-    panel-title Node filter
-    panel-description Determines on what nodes the cache should be started.
-    panel-content.pca-form-row(ng-if=`ui.isPanelLoaded('${form}')`)
-        .pca-form-column-6.pc-form-grid-row
-            .pc-form-grid-col-60
-                +dropdown('Node filter:', nodeFilterKind, '"nodeFilter"', 
'true', 'Not set', '::$ctrl.Caches.nodeFilterKinds', 'Node filter variant')
-            .pc-form-grid-col-60(
-                ng-if=igfsFilter
-            )
-                +sane-ignite-form-field-dropdown({
-                    label: 'IGFS:',
-                    model: `${nodeFilter}.IGFS.igfs`,
-                    name: '"igfsNodeFilter"',
-                    required: true,
-                    placeholder: 'Choose IGFS',
-                    placeholderEmpty: 'No IGFS configured',
-                    options: '$ctrl.igfssMenu',
-                    tip: 'Select IGFS to filter nodes'
-                })(
-                    pc-is-in-collection='$ctrl.igfsIDs'
-                )
-                    +form-field-feedback(_, 'isInCollection', `Cluster doesn't 
have such an IGFS`)
-            .pc-form-grid-col-60(ng-show=customFilter)
-                +java-class('Class name:', `${nodeFilter}.Custom.className`, 
'"customNodeFilter"',
-                    'true', customFilter, 'Class name of custom node filter 
implementation', customFilter)
-        .pca-form-column-6
-            +preview-xml-java(model, 'cacheNodeFilter', 'igfss')

http://git-wip-us.apache.org/repos/asf/ignite/blob/68719446/modules/web-console/frontend/app/modules/states/configuration/caches/query.pug
----------------------------------------------------------------------
diff --git 
a/modules/web-console/frontend/app/modules/states/configuration/caches/query.pug
 
b/modules/web-console/frontend/app/modules/states/configuration/caches/query.pug
deleted file mode 100644
index 20869f5..0000000
--- 
a/modules/web-console/frontend/app/modules/states/configuration/caches/query.pug
+++ /dev/null
@@ -1,114 +0,0 @@
-//-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-include /app/helpers/jade/mixins
-
--var form = 'query'
--var model = '$ctrl.clonedCache'
-
-panel-collapsible(ng-form=form on-open=`ui.loadPanel('${form}')`)
-    panel-title Queries & Indexing
-    panel-description 
-        | Cache queries settings. 
-        a.link-success(href="https://apacheignite-sql.readme.io/docs/select"; 
target="_blank") More info
-    panel-content.pca-form-row(ng-if=`ui.isPanelLoaded('${form}')`)
-        .pca-form-column-6.pc-form-grid-row
-            .pc-form-grid-col-60
-                +text('SQL schema name:', `${model}.sqlSchema`, '"sqlSchema"', 
'false', 'Input schema name',
-                    'Specify any custom name to be used as SQL schema for 
current cache. This name will correspond to SQL ANSI-99 standard.\
-                    Nonquoted identifiers are not case sensitive. Quoted 
identifiers are case sensitive.\
-                    When SQL schema is not specified, quoted cache name should 
used instead.<br/>\
-                    For example:\
-                    <ul>\
-                        <li>\
-                            Query without schema names (quoted cache names 
will be used):\
-                            SELECT * FROM "PersonsCache".Person p INNER JOIN 
"OrganizationsCache".Organization o on p.org = o.id\
-                        </li>\
-                        <li>\
-                            The same query using schema names "Persons" and 
"Organizations":\
-                            SELECT * FROM Persons.Person p INNER JOIN 
Organizations.Organization o on p.org = o.id\
-                        </li>\
-                    </ul>')
-
-            //- Removed in ignite 2.0
-            .pc-form-grid-col-60(ng-if='$ctrl.available(["1.0.0", "2.0.0"])')
-                +number('On-heap cache for off-heap indexes:', 
`${model}.sqlOnheapRowCacheSize`, '"sqlOnheapRowCacheSize"', 'true', '10240', 
'1',
-                    'Number of SQL rows which will be cached onheap to avoid 
deserialization on each SQL index access')
-
-            //- Deprecated in ignite 2.1
-            .pc-form-grid-col-60(ng-if='$ctrl.available(["1.0.0", "2.1.0"])')
-                +number('Long query timeout:', 
`${model}.longQueryWarningTimeout`, '"longQueryWarningTimeout"', 'true', 
'3000', '0',
-                    'Timeout in milliseconds after which long query warning 
will be printed')
-            .pc-form-grid-col-60
-                +number('History size:', `${model}.queryDetailMetricsSize`, 
'"queryDetailMetricsSize"', 'true', '0', '0',
-                    'Size of queries detail metrics that will be stored in 
memory for monitoring purposes')
-            .pc-form-grid-col-60
-                mixin caches-query-list-sql-functions()
-                    .ignite-form-field
-                        -let items = `${model}.sqlFunctionClasses`;
-                        -let uniqueTip = 'SQL function with such class name 
already exists!'
-
-                        list-editable(
-                            ng-model=items
-                            list-editable-cols=`::[{
-                                name: 'SQL functions:',
-                                tip: 'Collections of classes with user-defined 
functions for SQL queries'
-                            }]`
-                        )
-                            list-editable-item-view {{ $item }}
-
-                            list-editable-item-edit
-                                +list-java-class-field('SQL function', 
'$item', '"sqlFunction"', items)
-                                    +unique-feedback('"sqlFunction"', 
uniqueTip)
-
-                            list-editable-no-items
-                                list-editable-add-item-button(
-                                    add-item=`$editLast((${items} = ${items} 
|| []).push(""))`
-                                    label-single='SQL function'
-                                    label-multiple='SQL functions'
-                                )
-
-                - var form = '$parent.form'
-                +caches-query-list-sql-functions
-                - var form = 'query'
-
-            //- Removed in ignite 2.0
-            .pc-form-grid-col-60(ng-if='$ctrl.available(["1.0.0", "2.0.0"])')
-                +checkbox('Snapshotable index', `${model}.snapshotableIndex`, 
'"snapshotableIndex"',
-                    'Flag indicating whether SQL indexes should support 
snapshots')
-
-            .pc-form-grid-col-60
-                +checkbox('Escape table and filed names', 
`${model}.sqlEscapeAll`, '"sqlEscapeAll"',
-                    'If enabled than all schema, table and field names will be 
escaped with double quotes (for example: "tableName"."fieldName").<br/>\
-                    This enforces case sensitivity for field names and also 
allows having special characters in table and field names.<br/>\
-                    Escaped names will be used for creation internal 
structures in Ignite SQL engine.')
-
-            //- Since ignite 2.0
-            .pc-form-grid-col-30(ng-if-start='$ctrl.available("2.0.0")')
-                +number('Query parallelism', model + '.queryParallelism', 
'"queryParallelism"', 'true', '1', '1',
-                    'A hint to query execution engine on desired degree of 
parallelism within a single node')
-            .pc-form-grid-col-30(ng-if-end)
-                +sane-ignite-form-field-number({
-                    label: 'SQL index max inline size:',
-                    model: `${model}.sqlIndexMaxInlineSize`,
-                    name: '"sqlIndexMaxInlineSize"',
-                    placeholder: '-1',
-                    min: '-1',
-                    tip: 'Maximum inline size for sql indexes'
-                })
-
-        .pca-form-column-6
-            +preview-xml-java(model, 'cacheQuery', 'domains')

http://git-wip-us.apache.org/repos/asf/ignite/blob/68719446/modules/web-console/frontend/app/modules/states/configuration/caches/rebalance.pug
----------------------------------------------------------------------
diff --git 
a/modules/web-console/frontend/app/modules/states/configuration/caches/rebalance.pug
 
b/modules/web-console/frontend/app/modules/states/configuration/caches/rebalance.pug
deleted file mode 100644
index 7563435..0000000
--- 
a/modules/web-console/frontend/app/modules/states/configuration/caches/rebalance.pug
+++ /dev/null
@@ -1,66 +0,0 @@
-//-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-include /app/helpers/jade/mixins
-
--var form = 'rebalance'
--var model = '$ctrl.clonedCache'
-
-panel-collapsible(
-    ng-form=form
-    on-open=`ui.loadPanel('${form}')`
-    ng-hide=`${model}.cacheMode === "LOCAL"`
-)
-    panel-title Rebalance
-    panel-description
-        | Cache rebalance settings. 
-        a.link-success(href="https://apacheignite.readme.io/docs/rebalancing"; 
target="_blank") More info
-    panel-content.pca-form-row(ng-if=`ui.isPanelLoaded('${form}')`)
-        .pca-form-column-6.pc-form-grid-row
-            .pc-form-grid-col-30
-                +dropdown('Mode:', `${model}.rebalanceMode`, 
'"rebalanceMode"', 'true', 'ASYNC',
-                    '[\
-                        {value: "SYNC", label: "SYNC"},\
-                        {value: "ASYNC", label: "ASYNC"},\
-                        {value: "NONE", label: "NONE"}\
-                    ]',
-                    'Rebalance modes\
-                    <ul>\
-                        <li>Synchronous - in this mode distributed caches will 
not start until all necessary data is loaded from other available grid 
nodes</li>\
-                        <li>Asynchronous - in this mode distributed caches 
will start immediately and will load all necessary data from other available 
grid nodes in the background</li>\
-                        <li>None - in this mode no rebalancing will take place 
which means that caches will be either loaded on demand from persistent store 
whenever data is accessed, or will be populated explicitly</li>\
-                    </ul>')
-            .pc-form-grid-col-30
-                +number('Batch size:', `${model}.rebalanceBatchSize`, 
'"rebalanceBatchSize"', 'true', '512 * 1024', '1',
-                    'Size (in bytes) to be loaded within a single rebalance 
message<br/>\
-                    Rebalancing algorithm will split total data set on every 
node into multiple batches prior to sending data')
-            .pc-form-grid-col-30
-                +number('Batches prefetch count:', 
`${model}.rebalanceBatchesPrefetchCount`, '"rebalanceBatchesPrefetchCount"', 
'true', '2', '1',
-                    'Number of batches generated by supply node at rebalancing 
start')
-            .pc-form-grid-col-30
-                +number('Order:', `${model}.rebalanceOrder`, 
'"rebalanceOrder"', 'true', '0', Number.MIN_SAFE_INTEGER,
-                    'If cache rebalance order is positive, rebalancing for 
this cache will be started only when rebalancing for all caches with smaller 
rebalance order (except caches with rebalance order 0) will be completed')
-            .pc-form-grid-col-20
-                +number('Delay:', `${model}.rebalanceDelay`, 
'"rebalanceDelay"', 'true', '0', '0',
-                    'Delay in milliseconds upon a node joining or leaving 
topology (or crash) after which rebalancing should be started automatically')
-            .pc-form-grid-col-20
-                +number('Timeout:', `${model}.rebalanceTimeout`, 
'"rebalanceTimeout"', 'true', '10000', '0',
-                    'Rebalance timeout in milliseconds')
-            .pc-form-grid-col-20
-                +number('Throttle:', `${model}.rebalanceThrottle`, 
'"rebalanceThrottle"', 'true', '0', '0',
-                    'Time in milliseconds to wait between rebalance messages 
to avoid overloading of CPU or network')
-        .pca-form-column-6
-            +preview-xml-java(model, 'cacheRebalance')

http://git-wip-us.apache.org/repos/asf/ignite/blob/68719446/modules/web-console/frontend/app/modules/states/configuration/caches/statistics.pug
----------------------------------------------------------------------
diff --git 
a/modules/web-console/frontend/app/modules/states/configuration/caches/statistics.pug
 
b/modules/web-console/frontend/app/modules/states/configuration/caches/statistics.pug
deleted file mode 100644
index bf58354..0000000
--- 
a/modules/web-console/frontend/app/modules/states/configuration/caches/statistics.pug
+++ /dev/null
@@ -1,34 +0,0 @@
-//-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-         http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-include /app/helpers/jade/mixins
-
--var form = 'statistics'
--var model = '$ctrl.clonedCache'
-
-panel-collapsible(ng-form=form on-open=`ui.loadPanel('${form}')`)
-    panel-title Statistics
-    panel-description Cache statistics and management settings.
-    panel-content.pca-form-row(ng-if=`ui.isPanelLoaded('${form}')`)
-        .pca-form-column-6.pc-form-grid-row
-            .pc-form-grid-col-60
-                +checkbox('Statistics enabled', `${model}.statisticsEnabled`, 
'"statisticsEnabled"', 'Flag indicating whether statistics gathering is enabled 
on this cache')
-            .pc-form-grid-col-60
-                +checkbox('Management enabled', `${model}.managementEnabled`, 
'"managementEnabled"',
-                'Flag indicating whether management is enabled on this 
cache<br/>\
-                If enabled the CacheMXBean for each cache is registered in the 
platform MBean server')
-        .pca-form-column-6
-            +preview-xml-java(model, 'cacheStatistics')

Reply via email to