diff --git a/backend/src/ee/routes/v1/project-router.ts b/backend/src/ee/routes/v1/project-router.ts index 9795aaf86..8639ef1a1 100644 --- a/backend/src/ee/routes/v1/project-router.ts +++ b/backend/src/ee/routes/v1/project-router.ts @@ -143,7 +143,8 @@ export const registerProjectRouter = async (server: FastifyZodProvider) => { actorAuthMethod: req.permission.authMethod, projectId: req.params.workspaceId, ...req.query, - startDate: req.query.endDate || getLastMidnightDateISO(), + endDate: req.query.endDate, + startDate: req.query.startDate || getLastMidnightDateISO(), auditLogActor: req.query.actor, actor: req.permission.type }); diff --git a/frontend/src/views/Project/AuditLogsPage/components/LogsFilter.tsx b/frontend/src/views/Project/AuditLogsPage/components/LogsFilter.tsx index 57fdf46d4..011e1a915 100644 --- a/frontend/src/views/Project/AuditLogsPage/components/LogsFilter.tsx +++ b/frontend/src/views/Project/AuditLogsPage/components/LogsFilter.tsx @@ -179,8 +179,9 @@ export const LogsFilter = ({ control, reset }: Props) => { { - onChange(date); + onChange={(pickedDate) => { + pickedDate?.setHours(23, 59, 59, 999); // we choose the end of today not the start of it (going off of aws cloud watch) + onChange(pickedDate); setIsEndDatePickerOpen(false); }} popUpProps={{ diff --git a/frontend/src/views/Project/AuditLogsPage/components/LogsSection.tsx b/frontend/src/views/Project/AuditLogsPage/components/LogsSection.tsx index fcf63bece..e47b423a4 100644 --- a/frontend/src/views/Project/AuditLogsPage/components/LogsSection.tsx +++ b/frontend/src/views/Project/AuditLogsPage/components/LogsSection.tsx @@ -23,7 +23,8 @@ export const LogsSection = () => { defaultValues: { page: 1, perPage: 10, - startDate: new Date(new Date().setDate(new Date().getDate() - 1)) + startDate: new Date(new Date().setDate(new Date().getDate() - 1)), // day before today + endDate: new Date(new Date(Date.now()).setHours(23, 59, 59, 999)) // end of today } });