merge from main

crabnebula-dev · Jan 15, 2024 · 6eae8dc · 6eae8dc
2 parents 5a5c002 + ab2d371
commit 6eae8dc
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/crates/devtools/src/lib.rs b/crates/devtools/src/lib.rs
@@ -1,10 +1,13 @@
+mod server;
+
 use colored::Colorize;
 use devtools_core::aggregator::Aggregator;
 use devtools_core::layer::Layer;
 use devtools_core::server::wire::tauri::tauri_server::TauriServer;
 use devtools_core::server::Server;
 use devtools_core::Command;
-use devtools_core::{Error, Result, Shared};
+pub use devtools_core::Error;
+use devtools_core::{Result, Shared};
 use futures::FutureExt;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr, TcpListener};
 use std::sync::Arc;
@@ -16,8 +19,6 @@ use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::util::SubscriberInitExt;
 use tracing_subscriber::Layer as _;
 
-mod server;
-
 #[cfg(target_os = "ios")]
 mod ios {
     use cocoa::base::id;

diff --git a/web-client/src/components/span/span-list.tsx b/web-client/src/components/span/span-list.tsx
@@ -118,10 +118,22 @@ export function SpanList() {
                 onClick={() => setSearchParams({ span: String(span.id) })}
                 class="even:bg-nearly-invisible cursor-pointer hover:bg-[#ffffff05] even:hover:bg-[#ffffff10]"
               >
-                <td class="p-1">{span.name}</td>
-                <td class="p-1">{getTime(new Date(span.initiated))}</td>
-                <td class="p-1">{span.time.toFixed(2)}ms</td>
-                <td class="p-1 relative">
+                <td class="p-1 overflow-hidden text-ellipsis" title={span.name}>
+                  {span.name}
+                </td>
+                <td
+                  class="p-1 overflow-hidden text-ellipsis"
+                  title={getTime(new Date(span.initiated))}
+                >
+                  {getTime(new Date(span.initiated))}
+                </td>
+                <td
+                  class="p-1 overflow-hidden text-ellipsis"
+                  title={`${span.time.toFixed(2)} ms`}
+                >
+                  {span.time.toFixed(2)}ms
+                </td>
+                <td class="p-1 relative overflow-hidden">
                   <div class="relative w-[90%]">
                     <div class="bg-gray-800 w-full absolute rounded-sm h-2" />
                     <div