Skip to content

Commit 4eb04b4

Browse files
authored
IS-3020: Fix ufordelte brukere bug (#567)
1 parent 0e22712 commit 4eb04b4

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

src/sider/oversikt/sokeresultat/Sokeresultat.tsx

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
} from '@/utils/hendelseFilteringUtils';
1515
import { useFilters } from '@/context/filters/FilterContext';
1616
import { OversiktTableContainer } from '@/sider/oversikt/sokeresultat/oversikttable/OversiktTableContainer';
17-
import { useTabType } from '@/hooks/useTabType';
17+
import { TabType, useTabType } from '@/hooks/useTabType';
1818
import { filterUfordelteBrukere } from '@/sider/oversikt/filter/UfordelteBrukereFilter';
1919

2020
interface Props {
@@ -44,19 +44,22 @@ export default function Sokeresultat({ allEvents }: Props) {
4444
setMarkertePersoner([]);
4545
}, [selectedTab]);
4646

47-
const filteredEvents = allEvents
47+
let filteredEvents = allEvents
4848
.applyFilter((v) => filterOnCompany(v, filterState.selectedCompanies))
4949
.applyFilter((v) => filterOnBirthDates(v, filterState.selectedBirthDates))
5050
.applyFilter((v) => filterOnFrist(v, filterState.selectedFristFilters))
5151
.applyFilter((v) => filterOnAge(v, filterState.selectedAgeFilters))
5252
.applyFilter((v) => filterHendelser(v, filterState.selectedHendelseType))
53-
.applyFilter((v) =>
54-
filterUfordelteBrukere(v, filterState.isUfordelteBrukereFilter)
55-
)
5653
.applyFilter((v) =>
5754
filterOnFodselsnummerOrName(v, filterState.tekstFilter)
5855
);
5956

57+
if (selectedTab === TabType.ENHETENS_OVERSIKT) {
58+
filteredEvents = filteredEvents.applyFilter((v) =>
59+
filterUfordelteBrukere(v, filterState.isUfordelteBrukereFilter)
60+
);
61+
}
62+
6063
const allFnr = Object.keys(filteredEvents.value);
6164

6265
const checkAllHandler = (checked: boolean): void => {

0 commit comments

Comments
 (0)