made requested changes

th2-net · Jun 27, 2022 · cb7e31f · cb7e31f
1 parent 6c6b046
commit cb7e31f
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 42 deletions.
diff --git a/src/api/sse.ts b/src/api/sse.ts
@@ -83,9 +83,7 @@ export const toStream = (
 	name: string,
 	direction: MessageDirection[] = ['first', 'second'],
 ): string[] => {
-	const res = direction.map(dir => `${name}:${dir}`);
-
-	return res;
+	return direction.map(dir => `${name}:${dir}`);
 };
 
 export interface MessagesSSEParams extends BaseSSEParams {
@@ -201,7 +199,6 @@ export function getMessagesSSEParamsFromFilter(
 
 const sseApi: SSESchema = {
 	getEventSource: config => {
-		// console.error(new Error());
 		const { type, queryParams } = config;
 		const params = createURLSearchParams({
 			...queryParams,

diff --git a/src/components/embedded/EmbeddedEventHeader.tsx b/src/components/embedded/EmbeddedEventHeader.tsx
@@ -31,7 +31,6 @@ export default function EmbeddedEventHeader(props: Props) {
 	const { eventId, eventName, eventType, startTimestamp, endTimestamp } = event;
 
 	const status = getEventStatus(event);
-	const startTimestampValue = timestampToNumber(startTimestamp);
 
 	const elapsedTime =
 		endTimestamp && startTimestamp ? getElapsedTime(startTimestamp, endTimestamp) : null;
@@ -52,9 +51,7 @@ export default function EmbeddedEventHeader(props: Props) {
 				<>
 					{elapsedTime && <span className='event-header-card__elapsed-time'>{elapsedTime}</span>}
 					<div className='event-header-card__time-label'>
-						<span className='event-header-card__time-label-full'>
-							{formatTime(startTimestampValue)}
-						</span>
+						<span className='event-header-card__time-label-full'>{formatTime(startTimestamp)}</span>
 					</div>
 					{eventType && <span className='event-header-card__event-type'>{eventType}</span>}
 				</>

diff --git a/src/components/embedded/EmbeddedMessage.tsx b/src/components/embedded/EmbeddedMessage.tsx
@@ -30,23 +30,25 @@ function EmbeddedMessage({ messageId }: { messageId: string }) {
 	}, []);
 
 	useEffect(() => {
-		if (message)
-			message.parsedMessages?.forEach((parsedMessage, index) => {
-				const tempMessage = message;
-				const { parsedMessages, ...rest } = tempMessage;
+		if (message?.parsedMessages) {
+			const tempMessageList: EventMessageItem[] = [];
+			message.parsedMessages.forEach(parsedMessage => {
+				const { parsedMessages, ...rest } = message;
 				const tempMessageItem: EventMessageItem = {
 					...rest,
 					parsedMessage: null,
 					parsedMessages: [],
 				};
 
-				tempMessageItem.parsedMessage = tempMessage.parsedMessages
-					? tempMessage.parsedMessages[index]
-					: null;
+				tempMessageItem.parsedMessage = message.parsedMessages ? parsedMessage : null;
 				if (tempMessageItem.parsedMessages && tempMessageItem.parsedMessage)
 					tempMessageItem.parsedMessages[0] = tempMessageItem.parsedMessage;
-				setMessageList([...messageList, tempMessageItem]);
+				tempMessageList.push(tempMessageItem);
 			});
+			setMessageList(messageList => [...messageList, ...tempMessageList]);
+		} else {
+			setMessageList(messageList => [...messageList, message as EventMessageItem]);
+		}
 	});
 
 	async function getMessage() {

diff --git a/src/components/event/EventCardHeader.tsx b/src/components/event/EventCardHeader.tsx
@@ -62,7 +62,6 @@ function EventCardHeader(props: Props) {
 	const { stopSearch, setFormType, updateForm } = useSearchStore();
 
 	const status = isUnknown ? 'unknown' : getEventStatus(event);
-	const startTimestampValue = timestampToNumber(startTimestamp);
 
 	const elapsedTime =
 		endTimestamp && startTimestamp ? getElapsedTime(startTimestamp, endTimestamp) : null;
@@ -100,7 +99,7 @@ function EventCardHeader(props: Props) {
 		setFormType('event');
 		updateForm({
 			parentEvent: eventId,
-			startTimestamp: startTimestampValue,
+			startTimestamp: timestampToNumber(startTimestamp),
 		});
 		setActiveWorkspace(0);
 	}
@@ -129,9 +128,7 @@ function EventCardHeader(props: Props) {
 				<>
 					{elapsedTime && <span className='event-header-card__elapsed-time'>{elapsedTime}</span>}
 					<div className='event-header-card__time-label'>
-						<span className='event-header-card__time-label-full'>
-							{formatTime(startTimestampValue)}
-						</span>
+						<span className='event-header-card__time-label-full'>{formatTime(startTimestamp)}</span>
 					</div>
 					{eventType && (
 						<span className='event-header-card__event-type' onClick={handleTypeClick}>

diff --git a/src/components/message/message-card-list/MessagesVirtualizedList.tsx b/src/components/message/message-card-list/MessagesVirtualizedList.tsx
@@ -15,7 +15,6 @@
  ***************************************************************************** */
 
 import * as React from 'react';
-import { toJS } from 'mobx';
 import { Observer, observer } from 'mobx-react-lite';
 import { Virtuoso, VirtuosoHandle, ListItem } from 'react-virtuoso';
 import moment from 'moment';
@@ -102,26 +101,27 @@ const MessagesVirtualizedList = (props: Props) => {
 	]);
 
 	React.useEffect(() => {
-		toJS(messages).forEach(message =>
-			message.parsedMessages
-				? message.parsedMessages.forEach((parsedMessage, index) => {
-						const tempMessage = message;
-						const { parsedMessages, ...rest } = tempMessage;
-						const tempMessageItem: EventMessageItem = {
-							...rest,
-							parsedMessage: null,
-							parsedMessages: [],
-						};
+		messages.forEach(message => {
+			if (message.parsedMessages) {
+				const tempMessageList: EventMessageItem[] = [];
+				message.parsedMessages.forEach(parsedMessage => {
+					const { parsedMessages, ...rest } = message;
+					const tempMessageItem: EventMessageItem = {
+						...rest,
+						parsedMessage: null,
+						parsedMessages: [],
+					};
 
-						tempMessageItem.parsedMessage = tempMessage.parsedMessages
-							? tempMessage.parsedMessages[index]
-							: null;
-						if (tempMessageItem.parsedMessages && tempMessageItem.parsedMessage)
-							tempMessageItem.parsedMessages[0] = tempMessageItem.parsedMessage;
-						setMessageList(messageListCopy => [...messageListCopy, tempMessageItem]);
-				  })
-				: setMessageList(messageListCopy => [...messageListCopy, message as EventMessageItem]),
-		);
+					tempMessageItem.parsedMessage = message.parsedMessages ? parsedMessage : null;
+					if (tempMessageItem.parsedMessages && tempMessageItem.parsedMessage)
+						tempMessageItem.parsedMessages[0] = tempMessageItem.parsedMessage;
+					tempMessageList.push(tempMessageItem);
+				});
+				setMessageList(messageList => [...messageList, ...tempMessageList]);
+			} else {
+				setMessageList(messageList => [...messageList, message as EventMessageItem]);
+			}
+		});
 	}, [messages]);
 
 	const debouncedScrollHandler = useDebouncedCallback(

diff --git a/src/helpers/date.ts b/src/helpers/date.ts
@@ -39,7 +39,7 @@ export function formatTime(time: string | number) {
 	if (time == null) {
 		return '';
 	}
-	return moment.utc(time).format(DateTimeMask.DATE_TIME_MASK);
+	return moment.utc(new Date(time).getTime()).format(DateTimeMask.DATE_TIME_MASK);
 }
 
 export function timestampToNumber(timestamp: string): number {