[Frontend] Immediately execute filters before passing them to FilterView

Author: santeri0200

services/frontend/src/components/CoursePopulation/index.jsx

@@ -168,12 +168,12 @@ export const CoursePopulation = () => {
       courses={population?.coursestatistics ?? []}
       displayTray={!isFetching}
       filters={[
-        genderFilter,
-        studentNumberFilter,
-        ageFilter,
+        genderFilter(),
+        studentNumberFilter(),
+        ageFilter(),
         courseFilter({ courses: population?.coursestatistics }),
-        creditsEarnedFilter,
-        startYearAtUniFilter,
+        creditsEarnedFilter(),
+        startYearAtUniFilter(),
         programmeFilter({
           additionalModes: [
             {

services/frontend/src/components/CustomPopulation/index.jsx

@@ -57,15 +57,15 @@ export const CustomPopulation = () => {
 
   const filters = useMemo(() => {
     const filtersList = [
-      genderFilter,
-      ageFilter,
+      genderFilter(),
+      ageFilter(),
       courseFilter({ courses: population?.coursestatistics ?? [] }),
-      creditsEarnedFilter,
-      transferredToProgrammeFilter,
-      startYearAtUniFilter,
-      tagsFilter,
-      programmeFilter,
-      creditDateFilter,
+      creditsEarnedFilter(),
+      transferredToProgrammeFilter(),
+      startYearAtUniFilter(),
+      tagsFilter(),
+      programmeFilter(),
+      creditDateFilter(),
       enrollmentStatusFilter({
         allSemesters,
         programme: associatedProgramme,

services/frontend/src/components/FilterView/index.tsx

@@ -10,7 +10,7 @@ import type { CourseStats } from '@oodikone/shared/routes/populations'
 import { FilterViewContext } from './context'
 import type { FilterContext, FilterViewContextState } from './context'
 
-import type { Filter, FilterFactory } from './filters/createFilter'
+import type { Filter } from './filters/createFilter'
 import { FilterTray } from './FilterTray'
 
 // TODO: Use acual Student type when available
@@ -19,17 +19,15 @@ export type Student = ReturnType<typeof useGetPopulationStatisticsByCourseQuery>
 export const FilterView: FC<{
   children: (filteredStudents: Student[], filteredCourses: any[]) => any
   name: string
-  filters: (FilterFactory | Filter)[]
+  filters: Filter[]
   students: Student[]
   courses: CourseStats[]
   displayTray: boolean
   initialOptions: Record<Filter['key'], any>
-}> = ({ children, name, filters: pFilters, students, courses, displayTray, initialOptions }) => {
+}> = ({ children, name, filters, students, courses, displayTray, initialOptions }) => {
   const dispatch = useAppDispatch()
   const storeFilterOptions = useAppSelector(state => selectViewFilters(state, name))
 
-  const filters: Filter[] = pFilters.map(filter => (typeof filter === 'function' ? filter() : filter))
-
   const filterArgs = Object.fromEntries(filters.map(({ key, args }) => [key, args]))
   const filterOptions = useMemo(
     () =>

services/frontend/src/components/PopulationStatistics/index.tsx

@@ -166,29 +166,29 @@ export const PopulationStatistics = () => {
     useDegreeProgrammeTypes([programmeCode])?.[programmeCode] === 'urn:code:degree-program-type:masters-degree'
 
   const filters = [
-    !useUserHasRestrictedAccess() ? ageFilter : null,
-    citizenshipFilter,
+    !useUserHasRestrictedAccess() ? ageFilter() : null,
+    citizenshipFilter(),
     courseFilter({ courses: population?.coursestatistics }),
-    creditDateFilter,
-    creditsEarnedFilter,
-    curriculumPeriodFilter,
+    creditDateFilter(),
+    creditsEarnedFilter(),
+    curriculumPeriodFilter(),
     enrollmentStatusFilter({
       allSemesters: allSemesters ?? [],
       programme: programmeCode,
     }),
-    genderFilter,
+    genderFilter(),
     graduatedFromProgrammeFilter({
       code: programmeCode,
       combinedProgrammeCode,
       showBachelorAndMaster,
     }),
     hopsFilter({ programmeCode, combinedProgrammeCode }),
-    studentNumberFilter,
-    startYearAtUniFilter,
+    studentNumberFilter(),
+    startYearAtUniFilter(),
     studyTrackFilter({ code: programmeCode }),
     studyRightStatusFilter({ code: programmeCode, combinedProgrammeCode, currentSemester, showBachelorAndMaster }),
-    tagsFilter,
-    transferredToProgrammeFilter,
+    tagsFilter(),
+    transferredToProgrammeFilter(),
     enableStudyRightTypeFilter ? studyRightTypeFilter({ programme: programmeCode }) : null,
 
     // For combined programme admission type is the same as they started in bachelor programme

services/frontend/src/components/StudyGuidanceGroups/SingleStudyGuidanceGroup.jsx

@@ -143,20 +143,20 @@ const SingleStudyGroupFilterView = ({ group, population }) => {
   const { data } = useGetSemestersQuery()
   const { semesters: allSemesters } = data ?? { semesters: {} }
   const viewFilters = [
-    filters.studentNumberFilter,
+    filters.studentNumberFilter(),
     filters.enrollmentStatusFilter({
       allSemesters: allSemesters ?? [],
       programme: group?.tags?.studyProgramme,
     }),
-    filters.ageFilter,
-    filters.genderFilter,
-    filters.startYearAtUniFilter,
-    filters.tagsFilter,
+    filters.ageFilter(),
+    filters.genderFilter(),
+    filters.startYearAtUniFilter(),
+    filters.tagsFilter(),
     filters.courseFilter({
       courses: population?.coursestatistics ?? [],
     }),
-    filters.creditDateFilter,
-    filters.creditsEarnedFilter,
+    filters.creditDateFilter(),
+    filters.creditsEarnedFilter(),
   ]
 
   if (!group?.tags?.studyProgramme) {