Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@ai-sdk/react": "^3.0.171",
"@datadog/browser-rum": "^7.0.0",
"@datadog/browser-rum-react": "^7.0.0",
"@harperfast/agent-tools": "^1.1.5",
"@harperfast/agent-tools": "^1.1.6",
"@harperfast/skills": "^1.4.1",
"@hookform/resolvers": "^5.0.0",
"@monaco-editor/react": "^4.7.0",
Expand Down
10 changes: 5 additions & 5 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions src/features/instance/log/components/LogsFiltersForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@ export function LogsFiltersForm({
form,
resetFilters,
submitFilters,
showLogName,
}: {
form: UseFormReturn<z.infer<typeof LogFiltersFormSchema>>;
resetFilters: () => void;
submitFilters: (data: z.infer<typeof LogFiltersFormSchema>) => void;
showLogName?: boolean;
}) {
return (
<div>
Expand All @@ -29,6 +31,29 @@ export function LogsFiltersForm({
onSubmit={form.handleSubmit(submitFilters)}
className="flex-col space-y-5"
>
{showLogName && (
<FormField
control={form.control}
name="log_name"
render={({ field }) => (
<FormItem>
<FormLabel>Log File:</FormLabel>
<Select onValueChange={field.onChange} value={field.value ?? undefined}>
<SelectTrigger className="w-full">
<SelectValue placeholder="Select log file" />
</SelectTrigger>
<SelectContent>
<SelectGroup>
<SelectItem value="hdb.log">Application (hdb.log)</SelectItem>
<SelectItem value="system.log">System (system.log)</SelectItem>
</SelectGroup>
</SelectContent>
</Select>
<FormMessage />
</FormItem>
)}
/>
)}
<FormField
control={form.control}
name="limit"
Expand Down
15 changes: 14 additions & 1 deletion src/features/instance/log/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ import { LogsDataTable } from '@/features/instance/log/LogsDataTable';
import { ViewLogModal } from '@/features/instance/log/modals/ViewLogModal';
import { useRefreshClick } from '@/hooks/useRefreshClick';
import { getReadLogQueryOptions, ReadLogItem } from '@/integrations/api/instance/status/getReadLog';
import { getRegistrationInfoQueryOptions } from '@/integrations/api/instance/status/getRegistrationInfo';
import { LogFiltersFormSchema } from '@/integrations/api/instance/status/logFiltersFormSchema';
import { capitalizeWords } from '@/lib/string/capitalizeWords';
import { wasAReleasedBeforeB } from '@/lib/string/wasAReleasedBeforeB';
import { zodResolver } from '@hookform/resolvers/zod';
import { useQuery } from '@tanstack/react-query';
import { ColumnDef } from '@tanstack/react-table';
Expand All @@ -25,6 +27,7 @@ type RowData = {
};

const defaultFormValues: z.infer<typeof LogFiltersFormSchema> = {
log_name: 'hdb.log',
limit: '100',
level: 'undefined',
from: '',
Expand Down Expand Up @@ -120,6 +123,11 @@ export function Logs() {
const [isAutoRefreshEnabled, setIsAutoRefreshEnabled] = useState(false);

const instanceParams = useInstanceClientIdParams();

const { data: registrationInfo } = useQuery(getRegistrationInfoQueryOptions(instanceParams));
const version = registrationInfo?.version;
const isVersion5OrGreater = !!version && wasAReleasedBeforeB('5.0.0', version);

const {
data: instanceLogs,
isLoading,
Expand Down Expand Up @@ -170,7 +178,12 @@ export function Logs() {
return (
<div className="grid grid-cols-1 gap-4 text-white md:grid-cols-12">
<section className="col-span-1 md:col-span-4 lg:col-span-3 px-2 pt-4 md:pt-12">
<LogsFiltersForm form={form} resetFilters={resetFilters} submitFilters={submitFilters} />
<LogsFiltersForm
form={form}
resetFilters={resetFilters}
submitFilters={submitFilters}
showLogName={isVersion5OrGreater}
/>

<div className="flex items-center justify-between space-x-2 mt-2">
<Button
Expand Down
2 changes: 2 additions & 0 deletions src/integrations/api/instance/status/getReadLog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ export async function getReadLog(
level: logFilters.level !== 'undefined' ? logFilters.level : undefined,
from: logFilters.from ? new Date(logFilters.from).toISOString() : undefined,
until: logFilters.until ? new Date(logFilters.until).toISOString() : undefined,
log_name: logFilters.log_name ?? undefined,
order: 'desc',
});
return data;
Expand All @@ -44,6 +45,7 @@ export function getReadLogQueryOptions(params: GetReadLogParams & InstanceClient
logFilters.level,
logFilters.from,
logFilters.until,
logFilters.log_name,
params.replicated,
] as const,
queryFn: () => getReadLog(params),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { z } from 'zod';

export const LogFiltersFormSchema = z.object({
limit: z.string().or(z.undefined()).or(z.null()),
level: z.enum(['notify', 'error', 'warn', 'info', 'debug', 'trace', 'undefined']).or(z.undefined()).or(z.null()),
limit: z.string().or(z.undefined()).or(z.null()).optional(),
level: z.enum(['notify', 'error', 'warn', 'info', 'debug', 'trace', 'undefined']).or(z.undefined()).or(z.null())
.optional(),
from: z.string().or(z.undefined()).or(z.null()).optional(),
until: z.string().or(z.undefined()).or(z.null()).optional(),
log_name: z.enum(['hdb.log', 'system.log']).or(z.undefined()).or(z.null()).optional(),
});