diff --git a/clients/core/src/managementConsole/applicationAdministration/pages/ApplicationAssessment/ApplicationsAssessment.tsx b/clients/core/src/managementConsole/applicationAdministration/pages/ApplicationAssessment/ApplicationsAssessment.tsx index 74d8f2e1..61794fba 100644 --- a/clients/core/src/managementConsole/applicationAdministration/pages/ApplicationAssessment/ApplicationsAssessment.tsx +++ b/clients/core/src/managementConsole/applicationAdministration/pages/ApplicationAssessment/ApplicationsAssessment.tsx @@ -20,7 +20,7 @@ import { TableRow, } from '@/components/ui/table' import { columns } from './components/table/columns' -import { useState } from 'react' +import { useEffect, useState } from 'react' import { Input } from '@/components/ui/input' import { SearchIcon } from 'lucide-react' import { FilterMenu } from './components/table/filtering/FilterMenu' @@ -39,7 +39,10 @@ import { useDeleteApplications } from './hooks/useDeleteApplications' export const ApplicationsAssessment = (): JSX.Element => { const { additionalScores, participations } = useApplicationStore() - const [sorting, setSorting] = useState([{ id: 'lastName', desc: false }]) + const [sorting, setSorting] = useState([ + { id: 'passStatus', desc: false }, + { id: 'lastName', desc: false }, + ]) const [globalFilter, setGlobalFilter] = useState('') const [columnFilters, setColumnFilters] = useState([]) const [columnVisibility, setColumnVisibility] = useState({ gender: false }) @@ -92,6 +95,17 @@ export const ApplicationsAssessment = (): JSX.Element => { }, }) + // when sorting for status, this adds sorting by last name + useEffect(() => { + if ( + sorting.find((sort) => sort.id === 'passStatus') && + !sorting.find((sort) => sort.id === 'lastName') + ) { + setSorting((prev) => { + return [...prev, { id: 'lastName', desc: false }] + }) + } + }, [sorting]) const filteredRowsCount = table.getFilteredRowModel().rows.length const totalRowsCount = participations?.length ?? 0