ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [05/10] ignite git commit: IGNITE-5611 Update some selects to new design.
Date Fri, 30 Jun 2017 13:16:45 GMT
IGNITE-5611 Update some selects to new design.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/50376045
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/50376045
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/50376045

Branch: refs/heads/ignite-gg-12389
Commit: 50376045c2585ecf7a944d54846256e7b9bb514f
Parents: 4936c88
Author: Ilya Borisov <iborisov@gridgain.com>
Authored: Thu Jun 29 20:11:27 2017 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Thu Jun 29 20:11:27 2017 +0700

----------------------------------------------------------------------
 modules/web-console/frontend/app/app.config.js  |  3 +-
 modules/web-console/frontend/app/app.js         |  2 +
 .../app/components/bs-select-menu/controller.js | 28 +++++++
 .../app/components/bs-select-menu/directive.js  | 30 ++++++++
 .../app/components/bs-select-menu/index.js      | 24 ++++++
 .../app/components/bs-select-menu/style.scss    | 77 ++++++++++++++++++++
 .../app/components/bs-select-menu/template.pug  | 49 +++++++++++++
 .../page-configure-basic/controller.js          |  2 +-
 .../page-configure-basic/controller.spec.js     |  1 -
 .../page-configure-basic/template.pug           |  1 -
 .../directives/ui-ace-pojos/ui-ace-pojos.pug    |  2 +-
 .../helpers/jade/form/form-field-dropdown.pug   |  1 -
 .../frontend/app/helpers/jade/mixins.pug        |  2 +-
 .../states/configuration/caches/node-filter.pug |  2 +-
 .../states/configuration/caches/store.pug       |  2 +-
 .../configuration/clusters/deployment.pug       |  2 +-
 .../clusters/general/discovery/zookeeper.pug    |  2 +-
 .../states/configuration/clusters/hadoop.pug    |  2 +-
 .../configuration/clusters/load-balancing.pug   |  2 +-
 .../states/configuration/clusters/logger.pug    |  2 +-
 .../configuration/clusters/logger/log4j.pug     |  2 +-
 .../configuration/clusters/logger/log4j2.pug    |  2 +-
 .../states/configuration/clusters/swap.pug      |  2 +-
 .../frontend/controllers/domains-controller.js  |  3 -
 .../views/configuration/domains-import.tpl.pug  | 13 ++--
 .../frontend/views/templates/select.tpl.pug     | 26 -------
 26 files changed, 230 insertions(+), 54 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/app/app.config.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/app.config.js b/modules/web-console/frontend/app/app.config.js
index f93ee7e..b9741d1 100644
--- a/modules/web-console/frontend/app/app.config.js
+++ b/modules/web-console/frontend/app/app.config.js
@@ -29,7 +29,6 @@ _.mixin({
 });
 
 import alertTemplateUrl from 'views/templates/alert.tpl.pug';
-import selectTemplateUrl from 'views/templates/select.tpl.pug';
 import dropdownTemplateUrl from 'views/templates/dropdown.tpl.pug';
 import validationTemplateUrl from 'views/templates/validation-error.tpl.pug';
 
@@ -77,7 +76,7 @@ igniteConsoleCfg.config(['$selectProvider', ($selectProvider) => {
         maxLength: '5',
         allText: 'Select All',
         noneText: 'Clear All',
-        templateUrl: selectTemplateUrl,
+        template: '<bs-select-menu></bs-select-menu>',
         iconCheckmark: 'fa fa-check',
         caretHtml: ''
     });

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/app/app.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/app.js b/modules/web-console/frontend/app/app.js
index fb444d9..61372a2 100644
--- a/modules/web-console/frontend/app/app.js
+++ b/modules/web-console/frontend/app/app.js
@@ -123,6 +123,7 @@ import userNotifications from './components/user-notifications';
 import pageConfigure from './components/page-configure';
 import pageConfigureBasic from './components/page-configure-basic';
 import pageConfigureAdvanced from './components/page-configure-advanced';
+import bsSelectMenu from './components/bs-select-menu';
 
 // Inject external modules.
 import IgniteModules from 'IgniteModules/index';
@@ -188,6 +189,7 @@ angular
     pageConfigure.name,
     pageConfigureBasic.name,
     pageConfigureAdvanced.name,
+    bsSelectMenu.name,
     // Ignite modules.
     IgniteModules.name
 ])

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/app/components/bs-select-menu/controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/bs-select-menu/controller.js b/modules/web-console/frontend/app/components/bs-select-menu/controller.js
new file mode 100644
index 0000000..f8c0171
--- /dev/null
+++ b/modules/web-console/frontend/app/components/bs-select-menu/controller.js
@@ -0,0 +1,28 @@
+/*
+ * 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.
+ */
+
+export default class {
+    static $inject = ['$scope'];
+
+    constructor($scope) {
+        Object.assign(this, {$scope});
+    }
+
+    areAllSelected() {
+        return this.$scope.$matches.every(({index}) => this.$scope.$isActive(index));
+    }
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/app/components/bs-select-menu/directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/bs-select-menu/directive.js b/modules/web-console/frontend/app/components/bs-select-menu/directive.js
new file mode 100644
index 0000000..44aa199
--- /dev/null
+++ b/modules/web-console/frontend/app/components/bs-select-menu/directive.js
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+import template from './template.pug';
+import controller from './controller';
+import './style.scss';
+
+export default function bsSelectMenu() {
+    return {
+        template,
+        controller,
+        controllerAs: '$ctrl',
+        restrict: 'E',
+        replace: true // Workaround: without [replace: true] bs-select detects incorrect
menu size.
+    };
+}

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/app/components/bs-select-menu/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/bs-select-menu/index.js b/modules/web-console/frontend/app/components/bs-select-menu/index.js
new file mode 100644
index 0000000..e64e1fa
--- /dev/null
+++ b/modules/web-console/frontend/app/components/bs-select-menu/index.js
@@ -0,0 +1,24 @@
+/*
+ * 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.
+ */
+
+import angular from 'angular';
+
+import directive from './directive';
+
+export default angular
+    .module('ignite-console.bs-select-menu', [])
+    .directive('bsSelectMenu', directive);

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/app/components/bs-select-menu/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/bs-select-menu/style.scss b/modules/web-console/frontend/app/components/bs-select-menu/style.scss
new file mode 100644
index 0000000..67dec24
--- /dev/null
+++ b/modules/web-console/frontend/app/components/bs-select-menu/style.scss
@@ -0,0 +1,77 @@
+/*
+ * 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.
+ */
+
+.bs-select-menu {
+    @import '../../../public/stylesheets/variables.scss';
+
+    $item-height: 30px;
+    $max-visible-items: 11;
+
+    z-index: 2000;
+    padding: 0;
+    margin: 0;
+    list-style: none;
+    position: absolute;
+    font-family: Roboto;
+    outline: none !important;
+    overflow-y: auto;
+    overflow-x: hidden;
+    max-height: $max-visible-items * $item-height;
+    max-width: 280px;
+    box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.3);
+    border-radius: $ignite-button-border-radius;
+    border: 1px solid #c5c5c5;
+    background: white;
+
+    .bssm-active-indicator {
+        font-size: 14px;
+        width: 12px;
+        color: #afafaf;
+
+        &.bssm-active-indicator__active {
+            color: $ignite-brand-success;
+        }
+    }
+
+    .bssm-item-text {
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
+
+    &>li {
+        width: 100%;
+
+        &>.bssm-item-button {
+            width: 100%;
+            justify-content: flex-start;
+            border-bottom: 1px solid #dedede;
+            padding-bottom: 9px;
+            background-color: transparent;
+            border-radius: 0;
+
+            &:hover {
+                background-color: #eeeeee;
+            }
+        }
+
+        &:last-child > .bssm-item-button {
+            border-bottom: none;
+            padding-bottom: 10px;
+        }
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/app/components/bs-select-menu/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/bs-select-menu/template.pug b/modules/web-console/frontend/app/components/bs-select-menu/template.pug
new file mode 100644
index 0000000..91f3d8e
--- /dev/null
+++ b/modules/web-console/frontend/app/components/bs-select-menu/template.pug
@@ -0,0 +1,49 @@
+//-
+    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.
+
+ul.bs-select-menu(
+    tabindex='-1'
+    ng-show='$isVisible()'
+    role='select'
+)
+    li(ng-if='$showAllNoneButtons || ($isMultiple && $matches.length > 2)')
+        button.btn-ignite.bssm-item-button(
+            ng-click='$ctrl.areAllSelected() ? $selectNone() : $selectAll()'
+            type='button'
+        )
+            span.bssm-active-indicator.icon.icon-left.fa(
+                ng-class=`{
+                    'fa-check-square bssm-active-indicator__active': $ctrl.areAllSelected(),
+                    'fa-square-o': !$ctrl.areAllSelected()
+                }`
+            )
+            | All
+    li(role='presentation' ng-repeat='match in $matches')
+        button.btn-ignite.bssm-item-button(
+            type='button'
+            role='menuitem'
+            tabindex='-1'
+            ng-click='$select($index, $event)'
+            data-placement='right auto'
+            title='{{ ::match.label }}'
+        )
+            span.bssm-active-indicator.icon.icon-left.fa(
+                ng-class=`{
+                    'fa-check-square bssm-active-indicator__active': $isActive($index),
+                    'fa-square-o': !$isActive($index)
+                }`
+            )
+            span.bssm-item-text(ng-bind-html='match.label')

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/app/components/page-configure-basic/controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-configure-basic/controller.js
b/modules/web-console/frontend/app/components/page-configure-basic/controller.js
index ac99977..c0b56ac 100644
--- a/modules/web-console/frontend/app/components/page-configure-basic/controller.js
+++ b/modules/web-console/frontend/app/components/page-configure-basic/controller.js
@@ -113,7 +113,7 @@ export default class PageConfigureBasicController {
     getClustersMenu(clusters = new Map()) {
         const newOne = {_id: -1, name: '+ Add new cluster'};
         return clusters.size
-            ? [newOne, {}, ...clusters.values()]
+            ? [newOne, ...clusters.values()]
             : [newOne];
     }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/app/components/page-configure-basic/controller.spec.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-configure-basic/controller.spec.js
b/modules/web-console/frontend/app/components/page-configure-basic/controller.spec.js
index 4798219..f23b410 100644
--- a/modules/web-console/frontend/app/components/page-configure-basic/controller.spec.js
+++ b/modules/web-console/frontend/app/components/page-configure-basic/controller.spec.js
@@ -188,7 +188,6 @@ suite('page-configure-basic component controller', () => {
                 ],
                 clustersMenu: [
                     {_id: -1, name: '+ Add new cluster'},
-                    {},
                     {_id: 1, name: '1', caches: [1, 2]},
                     {_id: 2, name: '2'}
                 ],

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/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 91b0692..36dfb20 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
@@ -152,7 +152,6 @@ form(novalidate name=form)
                 }`
                 bs-options='cache._id as cache.name for cache in $ctrl.cachesMenu'
                 data-multiple='true'
-                data-all-none-buttons='true'
                 data-placement='top-left'
                 pcb-protect-from-bs-select-render
             )

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/app/directives/ui-ace-pojos/ui-ace-pojos.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/directives/ui-ace-pojos/ui-ace-pojos.pug b/modules/web-console/frontend/app/directives/ui-ace-pojos/ui-ace-pojos.pug
index 4bee5e5..bb8e6d352 100644
--- a/modules/web-console/frontend/app/directives/ui-ace-pojos/ui-ace-pojos.pug
+++ b/modules/web-console/frontend/app/directives/ui-ace-pojos/ui-ace-pojos.pug
@@ -22,7 +22,7 @@ mixin check-tooltip(message)
         .col-xs-2.col-sm-2.col-md-2
             label POJO class:
         .col-xs-10.col-sm-10.col-md-10.summary-pojo-list
-            button.select-toggle.form-control(ng-model='ctrl.class' bs-select bs-options='item
for item in ctrl.classes' data-container='')
+            button.select-toggle.form-control(ng-model='ctrl.class' bs-select bs-options='item
for item in ctrl.classes')
     .details-row.checkbox
         .col-xs-2.col-sm-2.col-md-2
         .col-xs-10.col-sm-10.col-md-10

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/app/helpers/jade/form/form-field-dropdown.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/helpers/jade/form/form-field-dropdown.pug b/modules/web-console/frontend/app/helpers/jade/form/form-field-dropdown.pug
index 2f13d69..d0f95d4 100644
--- a/modules/web-console/frontend/app/helpers/jade/form/form-field-dropdown.pug
+++ b/modules/web-console/frontend/app/helpers/jade/form/form-field-dropdown.pug
@@ -31,7 +31,6 @@ mixin ignite-form-field-dropdown(label, model, name, disabled, required,
multipl
             bs-options=`item.value as item.label for item in ${options}`
 
             data-multiple=multiple ? '1' : false
-            data-container='body > .wrapper'
 
             tabindex='0'
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/app/helpers/jade/mixins.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/helpers/jade/mixins.pug b/modules/web-console/frontend/app/helpers/jade/mixins.pug
index e18fcb1..9dfdab3 100644
--- a/modules/web-console/frontend/app/helpers/jade/mixins.pug
+++ b/modules/web-console/frontend/app/helpers/jade/mixins.pug
@@ -499,7 +499,7 @@ mixin evictionPolicy(model, name, enabled, required, tip)
             {value: "LRU", label: "LRU"},\
             {value: "FIFO", label: "FIFO"},\
             {value: "SORTED", label: "Sorted"},\
-            {value: undefined, label: "Not set"}\
+            {value: null, label: "Not set"}\
         ]', tip)
     span(ng-show=kind)
         +showHideLink('expanded', 'settings')

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/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
index 1b34b60..e184941 100644
--- 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
@@ -38,7 +38,7 @@ include /app/helpers/jade/mixins
                         '[\
                             {value: "IGFS", label: "IGFS nodes"},\
                             {value: "Custom", label: "Custom"},\
-                            {value: undefined, label: "Not set"}\
+                            {value: null, label: "Not set"}\
                         ]',
                         'Node filter variant'
                     )

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/app/modules/states/configuration/caches/store.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/caches/store.pug
b/modules/web-console/frontend/app/modules/states/configuration/caches/store.pug
index 3af24df..d68b57e 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/caches/store.pug
+++ b/modules/web-console/frontend/app/modules/states/configuration/caches/store.pug
@@ -62,7 +62,7 @@ mixin hibernateField(name, model, items, valid, save, newItem)
                             {value: "CacheJdbcPojoStoreFactory", label: "JDBC POJO store
factory"},\
                             {value: "CacheJdbcBlobStoreFactory", label: "JDBC BLOB store
factory"},\
                             {value: "CacheHibernateBlobStoreFactory", label: "Hibernate BLOB
store factory"},\
-                            {value: undefined, label: "Not set"}\
+                            {value: null, label: "Not set"}\
                         ]',
                         'Factory for persistent storage for cache data\
                         <ul>\

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/app/modules/states/configuration/clusters/deployment.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/clusters/deployment.pug
b/modules/web-console/frontend/app/modules/states/configuration/clusters/deployment.pug
index 25ee62a..74b2acf 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/clusters/deployment.pug
+++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/deployment.pug
@@ -127,7 +127,7 @@ include /app/helpers/jade/mixins
                             {value: "URI", label: "URI"},\
                             {value: "Local", label: "Local"}, \
                             {value: "Custom", label: "Custom"},\
-                            {value: undefined, label: "Default"}\
+                            {value: null, label: "Default"}\
                         ]',
                         'Grid deployment SPI is in charge of deploying tasks and classes
from different sources:\
                         <ul>\

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/app/modules/states/configuration/clusters/general/discovery/zookeeper.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/clusters/general/discovery/zookeeper.pug
b/modules/web-console/frontend/app/modules/states/configuration/clusters/general/discovery/zookeeper.pug
index 6220eb0..6531d1d 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/clusters/general/discovery/zookeeper.pug
+++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/general/discovery/zookeeper.pug
@@ -43,7 +43,7 @@ mixin discovery-zookeeper(modelAt = 'backupItem')
                     {value: "OneTime", label: "Only once"},\
                     {value: "Forever", label: "Always allow retry"},\
                     {value: "Custom", label: "Custom"},\
-                    {value: undefined, label: "Default"}\
+                    {value: null, label: "Default"}\
                 ]',
                 'Available retry policies:\
                 <ul>\

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/app/modules/states/configuration/clusters/hadoop.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/clusters/hadoop.pug
b/modules/web-console/frontend/app/modules/states/configuration/clusters/hadoop.pug
index b45efa4..22852cb 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/clusters/hadoop.pug
+++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/hadoop.pug
@@ -40,7 +40,7 @@ include /app/helpers/jade/mixins
                     +dropdown('Map reduce planner:', plannerModel + '.kind', '"MapReducePlanner"',
'true', 'Default', '[\
                         {value: "Weighted", label: "Weighted"},\
                         {value: "Custom", label: "Custom"},\
-                        {value: undefined, label: "Default"}\
+                        {value: null, label: "Default"}\
                     ]', 'Implementation of map reduce planner\
                     <ul>\
                         <li>Weighted - Planner which assigns mappers and reducers based
on their "weights"</li>\

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/app/modules/states/configuration/clusters/load-balancing.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/clusters/load-balancing.pug
b/modules/web-console/frontend/app/modules/states/configuration/clusters/load-balancing.pug
index b80f430..4fbc54e 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/clusters/load-balancing.pug
+++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/load-balancing.pug
@@ -68,7 +68,7 @@ include /app/helpers/jade/mixins
                                         {value: "CPU", label: "CPU load"},\
                                         {value: "ProcessingTime", label: "Processing time"},\
                                         {value: "Custom", label: "Custom"},\
-                                        {value: undefined, label: "Default"}\
+                                        {value: null, label: "Default"}\
                                     ]', 'Implementation of node load probing\
                                     <ul>\
                                         <li>Job count - Based on active and waiting
job count</li>\

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/app/modules/states/configuration/clusters/logger.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/clusters/logger.pug
b/modules/web-console/frontend/app/modules/states/configuration/clusters/logger.pug
index f135114..e750365 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/clusters/logger.pug
+++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/logger.pug
@@ -40,7 +40,7 @@ include /app/helpers/jade/mixins
                             {value: "JCL", label: "Jakarta Commons Logging (JCL)"},\
                             {value: "Null", label: "Null logger"},\
                             {value: "Custom", label: "Custom"},\
-                            {value: undefined, label: "Default"}\
+                            {value: null, label: "Default"}\
                         ]',
                         'Logger implementations\
                         <ul>\

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/app/modules/states/configuration/clusters/logger/log4j.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/clusters/logger/log4j.pug
b/modules/web-console/frontend/app/modules/states/configuration/clusters/logger/log4j.pug
index fadaea4..c4ab379 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/clusters/logger/log4j.pug
+++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/logger/log4j.pug
@@ -32,7 +32,7 @@ div
                 {value: "DEBUG", label: "DEBUG"},\
                 {value: "TRACE", label: "TRACE"},\
                 {value: "ALL", label: "ALL"},\
-                {value: undefined, label: "Default"}\
+                {value: null, label: "Default"}\
             ]',
             'Level for internal log4j implementation')
     .details-row

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/app/modules/states/configuration/clusters/logger/log4j2.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/clusters/logger/log4j2.pug
b/modules/web-console/frontend/app/modules/states/configuration/clusters/logger/log4j2.pug
index d90ca09..299386f 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/clusters/logger/log4j2.pug
+++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/logger/log4j2.pug
@@ -32,7 +32,7 @@ div
                 {value: "DEBUG", label: "DEBUG"},\
                 {value: "TRACE", label: "TRACE"},\
                 {value: "ALL", label: "ALL"},\
-                {value: undefined, label: "Default"}\
+                {value: null, label: "Default"}\
             ]',
             'Level for internal log4j2 implementation')
     .details-row

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/app/modules/states/configuration/clusters/swap.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/states/configuration/clusters/swap.pug
b/modules/web-console/frontend/app/modules/states/configuration/clusters/swap.pug
index d278a09..019b0cc 100644
--- a/modules/web-console/frontend/app/modules/states/configuration/clusters/swap.pug
+++ b/modules/web-console/frontend/app/modules/states/configuration/clusters/swap.pug
@@ -36,7 +36,7 @@ include /app/helpers/jade/mixins
                     +dropdown('Swap space SPI:', `${swapModel}.kind`, '"swapSpaceSpi"', 'true',
'Choose swap SPI',
                         '[\
                             {value: "FileSwapSpaceSpi", label: "File-based swap"},\
-                            {value: undefined, label: "Not set"}\
+                            {value: null, label: "Not set"}\
                         ]',
                         'Provides a mechanism in grid for storing data on disk<br/>\
                         Ignite cache uses swap space to overflow data to disk if it cannot
fit in memory\

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/controllers/domains-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/controllers/domains-controller.js b/modules/web-console/frontend/controllers/domains-controller.js
index 25bb877..7a16c50 100644
--- a/modules/web-console/frontend/controllers/domains-controller.js
+++ b/modules/web-console/frontend/controllers/domains-controller.js
@@ -661,9 +661,6 @@ export default ['$rootScope', '$scope', '$http', '$state', '$filter',
'$timeout'
                 }
 
                 if (!_.isEmpty($scope.caches)) {
-                    if (item.cachesOrTemplates.length > 0)
-                        item.cachesOrTemplates.push(null);
-
                     _.forEach($scope.caches, function(cache) {
                         item.cachesOrTemplates.push(cache);
                     });

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/views/configuration/domains-import.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/configuration/domains-import.tpl.pug b/modules/web-console/frontend/views/configuration/domains-import.tpl.pug
index 29bbf4a..7097197 100644
--- a/modules/web-console/frontend/views/configuration/domains-import.tpl.pug
+++ b/modules/web-console/frontend/views/configuration/domains-import.tpl.pug
@@ -66,7 +66,6 @@ mixin td-ellipses-lbl(w, lbl)
                                 'Choose JDBC driver', '', 'jdbcDriverJars',
                                 'Select appropriate JAR with JDBC driver<br> To add
another driver you need to place it into "/jdbc-drivers" folder of Ignite Web Agent<br>
Refer to Ignite Web Agent README.txt for for more information'
                             )(
-                                data-container='.modal-domain-import'
                                 data-ignite-form-field-input-autofocus='true'
                             )
                         .settings-row.settings-row_small-label
@@ -137,8 +136,8 @@ mixin td-ellipses-lbl(w, lbl)
                                                         div.td-ellipsis
                                                             a(ng-if='!table.edit' ng-click='startEditDbTableCache(table)')
{{tableActionView(table)}}
                                                             div(style='display: flex' ng-if='table.edit')
-                                                                button.select-toggle.form-control(style='width:
35%; margin-right: 5px' bs-select ng-model='table.action' data-container='.modal-domain-import'
bs-options='item.value as item.shortLabel for item in importActions')
-                                                                button.select-toggle.form-control(style='width:
65%; margin-right: 0' bs-select ng-model='table.cacheOrTemplate' data-container='.modal-domain-import'
bs-options='item.value as item.label for item in table.cachesOrTemplates')
+                                                                button.select-toggle.form-control(style='width:
35%; margin-right: 5px' bs-select ng-model='table.action' bs-options='item.value as item.shortLabel
for item in importActions')
+                                                                button.select-toggle.form-control(style='width:
65%; margin-right: 0' bs-select ng-model='table.cacheOrTemplate'  bs-options='item.value as
item.label for item in table.cachesOrTemplates')
                                                     td
                     .settings-row
                         label Defaults to be applied for filtered tables
@@ -146,9 +145,9 @@ mixin td-ellipses-lbl(w, lbl)
                     .settings-row
                         .col-sm-11
                             .col-sm-6(style='padding-right: 5px')
-                                button.select-toggle.form-control(bs-select ng-model='importCommon.action'
data-container='.modal-domain-import' bs-options='item.value as item.label for item in importActions')
+                                button.select-toggle.form-control(bs-select ng-model='importCommon.action'
bs-options='item.value as item.label for item in importActions')
                             .col-sm-6(style='padding-left: 5px; padding-right: 5px')
-                                button.select-toggle.form-control(bs-select ng-model='importCommon.cacheOrTemplate'
data-container='.modal-domain-import' bs-options='item.value as item.label for item in importCommon.cachesOrTemplates')
+                                button.select-toggle.form-control(bs-select ng-model='importCommon.cacheOrTemplate'
bs-options='item.value as item.label for item in importCommon.cachesOrTemplates')
                         .col-sm-1(style='padding-left: 5px')
                             button.btn.btn-primary(ng-click='applyDefaults()') Apply
                 .import-domain-model-wizard-page(ng-show='importDomain.action == "options"')
@@ -167,12 +166,12 @@ mixin td-ellipses-lbl(w, lbl)
                         .settings-row(ng-show=generatePojo)
                             +checkbox('Generate aliases for query fields', 'ui.generateFieldAliases',
'"domainGenerateFieldAliases"', 'Generate aliases for query fields with database field names
when database field name differ from Java field name')
                         .settings-row.settings-row_small-label(ng-show=generatePojo)
-                            +java-package('Package:', 'ui.packageName', '"domainPackageName"',
true, true, 'Package that will be used for POJOs generation')(data-container='.modal-domain-import')
+                            +java-package('Package:', 'ui.packageName', '"domainPackageName"',
true, true, 'Package that will be used for POJOs generation')
                         .settings-row.settings-row_small-label
                             +ignite-form-field-dropdown('Clusters:', 'ui.generatedCachesClusters',
'"generatedCachesClusters"', false, false, true,
                                 'Choose clusters for generated caches', '', 'clusters',
                                 'Choose clusters that will be associated with generated caches'
-                            )(data-container='.modal-domain-import')
+                            )
             .modal-footer
                 label(ng-hide='importDomain.action == "drivers" || (importDomain.action ==
"connect" && importDomain.demo)').labelField {{importDomain.info}}
                 a.btn.btn-primary(ng-hide='importDomain.action == "drivers" || importDomain.action
== "connect"' ng-click='importDomainPrev()' bs-tooltip='' data-title='{{prevTooltipText()}}'
data-placement='bottom') Prev

http://git-wip-us.apache.org/repos/asf/ignite/blob/50376045/modules/web-console/frontend/views/templates/select.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/views/templates/select.tpl.pug b/modules/web-console/frontend/views/templates/select.tpl.pug
deleted file mode 100644
index aa6a2ef..0000000
--- a/modules/web-console/frontend/views/templates/select.tpl.pug
+++ /dev/null
@@ -1,26 +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.
-
-ul.select.dropdown-menu(tabindex='-1' ng-show='$isVisible()' role='select')
-    li(ng-if='$showAllNoneButtons || ($isMultiple && $matches.length > 2)')
-        a(id='li-dropdown-select-all' ng-click='$selectAll()') {{$allText}} ({{$matches.length}})
-        a(id='li-dropdown-select-none' ng-click='$selectNone()') {{$noneText}}
-        hr(style='margin: 5px 0')
-    li(role='presentation' ng-repeat='match in $matches')
-        hr(ng-if='match.value == undefined' style='margin: 5px 0')
-        a(id='li-dropdown-item-{{$index}}'  role='menuitem' tabindex='-1' ng-class='{active:
$isActive($index)}' ng-click='$select($index, $event)' bs-tooltip='widthIsSufficient &&
!widthIsSufficient("li-dropdown-item-{{$index}}", $index, match.label) ? match.label : ""'
data-placement='right auto')
-            i(class='{{$iconCheckmark}}' ng-if='$isActive($index)' ng-class='{active: $isActive($index)}')
-            span(ng-bind-html='match.label')


Mime
View raw message