Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-10-27 11:02:16 +01:00
Code Issues Projects Releases Wiki Activity

feat: add event creators data to filter (#7822)

Browse Source 
Adds event creator data to the event creator filter.

It uses a new useEventCreators hook to fetch event creators from the new
API, and uses that to populate the event creators filter.
This commit is contained in:
Thomas Heartman 2024-08-13 10:41:55 +02:00 committed by GitHub
parent bb30032f2e
commit 1b892979d3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 61 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
frontend/src/component/events/EventLog/EventLogFilters.tsx
View File

@ -8,8 +8,11 @@ import useProjects from 'hooks/api/getters/useProjects/useProjects';
import { useFeatureSearch } from 'hooks/api/getters/useFeatureSearch/useFeatureSearch'; import { useFeatureSearch } from 'hooks/api/getters/useFeatureSearch/useFeatureSearch';
import { EventSchemaType } from 'openapi'; import { EventSchemaType } from 'openapi';
import type { IProjectCard } from 'interfaces/project'; import type { IProjectCard } from 'interfaces/project';
import { useEventCreators } from 'hooks/api/getters/useEventCreators/useEventCreators';
const sharedFilters: IFilterItem[] = [ const useSharedFilters = (): IFilterItem[] => {
const { eventCreators } = useEventCreators();
return [
{ {
label: 'Date From', label: 'Date From',
icon: 'today', icon: 'today',
@ -25,10 +28,12 @@ const sharedFilters: IFilterItem[] = [
dateOperators: ['IS'], dateOperators: ['IS'],
}, },
{ {
// todo fill this in with actual values
label: 'Created by', label: 'Created by',
icon: 'person', icon: 'person',
options: [], options: eventCreators.map((creator) => ({
label: creator.name,
value: creator.id.toString(),
})),
filterKey: 'createdBy', filterKey: 'createdBy',
singularOperators: ['IS'], singularOperators: ['IS'],
pluralOperators: ['IS_ANY_OF'], pluralOperators: ['IS_ANY_OF'],
@ -44,7 +49,8 @@ const sharedFilters: IFilterItem[] = [
singularOperators: ['IS'], singularOperators: ['IS'],
pluralOperators: ['IS_ANY_OF'], pluralOperators: ['IS_ANY_OF'],
}, },
]; ];
};
type EventLogFiltersProps = { type EventLogFiltersProps = {
logType: 'flag' | 'project' | 'global'; logType: 'flag' | 'project' | 'global';
@ -60,6 +66,7 @@ export const EventLogFilters: FC<EventLogFiltersProps> = ({
}) => { }) => {
const { projects } = useProjects(); const { projects } = useProjects();
const { features } = useFeatureSearch({}); const { features } = useFeatureSearch({});
const sharedFilters = useSharedFilters();
const [availableFilters, setAvailableFilters] = useState<IFilterItem[]>([]); const [availableFilters, setAvailableFilters] = useState<IFilterItem[]>([]);
useEffect(() => { useEffect(() => {
@ -106,7 +113,11 @@ export const EventLogFilters: FC<EventLogFiltersProps> = ({
]; ];
setAvailableFilters(availableFilters); setAvailableFilters(availableFilters);
}, [JSON.stringify(features), JSON.stringify(projects)]); }, [
JSON.stringify(features),
JSON.stringify(projects),
JSON.stringify(sharedFilters),
]);
return ( return (
<Filters <Filters

13
frontend/src/hooks/api/getters/useEventCreators/useEventCreators.ts Normal file
View File

@ -0,0 +1,13 @@
import { fetcher, useApiGetter } from '../useApiGetter/useApiGetter';
import { formatApiPath } from 'utils/formatPath';
import type { EventCreatorsSchema } from '../../../../openapi';
export const useEventCreators = () => {
const PATH = `api/admin/event-creators`;
const { data, refetch, loading, error } = useApiGetter<EventCreatorsSchema>(
formatApiPath(PATH),
() => fetcher(formatApiPath(PATH), 'Event creators'),
);
return { eventCreators: data || [], refetch, error, loading };
};