You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/09/15 10:20:09 UTC
[incubator-dlab] branch DLAB-2049 created (now b7d16b6)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DLAB-2049
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at b7d16b6 [DLAB-2049]: Fixed clicking the same sort icon should not change value position in grid
This branch includes the following new commits:
new e1eb9a7 Merge remote-tracking branch 'origin/develop' into develop
new b7d16b6 [DLAB-2049]: Fixed clicking the same sort icon should not change value position in grid
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: Merge remote-tracking branch
'origin/develop' into develop
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2049
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit e1eb9a736d29b7f2a25a8bbead4f1faa7f9ea612
Merge: d5a5713 8886492
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Mon Sep 14 17:10:09 2020 +0300
Merge remote-tracking branch 'origin/develop' into develop
infrastructure-provisioning/src/general/conf/dlab.ini | 2 +-
.../src/general/files/aws/rstudio_description.json | 2 +-
.../src/general/files/azure/rstudio_description.json | 2 +-
.../src/general/files/gcp/rstudio_description.json | 2 +-
.../src/general/lib/os/debian/notebook_lib.py | 17 ++++++++++-------
.../src/rstudio/scripts/configure_rstudio_node.py | 2 +-
.../epam/dlab/backendapi/domain/NotebookTemplate.java | 2 +-
.../management-grid/management-grid.component.html | 8 ++++----
.../management-grid/management-grid.component.scss | 5 +++++
.../reporting-grid/reporting-grid.component.html | 2 +-
.../reporting-grid/reporting-grid.component.ts | 2 --
.../install-libraries/install-libraries.component.html | 1 +
.../resources-grid/resources-grid.component.html | 2 +-
13 files changed, 28 insertions(+), 21 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: [DLAB-2049]: Fixed clicking the same sort
icon should not change value position in grid
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2049
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit b7d16b68441de618ced98d7c19ee301f7eb29b2e
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Tue Sep 15 13:19:50 2020 +0300
[DLAB-2049]: Fixed clicking the same sort icon should not change value position in grid
---
.../reports/reporting/reporting-grid/reporting-grid.component.ts | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
index 6172a78..29e8ed2 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
@@ -58,6 +58,8 @@ export class ReportingGridComponent implements OnInit, AfterViewInit {
isFilterSelected: boolean;
isFilterChanged: boolean;
public isScrollButtonsVisible: boolean;
+ public previousItem: string;
+ public previousDirection: string;
@ViewChild('nameFilter', { static: false }) filter;
@ViewChild('tableWrapper', { static: false }) tableWrapper;
@@ -121,7 +123,12 @@ export class ReportingGridComponent implements OnInit, AfterViewInit {
}
sortBy(sortItem, direction) {
+ if (this.previousItem === sortItem && this.previousDirection === direction) {
+ return;
+ }
let report: Array<object>;
+ this.previousItem = sortItem;
+ this.previousDirection = direction;
if (direction === 'down') {
report = this.reportData.sort((a, b) => {
if (a[sortItem] === null) a[sortItem] = '';
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org