From f3d4cebb6516f1f35d4ff9fbb9d3ff941f92243e Mon Sep 17 00:00:00 2001 From: Ferenc Csaky Date: Mon, 2 May 2022 21:57:07 +0200 Subject: [PATCH] [FLINK-27441][webfrontend] fix "nzScroll" calculations Co-authored-by: Ferenc Csaky --- .../job-overview-drawer-accumulators.component.html | 4 ++-- .../job-overview-drawer-backpressure.component.html | 2 +- .../subtasks/job-overview-drawer-subtasks.component.html | 2 +- .../job-overview-drawer-taskmanagers.component.html | 2 +- .../watermarks/job-overview-drawer-watermarks.component.html | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flink-runtime-web/web-dashboard/src/app/pages/job/overview/accumulators/job-overview-drawer-accumulators.component.html b/flink-runtime-web/web-dashboard/src/app/pages/job/overview/accumulators/job-overview-drawer-accumulators.component.html index 1512e6e1f3fc4..942be678edead 100644 --- a/flink-runtime-web/web-dashboard/src/app/pages/job/overview/accumulators/job-overview-drawer-accumulators.component.html +++ b/flink-runtime-web/web-dashboard/src/app/pages/job/overview/accumulators/job-overview-drawer-accumulators.component.html @@ -22,7 +22,7 @@ [nzSize]="'small'" [nzLoading]="isLoading" [nzData]="listOfAccumulator" - [nzScroll]="{ y: 'calc( 100% - 72px )' }" + [nzScroll]="{ y: 'calc( 100vh - 72px )' }" [nzFrontPagination]="false" [nzShowPagination]="false" > @@ -47,7 +47,7 @@ [nzSize]="'small'" [nzLoading]="isLoading" [nzData]="listOfSubTaskAccumulator" - [nzScroll]="{ y: 'calc( 100% - 72px )' }" + [nzScroll]="{ y: 'calc( 100vh - 72px )' }" [nzFrontPagination]="false" [nzShowPagination]="false" > diff --git a/flink-runtime-web/web-dashboard/src/app/pages/job/overview/backpressure/job-overview-drawer-backpressure.component.html b/flink-runtime-web/web-dashboard/src/app/pages/job/overview/backpressure/job-overview-drawer-backpressure.component.html index 546312aae08c8..ac7e825c2a995 100644 --- a/flink-runtime-web/web-dashboard/src/app/pages/job/overview/backpressure/job-overview-drawer-backpressure.component.html +++ b/flink-runtime-web/web-dashboard/src/app/pages/job/overview/backpressure/job-overview-drawer-backpressure.component.html @@ -21,7 +21,7 @@ [nzSize]="'small'" [nzLoading]="isLoading" [nzData]="listOfSubTaskBackpressure" - [nzScroll]="{ y: 'calc( 100% - 72px )' }" + [nzScroll]="{ y: 'calc( 100vh - 72px )' }" [nzWidthConfig]="['33.33%', '33.33%', '33.33%']" [nzFrontPagination]="false" [nzShowPagination]="false" diff --git a/flink-runtime-web/web-dashboard/src/app/pages/job/overview/subtasks/job-overview-drawer-subtasks.component.html b/flink-runtime-web/web-dashboard/src/app/pages/job/overview/subtasks/job-overview-drawer-subtasks.component.html index 231310d197101..dd71be2dc270d 100644 --- a/flink-runtime-web/web-dashboard/src/app/pages/job/overview/subtasks/job-overview-drawer-subtasks.component.html +++ b/flink-runtime-web/web-dashboard/src/app/pages/job/overview/subtasks/job-overview-drawer-subtasks.component.html @@ -22,7 +22,7 @@ [nzSize]="'small'" [nzLoading]="isLoading" [nzData]="listOfTask" - [nzScroll]="{ x: '1480px', y: 'calc( 100% - 35px )' }" + [nzScroll]="{ x: '1480px', y: 'calc( 100vh - 35px )' }" [nzFrontPagination]="false" [nzShowPagination]="false" > diff --git a/flink-runtime-web/web-dashboard/src/app/pages/job/overview/taskmanagers/job-overview-drawer-taskmanagers.component.html b/flink-runtime-web/web-dashboard/src/app/pages/job/overview/taskmanagers/job-overview-drawer-taskmanagers.component.html index 717dd209efe24..5bf53be535d18 100644 --- a/flink-runtime-web/web-dashboard/src/app/pages/job/overview/taskmanagers/job-overview-drawer-taskmanagers.component.html +++ b/flink-runtime-web/web-dashboard/src/app/pages/job/overview/taskmanagers/job-overview-drawer-taskmanagers.component.html @@ -22,7 +22,7 @@ [nzSize]="'small'" [nzLoading]="isLoading" [nzData]="listOfTaskManager" - [nzScroll]="{ x: '1500px', y: 'calc( 100% - 35px )' }" + [nzScroll]="{ x: '1500px', y: 'calc( 100vh - 35px )' }" [nzFrontPagination]="false" [nzShowPagination]="false" > diff --git a/flink-runtime-web/web-dashboard/src/app/pages/job/overview/watermarks/job-overview-drawer-watermarks.component.html b/flink-runtime-web/web-dashboard/src/app/pages/job/overview/watermarks/job-overview-drawer-watermarks.component.html index e5f6c6a91ece3..ae984919a6014 100644 --- a/flink-runtime-web/web-dashboard/src/app/pages/job/overview/watermarks/job-overview-drawer-watermarks.component.html +++ b/flink-runtime-web/web-dashboard/src/app/pages/job/overview/watermarks/job-overview-drawer-watermarks.component.html @@ -21,7 +21,7 @@ [nzSize]="'small'" [nzLoading]="isLoading" [nzData]="listOfWaterMark" - [nzScroll]="{ y: 'calc( 100% - 35px )' }" + [nzScroll]="{ y: 'calc( 100vh - 35px )' }" [nzFrontPagination]="false" [nzShowPagination]="false" >