remove ExcludeNodeList.vue

apache · Dec 12, 2024 · 4b5f339 · 4b5f339
1 parent b7c9ca5
commit 4b5f339
Show file tree

Hide file tree

Showing 5 changed files with 185 additions and 279 deletions.
diff --git a/coordinator/src/main/java/org/apache/uniffle/coordinator/web/resource/ServerResource.java b/coordinator/src/main/java/org/apache/uniffle/coordinator/web/resource/ServerResource.java
@@ -79,8 +79,8 @@ public Response<List<ServerNode>> nodes(@QueryParam("status") String status) {
       serverList = clusterManager.getLostServerList();
     } else if (ServerStatus.EXCLUDED.name().equalsIgnoreCase(status)) {
       serverList =
-          clusterManager.getExcludedNodes().stream()
-              .map(ServerNode::new)
+          clusterManager.list().stream()
+              .filter(node -> clusterManager.getExcludedNodes().contains(node.getId()))
               .collect(Collectors.toList());
     } else {
       List<ServerNode> serverAllList = clusterManager.list();
@@ -92,9 +92,10 @@ public Response<List<ServerNode>> nodes(@QueryParam("status") String status) {
     serverList =
         serverList.stream()
             .filter(
-                server -> {
-                  return status == null || server.getStatus().name().equalsIgnoreCase(status);
-                })
+                server ->
+                    status == null
+                        || server.getStatus().name().equalsIgnoreCase(status)
+                        || ServerStatus.EXCLUDED.name().equalsIgnoreCase(status))
             .collect(Collectors.toList());
     serverList.sort(Comparator.comparing(ServerNode::getId));
     return Response.success(serverList);

diff --git a/dashboard/src/main/webapp/src/pages/ShuffleServerPage.vue b/dashboard/src/main/webapp/src/pages/ShuffleServerPage.vue
@@ -21,7 +21,7 @@
       <el-col :span="4">
         <router-link
           class="router-link-active"
-          to="/shuffleserverpage/activeNodeList"
+          :to="{ path: '/shuffleserverpage/activeNodeList', query: { isExcludedPage: false } }"
           @click.native="routerHandler"
         >
           <el-card class="box-card" shadow="hover">
@@ -37,7 +37,7 @@
       <el-col :span="4">
         <router-link
           class="router-link-active"
-          to="/shuffleserverpage/decommissioningNodeList"
+          :to="{ path: '/shuffleserverpage/decommissioningNodeList', query: { isExcludedPage: false } }"
           @click.native="routerHandler"
         >
           <el-card class="box-card" shadow="hover">
@@ -55,7 +55,7 @@
       <el-col :span="4">
         <router-link
           class="router-link-active"
-          to="/shuffleserverpage/decommissionedNodeList"
+          :to="{ path: '/shuffleserverpage/decommissionedNodeList', query: { isExcludedPage: false } }"
           @click.native="routerHandler"
         >
           <el-card class="box-card" shadow="hover">
@@ -73,7 +73,7 @@
       <el-col :span="4">
         <router-link
           class="router-link-active"
-          to="/shuffleserverpage/lostNodeList"
+          :to="{ path: '/shuffleserverpage/lostNodeList', query: { isExcludedPage: false } }"
           @click.native="routerHandler"
           :updateTotalPage="updateTotalPage"
         >
@@ -90,7 +90,7 @@
       <el-col :span="4">
         <router-link
           class="router-link-active"
-          to="/shuffleserverpage/unhealthyNodeList"
+          :to="{ path: '/shuffleserverpage/unhealthyNodeList', query: { isExcludedPage: false } }"
           @click.native="routerHandler"
         >
           <el-card class="box-card" shadow="hover">
@@ -106,7 +106,7 @@
       <el-col :span="4">
         <router-link
           class="router-link-active"
-          to="/shuffleserverpage/excludeNodeList"
+          :to="{ path: '/shuffleserverpage/excludeNodeList', query: { isExcludedPage: true } }"
           @click.native="routerHandler"
         >
           <el-card class="box-card" shadow="hover">

diff --git a/dashboard/src/main/webapp/src/pages/serverstatus/ExcludeNodeList.vue b/dashboard/src/main/webapp/src/pages/serverstatus/ExcludeNodeList.vue