From e46b7e41e5cef869c861774aa1fcbaa8ce462e47 Mon Sep 17 00:00:00 2001
From: palashgdev <palashgdev@gmail.com>
Date: Wed, 1 Mar 2023 17:26:37 +0530
Subject: [PATCH] feat: restricted_SELECTED_FIELDS is filtered from the
 selected list (#2401)

* feat: restricted_SELECTED_FIELDS is filtered from the selected list

* chore: selected id fields is removed from the rendering part
---
 frontend/src/components/Logs/ListLogView/index.tsx | 7 ++++++-
 frontend/src/components/Logs/TableView/index.tsx   | 8 ++++----
 frontend/src/container/LogsFilters/index.tsx       | 3 ++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/frontend/src/components/Logs/ListLogView/index.tsx b/frontend/src/components/Logs/ListLogView/index.tsx
index d8108062aa..d38102c378 100644
--- a/frontend/src/components/Logs/ListLogView/index.tsx
+++ b/frontend/src/components/Logs/ListLogView/index.tsx
@@ -103,6 +103,11 @@ function ListLogView({ logData }: ListLogViewProps): JSX.Element {
 		});
 	};
 
+	const updatedSelecedFields = useMemo(
+		() => selected.filter((e) => e.name !== 'id'),
+		[selected],
+	);
+
 	return (
 		<Container>
 			<div>
@@ -123,7 +128,7 @@ function ListLogView({ logData }: ListLogViewProps): JSX.Element {
 					{'}'}
 				</div>
 				<div>
-					{map(selected, (field) =>
+					{map(updatedSelecedFields, (field) =>
 						isValidLogField(flattenLogData[field.name] as never) ? (
 							<LogSelectedField
 								key={field.name}
diff --git a/frontend/src/components/Logs/TableView/index.tsx b/frontend/src/components/Logs/TableView/index.tsx
index 3cb6d9a041..4ac289336c 100644
--- a/frontend/src/components/Logs/TableView/index.tsx
+++ b/frontend/src/components/Logs/TableView/index.tsx
@@ -33,8 +33,9 @@ function LogsTableView(props: LogsTableViewProps): JSX.Element {
 	]);
 
 	const columns: ColumnsType<Record<string, unknown>> = useMemo(() => {
-		const fieldColumns: ColumnsType<Record<string, unknown>> = fields.map(
-			({ name }) => ({
+		const fieldColumns: ColumnsType<Record<string, unknown>> = fields
+			.filter((e) => e.name !== 'id')
+			.map(({ name }) => ({
 				title: name,
 				dataIndex: name,
 				key: name,
@@ -48,8 +49,7 @@ function LogsTableView(props: LogsTableViewProps): JSX.Element {
 						</Typography.Paragraph>
 					),
 				}),
-			}),
-		);
+			}));
 
 		return [
 			{
diff --git a/frontend/src/container/LogsFilters/index.tsx b/frontend/src/container/LogsFilters/index.tsx
index d5a673395a..26c3bd739a 100644
--- a/frontend/src/container/LogsFilters/index.tsx
+++ b/frontend/src/container/LogsFilters/index.tsx
@@ -7,7 +7,7 @@ import { useSelector } from 'react-redux';
 import { AppState } from 'store/reducers';
 import { ILogsReducer } from 'types/reducer/logs';
 
-import { ICON_STYLE } from './config';
+import { ICON_STYLE, RESTRICTED_SELECTED_FIELDS } from './config';
 import FieldItem from './FieldItem';
 import { CategoryContainer, FieldContainer } from './styles';
 import { IHandleInterestProps, IHandleRemoveInterestProps } from './types';
@@ -71,6 +71,7 @@ function LogsFilters(): JSX.Element {
 				<FieldContainer>
 					{selected
 						.filter((field) => fieldSearchFilter(field.name, filterValuesInput))
+						.filter((field) => RESTRICTED_SELECTED_FIELDS.indexOf(field.name) === -1)
 						.map((field, idx) => (
 							<FieldItem
 								key={`${JSON.stringify(field)}`}