Inline errors

Author: aorith

assets/css/02_main.css

@@ -127,6 +127,15 @@ pre {
   text-decoration: line-through !important;
 }
 
+.error-inline {
+  color: var(--red-0);
+  border: 1px solid var(--red-0);
+  border-radius: 6px;
+  padding: 0.6rem 1rem;
+  margin-bottom: 1rem;
+  background: var(--deleted);
+}
+
 .bold {
   font-weight: 600;
 }

assets/templates/views/parsed_view.html

@@ -3,7 +3,12 @@
 <div class="view active" id="parse-view">
 	<div class="view-content">
 		<h1>Parse</h1>
-		{{if .Transactions.Count }}
+		{{if .Error }}
+		<div class="error-inline">
+			<b>Parse error:</b>
+			<pre>{{ .Error }}</pre>
+		</div>
+		{{else if .Transactions.Count }}
 		<p>Use the menu to navigate to the different views.</p>
 		{{ else }}
 		<p>No valid transactions found.</p>

internal/server/html/html.go

@@ -89,15 +89,15 @@ func Index(w http.ResponseWriter, data PageData) error {
 
 func Parsed(w http.ResponseWriter, data PageData) error {
 	parser := vsl.NewTransactionParser(strings.NewReader(data.Logs.Textinput))
-	ts, err := parser.Parse()
-	slog.Info("txs", "count", len(ts.Transactions()))
 
+	ts, err := parser.Parse()
 	if err != nil {
 		slog.Warn("failed to parse logs", "error", err)
-
-		return err
+		data.Error = err
 	}
 
+	slog.Info("txs", "count", len(ts.Transactions()))
+
 	data.Transactions.Set = ts
 	data.Transactions.Count = len(ts.Transactions())
 

internal/server/routes.go

@@ -40,9 +40,9 @@ func indexHandler(version string) func(http.ResponseWriter, *http.Request) {
 const maxRequestBodyBytes = 32 * 1024 * 1024 // 32 MiB
 
 func parseHandler(version string) func(http.ResponseWriter, *http.Request) {
-	data := html.PageData{Version: version}
-
 	return func(w http.ResponseWriter, r *http.Request) {
+		data := html.PageData{Version: version}
+
 		r.Body = http.MaxBytesReader(w, r.Body, maxRequestBodyBytes)
 
 		err := r.ParseForm()
@@ -131,9 +131,9 @@ func parseHandler(version string) func(http.ResponseWriter, *http.Request) {
 }
 
 func reqBuilderHandler(version string) func(http.ResponseWriter, *http.Request) {
-	data := html.PageData{Version: version}
-
 	return func(w http.ResponseWriter, r *http.Request) {
+		data := html.PageData{Version: version}
+
 		r.Body = http.MaxBytesReader(w, r.Body, maxRequestBodyBytes)
 
 		err := r.ParseForm()

render/sequence.go

@@ -366,13 +366,9 @@ func drawRequest(req *HTTPRequest, truncateLen int) string {
 
 // truncateStr trims the input string to a maximum length, appending "…" if it exceeds the length.
 func truncateStr(s string, maxLen int) string {
-	if utf8.RuneCountInString(s) <= maxLen {
-		return s
-	}
-
 	runes := []rune(s)
-	if maxLen > len(runes) {
-		maxLen = len(runes) // Cap maxLen if it's greater than the length of runes
+	if len(runes) <= maxLen {
+		return s
 	}
 
 	return strings.TrimSpace(string(runes[:maxLen])) + "…"
@@ -430,7 +426,7 @@ func wrapAndTruncate(s string, wrapLen, maxLen int) string {
 		lineLen += wordLen
 
 		// Early stop if we already exceed maxLen (slightly before truncation)
-		if builder.Len() > maxLen {
+		if utf8.RuneCountInString(builder.String()) > maxLen {
 			break
 		}
 

render/timeline.go

@@ -142,7 +142,7 @@ func collectAndSortRecords(ts vsl.TransactionSet, tx *vsl.Transaction, visited m
 	var events []TimelineEvent
 
 	if visited[tx.VXID] {
-		slog.Info("collectAndSortRecords(): loop detected", "txid", tx.TXID)
+		slog.Warn("collectAndSortRecords(): loop detected", "txid", tx.TXID)
 
 		return events
 	}