feat: addressed review comments

This commit is contained in:
=
2025-07-02 23:04:36 +05:30
parent b52ec37f76
commit 3b839d4826
4 changed files with 9 additions and 8 deletions
+2 -2
View File
@@ -116,7 +116,7 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => {
eventType: z.nativeEnum(EventType).optional().describe(AUDIT_LOGS.EXPORT.eventType), eventType: z.nativeEnum(EventType).optional().describe(AUDIT_LOGS.EXPORT.eventType),
userAgentType: z.nativeEnum(UserAgentType).optional().describe(AUDIT_LOGS.EXPORT.userAgentType), userAgentType: z.nativeEnum(UserAgentType).optional().describe(AUDIT_LOGS.EXPORT.userAgentType),
startDate: z.string().datetime().optional().describe(AUDIT_LOGS.EXPORT.startDate), startDate: z.string().datetime().optional().describe(AUDIT_LOGS.EXPORT.startDate),
endDate: z.string().datetime().default(new Date().toISOString()).describe(AUDIT_LOGS.EXPORT.endDate), endDate: z.string().datetime().optional().describe(AUDIT_LOGS.EXPORT.endDate),
offset: z.coerce.number().default(0).describe(AUDIT_LOGS.EXPORT.offset), offset: z.coerce.number().default(0).describe(AUDIT_LOGS.EXPORT.offset),
limit: z.coerce.number().max(1000).default(20).describe(AUDIT_LOGS.EXPORT.limit), limit: z.coerce.number().max(1000).default(20).describe(AUDIT_LOGS.EXPORT.limit),
actor: z.string().optional().describe(AUDIT_LOGS.EXPORT.actor) actor: z.string().optional().describe(AUDIT_LOGS.EXPORT.actor)
@@ -184,7 +184,7 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => {
filter: { filter: {
...req.query, ...req.query,
projectId: req.params.workspaceId, projectId: req.params.workspaceId,
endDate: req.query.endDate, endDate: req.query.endDate || new Date().toISOString(),
startDate: req.query.startDate || getLastMidnightDateISO(), startDate: req.query.startDate || getLastMidnightDateISO(),
auditLogActorId: req.query.actor, auditLogActorId: req.query.actor,
eventType: req.query.eventType ? [req.query.eventType] : undefined eventType: req.query.eventType ? [req.query.eventType] : undefined
@@ -153,7 +153,7 @@ export const registerOrgRouter = async (server: FastifyZodProvider) => {
}) })
.describe(AUDIT_LOGS.EXPORT.eventMetadata), .describe(AUDIT_LOGS.EXPORT.eventMetadata),
startDate: z.string().datetime().optional().describe(AUDIT_LOGS.EXPORT.startDate), startDate: z.string().datetime().optional().describe(AUDIT_LOGS.EXPORT.startDate),
endDate: z.string().datetime().default(new Date().toISOString()).describe(AUDIT_LOGS.EXPORT.endDate), endDate: z.string().datetime().optional().describe(AUDIT_LOGS.EXPORT.endDate),
offset: z.coerce.number().default(0).describe(AUDIT_LOGS.EXPORT.offset), offset: z.coerce.number().default(0).describe(AUDIT_LOGS.EXPORT.offset),
limit: z.coerce.number().max(1000).default(20).describe(AUDIT_LOGS.EXPORT.limit), limit: z.coerce.number().max(1000).default(20).describe(AUDIT_LOGS.EXPORT.limit),
actor: z.string().optional().describe(AUDIT_LOGS.EXPORT.actor) actor: z.string().optional().describe(AUDIT_LOGS.EXPORT.actor)
@@ -209,7 +209,7 @@ export const registerOrgRouter = async (server: FastifyZodProvider) => {
const auditLogs = await server.services.auditLog.listAuditLogs({ const auditLogs = await server.services.auditLog.listAuditLogs({
filter: { filter: {
...req.query, ...req.query,
endDate: req.query.endDate, endDate: req.query.endDatea || new Date().toISOString(),
projectId: req.query.projectId, projectId: req.query.projectId,
startDate: req.query.startDate || getLastMidnightDateISO(), startDate: req.query.startDate || getLastMidnightDateISO(),
auditLogActorId: req.query.actor, auditLogActorId: req.query.actor,
@@ -75,7 +75,7 @@ export const LogsFilter = ({ presets, setFilter, filter }: Props) => {
const workspacesInOrg = workspaces.filter((ws) => ws.orgId === currentOrg?.id); const workspacesInOrg = workspaces.filter((ws) => ws.orgId === currentOrg?.id);
const { control, reset, watch, resetField, setValue, handleSubmit, formState } = const { control, watch, resetField, setValue, handleSubmit, formState } =
useForm<TAuditLogFilterFormData>({ useForm<TAuditLogFilterFormData>({
resolver: zodResolver(auditLogFilterFormSchema), resolver: zodResolver(auditLogFilterFormSchema),
defaultValues: { defaultValues: {
@@ -84,7 +84,7 @@ export const LogsFilter = ({ presets, setFilter, filter }: Props) => {
secretKey: "", secretKey: "",
secretPath: "", secretPath: "",
actor: presets?.actorId, actor: presets?.actorId,
eventType: presets?.eventType || [], eventType: filter?.eventType || [],
userAgentType: undefined userAgentType: undefined
}, },
values: filter values: filter
@@ -130,7 +130,7 @@ export const LogsFilter = ({ presets, setFilter, filter }: Props) => {
</div> </div>
<Button <Button
onClick={() => { onClick={() => {
reset({ setFilter({
eventType: presets?.eventType || [], eventType: presets?.eventType || [],
actor: presets?.actorId, actor: presets?.actorId,
userAgentType: undefined, userAgentType: undefined,
@@ -28,7 +28,8 @@ export const LogsSection = withPermission(
const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp(["upgradePlan"] as const); const { popUp, handlePopUpOpen, handlePopUpToggle } = usePopUp(["upgradePlan"] as const);
const [logFilter, setLogFilter] = useState<TAuditLogFilterFormData>({ const [logFilter, setLogFilter] = useState<TAuditLogFilterFormData>({
eventType: [] eventType: presets?.eventType || [],
actor: presets?.actorId
}); });
const [dateFilter, setDateFilter] = useState<TAuditLogDateFilterFormData>({ const [dateFilter, setDateFilter] = useState<TAuditLogDateFilterFormData>({
startDate: new Date(Number(new Date()) - ms("1h")), startDate: new Date(Number(new Date()) - ms("1h")),