From 4b77aad824d6a5f2b1dce5b0813a6690b3a979bf Mon Sep 17 00:00:00 2001
From: Kent Yao <yao@apache.org>
Date: Wed, 5 Jul 2023 16:41:18 +0900
Subject: [PATCH] [SPARK-44294][UI] Fix HeapHistogram column shows unexpectedly
 w/ select-all-box

### What changes were proposed in this pull request?

This PR fixes the bug that the last element of execOptionalColumns does not point to the executor removeReason but HeapHistogram.

### Why are the changes needed?

bugfix, otherwise, after users've checked the select-all-box, an unexpected HeapHistogram will show with a dead link
### Does this PR introduce _any_ user-facing change?

no, bugfix and not released

### How was this patch tested?

locally built and tested to verify the HeapHistogram invisible

<img width="1768" alt="image" src="https://github.com/apache/spark/assets/8326978/1fa108a6-5598-4c90-855c-35104ed2c740">

Closes #41847 from yaooqinn/SPARK-44294.

Authored-by: Kent Yao <yao@apache.org>
Signed-off-by: Hyukjin Kwon <gurwls223@apache.org>
---
 .../org/apache/spark/ui/static/executorspage.js  | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/core/src/main/resources/org/apache/spark/ui/static/executorspage.js b/core/src/main/resources/org/apache/spark/ui/static/executorspage.js
index b52ece87ba125..1ea0adf5467be 100644
--- a/core/src/main/resources/org/apache/spark/ui/static/executorspage.js
+++ b/core/src/main/resources/org/apache/spark/ui/static/executorspage.js
@@ -147,7 +147,7 @@ function totalDurationColor(totalGCTime, totalDuration) {
 }
 
 var sumOptionalColumns = [3, 4];
-var execOptionalColumns = [5, 6, 7, 8, 9, 10, 13, 14, 25];
+var execOptionalColumns = [5, 6, 7, 8, 9, 10, 13, 14, 26];
 var execDataTable;
 var sumDataTable;
 
@@ -572,15 +572,7 @@ $(document).ready(function () {
           ],
           "order": [[0, "asc"]],
           "columnDefs": [
-            {"visible": false, "targets": 5},
-            {"visible": false, "targets": 6},
-            {"visible": false, "targets": 7},
-            {"visible": false, "targets": 8},
-            {"visible": false, "targets": 9},
-            {"visible": false, "targets": 10},
-            {"visible": false, "targets": 13},
-            {"visible": false, "targets": 14},
-            {"visible": false, "targets": 26}
+            {"visible": false, "targets": execOptionalColumns}
           ],
           "deferRender": true
         };
@@ -712,10 +704,8 @@ $(document).ready(function () {
           "searching": false,
           "info": false,
           "columnDefs": [
-            {"visible": false, "targets": 3},
-            {"visible": false, "targets": 4}
+            {"visible": false, "targets": sumOptionalColumns}
           ]
-
         };
 
         sumDataTable = $(sumSelector).DataTable(sumConf);