diff --git a/apps/statgpt-admin-frontend/src/app/audit-logs/page.tsx b/apps/statgpt-admin-frontend/src/app/audit-logs/page.tsx
index 9578ed2..2820dcf 100644
--- a/apps/statgpt-admin-frontend/src/app/audit-logs/page.tsx
+++ b/apps/statgpt-admin-frontend/src/app/audit-logs/page.tsx
@@ -4,6 +4,7 @@ import { SIGN_IN_LINK } from '@/src/constants/auth';
 import { getIsInvalidSession, getUserToken } from '@/src/utils/auth/get-token';
 import { getIsEnableAuthToggle } from '@/src/utils/get-auth-toggle';
 import { AuditLogsListView } from '@/src/components/AuditLogs/AuditLogsListView';
+import { auditLogsApi } from '../api/api';
 
 export const dynamic = 'force-dynamic';
 
@@ -16,5 +17,7 @@ export default async function Page() {
     return redirect(SIGN_IN_LINK);
   }
 
-  return <AuditLogsListView />;
+  const enums = await auditLogsApi.getEnumValues(token);
+
+  return <AuditLogsListView enums={enums} />;
 }
diff --git a/apps/statgpt-admin-frontend/src/components/AuditLogs/AuditLogsListView.tsx b/apps/statgpt-admin-frontend/src/components/AuditLogs/AuditLogsListView.tsx
index bdea0d3..b4eaaa6 100644
--- a/apps/statgpt-admin-frontend/src/components/AuditLogs/AuditLogsListView.tsx
+++ b/apps/statgpt-admin-frontend/src/components/AuditLogs/AuditLogsListView.tsx
@@ -1,7 +1,6 @@
 'use client';
 
-import { useCallback, useEffect, useRef, useState } from 'react';
-import { ListView } from '@/src/components/ListView/ListView';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Menu } from '@/src/constants/menu';
 import type {
   FetchRowsArgs,
@@ -10,18 +9,24 @@ import type {
 import type {
   AuditLog,
   AuditLogDetails,
+  AuditLogEnumValues,
   AuditLogRequestModel,
 } from '@/src/models/audit-log';
-import { AUDIT_LOGS_COLUMNS } from '@/src/constants/columns/grid-columns';
 import { AuditLogsHeader } from './AuditLogsHeader';
 import type { RequestData } from '@/src/models/request-data';
 import { sendGetRequest } from '@/src/server/api';
 import { DEFAULT_GRID_PAGE_SIZE } from '@/src/constants/columns/grid';
 import { useAuditLogFiltersInUrl } from '@/src/hooks/use-audit-logs-filters-in-url';
 import { auditLogRequestToQueryString } from '@/src/utils/audit-logs';
-import { getTextEquals } from '@/src/utils/client/grid';
+import { getEnumFilterValue, getTextEquals } from '@/src/utils/client/grid';
+import { ListContent } from '../ListView/ListContent/ListContent';
+import { getAuditLogsColumns } from '@/src/constants/columns/audit-logs';
 
-export function AuditLogsListView() {
+interface AuditLogsListViewProps {
+  enums?: AuditLogEnumValues | null;
+}
+
+export function AuditLogsListView({ enums }: AuditLogsListViewProps) {
   const [totalCount, setTotalCount] = useState<number | undefined>(undefined);
 
   const { filters, queryKey } = useAuditLogFiltersInUrl();
@@ -37,8 +42,9 @@ export function AuditLogsListView() {
     async (args: FetchRowsArgs): Promise<FetchRowsResult<AuditLog>> => {
       const { created_at_from, created_at_to } = filtersRef.current;
 
-      const entity_type = getTextEquals(args.filterModel, 'entity_type');
-      const action_type = getTextEquals(args.filterModel, 'action_type');
+      const entity_type = getEnumFilterValue(args.filterModel, 'entity_type');
+      const action_type = getEnumFilterValue(args.filterModel, 'action_type');
+
       const entity_id = getTextEquals(args.filterModel, 'entity_id');
 
       const request: AuditLogRequestModel = {
@@ -72,21 +78,24 @@ export function AuditLogsListView() {
     [],
   );
 
+  const columns = useMemo(() => getAuditLogsColumns({ enums }), [enums]);
+
   return (
-    <ListView<AuditLog>
-      colDefs={AUDIT_LOGS_COLUMNS}
-      customHeader={
-        <AuditLogsHeader
-          onRefresh={() => setRefreshToken((x) => x + 1)}
-          count={totalCount}
-        />
-      }
-      emptyDataTitle="No audit logs"
-      menuItem={Menu.AUDIT_LOGS}
-      fetchRows={fetchRows}
-      pageSize={DEFAULT_GRID_PAGE_SIZE}
-      queryKey={queryKey}
-      refreshToken={refreshToken}
-    />
+    <div className="flex flex-col h-full rounded bg-layer-2 common-paddings">
+      <AuditLogsHeader
+        onRefresh={() => setRefreshToken((x) => x + 1)}
+        count={totalCount}
+      />
+      <ListContent<AuditLog>
+        colDefs={columns}
+        emptyDataTitle="No audit logs"
+        menuItem={Menu.AUDIT_LOGS}
+        fetchRows={fetchRows}
+        pageSize={DEFAULT_GRID_PAGE_SIZE}
+        queryKey={queryKey}
+        refreshToken={refreshToken}
+        withHeader={false}
+      />
+    </div>
   );
 }
diff --git a/apps/statgpt-admin-frontend/src/components/AuditLogs/TimePeriodDropdown.tsx b/apps/statgpt-admin-frontend/src/components/AuditLogs/TimePeriodDropdown.tsx
index 058bff2..94a6116 100644
--- a/apps/statgpt-admin-frontend/src/components/AuditLogs/TimePeriodDropdown.tsx
+++ b/apps/statgpt-admin-frontend/src/components/AuditLogs/TimePeriodDropdown.tsx
@@ -343,7 +343,11 @@ export const TimePeriodDropdown = ({
               preventOpenOnFocus
             />
 
-            <Button cssClass="primary" title="Apply" onClick={applyCustom} />
+            <Button
+              cssClass="primary w-fit"
+              title="Apply"
+              onClick={applyCustom}
+            />
           </div>
           <div className="w-full border border-primary my-1" />
         </>
diff --git a/apps/statgpt-admin-frontend/src/components/GridView/CustomFilters/EnumSelectFilter.tsx b/apps/statgpt-admin-frontend/src/components/GridView/CustomFilters/EnumSelectFilter.tsx
new file mode 100644
index 0000000..b0a9e53
--- /dev/null
+++ b/apps/statgpt-admin-frontend/src/components/GridView/CustomFilters/EnumSelectFilter.tsx
@@ -0,0 +1,51 @@
+'use client';
+
+import { EnumSelectFilterModel } from '@/src/models/grid';
+import { normalizeEnumValues } from '@/src/utils/client/grid';
+import React, { useMemo } from 'react';
+
+export interface EnumSelectFilterProps {
+  model: EnumSelectFilterModel;
+  onModelChange: (model: EnumSelectFilterModel) => void;
+  values: readonly string[];
+  allLabel?: string;
+  formatValue?: (v: string) => string;
+  colDef?: { headerName?: string; field?: string };
+}
+
+export function EnumSelectFilter({
+  model,
+  onModelChange,
+  values,
+  allLabel = 'All',
+  formatValue,
+  colDef,
+}: EnumSelectFilterProps) {
+  const options = useMemo(() => normalizeEnumValues(values), [values]);
+  const selected = model?.value ?? '';
+
+  return (
+    <div className="flex flex-col gap-2 p-2">
+      <div className="text-xs text-secondary">
+        {colDef?.headerName ?? colDef?.field ?? 'Filter'}
+      </div>
+
+      <select
+        className="w-full rounded border border-primary bg-layer-2 px-2 py-1 text-sm text-primary outline-none"
+        value={selected}
+        onChange={(e) => {
+          const next = e.target.value;
+          onModelChange(next ? { value: next } : null);
+        }}
+      >
+        <option value="">{allLabel}</option>
+
+        {options.map((v) => (
+          <option key={v} value={v}>
+            {formatValue ? formatValue(v) : v}
+          </option>
+        ))}
+      </select>
+    </div>
+  );
+}
diff --git a/apps/statgpt-admin-frontend/src/components/GridView/CustomFilters/EnumSelectFloatingFilter.tsx b/apps/statgpt-admin-frontend/src/components/GridView/CustomFilters/EnumSelectFloatingFilter.tsx
new file mode 100644
index 0000000..b9a90da
--- /dev/null
+++ b/apps/statgpt-admin-frontend/src/components/GridView/CustomFilters/EnumSelectFloatingFilter.tsx
@@ -0,0 +1,42 @@
+'use client';
+
+import { EnumSelectFilterModel } from '@/src/models/grid';
+import { normalizeEnumValues } from '@/src/utils/client/grid';
+import React, { useMemo } from 'react';
+
+export interface EnumSelectFloatingFilterProps {
+  model: EnumSelectFilterModel;
+  onModelChange: (model: EnumSelectFilterModel) => void;
+  values: readonly string[];
+  allLabel?: string;
+  formatValue?: (v: string) => string;
+}
+
+export function EnumSelectFloatingFilter({
+  model,
+  onModelChange,
+  values,
+  allLabel = 'All',
+  formatValue,
+}: EnumSelectFloatingFilterProps) {
+  const options = useMemo(() => normalizeEnumValues(values), [values]);
+  const selected = model?.value ?? '';
+
+  return (
+    <select
+      className="w-full rounded border border-primary bg-layer-1 my-[1px] px-1 text-xs text-primary outline-none"
+      value={selected}
+      onChange={(e) => {
+        const next = e.target.value;
+        onModelChange(next ? { value: next } : null);
+      }}
+    >
+      <option value="">{allLabel}</option>
+      {options.map((v) => (
+        <option key={v} value={v}>
+          {formatValue ? formatValue(v) : v}
+        </option>
+      ))}
+    </select>
+  );
+}
diff --git a/apps/statgpt-admin-frontend/src/components/GridView/GridView.tsx b/apps/statgpt-admin-frontend/src/components/GridView/GridView.tsx
index 50df0c3..eb317da 100644
--- a/apps/statgpt-admin-frontend/src/components/GridView/GridView.tsx
+++ b/apps/statgpt-admin-frontend/src/components/GridView/GridView.tsx
@@ -1,5 +1,13 @@
 'use client';
 
+import React, {
+  memo,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  useCallback,
+} from 'react';
 import {
   AllCommunityModule,
   ColDef,
@@ -13,7 +21,6 @@ import {
   themeBalham,
 } from 'ag-grid-community';
 import { AgGridReact } from 'ag-grid-react';
-import { useEffect, useMemo, useRef, useState } from 'react';
 
 import { ActionColumn } from '@/src/components/ListView/ActionColumn/ActionColumn';
 import { ACTION_COLUMN_CELL_RENDERER_KEY } from '@/src/constants/columns/action';
@@ -53,7 +60,7 @@ ModuleRegistry.registerModules([AllCommunityModule]);
 const GRID_CUSTOM_COMPONENT = {
   [ACTION_COLUMN_CELL_RENDERER_KEY]: ActionColumn,
   [AUDIT_LOG_DETAILS_CELL_RENDERER_KEY]: AuditLogDetailsCellRenderer,
-};
+} as const;
 
 const GRID_THEME_COLORS = {
   accentColor: 'var(--controls-bg-accent, #5C8DEA)',
@@ -73,9 +80,9 @@ const GRID_THEME_COLORS = {
   fontFamily: {
     googleFont: 'var(--theme-font, var(--font-inter))',
   },
-};
+} as const;
 
-export function GridView<T = BaseEntity>({
+function GridViewInner<T = BaseEntity>({
   data,
   colDefs,
   emptyDataTitle,
@@ -97,6 +104,18 @@ export function GridView<T = BaseEntity>({
 
   const isInfinite = typeof fetchRows === 'function';
 
+  const gridTheme = useMemo(() => {
+    return themeBalham.withPart(colorSchemeDark).withParams(GRID_THEME_COLORS);
+  }, []);
+
+  const defaultColDef = useMemo<ColDef>(() => {
+    return {
+      floatingFilter: true,
+      tooltipValueGetter: (p: ITooltipParams) =>
+        p.data?.[(p.colDef as ColDef)?.field || ''],
+    };
+  }, []);
+
   useEffect(() => {
     if (!api || !isInfinite) return;
     api.purgeInfiniteCache();
@@ -147,40 +166,46 @@ export function GridView<T = BaseEntity>({
 
   const shouldShowEmpty = !isInfinite && (!data || data.length === 0);
 
+  const onGridReady = useCallback((e: any) => {
+    setApi(e.api);
+  }, []);
+
+  const lastDatasourceRef = useRef<IDatasource | undefined>(undefined);
+  useEffect(() => {
+    if (!api || !isInfinite) return;
+    if (!datasource) return;
+
+    if (lastDatasourceRef.current !== datasource) {
+      lastDatasourceRef.current = datasource;
+      api.setGridOption('datasource', datasource);
+    }
+  }, [api, datasource, isInfinite]);
+
   return shouldShowEmpty ? (
     <EmptyState title={emptyDataTitle} />
   ) : (
     <div className="ag-theme-balham-dark h-full">
       <AgGridReact
         columnDefs={colDefs}
-        theme={themeBalham
-          .withPart(colorSchemeDark)
-          .withParams({ ...GRID_THEME_COLORS })}
+        theme={gridTheme}
         headerHeight={28}
         rowHeight={32}
         suppressCellFocus={true}
         components={GRID_CUSTOM_COMPONENT}
-        onGridReady={(e) => {
-          setApi(e.api);
-
-          if (datasource) {
-            e.api.setGridOption('datasource', datasource);
-          }
-        }}
+        onGridReady={onGridReady}
         tooltipShowDelay={500}
-        defaultColDef={{
-          floatingFilter: true,
-          tooltipValueGetter: (p: ITooltipParams) =>
-            p.data?.[(p.colDef as ColDef)?.field || ''],
-        }}
+        defaultColDef={defaultColDef}
         onGridSizeChanged={(e) => e.api.sizeColumnsToFit()}
         rowModelType={isInfinite ? 'infinite' : undefined}
         rowData={isInfinite ? undefined : (data ?? [])}
         cacheBlockSize={isInfinite ? pageSize : undefined}
         maxBlocksInCache={isInfinite ? 5 : undefined}
         infiniteInitialRowCount={isInfinite ? pageSize : undefined}
+        enableFilterHandlers={true}
         {...additionalOptions}
       />
     </div>
   );
 }
+
+export const GridView = memo(GridViewInner) as typeof GridViewInner;
diff --git a/apps/statgpt-admin-frontend/src/components/ListView/ListContent/ListContent.tsx b/apps/statgpt-admin-frontend/src/components/ListView/ListContent/ListContent.tsx
index 97a7cdf..b9b51c3 100644
--- a/apps/statgpt-admin-frontend/src/components/ListView/ListContent/ListContent.tsx
+++ b/apps/statgpt-admin-frontend/src/components/ListView/ListContent/ListContent.tsx
@@ -2,7 +2,7 @@
 
 import { ColDef, GridOptions } from 'ag-grid-community';
 import { useRouter } from 'next/navigation';
-import { ReactNode } from 'react';
+import { useMemo, useCallback } from 'react';
 
 import { Menu, MenuUrl } from '@/src/constants/menu';
 import { BaseEntity } from '@/src/models/base-entity';
@@ -17,7 +17,7 @@ interface Props<T = BaseEntity> {
   menuItem: Menu;
   colDefs: ColDef[];
   emptyDataTitle: string;
-  customHeader?: ReactNode;
+  withHeader?: boolean;
   data?: T[];
   fetchRows?: (args: FetchRowsArgs) => Promise<FetchRowsResult<T>>;
   pageSize?: number;
@@ -31,66 +31,73 @@ export function ListContent<T = BaseEntity>({
   colDefs,
   emptyDataTitle,
   data,
-  customHeader,
   fetchRows,
   pageSize,
   totalCount,
   queryKey,
   refreshToken,
+  withHeader = true,
 }: Props<T>) {
   const router = useRouter();
-  const columns = colDefs.map((col) => {
-    if (col.field === 'metadata.publication_date') {
-      return {
-        ...col,
-        valueGetter: ({
-          data,
-        }: {
-          data: { metadata: { publication_date: string } };
-        }) =>
-          data?.metadata?.publication_date
-            ? new Date(data.metadata.publication_date).getTime()
-            : null,
-        valueFormatter: ({ value }: { value: number | null }) =>
-          value ? new Date(value).toLocaleDateString() : '',
-      };
-    }
-    if (col.field === 'created_at') {
-      return {
-        ...col,
-        valueGetter: ({ data }: { data: { created_at: string } }) =>
-          data?.created_at ? new Date(data.created_at).getTime() : null,
-        valueFormatter: ({ value }: { value: number | null }) =>
-          value ? new Date(value).toLocaleString() : '',
-      };
-    }
-    return col;
-  });
 
-  const gridOptions: GridOptions = {
-    onCellClicked: (event) => {
+  const onCellClicked = useCallback(
+    (event: any) => {
       if (event.colDef.field == null || menuItem !== Menu.CHANNELS) {
-        //action column
         return;
       }
 
-      if (event.data.id && menuItem === Menu.CHANNELS) {
+      if (event.data?.id && menuItem === Menu.CHANNELS) {
         router.push(`${MenuUrl.CHANNELS}/${event.data.id}`);
       }
     },
-  };
+    [menuItem, router],
+  );
+
+  const gridOptions: GridOptions = useMemo(
+    () => ({
+      onCellClicked,
+    }),
+    [onCellClicked],
+  );
+
+  const columns: ColDef[] = useMemo(() => {
+    return colDefs.map((col) => {
+      if (col.field === 'metadata.publication_date') {
+        return {
+          ...col,
+          valueGetter: ({
+            data,
+          }: {
+            data: { metadata?: { publication_date?: string } };
+          }) =>
+            data?.metadata?.publication_date
+              ? new Date(data.metadata.publication_date).getTime()
+              : null,
+          valueFormatter: ({ value }: { value: number | null }) =>
+            value ? new Date(value).toLocaleDateString() : '',
+        };
+      }
+
+      if (col.field === 'created_at') {
+        return {
+          ...col,
+          valueGetter: ({ data }: { data: { created_at?: string } }) =>
+            data?.created_at ? new Date(data.created_at).getTime() : null,
+          valueFormatter: ({ value }: { value: number | null }) =>
+            value ? new Date(value).toLocaleString() : '',
+        };
+      }
+
+      return col;
+    });
+  }, [colDefs]);
 
   const headerCount =
     typeof totalCount === 'number' ? totalCount : data?.length;
 
   return (
     <>
-      {customHeader ? (
-        customHeader
-      ) : (
-        <ListHeader title={menuItem} count={headerCount ?? 0} />
-      )}
-
+      {withHeader && <ListHeader title={menuItem} count={headerCount ?? 0} />}
       <div className="flex-1 min-h-0 mt-4">
         <GridView<T>
           colDefs={columns}
diff --git a/apps/statgpt-admin-frontend/src/components/ListView/ListView.tsx b/apps/statgpt-admin-frontend/src/components/ListView/ListView.tsx
index 08bd941..ef5c0d1 100644
--- a/apps/statgpt-admin-frontend/src/components/ListView/ListView.tsx
+++ b/apps/statgpt-admin-frontend/src/components/ListView/ListView.tsx
@@ -1,5 +1,4 @@
 import { ColDef } from 'ag-grid-community';
-import { ReactNode } from 'react';
 
 import { Menu } from '@/src/constants/menu';
 import { BaseEntity } from '@/src/models/base-entity';
@@ -13,7 +12,7 @@ interface Props<T = BaseEntity> {
   menuItem: Menu;
   colDefs: ColDef[];
   emptyDataTitle: string;
-  customHeader?: ReactNode;
+  withHeader?: boolean;
   data?: T[];
   fetchRows?: (args: FetchRowsArgs) => Promise<FetchRowsResult<T>>;
   pageSize?: number;
@@ -27,7 +26,7 @@ export function ListView<T = BaseEntity>({
   colDefs,
   emptyDataTitle,
   data,
-  customHeader,
+  withHeader,
   fetchRows,
   pageSize,
   totalCount,
@@ -44,7 +43,7 @@ export function ListView<T = BaseEntity>({
         pageSize={pageSize}
         totalCount={totalCount}
         emptyDataTitle={emptyDataTitle}
-        customHeader={customHeader}
+        withHeader={withHeader}
         queryKey={queryKey}
         refreshToken={refreshToken}
       />
diff --git a/apps/statgpt-admin-frontend/src/constants/columns/audit-logs.ts b/apps/statgpt-admin-frontend/src/constants/columns/audit-logs.ts
new file mode 100644
index 0000000..b46cf1b
--- /dev/null
+++ b/apps/statgpt-admin-frontend/src/constants/columns/audit-logs.ts
@@ -0,0 +1,76 @@
+import { AUDIT_LOG_DETAILS_CELL_RENDERER_KEY } from '@/src/components/AuditLogs/AuditLogDetails/AuditLogDetailsCellRenderer';
+import { EnumSelectFilter } from '@/src/components/GridView/CustomFilters/EnumSelectFilter';
+import { EnumSelectFloatingFilter } from '@/src/components/GridView/CustomFilters/EnumSelectFloatingFilter';
+import { AuditLog, AuditLogEnumValues } from '@/src/models/audit-log';
+import { ColDef } from 'ag-grid-community';
+
+const EQUALS_ONLY_FILTER = {
+  filterOptions: ['equals'],
+  defaultOption: 'equals',
+  suppressAndOrCondition: true,
+  debounceMs: 400,
+};
+
+export const getAuditLogsColumns = ({
+  enums,
+}: {
+  enums?: AuditLogEnumValues | null;
+}): ColDef[] => [
+  {
+    field: 'action_type',
+    headerName: 'Action',
+    filter: EnumSelectFilter,
+    filterParams: {
+      values: enums?.action_types ?? [],
+    },
+    floatingFilter: true,
+    floatingFilterComponent: EnumSelectFloatingFilter,
+    floatingFilterComponentParams: {
+      values: enums?.action_types ?? [],
+    },
+  },
+  {
+    field: 'entity_type',
+    headerName: 'Entity type',
+    filter: EnumSelectFilter,
+    filterParams: {
+      values: enums?.entity_types ?? [],
+    },
+    floatingFilter: true,
+    floatingFilterComponent: EnumSelectFloatingFilter,
+    floatingFilterComponentParams: {
+      values: enums?.entity_types ?? [],
+    },
+  },
+  {
+    field: 'entity_id',
+    headerName: 'Entity ID',
+    filter: 'agTextColumnFilter',
+    filterParams: EQUALS_ONLY_FILTER,
+  },
+  {
+    field: 'entity_name',
+    headerName: 'Entity name',
+  },
+  {
+    field: 'performed_by_name',
+    headerName: 'Initiated',
+    valueGetter: ({ data }: { data: AuditLog }) => {
+      return data?.performed_by_name ?? data?.performed_by ?? '';
+    },
+  },
+  {
+    field: 'trace_id',
+    headerName: 'Activity ID',
+  },
+  {
+    field: 'created_at',
+    headerName: 'Time',
+  },
+  {
+    width: 32,
+    maxWidth: 32,
+    cellRenderer: AUDIT_LOG_DETAILS_CELL_RENDERER_KEY,
+    cellClass: 'ag-grid__action-column',
+  },
+];
diff --git a/apps/statgpt-admin-frontend/src/constants/columns/grid-columns.ts b/apps/statgpt-admin-frontend/src/constants/columns/grid-columns.ts
index 5db3d01..7c5d0f2 100644
--- a/apps/statgpt-admin-frontend/src/constants/columns/grid-columns.ts
+++ b/apps/statgpt-admin-frontend/src/constants/columns/grid-columns.ts
@@ -1,4 +1,3 @@
-import { AuditLog } from '@/src/models/audit-log';
 import { ColDef } from 'ag-grid-community';
 
 import { Menu } from '@/src/constants/menu';
@@ -7,7 +6,6 @@ import {
   CONNECTION_TYPE_COLUMN,
 } from '@/src/constants/columns/common-columns';
 import { ACTION_COLUMN, EntityOperation } from '@/src/constants/columns/action';
-import { AUDIT_LOG_DETAILS_CELL_RENDERER_KEY } from '@/src/components/AuditLogs/AuditLogDetails/AuditLogDetailsCellRenderer';
 
 export const DATA_SOURCE_COLUMNS: ColDef[] = [
   ...BASE_COLUMNS,
@@ -87,56 +85,3 @@ export const DOCUMENTS_COLUMNS_WITH_ACTIONS: ColDef[] = [
   },
   ACTION_COLUMN(Menu.DOCUMENTS, [EntityOperation.Delete]),
 ];
-
-const EQUALS_ONLY_FILTER = {
-  filterOptions: ['equals'],
-  defaultOption: 'equals',
-  suppressAndOrCondition: true,
-  debounceMs: 400,
-};
-
-export const AUDIT_LOGS_COLUMNS: ColDef[] = [
-  {
-    field: 'action_type',
-    headerName: 'Action',
-    filter: 'agTextColumnFilter',
-    filterParams: EQUALS_ONLY_FILTER,
-  },
-  {
-    field: 'entity_type',
-    headerName: 'Entity type',
-    filter: 'agTextColumnFilter',
-    filterParams: EQUALS_ONLY_FILTER,
-  },
-  {
-    field: 'entity_id',
-    headerName: 'Entity ID',
-    filter: 'agTextColumnFilter',
-    filterParams: EQUALS_ONLY_FILTER,
-  },
-  {
-    field: 'entity_name',
-    headerName: 'Entity name',
-  },
-  {
-    field: 'performed_by_name',
-    headerName: 'Initiated',
-    valueGetter: ({ data }: { data: AuditLog }) => {
-      return data?.performed_by_name ?? data?.performed_by ?? '';
-    },
-  },
-  {
-    field: 'trace_id',
-    headerName: 'Activity ID',
-  },
-  {
-    field: 'created_at',
-    headerName: 'Time',
-  },
-  {
-    width: 32,
-    maxWidth: 32,
-    cellRenderer: AUDIT_LOG_DETAILS_CELL_RENDERER_KEY,
-    cellClass: 'ag-grid__action-column',
-  },
-];
diff --git a/apps/statgpt-admin-frontend/src/models/audit-log.ts b/apps/statgpt-admin-frontend/src/models/audit-log.ts
index 3e53d54..a0311f4 100644
--- a/apps/statgpt-admin-frontend/src/models/audit-log.ts
+++ b/apps/statgpt-admin-frontend/src/models/audit-log.ts
@@ -29,3 +29,8 @@ export interface AuditLogRequestModel extends AuditLogTimeRange {
   entity_id?: string;
   performed_by?: string;
 }
+
+export interface AuditLogEnumValues {
+  entity_types: string[];
+  action_types: string[];
+}
diff --git a/apps/statgpt-admin-frontend/src/models/grid.ts b/apps/statgpt-admin-frontend/src/models/grid.ts
index 3793790..a656bd9 100644
--- a/apps/statgpt-admin-frontend/src/models/grid.ts
+++ b/apps/statgpt-admin-frontend/src/models/grid.ts
@@ -3,3 +3,5 @@ export interface AgTextEqualsFilterModel {
   type: 'equals';
   filter?: string;
 }
+
+export type EnumSelectFilterModel = { value: string } | null;
diff --git a/apps/statgpt-admin-frontend/src/server/audit-logs-api.ts b/apps/statgpt-admin-frontend/src/server/audit-logs-api.ts
index 5f8ab69..cb996a2 100644
--- a/apps/statgpt-admin-frontend/src/server/audit-logs-api.ts
+++ b/apps/statgpt-admin-frontend/src/server/audit-logs-api.ts
@@ -1,6 +1,7 @@
 import {
   AuditLog,
   AuditLogDetails,
+  AuditLogEnumValues,
   AuditLogRequestModel,
 } from '@/src/models/audit-log';
 import { JWT } from 'next-auth/jwt';
@@ -13,6 +14,7 @@ const AUDIT_LOGS_URL = `${MAIN_API}/audit-logs`;
 const AUDIT_LOGS_ID_URL = (id?: string | number): string =>
   `${AUDIT_LOGS_URL}/${id}`;
 const EXPORT_URL = `${AUDIT_LOGS_URL}/export`;
+const ENUM_VALUES_URL = `${AUDIT_LOGS_URL}/enum-values`;
 
 export class AuditLogsApi extends BaseApi {
   getAuditLogs(
@@ -50,4 +52,8 @@ export class AuditLogsApi extends BaseApi {
 
     return this.streamRequest(url, token);
   }
+
+  getEnumValues(token: JWT | null): Promise<AuditLogEnumValues | null> {
+    return this.get(ENUM_VALUES_URL, token);
+  }
 }
diff --git a/apps/statgpt-admin-frontend/src/utils/client/grid.ts b/apps/statgpt-admin-frontend/src/utils/client/grid.ts
index 2d46898..dede75f 100644
--- a/apps/statgpt-admin-frontend/src/utils/client/grid.ts
+++ b/apps/statgpt-admin-frontend/src/utils/client/grid.ts
@@ -25,3 +25,26 @@ export function getNumberEquals(
   const numberValue = Number(value);
   return Number.isFinite(numberValue) ? numberValue : undefined;
 }
+
+export function getEnumFilterValue(
+  filterModel: unknown,
+  field: string,
+): string | undefined {
+  const model = filterModel as Record<string, any> | undefined;
+  const filter = model?.[field] as { value?: string } | undefined;
+  const value = typeof filter?.value === 'string' ? filter.value.trim() : '';
+  return value || undefined;
+}
+
+export function normalizeEnumValues(values: readonly string[]) {
+  const seen = new Set<string>();
+  const out: string[] = [];
+  for (const v of values ?? []) {
+    const s = String(v);
+    if (!seen.has(s)) {
+      seen.add(s);
+      out.push(s);
+    }
+  }
+  return out;
+}