Skip to content

feat: Allow to sort logs by timestamp in ASC direction #787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 6, 2025
Merged

feat: Allow to sort logs by timestamp in ASC direction #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9828308
feat: Allow to sort logs by timestamp in ASC direction
ernestii May 2, 2025
8ba294b
Merge branch 'main' into ernest/hdx-1449-v1-feat-option-to-order-by-t…
teeohhem May 6, 2025
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
66 changes: 54 additions & 12 deletions packages/app/src/LogTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,14 +220,15 @@ export const RawLogTable = memo(
isLoading,
logs,
onInstructionsClick,
// onPropertySearchClick,
onRowExpandClick,
onScroll,
onSettingsClick,
onShowPatternsClick,
wrapLines,
columnNameMap,
showServiceColumn = true,
order,
setOrder,
}: {
wrapLines: boolean;
displayedColumns: string[];
Expand All @@ -244,10 +245,6 @@ export const RawLogTable = memo(
isLoading: boolean;
fetchNextPage: (arg0?: { cb?: VoidFunction }) => any;
onRowExpandClick: (id: string, sortKey: string) => void;
// onPropertySearchClick: (
// name: string,
// value: string | number | boolean,
// ) => void;
hasNextPage: boolean;
highlightedLineId: string | undefined;
onScroll: (scrollTop: number) => void;
Expand All @@ -256,6 +253,8 @@ export const RawLogTable = memo(
tableId?: string;
columnNameMap?: Record<string, string>;
showServiceColumn?: boolean;
order?: 'asc' | 'desc';
setOrder?: (order: 'asc' | 'desc') => void;
}) => {
const dedupLogs = useMemo(() => {
const lIds = new Set();
Expand Down Expand Up @@ -324,10 +323,39 @@ export const RawLogTable = memo(
},
{
accessorKey: 'timestamp',
header: () =>
isSmallScreen
? 'Time'
: `Timestamp${isUTC ? ' (UTC)' : ' (Local)'}`,
header: () => (
<div
Copy link
Preview

Copilot AI May 2, 2025

Choose a reason for hiding this comment

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

Consider adding role="button" and keyboard event support (e.g., onKeyDown) to the clickable header div for improved accessibility.

Suggested change
<div
<div
role="button"
tabIndex={0}

Copilot uses AI. Check for mistakes.

className={cx('d-flex align-items-center', {
'cursor-pointer text-muted-hover': !isLive,
'text-muted': isLive,
})}
title={
order
? isLive
? 'Sort order is fixed in live mode'
: `Sort ${order === 'desc' ? 'ascending' : 'descending'}`
: ''
}
onClick={() => {
setOrder?.(order === 'desc' ? 'asc' : 'desc');
}}
>
{isSmallScreen
? 'Time'
: `Timestamp${isUTC ? ' (UTC)' : ' (Local)'}`}
{order && (
<i
className={`ms-2 fs-7 bi ${
isLive
? 'bi-record-fill effect-pulse text-success'
: order === 'desc'
? 'bi-arrow-down text-white'
: 'bi-arrow-up text-white'
}`}
/>
)}
</div>
),
cell: info => {
// FIXME: since original timestamp doesn't come with timezone info
const date = new Date(info.getValue<string>());
Expand Down Expand Up @@ -429,6 +457,8 @@ export const RawLogTable = memo(
columnSizeStorage,
showServiceColumn,
columnNameMap,
order,
setOrder,
],
);

Expand Down Expand Up @@ -829,10 +859,21 @@ export default function LogTable({
const [instructionsOpen, setInstructionsOpen] = useState(false);
const [settingsOpen, setSettingsOpen] = useState(false);
const [wrapLines, setWrapLines] = useState(false);
const [_order, setOrder] = useState<'asc' | 'desc'>('desc');

const prevQueryConfig = usePrevious({ searchedQuery, isLive });

const resultsKey = [searchedQuery, displayedColumns, isLive].join(':');
// Ensure order is always 'desc' in live mode
const order = isLive ? 'desc' : _order;
useEffect(() => {
// Force set to 'desc' after switching to live mode to ensure
// scrolling down while in live mode doesn't reset the order to 'asc'
if (isLive && _order === 'asc') {
setOrder('desc');
}
}, [_order, isLive, setOrder]);

const resultsKey = [searchedQuery, displayedColumns, isLive, order].join(':');

const {
userPreferences: { isUTC },
Expand All @@ -851,7 +892,7 @@ export default function LogTable({
startDate: searchedTimeRange?.[0] ?? new Date(),
endDate: searchedTimeRange?.[1] ?? new Date(),
extraFields: displayedColumns,
order: 'desc',
order,
onEnd,
resultsKey,
},
Expand Down Expand Up @@ -931,13 +972,14 @@ export default function LogTable({
(args: any) => fetchNextPage({ limit: 200, ...args }),
[fetchNextPage],
)}
// onPropertySearchClick={onPropertySearchClick}
hasNextPage={hasNextPageWhenNotLive}
onRowExpandClick={onRowExpandClick}
onScroll={onScroll}
onShowPatternsClick={onShowPatternsClick}
columnNameMap={columnNameMap}
showServiceColumn={showServiceColumn}
order={order}
setOrder={setOrder}
/>
</>
);
Expand Down
3 changes: 2 additions & 1 deletion packages/app/styles/LogTable.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
@import './variables';

.tableHead {
background: inherit;
background: $bg-hdx-dark;
outline: 1px solid $slate-950;
position: sticky;
top: 0;
}
Expand Down