fix leaf name and default search tokens

th2-net · Feb 4, 2025 · 9d776d1 · 9d776d1
1 parent 44d8798
commit 9d776d1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 30 deletions.
diff --git a/src/components/JSONViewer/TreeLeaf.tsx b/src/components/JSONViewer/TreeLeaf.tsx
@@ -211,7 +211,6 @@ const TreeLeaf = ({
 						}}>
 						<div className={createBemBlock('event-status-icon')} />
 						<span style={{ color: treeNode.isGeneratedKey ? '#333333' : undefined }}>
-							{treeNode.id} ={'>'} {treeNode.parentIds.join(', ')} {'    '}
 							{splitContent.map((contentPart, index) => (
 								<span
 									key={index}

diff --git a/src/stores/JSONViewer/JSONViewerStore.ts b/src/stores/JSONViewer/JSONViewerStore.ts
@@ -61,6 +61,21 @@ export interface BodyReaderSearchResult extends BaseReaderSearchResult {
 	position: 'key' | 'value';
 }
 
+const defaultSearchTokens: SearchToken[] = [
+	{
+		pattern: 'PASS',
+		color: 'green',
+		isScrollable: true,
+		isActive: false,
+	},
+	{
+		pattern: 'FAIL',
+		color: 'red',
+		isScrollable: true,
+		isActive: false,
+	},
+];
+
 type ReaderSearchResult = NameReaderSearchResult | TableReaderSearchResult | BodyReaderSearchResult;
 
 export type PanelType = 'default' | 'compare';
@@ -163,20 +178,7 @@ export class JSONViewerStore {
 	@observable isCompare = false;
 
 	@observable
-	public tokens: SearchToken[] = [
-		{
-			pattern: 'PASS',
-			color: 'green',
-			isScrollable: true,
-			isActive: false,
-		},
-		{
-			pattern: 'FAIL',
-			color: 'red',
-			isScrollable: true,
-			isActive: false,
-		},
-	];
+	public tokens: SearchToken[] = [...defaultSearchTokens];
 
 	@observable
 	public currentSearchResult: {
@@ -523,7 +525,7 @@ export class JSONViewerStore {
 
 	@action
 	updateTokensFromText = (text: string) => {
-		const newTokens: SearchToken[] = [];
+		const newTokens: SearchToken[] = [...defaultSearchTokens];
 		try {
 			const json = JSON.parse(text);
 			for (let i = 0; i < json.length; i++) {
@@ -579,20 +581,7 @@ export class JSONViewerStore {
 
 	@action
 	clearSearchField = () => {
-		this.tokens = [
-			{
-				pattern: 'PASS',
-				color: 'green',
-				isScrollable: true,
-				isActive: false,
-			},
-			{
-				pattern: 'FAIL',
-				color: 'red',
-				isScrollable: true,
-				isActive: false,
-			},
-		];
+		this.tokens = [...defaultSearchTokens];
 	};
 
 	@action