Skip to content

Commit de25a3d

Browse files
committed
FO-2772 Flyttet alt relatert til sok i egen store
1 parent e2e68d6 commit de25a3d

34 files changed

+288
-236
lines changed

package-lock.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
"craco-less": "1.9.0",
4343
"dayjs": "^1.8.17",
4444
"lodash.throttle": "^4.1.1",
45+
"lodash.debounce": "^4.0.8",
4546
"nav-frontend-alertstriper": "^3.0.11",
4647
"nav-frontend-alertstriper-style": "^2.0.9",
4748
"nav-frontend-chevron": "^1.0.10",

src/app.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import StoreProvider from './stores/store-provider';
33
import { Header } from './components/header/header';
44
import { InternflateDecorator } from './components/internflate-decorator/internflate-decorator';
55
import { Hovedside } from './hovedside/hovedside';
6-
import { FilterSync } from './components/filter-sync';
6+
import { SokSync } from './components/sok-sync';
77

88
function App() {
99
return (
1010
<StoreProvider>
1111
<InternflateDecorator />
1212
<Header />
1313
<Hovedside />
14-
<FilterSync />
14+
<SokSync />
1515
</StoreProvider>
1616
);
1717
}

src/components/datafetcher.tsx

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,18 @@ import { AlertStripeFeil } from 'nav-frontend-alertstriper';
55
import Spinner from './felles/spinner/spinner';
66

77
export function DataFetcher(props: { children: any }) {
8-
const { brukere, innloggetVeileder } = useFetchStore();
8+
const { innloggetVeileder } = useFetchStore();
99

1010
useEffect(() => {
11-
if (isNotStarted(brukere)) {
12-
brukere.fetch(null);
13-
}
14-
1511
if (isNotStarted(innloggetVeileder)) {
1612
innloggetVeileder.fetch(null);
1713
}
1814
// eslint-disable-next-line react-hooks/exhaustive-deps
19-
}, [brukere, innloggetVeileder]);
15+
}, [innloggetVeileder]);
2016

21-
if (isAnyNotStartedOrPending([brukere, innloggetVeileder])) {
17+
if (isAnyNotStartedOrPending([innloggetVeileder])) {
2218
return <Spinner />;
23-
} else if (hasAnyFailed([brukere, innloggetVeileder])) {
19+
} else if (hasAnyFailed([innloggetVeileder])) {
2420
return (
2521
<AlertStripeFeil className="vedtaksstotte-alert">
2622
Det oppnås for tiden ikke kontakt med alle baksystemer.

src/components/filter-etiketter/filter-etiketter.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import React from 'react';
2-
import { Filters, StatusFilter, useFilterStore } from '../../stores/filter-store';
32
import { FilterEtikett } from './etikett/filter-etikett';
4-
import './filter-etiketter.less';
53
import { isEmpty } from '../../utils';
4+
import './filter-etiketter.less';
5+
import { Filters, useSokStore } from '../../stores/sok-store';
66

77
export type OnRemoveClicked = (id: string) => void;
88

@@ -26,7 +26,7 @@ function lagFilterEtiketter(filters: Filters, onRemoveClicked: OnRemoveClicked)
2626
);
2727
}
2828

29-
if (status !== StatusFilter.ALLE) {
29+
if (status) {
3030
filterEtiketter.push(
3131
<FilterEtikett key={STATUS_FILTER} id={STATUS_FILTER} tekst="Søk på status" onRemoveClicked={onRemoveClicked} />
3232
);
@@ -36,15 +36,15 @@ function lagFilterEtiketter(filters: Filters, onRemoveClicked: OnRemoveClicked)
3636
}
3737

3838
export const FilterEtiketter = () => {
39-
const { filters, setFnrOrNameFilter, setEnheterFilter, setStatusFilter } = useFilterStore();
39+
const { filters, setFnrOrNameFilter, setEnheterFilter, setStatusFilter } = useSokStore();
4040

4141
function handleOnRemoveClicked(id: string) {
4242
if (id === NAVN_ELLER_FNR_FILTER) {
4343
setFnrOrNameFilter('');
4444
} else if (id === ENHET_FILTER) {
4545
setEnheterFilter([]);
4646
} else if (id === STATUS_FILTER) {
47-
setStatusFilter(StatusFilter.ALLE);
47+
setStatusFilter(undefined);
4848
}
4949
}
5050

src/components/filter-sync.tsx

Lines changed: 0 additions & 28 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
.bruker-filter {
2+
margin: 0 1rem;
3+
4+
.bruker-filter__checkbox {
5+
margin-top: 0.5rem;
6+
}
7+
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import React from 'react';
2+
import { Element } from 'nav-frontend-typografi';
3+
import { DropdownOption } from '../enhet-dropdown/enhet-dropdown';
4+
import { Checkbox } from 'nav-frontend-skjema';
5+
import './bruker-filter.less';
6+
import { useSokStore } from '../../../stores/sok-store';
7+
8+
export const BrukerFilter = () => {
9+
const { filters, setStatusFilter } = useSokStore();
10+
11+
function handleOnStatusSelectedChanged(selectedOption: DropdownOption | null) {
12+
console.log('selectedOption', selectedOption); // tslint:disable-line
13+
}
14+
15+
return (
16+
<div className="bruker-filter">
17+
<Element>Bruker</Element>
18+
<Checkbox label="Mine brukere" className="bruker-filter__checkbox" />
19+
</div>
20+
);
21+
};

src/components/filters/custom-dropdown/custom-dropdown.less

Lines changed: 0 additions & 3 deletions
This file was deleted.

src/components/filters/custom-dropdown/custom-dropdown.tsx

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)