Fix audit logs UI rendering

This commit is contained in:
Tuan Dang
2023-12-04 18:23:04 +07:00
parent c917cf8a18
commit 8b1eaad7b5
5 changed files with 39 additions and 12 deletions
+6 -1
View File
@@ -10,6 +10,11 @@ interface ServiceActorMetadata {
name: string;
}
interface MachineActorMetadata {
machineId: string;
name: string;
}
interface UserActor {
type: ActorType.USER;
metadata: UserActorMetadata;
@@ -22,7 +27,7 @@ export interface ServiceActor {
export interface MachineActor {
type: ActorType.MACHINE;
metadata: ServiceActorMetadata;
metadata: MachineActorMetadata;
}
export type Actor = UserActor | ServiceActor | MachineActor;
@@ -53,8 +53,8 @@ export const LogsFilter = ({ control, reset }: Props) => {
case ActorType.MACHINE:
return (
<SelectItem
value={`${actor.type}-${actor.metadata.serviceId}`}
key={`machine-filter-${actor.metadata.serviceId}`}
value={`${actor.type}-${actor.metadata.machineId}`}
key={`machine-filter-${actor.metadata.machineId}`}
>
{actor.metadata.name}
</SelectItem>
@@ -31,6 +31,7 @@ const AUDIT_LOG_LIMIT = 15;
export const LogsTable = ({ eventType, userAgentType, actor, startDate, endDate }: Props) => {
const { currentWorkspace } = useWorkspace();
const { data, isLoading, isFetchingNextPage, hasNextPage, fetchNextPage } = useGetAuditLogs(
currentWorkspace?._id ?? "",
{