diff --git a/frontend/src/views/Project/AuditLogsPage/components/LogsFilter.tsx b/frontend/src/views/Project/AuditLogsPage/components/LogsFilter.tsx index 011e1a915..a9f10875c 100644 --- a/frontend/src/views/Project/AuditLogsPage/components/LogsFilter.tsx +++ b/frontend/src/views/Project/AuditLogsPage/components/LogsFilter.tsx @@ -2,6 +2,7 @@ import { useState } from "react"; import { Control, Controller, UseFormReset } from "react-hook-form"; import { faFilterCircleXmark } from "@fortawesome/free-solid-svg-icons"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { twMerge } from "tailwind-merge"; import { Button, DatePicker, FormControl, Select, SelectItem } from "@app/components/v2"; import { useWorkspace } from "@app/context"; @@ -19,11 +20,13 @@ const userAgentTypes = Object.entries(userAgentTTypeoNameMap).map(([value, label })); type Props = { + presetActor?: string; + className?: string; control: Control; reset: UseFormReset; }; -export const LogsFilter = ({ control, reset }: Props) => { +export const LogsFilter = ({ presetActor, className, control, reset }: Props) => { const [isStartDatePickerOpen, setIsStartDatePickerOpen] = useState(false); const [isEndDatePickerOpen, setIsEndDatePickerOpen] = useState(false); @@ -69,8 +72,13 @@ export const LogsFilter = ({ control, reset }: Props) => { }; return ( -
-
+
+
{ label="Event" errorText={error?.message} isError={Boolean(error)} - className="mr-4 w-40" + className="w-40" > { label="Source" errorText={error?.message} isError={Boolean(error)} - className="mr-4 w-40" + className="w-40" >