You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2017/04/12 12:19:31 UTC
ignite git commit: IGNITE-4943 Improve design of table on Admin Panel
screen: minor fixes.
Repository: ignite
Updated Branches:
refs/heads/master 8c9c60a48 -> 775c6e57f
IGNITE-4943 Improve design of table on Admin Panel screen: minor fixes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/775c6e57
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/775c6e57
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/775c6e57
Branch: refs/heads/master
Commit: 775c6e57f9515a6f3390d598a5eaa1914329eff1
Parents: 8c9c60a
Author: Dmitriy Shabalin <ds...@gridgain.com>
Authored: Wed Apr 12 19:20:24 2017 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Apr 12 19:20:24 2017 +0700
----------------------------------------------------------------------
.../list-of-registered-users.controller.js | 11 ++++++++++-
.../list-of-registered-users.tpl.pug | 7 +++++--
.../frontend/app/primitives/ui-grid/index.scss | 8 ++++++++
3 files changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/775c6e57/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
index 3590229..0fc1cd6 100644
--- a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
+++ b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.controller.js
@@ -166,6 +166,9 @@ export default class IgniteListOfRegisteredUsersCtrl {
api.selection.on.rowSelectionChanged($scope, $ctrl._updateSelected.bind($ctrl));
api.selection.on.rowSelectionChangedBatch($scope, $ctrl._updateSelected.bind($ctrl));
+ api.core.on.filterChanged($scope, $ctrl._filteredRows.bind($ctrl));
+ api.core.on.rowsVisibleChanged($scope, $ctrl._filteredRows.bind($ctrl));
+
api.grid.registerRowsProcessor(companiesExcludeFilter, 50);
$scope.$watch(() => $ctrl.gridApi.grid.getVisibleRows().length, (rows) => $ctrl.adjustHeight(rows));
@@ -211,6 +214,13 @@ export default class IgniteListOfRegisteredUsersCtrl {
this.gridApi.core.handleWindowResize();
}
+ _filteredRows() {
+ const filtered = _.filter(this.gridApi.grid.rows, ({ visible}) => visible);
+ const entities = _.map(filtered, 'entity');
+
+ this.filteredRows = entities;
+ }
+
_updateSelected() {
const ids = this.gridApi.selection.getSelectedRows().map(({ _id }) => _id).sort();
@@ -241,7 +251,6 @@ export default class IgniteListOfRegisteredUsersCtrl {
// Check to all selected columns.
this.gridOptions.selectedAll = true;
-
_.forEach(this._selectableColumns(), ({ visible }) => this.gridOptions.selectedAll = visible);
// Workaround for this.gridApi.grid.refresh() didn't return promise.
http://git-wip-us.apache.org/repos/asf/ignite/blob/775c6e57/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.tpl.pug b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.tpl.pug
index c4fec37..0b8bf7e 100644
--- a/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.tpl.pug
+++ b/modules/web-console/frontend/app/components/list-of-registered-users/list-of-registered-users.tpl.pug
@@ -21,7 +21,7 @@ mixin grid-settings()
i.fa.fa-cog(data-animation='am-flip-x' bs-dropdown='' aria-haspopup='true' aria-expanded='expanded' data-auto-close='1' data-trigger='click')
ul.select.dropdown-menu(role='menu')
li
- a(ng-click='$ctrl.gridOptions.selectedAll ? $ctrl.clearAllColumns() : $ctrl.selectAllColumns()')
+ a(ng-click='$ctrl.gridOptions.selectedAll ? $ctrl.clearAllColumns() : $ctrl.selectAllColumns()')
i.fa.fa-check-square-o.pull-left(ng-if='$ctrl.gridOptions.selectedAll')
i.fa.fa-square-o.pull-left(ng-if='!$ctrl.gridOptions.selectedAll')
span All
@@ -36,7 +36,10 @@ mixin grid-settings()
li(role='presentation' ng-class='{ active: $ctrl.groupBy === "user" }')
a(ng-click='$ctrl.groupByUser()')
span Users
- span.badge.badge--blue {{ $ctrl.gridOptions.data.length }}
+ span.badge.badge--blue(ng-hide='$ctrl.groupBy === "user"')
+ | {{ $ctrl.gridOptions.data.length }}
+ span.badge.badge--blue(ng-show='$ctrl.groupBy === "user"')
+ | {{ $ctrl.filteredRows.length }}
li(role='presentation' ng-class='{ active: $ctrl.groupBy === "company" }')
a(ng-click='$ctrl.groupByCompany()')
span Companies
http://git-wip-us.apache.org/repos/asf/ignite/blob/775c6e57/modules/web-console/frontend/app/primitives/ui-grid/index.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/ui-grid/index.scss b/modules/web-console/frontend/app/primitives/ui-grid/index.scss
index 504cf5a..8e2fbaa 100644
--- a/modules/web-console/frontend/app/primitives/ui-grid/index.scss
+++ b/modules/web-console/frontend/app/primitives/ui-grid/index.scss
@@ -236,6 +236,10 @@
.ui-grid-header,
.ui-grid-viewport {
+ .ui-grid-icon-cancel {
+ right: 20px;
+ }
+
.ui-grid-tree-base-row-header-buttons {
.ui-grid-icon-plus-squared,
.ui-grid-icon-minus-squared,
@@ -305,6 +309,10 @@
&.disabled {
opacity: .5;
+
+ .ui-grid-icon-ok {
+ cursor: default;
+ }
}
}
}