Просмотр исходного кода

fix(inbounds): show remark first, else inbound tag, in client labels

Revert formatInboundLabel to the pre-#5151 behavior: display the inbound
remark when set, otherwise the inbound tag, instead of "tag (remark)".
Affects the Attach clients / Attached inbounds views and client lists.
Routing keeps its own tag (remark) formatting.
MHSanaei 17 часов назад
Родитель
Сommit
41cb0b8ae7
2 измененных файлов с 5 добавлено и 8 удалено
  1. 4 7
      frontend/src/lib/inbounds/label.ts
  2. 1 1
      main.go

+ 4 - 7
frontend/src/lib/inbounds/label.ts

@@ -1,12 +1,9 @@
 /**
- * Display label for an inbound: `tag (remark)` when a distinct remark exists,
- * otherwise just the tag. Falls back to the remark when no tag is set, and to an
- * empty string when neither is present.
+ * Display label for an inbound: the remark when one is set, otherwise the
+ * inbound tag. Falls back to an empty string when neither is present.
  */
 export function formatInboundLabel(tag?: string, remark?: string): string {
-  const tagText = (tag || '').trim();
   const remarkText = (remark || '').trim();
-  if (!tagText) return remarkText;
-  if (!remarkText || remarkText === tagText) return tagText;
-  return `${tagText} (${remarkText})`;
+  if (remarkText) return remarkText;
+  return (tag || '').trim();
 }

+ 1 - 1
main.go

@@ -418,7 +418,7 @@ func GetApiToken(getApiToken bool) {
 	if len(tokens) > 0 {
 		fmt.Printf("There are %d API token(s) configured. Existing tokens cannot be retrieved in plaintext because only hashes are stored.\n", len(tokens))
 		fmt.Println("If you have lost your token, you can manage and generate new tokens through the Panel UI (Settings -> API Tokens).")
-		
+
 		// Create a new fallback token so the CLI is still useful without the UI
 		fallbackName := fmt.Sprintf("cli-fallback-%d", time.Now().Unix())
 		created, err := apiTokenService.Create(fallbackName)