Skip to content
This repository was archived by the owner on Jan 30, 2025. It is now read-only.

Commit 1f65458

Browse files
authored
Merge pull request #77 from navikt/filter-fix
Fikse bug og typo
2 parents 26e7d28 + 5ce0a12 commit 1f65458

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

mock/endpoint.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default [
2929
},
3030
{
3131
eventId: "3984093204236",
32-
type: "BESKJED",
32+
type: "innboks",
3333
forstBehandlet: "2021-01-01T11:12:04+01:00",
3434
arkivertAvNAV: false,
3535
tekst: "Svar fra veilederen din i innboksen: Hei, nå har jeg sjekket om...",

src/components/tidligereVarslerPage/TidligereVarslerPage.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,24 @@ const TidligereVarslerPage = ({ varsler, isSuccess }: { varsler: Array<Varsel>;
1818
const searchTextInput = useStore(filterSearch);
1919

2020
const sortedVarsler = useMemo(() => varsler?.sort(byForstBehandlet), [varsler]);
21-
const filtertedVarseler = sortedVarsler?.filter(
21+
const filteredVarsler = sortedVarsler?.filter(
2222
(varsel) =>
23-
(selectedFilter === "alle" || varsel.type.toLowerCase() === selectedFilter) &&
23+
(selectedFilter === "alle" ||
24+
varsel.type.toLowerCase() === selectedFilter ||
25+
(varsel.type.toLowerCase() === "innboks" && selectedFilter === "beskjed")) &&
2426
(varsel.tekst === null || varsel.tekst.toLowerCase().includes(searchTextInput)),
2527
);
2628

2729
return (
2830
<>
2931
<Filter />
3032
<Heading level="2" size="xsmall" className={styles.varslerListHeading}>
31-
{text.antallSokeTreff(language, filtertedVarseler.length, varsler.length)}
33+
{text.antallSokeTreff(language, filteredVarsler.length, varsler.length)}
3234
</Heading>
33-
{filtertedVarseler.length > 0 ? (
35+
{filteredVarsler.length > 0 ? (
3436
<ul className={styles.varslerList}>
3537
{isSuccess &&
36-
filtertedVarseler?.map((varsel) => (
38+
filteredVarsler?.map((varsel) => (
3739
<li key={varsel.eventId}>
3840
<TidligereVarsel varselData={varsel} />
3941
</li>

0 commit comments

Comments
 (0)