From dd6c3fc60e40018e5fc79ac6d84304d444f9ec32 Mon Sep 17 00:00:00 2001
From: Palash <palashgdev@gmail.com>
Date: Tue, 7 Mar 2023 12:53:37 +0530
Subject: [PATCH] feat: color coding is added in the list view

---
 .../src/components/Logs/ListLogView/index.tsx | 87 +++++++++----------
 .../src/components/Logs/ListLogView/styles.ts | 14 +++
 2 files changed, 57 insertions(+), 44 deletions(-)

diff --git a/frontend/src/components/Logs/ListLogView/index.tsx b/frontend/src/components/Logs/ListLogView/index.tsx
index d38102c378..6095d343fc 100644
--- a/frontend/src/components/Logs/ListLogView/index.tsx
+++ b/frontend/src/components/Logs/ListLogView/index.tsx
@@ -1,8 +1,10 @@
 import { blue, grey, orange } from '@ant-design/colors';
 import { CopyFilled, ExpandAltOutlined } from '@ant-design/icons';
+import Convert from 'ansi-to-html';
 import { Button, Divider, Row, Typography } from 'antd';
 import { map } from 'd3';
 import dayjs from 'dayjs';
+import dompurify from 'dompurify';
 import { useNotifications } from 'hooks/useNotifications';
 // utils
 import { FlatLogData } from 'lib/logs/flatLogData';
@@ -19,24 +21,37 @@ import { ILogsReducer } from 'types/reducer/logs';
 import AddToQueryHOC from '../AddToQueryHOC';
 import CopyClipboardHOC from '../CopyClipboardHOC';
 // styles
-import { Container, LogContainer, Text, TextContainer } from './styles';
+import {
+	Container,
+	LogContainer,
+	LogText,
+	SelectedLog,
+	Text,
+	TextContainer,
+} from './styles';
 import { isValidLogField } from './util';
 
+const convert = new Convert();
+
 interface LogFieldProps {
 	fieldKey: string;
 	fieldValue: string;
 }
 function LogGeneralField({ fieldKey, fieldValue }: LogFieldProps): JSX.Element {
+	const html = useMemo(
+		() => ({
+			__html: convert.toHtml(dompurify.sanitize(fieldValue)),
+		}),
+		[fieldValue],
+	);
+
 	return (
 		<TextContainer>
 			<Text ellipsis type="secondary">
-				{fieldKey}
+				{`${fieldKey}: `}
 			</Text>
 			<CopyClipboardHOC textToCopy={fieldValue}>
-				<Typography.Text ellipsis>
-					{': '}
-					{fieldValue}
-				</Typography.Text>
+				<LogText dangerouslySetInnerHTML={html} />
 			</CopyClipboardHOC>
 		</TextContainer>
 	);
@@ -47,31 +62,19 @@ function LogSelectedField({
 	fieldValue = '',
 }: LogFieldProps): JSX.Element {
 	return (
-		<div
-			style={{
-				display: 'flex',
-				overflow: 'hidden',
-				width: '100%',
-			}}
-		>
+		<SelectedLog>
 			<AddToQueryHOC fieldKey={fieldKey} fieldValue={fieldValue}>
 				<Typography.Text>
-					{`"`}
 					<span style={{ color: blue[4] }}>{fieldKey}</span>
-					{`"`}
 				</Typography.Text>
 			</AddToQueryHOC>
 			<CopyClipboardHOC textToCopy={fieldValue}>
 				<Typography.Text ellipsis>
-					<span>
-						{': '}
-						{typeof fieldValue === 'string' && `"`}
-					</span>
-					<span style={{ color: orange[6] }}>{fieldValue}</span>
-					{typeof fieldValue === 'string' && `"`}
+					<span>{': '}</span>
+					<span style={{ color: orange[6] }}>{fieldValue || "''"}</span>
 				</Typography.Text>
 			</CopyClipboardHOC>
-		</div>
+		</SelectedLog>
 	);
 }
 
@@ -111,22 +114,18 @@ function ListLogView({ logData }: ListLogViewProps): JSX.Element {
 	return (
 		<Container>
 			<div>
-				<div>
-					{'{'}
-					<LogContainer>
-						<>
-							<LogGeneralField fieldKey="log" fieldValue={flattenLogData.body} />
-							{flattenLogData.stream && (
-								<LogGeneralField fieldKey="stream" fieldValue={flattenLogData.stream} />
-							)}
-							<LogGeneralField
-								fieldKey="timestamp"
-								fieldValue={dayjs((flattenLogData.timestamp as never) / 1e6).format()}
-							/>
-						</>
-					</LogContainer>
-					{'}'}
-				</div>
+				<LogContainer>
+					<>
+						<LogGeneralField fieldKey="log" fieldValue={flattenLogData.body} />
+						{flattenLogData.stream && (
+							<LogGeneralField fieldKey="stream" fieldValue={flattenLogData.stream} />
+						)}
+						<LogGeneralField
+							fieldKey="timestamp"
+							fieldValue={dayjs((flattenLogData.timestamp as never) / 1e6).format()}
+						/>
+					</>
+				</LogContainer>
 				<div>
 					{map(updatedSelecedFields, (field) =>
 						isValidLogField(flattenLogData[field.name] as never) ? (
@@ -145,19 +144,19 @@ function ListLogView({ logData }: ListLogViewProps): JSX.Element {
 					size="small"
 					type="text"
 					onClick={handleDetailedView}
-					style={{ color: blue[5], padding: 0, margin: 0 }}
+					style={{ color: blue[5] }}
+					icon={<ExpandAltOutlined />}
 				>
-					{' '}
-					<ExpandAltOutlined /> View Details
+					View Details
 				</Button>
 				<Button
 					size="small"
 					type="text"
 					onClick={handleCopyJSON}
-					style={{ padding: 0, margin: 0, color: grey[1] }}
+					style={{ color: grey[1] }}
+					icon={<CopyFilled />}
 				>
-					{' '}
-					<CopyFilled /> Copy JSON
+					Copy JSON
 				</Button>
 			</Row>
 		</Container>
diff --git a/frontend/src/components/Logs/ListLogView/styles.ts b/frontend/src/components/Logs/ListLogView/styles.ts
index ff913cae9c..a73b641e59 100644
--- a/frontend/src/components/Logs/ListLogView/styles.ts
+++ b/frontend/src/components/Logs/ListLogView/styles.ts
@@ -33,3 +33,17 @@ export const TextContainer = styled.div`
 export const LogContainer = styled.div`
 	margin-left: 0.5rem;
 `;
+
+export const LogText = styled.div`
+	display: inline-block;
+
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
+`;
+
+export const SelectedLog = styled.div`
+	display: flex;
+	width: 100%;
+	overflow: hidden;
+`;