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
This commit is contained in:
palashgdev 2023-03-01 17:26:37 +05:30 committed by GitHub
parent 50270281e3
commit e46b7e41e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 6 deletions

View File

@ -103,6 +103,11 @@ function ListLogView({ logData }: ListLogViewProps): JSX.Element {
}); });
}; };
const updatedSelecedFields = useMemo(
() => selected.filter((e) => e.name !== 'id'),
[selected],
);
return ( return (
<Container> <Container>
<div> <div>
@ -123,7 +128,7 @@ function ListLogView({ logData }: ListLogViewProps): JSX.Element {
{'}'} {'}'}
</div> </div>
<div> <div>
{map(selected, (field) => {map(updatedSelecedFields, (field) =>
isValidLogField(flattenLogData[field.name] as never) ? ( isValidLogField(flattenLogData[field.name] as never) ? (
<LogSelectedField <LogSelectedField
key={field.name} key={field.name}

View File

@ -33,8 +33,9 @@ function LogsTableView(props: LogsTableViewProps): JSX.Element {
]); ]);
const columns: ColumnsType<Record<string, unknown>> = useMemo(() => { const columns: ColumnsType<Record<string, unknown>> = useMemo(() => {
const fieldColumns: ColumnsType<Record<string, unknown>> = fields.map( const fieldColumns: ColumnsType<Record<string, unknown>> = fields
({ name }) => ({ .filter((e) => e.name !== 'id')
.map(({ name }) => ({
title: name, title: name,
dataIndex: name, dataIndex: name,
key: name, key: name,
@ -48,8 +49,7 @@ function LogsTableView(props: LogsTableViewProps): JSX.Element {
</Typography.Paragraph> </Typography.Paragraph>
), ),
}), }),
}), }));
);
return [ return [
{ {

View File

@ -7,7 +7,7 @@ import { useSelector } from 'react-redux';
import { AppState } from 'store/reducers'; import { AppState } from 'store/reducers';
import { ILogsReducer } from 'types/reducer/logs'; import { ILogsReducer } from 'types/reducer/logs';
import { ICON_STYLE } from './config'; import { ICON_STYLE, RESTRICTED_SELECTED_FIELDS } from './config';
import FieldItem from './FieldItem'; import FieldItem from './FieldItem';
import { CategoryContainer, FieldContainer } from './styles'; import { CategoryContainer, FieldContainer } from './styles';
import { IHandleInterestProps, IHandleRemoveInterestProps } from './types'; import { IHandleInterestProps, IHandleRemoveInterestProps } from './types';
@ -71,6 +71,7 @@ function LogsFilters(): JSX.Element {
<FieldContainer> <FieldContainer>
{selected {selected
.filter((field) => fieldSearchFilter(field.name, filterValuesInput)) .filter((field) => fieldSearchFilter(field.name, filterValuesInput))
.filter((field) => RESTRICTED_SELECTED_FIELDS.indexOf(field.name) === -1)
.map((field, idx) => ( .map((field, idx) => (
<FieldItem <FieldItem
key={`${JSON.stringify(field)}`} key={`${JSON.stringify(field)}`}