Skip to content

refactor: filters refactor - Not urgent #3401

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

Closed
ogzhanolguncu wants to merge 5 commits into from
Closed

refactor: filters refactor - Not urgent #3401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee004a1
refactor: wip
ogzhanolguncu Jun 24, 2025
be1666d
refactor: use same filter structure
ogzhanolguncu Jun 24, 2025
759fff7
refactor: rely on same queryParams
ogzhanolguncu Jun 24, 2025
c1d5fb1
chore: fmt
ogzhanolguncu Jun 24, 2025
d4151b6
chore: fmt
ogzhanolguncu Jun 24, 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
4 changes: 2 additions & 2 deletions ...uthId]/[keyId]/components/table/components/log-details/components/hooks/use-logs-query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ export function useFetchRequestDetails({ requestId }: useFetchRequestDetails) {
startTime: 0,
endTime: timestamp,
host: { filters: [] },
method: { filters: [] },
path: { filters: [] },
methods: { filters: [] },
paths: { filters: [] },
status: { filters: [] },
requestId: requestId
? {
Expand Down
4 changes: 2 additions & 2 deletions ...dashboard/app/(app)/apis/[apiId]/keys/[keyAuthId]/[keyId]/components/table/logs-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ export const KeyDetailsLogsTable = ({ keyspaceId, keyId, selectedLog, onLogSelec
startTime: 0,
endTime: timestamp,
host: { filters: [] },
method: { filters: [] },
path: { filters: [] },
methods: { filters: [] },
paths: { filters: [] },
status: { filters: [] },
requestId: {
filters: [
Expand Down
88 changes: 2 additions & 86 deletions apps/dashboard/app/(app)/logs/components/charts/hooks/use-fetch-timeseries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,95 +1,11 @@
import { formatTimestampForChart } from "@/components/logs/chart/utils/format-timestamp";
import { HISTORICAL_DATA_WINDOW } from "@/components/logs/constants";
import { trpc } from "@/lib/trpc/client";
import { useQueryTime } from "@/providers/query-time-provider";
import { useMemo } from "react";
import type { z } from "zod";
import { useFilters } from "../../../hooks/use-filters";
import type { queryTimeseriesPayload } from "../query-timeseries.schema";
import { buildQueryParams } from "../../../filters.query-params";

export const useFetchTimeseries = () => {
const { filters } = useFilters();

const { queryTime: timestamp } = useQueryTime();
const queryParams = useMemo(() => {
const params: z.infer<typeof queryTimeseriesPayload> = {
startTime: timestamp - HISTORICAL_DATA_WINDOW,
endTime: timestamp,
host: { filters: [] },
method: { filters: [] },
path: { filters: [] },
status: { filters: [] },
since: "",
};

filters.forEach((filter) => {
switch (filter.field) {
case "status": {
params.status?.filters.push({
operator: "is",
value: Number.parseInt(filter.value as string),
});
break;
}

case "methods": {
if (typeof filter.value !== "string") {
console.error("Method filter value type has to be 'string'");
return;
}
params.method?.filters.push({
operator: "is",
value: filter.value,
});
break;
}

case "paths": {
if (typeof filter.value !== "string") {
console.error("Path filter value type has to be 'string'");
return;
}
params.path?.filters.push({
operator: filter.operator,
value: filter.value,
});
break;
}

case "host": {
if (typeof filter.value !== "string") {
console.error("Host filter value type has to be 'string'");
return;
}
params.host?.filters.push({
operator: "is",
value: filter.value,
});
break;
}

case "startTime":
case "endTime": {
if (typeof filter.value !== "number") {
console.error(`${filter.field} filter value type has to be 'number'`);
return;
}
params[filter.field] = filter.value;
break;
}
case "since": {
if (typeof filter.value !== "string") {
console.error("Since filter value type has to be 'string'");
return;
}
params.since = filter.value;
break;
}
}
});

return params;
}, [filters, timestamp]);
const queryParams = buildQueryParams({ timestamp });

const { data, isLoading, isError } = trpc.logs.queryTimeseries.useQuery(queryParams, {
refetchInterval: queryParams.endTime ? false : 10_000,
Expand Down
48 changes: 0 additions & 48 deletions apps/dashboard/app/(app)/logs/components/charts/query-timeseries.schema.ts
View file
Open in desktop

This file was deleted.

101 changes: 2 additions & 99 deletions apps/dashboard/app/(app)/logs/components/table/hooks/use-logs-query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import { HISTORICAL_DATA_WINDOW } from "@/components/logs/constants";
import { trpc } from "@/lib/trpc/client";
import { useQueryTime } from "@/providers/query-time-provider";
import type { Log } from "@unkey/clickhouse/src/logs";
import { useCallback, useEffect, useMemo, useState } from "react";
import type { z } from "zod";
import { useFilters } from "../../../hooks/use-filters";
import type { queryLogsPayload } from "../query-logs.schema";
import { buildQueryParams } from "../../../filters.query-params";

// Duration in milliseconds for historical data fetch window (12 hours)
type UseLogsQueryParams = {
Expand All @@ -25,7 +22,6 @@ export function useLogsQuery({
const [realtimeLogsMap, setRealtimeLogsMap] = useState(() => new Map<string, Log>());
const [totalCount, setTotalCount] = useState(0);

const { filters } = useFilters();
const queryClient = trpc.useUtils();
const { queryTime: timestamp } = useQueryTime();

Expand All @@ -35,100 +31,7 @@ export function useLogsQuery({

const historicalLogs = useMemo(() => Array.from(historicalLogsMap.values()), [historicalLogsMap]);

//Required for preventing double trpc call during initial render
const queryParams = useMemo(() => {
const params: z.infer<typeof queryLogsPayload> = {
limit,
startTime: timestamp - HISTORICAL_DATA_WINDOW,
endTime: timestamp,
host: { filters: [] },
requestId: { filters: [] },
method: { filters: [] },
path: { filters: [] },
status: { filters: [] },
since: "",
};

filters.forEach((filter) => {
switch (filter.field) {
case "status": {
params.status?.filters.push({
operator: "is",
value: Number.parseInt(filter.value as string),
});
break;
}

case "methods": {
if (typeof filter.value !== "string") {
console.error("Method filter value type has to be 'string'");
return;
}
params.method?.filters.push({
operator: "is",
value: filter.value,
});
break;
}

case "paths": {
if (typeof filter.value !== "string") {
console.error("Path filter value type has to be 'string'");
return;
}
params.path?.filters.push({
operator: filter.operator,
value: filter.value,
});
break;
}

case "host": {
if (typeof filter.value !== "string") {
console.error("Host filter value type has to be 'string'");
return;
}
params.host?.filters.push({
operator: "is",
value: filter.value,
});
break;
}

case "requestId": {
if (typeof filter.value !== "string") {
console.error("Request ID filter value type has to be 'string'");
return;
}
params.requestId?.filters.push({
operator: "is",
value: filter.value,
});
break;
}

case "startTime":
case "endTime": {
if (typeof filter.value !== "number") {
console.error(`${filter.field} filter value type has to be 'string'`);
return;
}
params[filter.field] = filter.value;
break;
}
case "since": {
if (typeof filter.value !== "string") {
console.error("Since filter value type has to be 'string'");
return;
}
params.since = filter.value;
break;
}
}
});

return params;
}, [filters, limit, timestamp]);
const queryParams = buildQueryParams({ timestamp, limit });

// Main query for historical data
const {
Expand Down
60 changes: 0 additions & 60 deletions apps/dashboard/app/(app)/logs/components/table/query-logs.schema.ts
View file
Open in desktop

This file was deleted.

Loading
Loading