github/infisical
1
0
Fork 0
mirror of https://github.com/Infisical/infisical.git synced 2026-01-09 07:28:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

add input validation & allow blank input values

Browse Source
This commit is contained in:
x032205
2025-10-07 13:39:47 -04:00
parent 504a8c1d01
commit 0ca583aa87
2 changed files with 49 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
frontend/src/pages/organization/AuditLogsPage/components/LogsDateFilter.tsx
View File

@@ -174,7 +174,7 @@ export const LogsDateFilter = ({ setFilter, filter, timezone, setTimezone }: Pro
<Controller
control={control}
name="relativeModeValue"
render={({ field }) => {
render={({ field, fieldState: { error } }) => {
const duration = field.value?.substring(0, field.value.length - 1);
const unitOfTime = field.value?.at(-1);
return (
@@ -200,31 +200,42 @@ export const LogsDateFilter = ({ setFilter, filter, timezone, setTimezone }: Pro
})}
</div>
))}
<div className="flex items-center gap-2">
<FormControl className="mb-0 w-28" label="Duration">
<Input
type="number"
value={duration || "1"}
onChange={(val) => {
const durationVal = val.target.value;
field.onChange(`${durationVal}${unitOfTime}`);
}}
max={60}
min={1}
/>
</FormControl>
<FormControl className="mb-0 w-36" label="Unit of Time">
<Select
value={unitOfTime}
onValueChange={(val) => field.onChange(`${duration}${val}`)}
className="w-full"
position="popper"
<div className="flex flex-col gap-1">
<div className="flex items-center gap-2">
<FormControl
className="mb-0 w-28"
label="Duration"
isError={Boolean(error)}
>
{RELATIVE_OPTIONS.map((opt) => (
<SelectItem value={opt.unit}>{opt.label}</SelectItem>
))}
</Select>
</FormControl>
<Input
type="number"
value={duration}
onChange={(val) => {
const durationVal = val.target.value;
field.onChange(`${durationVal}${unitOfTime}`);
}}
max={60}
min={1}
/>
</FormControl>
<FormControl className="mb-0 w-36" label="Unit of Time">
<Select
value={unitOfTime}
onValueChange={(val) => field.onChange(`${duration}${val}`)}
className="w-full"
position="popper"
>
{RELATIVE_OPTIONS.map((opt) => (
<SelectItem value={opt.unit}>{opt.label}</SelectItem>
))}
</Select>
</FormControl>
</div>
{error && (
<span className="text-xs text-red-600 text-opacity-90">
{error.message}
</span>
)}
</div>
</div>
);

14
frontend/src/pages/organization/AuditLogsPage/components/types.tsx
View File

@@ -1,3 +1,4 @@
import ms from "ms";
import { z } from "zod";
import { ActorType, EventType, UserAgentType } from "@app/hooks/api/auditLogs/enums";
@@ -27,7 +28,18 @@ export const auditLogFilterFormSchema = z.object({
export const auditLogDateFilterFormSchema = z
.object({
type: z.nativeEnum(AuditLogDateFilterType),
relativeModeValue: z.string().optional(),
relativeModeValue: z
.string()
.refine(
(val) => {
const parsedMs = ms(val);
return typeof parsedMs === "number" && parsedMs > 0;
},
{
message: "Invalid duration format. Must be a positive duration."
}
)
.optional(),
startDate: z.date(),
endDate: z.date()
})