You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by dw...@apache.org on 2019/09/27 15:37:11 UTC

[flink] 06/06: [FLINK-13386][web]: Fix sort in Firefox

This is an automated email from the ASF dual-hosted git repository.

dwysakowicz pushed a commit to branch release-1.9
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 883d9cdb6873e506a688a64f0cb6f122c33ed092
Author: vthinkxie <ya...@alibaba-inc.com>
AuthorDate: Tue Jul 30 10:42:34 2019 +0800

    [FLINK-13386][web]: Fix sort in Firefox
---
 .../src/app/pages/job/overview/list/job-overview-list.component.html  | 4 ++--
 .../src/app/pages/job/overview/list/job-overview-list.component.ts    | 4 ++--
 flink-runtime-web/web-dashboard/src/app/services/job.service.ts       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/flink-runtime-web/web-dashboard/src/app/pages/job/overview/list/job-overview-list.component.html b/flink-runtime-web/web-dashboard/src/app/pages/job/overview/list/job-overview-list.component.html
index 8e2debe..f6d7399 100644
--- a/flink-runtime-web/web-dashboard/src/app/pages/job/overview/list/job-overview-list.component.html
+++ b/flink-runtime-web/web-dashboard/src/app/pages/job/overview/list/job-overview-list.component.html
@@ -20,7 +20,7 @@
   class="no-border small"
   [nzSize]="'small'"
   [nzData]="nodes"
-  [nzScroll]="{x:((1310+left)+'px')}"
+  [nzScroll]="{x:((1360+left)+'px')}"
   [nzFrontPagination]="false"
   [nzShowPagination]="false">
   <thead (nzSortChange)="sort($event)" nzSingleSort>
@@ -33,7 +33,7 @@
       <th nzSortKey="detail.metrics.write-records" nzShowSort nzWidth="120px">Records Sent</th>
       <th nzSortKey="parallelism" nzShowSort nzWidth="120px">Parallelism</th>
       <th nzSortKey="detail.start-time" nzShowSort nzWidth="150px">Start Time</th>
-      <th nzSortKey="detail.duration" nzShowSort nzWidth="100px">Duration</th>
+      <th nzSortKey="detail.duration" nzShowSort nzWidth="150px">Duration</th>
       <th nzSortKey="detail.end-time" nzShowSort nzWidth="150px">End Time</th>
       <th nzWidth="100px" nzRight="0px">Tasks</th>
     </tr>
diff --git a/flink-runtime-web/web-dashboard/src/app/pages/job/overview/list/job-overview-list.component.ts b/flink-runtime-web/web-dashboard/src/app/pages/job/overview/list/job-overview-list.component.ts
index e7cf66b..c1ceaef 100644
--- a/flink-runtime-web/web-dashboard/src/app/pages/job/overview/list/job-overview-list.component.ts
+++ b/flink-runtime-web/web-dashboard/src/app/pages/job/overview/list/job-overview-list.component.ts
@@ -28,8 +28,8 @@ import { NodesItemCorrectInterface } from 'interfaces';
 })
 export class JobOverviewListComponent {
   innerNodes: NodesItemCorrectInterface[] = [];
-  sortName = 'detail.topology-id';
-  sortValue = 'ascend';
+  sortName: string;
+  sortValue: string;
   left = 390;
   @Output() nodeClick = new EventEmitter();
   @Input() selectedNode: NodesItemCorrectInterface;
diff --git a/flink-runtime-web/web-dashboard/src/app/services/job.service.ts b/flink-runtime-web/web-dashboard/src/app/services/job.service.ts
index 48f32a1..4abaa3f 100644
--- a/flink-runtime-web/web-dashboard/src/app/services/job.service.ts
+++ b/flink-runtime-web/web-dashboard/src/app/services/job.service.ts
@@ -265,7 +265,7 @@ export class JobService {
         }
       });
       const listOfVerticesId = job.vertices.map(item => item.id);
-      nodes.sort((pre, next) => listOfVerticesId.indexOf(next.id) - listOfVerticesId.indexOf(pre.id));
+      nodes.sort((pre, next) => listOfVerticesId.indexOf(pre.id) - listOfVerticesId.indexOf(next.id));
     }
     return {
       ...job,