Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#2288] feat(dashboard): Show nodeInfo in excludeNode page #2289

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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);
Expand Down
12 changes: 6 additions & 6 deletions dashboard/src/main/webapp/src/pages/ShuffleServerPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand All @@ -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">
Expand All @@ -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">
Expand All @@ -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"
>
Expand All @@ -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">
Expand All @@ -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">
Expand Down
264 changes: 0 additions & 264 deletions dashboard/src/main/webapp/src/pages/serverstatus/ExcludeNodeList.vue

This file was deleted.

Loading
Loading