File tree Expand file tree Collapse file tree 5 files changed +11
-6
lines changed
components/PopulationStudents/StudentTable/GeneralTab
StudyProgramme/StudyProgrammeSelector Expand file tree Collapse file tree 5 files changed +11
-6
lines changed Original file line number Diff line number Diff line change @@ -84,8 +84,9 @@ export const GeneralTab = ({
8484 columnFunction : ( ) => [ string [ ] , string [ ] ]
8585 formattingFunction : ( ) => Partial < FormattedStudentData > [ ]
8686} ) => {
87- const { data : degreeProgrammes } = useGetProgrammesQuery ( )
87+ const { data : degreeData } = useGetProgrammesQuery ( )
8888 const { isAdmin } = useGetAuthorizedUserQuery ( )
89+ const degreeProgrammes = degreeData ?. filteredProgrammes ?? { }
8990
9091 const columns = useGetColumnDefinitions ( {
9192 programme,
Original file line number Diff line number Diff line change 11import { useGetProgrammesQuery } from '@/redux/populations'
22
33export const useDegreeProgrammeTypes = ( programmeCodes : string [ ] ) => {
4- const { data : degreeProgrammes } = useGetProgrammesQuery ( )
4+ const { data } = useGetProgrammesQuery ( )
5+ const degreeProgrammes = data ?. filteredProgrammes
56 if ( ! degreeProgrammes ) {
67 return { } as Record < string , string | null >
78 }
Original file line number Diff line number Diff line change @@ -69,10 +69,12 @@ export const StudyrightsTable = ({
6969 selectedStudyPlanId : string | null
7070} ) => {
7171 const { getTextIn } = useLanguage ( )
72- const { data : studyProgrammes } = useGetProgrammesQuery ( )
72+ const { data } = useGetProgrammesQuery ( )
7373 const { data : semesters } = useGetSemestersQuery ( )
7474 const { currentSemester } = semesters ?? { currentSemester : null }
7575
76+ const studyProgrammes = data ?. filteredProgrammes ?? { }
77+
7678 if ( ! student ) return null
7779
7880 // Study right elements are sorted by end date in descending order in the backend so the newest programme is the first one
Original file line number Diff line number Diff line change @@ -30,8 +30,8 @@ export type CombinedDegreeProgramme = Omit<
3030
3131export const StudyProgrammeSelector = ( ) => {
3232 const { getTextIn } = useLanguage ( )
33- const { data : programmes , isLoading } = useGetProgrammesQuery ( )
34- const studyProgrammes = Object . values ( programmes ?. filteredProgrammes ?? { } )
33+ const { data, isLoading } = useGetProgrammesQuery ( )
34+ const studyProgrammes = Object . values ( data ?. filteredProgrammes ?? { } )
3535 const currentCurriculumPeriod = useCurrentCurriculumPeriod ( )
3636 const [ filter , setFilter ] = useState ( '' )
3737 const [ otherProgrammesVisible , setOtherProgrammesVisible ] = useState ( false )
Original file line number Diff line number Diff line change @@ -31,7 +31,8 @@ export const UsersTable = ({
3131} ) => {
3232 const { getTextIn } = useLanguage ( )
3333 const { data : roles = [ ] } = useGetRolesQuery ( )
34- const { data : studyProgrammes = { } } = useGetProgrammesQuery ( )
34+ const { data } = useGetProgrammesQuery ( )
35+ const studyProgrammes = data ?. filteredProgrammes ?? { }
3536
3637 const iamGroups = [ ...new Set ( users . map ( user => user . iamGroups ) . flat ( ) ) ]
3738
You can’t perform that action at this time.
0 commit comments