Merge pull request apache#2750 from apache/dashboard-event

Merge `dashboard-event` to `dashboard`
xwm1992 · Jan 3, 2023 · b7d0033 · b7d0033
2 parents 52e74fa + e5ba5c8
commit b7d0033
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/eventmesh-dashboard/components/client/GrpcClientTable.tsx b/eventmesh-dashboard/components/client/GrpcClientTable.tsx
@@ -138,7 +138,7 @@ const GrpcClientTable = () => {
         if (axios.isAxiosError(error)) {
           toast({
             title: 'Failed to fetch the list of gRPC Clients',
-            description: 'unable to connect to the EventMesh daemon',
+            description: 'Unable to connect to the EventMesh daemon',
             status: 'error',
             duration: 3000,
             isClosable: true,
@@ -149,7 +149,7 @@ const GrpcClientTable = () => {
     };
 
     fetch();
-  }, [GrpcClientList]);
+  }, []);
 
   return (
     <Box

diff --git a/eventmesh-dashboard/components/client/HTTPClientTable.tsx b/eventmesh-dashboard/components/client/HTTPClientTable.tsx
@@ -138,7 +138,7 @@ const HTTPClientTable = () => {
         if (axios.isAxiosError(error)) {
           toast({
             title: 'Failed to fetch the list of HTTP Clients',
-            description: 'unable to connect to the EventMesh daemon',
+            description: 'Unable to connect to the EventMesh daemon',
             status: 'error',
             duration: 3000,
             isClosable: true,
@@ -149,7 +149,7 @@ const HTTPClientTable = () => {
     };
 
     fetch();
-  }, [HTTPClientList]);
+  }, []);
 
   return (
     <Box

diff --git a/eventmesh-dashboard/components/client/TCPClientTable.tsx b/eventmesh-dashboard/components/client/TCPClientTable.tsx
@@ -141,7 +141,7 @@ const TCPClientTable = () => {
         if (axios.isAxiosError(error)) {
           toast({
             title: 'Failed to fetch the list of TCP Clients',
-            description: 'unable to connect to the EventMesh daemon',
+            description: 'Unable to connect to the EventMesh daemon',
             status: 'error',
             duration: 3000,
             isClosable: true,
@@ -152,7 +152,7 @@ const TCPClientTable = () => {
     };
 
     fetch();
-  }, [TCPClientList]);
+  }, []);
 
   return (
     <Box
@@ -186,6 +186,7 @@ const TCPClientTable = () => {
         <Table variant="simple">
           <Thead>
             <Tr>
+              <Th>Host</Th>
               <Th>Host</Th>
               <Th>Group</Th>
               <Th>Action</Th>

diff --git a/eventmesh-dashboard/components/event/EventTable.tsx b/eventmesh-dashboard/components/event/EventTable.tsx
@@ -302,7 +302,7 @@ const EventTable = () => {
         if (axios.isAxiosError(error)) {
           toast({
             title: 'Failed to fetch the list of events',
-            description: 'unable to connect to the EventMesh daemon',
+            description: 'Unable to connect to the EventMesh daemon',
             status: 'error',
             duration: 3000,
             isClosable: true,

diff --git a/eventmesh-dashboard/components/topic/TopicTable.tsx b/eventmesh-dashboard/components/topic/TopicTable.tsx
@@ -205,7 +205,7 @@ const TopicTable = () => {
         if (axios.isAxiosError(error)) {
           toast({
             title: 'Failed to fetch the list of topics',
-            description: 'unable to connect to the EventMesh daemon',
+            description: 'Unable to connect to the EventMesh daemon',
             status: 'error',
             duration: 3000,
             isClosable: true,
@@ -216,7 +216,7 @@ const TopicTable = () => {
     };
 
     fetch();
-  }, [topicList]);
+  }, []);
 
   return (
     <Box

diff --git a/...src/main/java/org/apache/eventmesh/runtime/admin/controller/EventMeshAdminController.java b/...src/main/java/org/apache/eventmesh/runtime/admin/controller/EventMeshAdminController.java
@@ -36,7 +36,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.sun.net.httpserver.HttpServer;
+import java.io.IOException;
+import java.net.InetSocketAddress;
 
 public class EventMeshAdminController {