This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-1969 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit a19fc8a1f2d16fe01286ae57f2e73b808f922d95 Author: Dmytro_Gnatyshyn <[email protected]> AuthorDate: Mon Aug 3 12:30:21 2020 +0300 [DLAB-1969]: Fix build bugs --- .../reporting/reporting-grid/reporting-grid.component.ts | 15 ++++++++++----- .../main/resources/webapp/src/assets/styles/_theme.scss | 5 +++-- 2 files changed, 13 insertions(+), 7 deletions(-) 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 ef70e24..bf25aae 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 @@ -36,24 +36,24 @@ export class ReportingGridComponent implements OnInit, AfterViewInit { fullReport: Array<any>; isFiltered: boolean = false; active: object = {}; + public isScrollButtonsVisible: boolean; @ViewChild('nameFilter', { static: false }) filter; @ViewChild('tableWrapper', { static: false }) tableWrapper; - @ViewChild('table', { static: false }) table; + @ViewChild('table', { static: false }) table; @Output() filterReport: EventEmitter<{}> = new EventEmitter(); @Output() resetRangePicker: EventEmitter<boolean> = new EventEmitter(); @Input() filteredReportData: ReportingConfigModel; - private isScrollButtonsVisible: boolean; @HostListener('window:resize', ['$event']) onResize(event) { this.isScrollButtonsVisible = this.tableWrapper.nativeElement.offsetWidth - this.table._elementRef.nativeElement.offsetWidth < 0; - this.isMaxRight = this.tableWrapper.nativeElement.offsetWidth + this.tableWrapper.nativeElement.scrollLeft + 2 <= this.table._elementRef.nativeElement.offsetWidth; + this.isMaxRight = this.checkMaxRight(); } @HostListener('scroll', ['$event']) scrollTable($event: Event) { - this.isMaxRight = this.tableWrapper.nativeElement.offsetWidth + this.tableWrapper.nativeElement.scrollLeft + 2 <= this.table._elementRef.nativeElement.offsetWidth; + this.isMaxRight = this.checkMaxRight(); } @@ -71,7 +71,7 @@ export class ReportingGridComponent implements OnInit, AfterViewInit { ngAfterViewInit() { window.setTimeout(() => { this.isScrollButtonsVisible = this.tableWrapper.nativeElement.offsetWidth - this.table._elementRef.nativeElement.offsetWidth < 0; - this.isMaxRight = this.tableWrapper.nativeElement.offsetWidth + this.tableWrapper.nativeElement.scrollLeft !== this.table._elementRef.nativeElement.offsetWidth; + this.isMaxRight = this.checkMaxRight(); }, 500); } @@ -152,4 +152,9 @@ export class ReportingGridComponent implements OnInit, AfterViewInit { } } + private checkMaxRight() { + return this.isMaxRight = this.tableWrapper.nativeElement.offsetWidth + + this.tableWrapper.nativeElement.scrollLeft + 2 <= this.table._elementRef.nativeElement.offsetWidth; + } + } diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss index f8fc702..3b2e0ff 100644 --- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss +++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss @@ -843,7 +843,7 @@ mat-progress-bar { box-shadow: none; } -#range-picker .ng-daterangepicker .calendar{ +#range-picker .ng-daterangepicker .calendar { z-index: 102; border: 1px solid rgba(234, 234, 234, 0.64); border-radius: 0; @@ -851,9 +851,10 @@ mat-progress-bar { 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12); - &.is-to:after{ + &.is-to:after { left: 250px; } +} #range-picker .ng-daterangepicker .calendar::after { border-top: 1px solid rgba(234, 234, 234, 0.64); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
