implemented JSON viewer only with files (#556)

* [Th2-4830] Hide next/prev buttons in verificationTable and add button to reset width of columns (#547) * hide next/prev btns and add resetWidth btn * bump version * deleted comments * changed button to same style as others * changed buttons styling * updated readme (#552) * implemented JSON viewer only with files * added ability to request files from shared folder * added styling to load file from server * moved from axios to fetch * Moved api requests to ApiSchema * changed return on error * bump version * [TH2-5125] Add opening workspace with event from query parameters (#557) * TH2-4996: UI: Cannot show event if its scope contains # symbol (#558) * TH2-4996: UI: Cannot show event if its scope contains # symbol * bump version * TH2-4993: UI doesn't provide the list of available books (#559) * [TH2-4979] UI doesn't update scopes list when I update time range (#560) * [TH2-4978] UI skips a message that should be highlighted in the messa… (#561) [TH2-4978] UI skips a message that should be highlighted in the message box when the event is clicked * [TH2-5155] Add ability to turn back to the attached message (#562) * bump version (#563) * [TH2-5158] Outline searched messages (#564) * [TH2-5164] Raw message in ASCII display mode has incorrect character if the content is in UTF8 (#566) * [TH2-4909] Add sorting for list of event-scopes in UI (#565) * added local file upload and basic functions for server load * bump version to 5.2 --------- Co-authored-by: Osinkin Roman <[email protected]> Co-authored-by: Petr Zlydenko <[email protected]>
th2-net · Feb 19, 2024 · 2f0c4c9 · 2f0c4c9
1 parent bd81a31
commit 2f0c4c9
Show file tree

Hide file tree

Showing 40 changed files with 1,356 additions and 94 deletions.
diff --git a/README.md b/README.md
@@ -1,8 +1,7 @@
 # Report-viewer
 
-![](https://img.shields.io/github/package-json/v/th2-net/th2-rpt-viewer)
-![](https://img.shields.io/github/workflow/status/th2-net/th2-rpt-viewer/build%20&%20publish%20release%20image%20to%20ghcr.io)
-
+![](https://img.shields.io/github/package-json/v/th2-net/th2-rpt-viewer/version-5.1)
+![](https://img.shields.io/github/actions/workflow/status/th2-net/th2-rpt-viewer/build-release.yml?branch=version-5.1)
 This is a web app that displays the stored test data (events and messages) using `report-data-provider`.
 
 # API
@@ -14,29 +13,28 @@ This app needs `report-data-provider 5.1.0 (or newer)` backend component to func
 To include this component in your schema, a following yml file needs to be created
 
 ```
-apiVersion: th2.exactpro.com/v1
+apiVersion: th2.exactpro.com/v2
 kind: Th2CoreBox
 metadata:
-  name: report-data-viewer
+  name: rpt-data-viewer
 spec:
-  image-name: ghcr.io/th2-net/th2-rpt-viewer
-  image-version: 3.0.0 // change this line if you want to use a newer version
+  imageName: ghcr.io/th2-net/th2-rpt-viewer
+  imageVersion: 5.1.19 // change this line if you want to use a newer version
   type: th2-rpt-viewer
-  extended-settings:
-    chart-cfg:
-      ref: schema-stable
-      path: custom-component
-    service:
-      enabled: false
-      targetPort: 80
-      nodePort: '31276'
+  extendedSettings:
     resources:
       limits:
-        memory: 15Mi
-        cpu: 200m
+        cpu: 50m
+        memory: 50Mi
       requests:
-        memory: 10Mi
-        cpu: 20m
+        cpu: 50m
+        memory: 50Mi
+    service:
+      enabled: true
+      clusterIP:
+      - name: gui
+        containerPort: 8080
+        port: 8080
 
 ```
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "th2-rpt-viewer",
-	"version": "5.2.5",
+	"version": "5.2.6",
 	"description": "",
 	"main": "index.tsx",
 	"private": true,

diff --git a/screenshot.png b/screenshot.png
diff --git a/src/api/ApiSchema.ts b/src/api/ApiSchema.ts
@@ -31,12 +31,14 @@ import { IndexedDB } from './indexedDb';
 import { MatchMessageParams } from './message';
 import { DirectionalStreamInfo } from '../models/StreamInfo';
 import { Book } from '../models/Books';
+import { Tree } from '../models/JSONSchema';
 
 export default interface ApiSchema {
 	events: EventApiSchema;
 	messages: MessageApiSchema;
 	books: BooksApiSchema;
 	sse: SSESchema;
+	jsonViewer: JSONViewerApiSchema;
 	indexedDb: IndexedDB;
 }
 
@@ -106,6 +108,11 @@ export interface BooksApiSchema {
 	getBookScope: (bookId: string, abortSignal?: AbortSignal) => Promise<string[]>;
 }
 
+export interface JSONViewerApiSchema {
+	getLinks: (dir?: string) => Promise<string[]>;
+	getFile: (directory: string, file: string) => Promise<Tree>;
+}
+
 export interface SSESchema {
 	getEventSource: (config: EventSourceConfig) => EventSource;
 	getEventsTreeSource: (

diff --git a/src/api/JSONViewer.ts b/src/api/JSONViewer.ts
@@ -0,0 +1,47 @@
+import notificationsStore from '../stores/NotificationsStore';
+import { JSONViewerApiSchema } from './ApiSchema';
+
+const directoriesURL = '/resources/';
+
+const JSONViewerHttpApi: JSONViewerApiSchema = {
+	getLinks: async (dir?: string) => {
+		const res = await fetch(`${directoriesURL}${dir || ''}`, {
+			cache: 'reload',
+			headers: {
+				Accept: 'application/json, text/plain, */*',
+			},
+		});
+		if (res.ok) {
+			const text = await res.text();
+			const links: string[] = [];
+			let tempText = text.slice();
+			const linkStartInf = `a href="`;
+			let linkStart = tempText.indexOf(linkStartInf);
+			while (linkStart > -1) {
+				tempText = tempText.slice(linkStart + linkStartInf.length);
+				const linkEnd = tempText.indexOf(`"`);
+				const link = tempText.slice(0, linkEnd);
+				links.push(link);
+				linkStart = tempText.indexOf(linkStartInf);
+			}
+			return links;
+		}
+		notificationsStore.handleRequestError(res);
+		return [];
+	},
+	getFile: async (directory: string, file: string) => {
+		const res = await fetch(`${directoriesURL}/${directory}/${file}`, {
+			headers: {
+				Accept: 'application/json, text/plain, */*',
+			},
+		});
+
+		if (res.ok) {
+			return res.json();
+		}
+		notificationsStore.handleRequestError(res);
+		return {};
+	},
+};
+
+export default JSONViewerHttpApi;
diff --git a/src/api/event.ts b/src/api/event.ts
@@ -23,7 +23,7 @@ import fetch from '../helpers/fetchRetry';
 const eventHttpApi: EventApiSchema = {
 	getEvent: async (id, signal?, queryParams = {}) => {
 		const params = createURLSearchParams(queryParams);
-		const res = await fetch(`backend/event/${id}?${params}`, {
+		const res = await fetch(`backend/event/${encodeURIComponent(id)}?${params}`, {
 			signal,
 		});
 

diff --git a/src/api/index.ts b/src/api/index.ts
@@ -20,6 +20,7 @@ import eventHttpApi from './event';
 import messageHttpApi from './message';
 import sseApi from './sse';
 import booksHttpApi from './books';
+import JSONViewerHttpApi from './JSONViewer';
 
 const envName =
 	process.env.NODE_ENV === 'development'
@@ -31,6 +32,7 @@ const api: ApiSchema = {
 	messages: messageHttpApi,
 	books: booksHttpApi,
 	sse: sseApi,
+	jsonViewer: JSONViewerHttpApi,
 	indexedDb: new IndexedDB(envName),
 };