Skip to content
This repository was archived by the owner on May 13, 2025. It is now read-only.

Json/valid cols #299

Merged
merged 13 commits into from
Aug 23, 2024
Merged

Json/valid cols #299

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1ed94c7
Show only valid logs in JSON table
Koustavd18 Aug 20, 2024
5d3b345
WIP
Koustavd18 Aug 21, 2024
c586827
Handle field with null as value
Koustavd18 Aug 21, 2024
0bfadc6
Null fields wont be visible
Koustavd18 Aug 22, 2024
6ac6470
Comments resolved
Koustavd18 Aug 22, 2024
55a238b
WIP
Koustavd18 Aug 22, 2024
5896f4c
Comments resolved
Koustavd18 Aug 22, 2024
f594023
Show headers when value is available
Koustavd18 Aug 22, 2024
955a6a4
render logic simplified with an exit condition
Koustavd18 Aug 22, 2024
4a714b2
Changes in render logic
Koustavd18 Aug 23, 2024
9691598
Changes in render logic
Koustavd18 Aug 23, 2024
485045d
comments resolved
Koustavd18 Aug 23, 2024
670032e
Empty Line added
Koustavd18 Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 16 additions & 14 deletions src/pages/Stream/Views/Explore/JSONView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
STREAM_PRIMARY_TOOLBAR_CONTAINER_HEIGHT,
STREAM_SECONDARY_TOOLBAR_HRIGHT,
} from '@/constants/theme';
import { columnsToSkip, useLogsStore, logsStoreReducers, isJqSearch } from '../../providers/LogsProvider';
import { useLogsStore, logsStoreReducers, isJqSearch } from '../../providers/LogsProvider';
import { Log } from '@/@types/parseable/api/query';
import _ from 'lodash';
import jqSearch from '@/utils/jqSearch';
Expand Down Expand Up @@ -61,25 +61,29 @@ const CopyIcon = (props: { log: Log }) => {

const Row = (props: {
log: Log;
headers: string[];
searchValue: string;
disableHighlight: boolean;
shouldHighlight: (val: number | string | Date | null) => boolean;
}) => {
const { log, headers, disableHighlight, shouldHighlight } = props;
const { log, disableHighlight, shouldHighlight } = props;

return (
<Stack style={{ flexDirection: 'row' }} className={classes.rowContainer} gap={0}>
<span>
{_.isObject(log) ? (
_.map(headers, (header, index) => (
<Item
header={header}
key={index}
value={_.toString(log[header])}
highlight={disableHighlight ? false : shouldHighlight(log[header])}
/>
))
_.map(log, (value, key) => {
//skiping fields with empty strings
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why this is still needed.
If you are iterating over a log object, why you'd want to test whether its empty or not ?

if (!_.toString(value)) return;

return (
<Item
header={key}
key={key}
value={_.toString(value)}
highlight={disableHighlight ? false : shouldHighlight(value)}
/>
);
})
) : (
<Item
header={null}
Expand All @@ -94,8 +98,7 @@ const Row = (props: {
};

const JsonRows = (props: { isSearching: boolean }) => {
const [{ pageData, headers, instantSearchValue }] = useLogsStore((store) => store.tableOpts);
const sanitizedHeaders = _.without(headers, ...columnsToSkip);
const [{ pageData, instantSearchValue }] = useLogsStore((store) => store.tableOpts);
const disableHighlight = props.isSearching || _.isEmpty(instantSearchValue) || isJqSearch(instantSearchValue);
const regExp = disableHighlight ? null : new RegExp(instantSearchValue, 'i');

Expand All @@ -112,7 +115,6 @@ const JsonRows = (props: { isSearching: boolean }) => {
<Row
log={d}
key={index}
headers={sanitizedHeaders}
searchValue={instantSearchValue}
disableHighlight={disableHighlight}
shouldHighlight={shouldHighlight}
Expand Down