Skip to content

Commit 61c64c0

Browse files
matiasvinjevollmatiasvinjevoll
committed
FO-3015 oppdater avhengigheter
1 parent 1241185 commit 61c64c0

File tree

9 files changed

+5375
-3960
lines changed

9 files changed

+5375
-3960
lines changed

‎package-lock.json‎

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

‎package.json‎

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
"lint-staged": {
2424
"src/*.{ts,tsx}": [
2525
"prettier --write",
26-
"tslint --fix",
27-
"git add"
26+
"tslint --fix"
2827
]
2928
},
3029
"browserslist": [
@@ -34,58 +33,58 @@
3433
"not op_mini all"
3534
],
3635
"dependencies": {
37-
"@craco/craco": "5.2.4",
38-
"@navikt/fnrvalidator": "^1.1.0",
36+
"@craco/craco": "^5.6.4",
37+
"@navikt/fnrvalidator": "^1.1.3",
3938
"@navikt/navspa": "^1.0.3",
4039
"classnames": "^2.2.6",
41-
"constate": "^1.3.2",
42-
"craco-less": "1.9.0",
43-
"dayjs": "^1.8.17",
40+
"constate": "^3.0.1",
41+
"craco-less": "^1.17.0",
42+
"dayjs": "^1.8.36",
4443
"lodash.throttle": "^4.1.1",
4544
"lodash.debounce": "^4.0.8",
46-
"nav-frontend-alertstriper": "^3.0.11",
47-
"nav-frontend-alertstriper-style": "^2.0.9",
48-
"nav-frontend-chevron": "^1.0.10",
45+
"nav-frontend-alertstriper": "^3.0.23",
46+
"nav-frontend-alertstriper-style": "^2.0.17",
47+
"nav-frontend-chevron": "^1.0.13",
4948
"nav-frontend-chevron-style": "^0.3.5",
50-
"nav-frontend-core": "^4.0.11",
51-
"nav-frontend-etiketter": "^1.0.30",
52-
"nav-frontend-etiketter-style": "^0.3.19",
53-
"nav-frontend-ikoner-assets": "^1.0.5",
54-
"nav-frontend-js-utils": "^1.0.8",
55-
"nav-frontend-lenker": "^1.0.33",
56-
"nav-frontend-lenker-style": "^0.2.24",
57-
"nav-frontend-paneler-style": "^0.3.17",
58-
"nav-frontend-skjema": "^2.0.11",
59-
"nav-frontend-skjema-style": "^2.0.3",
60-
"nav-frontend-spinner": "^2.0.1",
49+
"nav-frontend-core": "^5.0.1",
50+
"nav-frontend-etiketter": "^2.0.8",
51+
"nav-frontend-etiketter-style": "^1.0.3",
52+
"nav-frontend-ikoner-assets": "^2.0.3",
53+
"nav-frontend-js-utils": "^1.0.9",
54+
"nav-frontend-lenker": "^1.0.41",
55+
"nav-frontend-lenker-style": "^0.2.29",
56+
"nav-frontend-paneler-style": "^0.3.21",
57+
"nav-frontend-skjema": "^3.0.18",
58+
"nav-frontend-skjema-style": "^2.0.10",
59+
"nav-frontend-spinner": "^2.0.5",
6160
"nav-frontend-spinner-style": "^0.2.5",
62-
"nav-frontend-typografi": "^2.0.17",
63-
"nav-frontend-typografi-style": "^1.0.18",
61+
"nav-frontend-typografi": "^2.0.26",
62+
"nav-frontend-typografi-style": "^1.0.22",
6463
"prop-types": "^15.7.2",
6564
"react": "^16.13.1",
66-
"react-dom": "^16.11.0",
67-
"react-scripts": "3.0.1",
68-
"react-select": "^3.0.8",
69-
"typescript": "3.4.5"
65+
"react-dom": "^16.13.1",
66+
"react-scripts": "^3.4.3",
67+
"react-select": "^3.1.0",
68+
"typescript": "^4.0.2"
7069
},
7170
"devDependencies": {
72-
"@types/classnames": "^2.2.9",
73-
"@types/faker": "^4.1.10",
74-
"@types/jest": "^24.0.22",
71+
"@types/classnames": "^2.2.10",
72+
"@types/faker": "^5.1.0",
73+
"@types/jest": "^26.0.14",
7574
"@types/lodash.debounce": "^4.0.6",
76-
"@types/node": "^12.12.6",
77-
"@types/react": "^16.9.11",
78-
"@types/react-dom": "^16.9.4",
79-
"@types/react-modal": "^3.10.0",
80-
"@types/react-select": "^3.0.8",
81-
"cross-env": "^7.0.0",
82-
"faker": "^4.1.0",
83-
"husky": "^3.0.9",
84-
"lint-staged": "^9.4.2",
85-
"prettier": "^1.18.2",
86-
"tslint": "^5.20.1",
75+
"@types/node": "^14.10.3",
76+
"@types/react": "^16.9.49",
77+
"@types/react-dom": "^16.9.8",
78+
"@types/react-modal": "^3.10.6",
79+
"@types/react-select": "^3.0.19",
80+
"cross-env": "^7.0.2",
81+
"faker": "^5.1.0",
82+
"husky": "^4.3.0",
83+
"lint-staged": "^10.4.0",
84+
"prettier": "^2.1.2",
85+
"tslint": "^6.1.3",
8786
"tslint-config-prettier": "^1.18.0",
88-
"tslint-react": "^4.1.0",
89-
"yet-another-fetch-mock": "^3.3.1"
87+
"tslint-react": "^5.0.0",
88+
"yet-another-fetch-mock": "^4.1.0"
9089
}
9190
}

‎src/components/filters/sokefelt/sokefelt.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export const Sokefelt = () => {
88
const { filters, setFnrOrNameFilter } = useSokStore();
99
const [tekst, setTekst] = useState(filters.fnrOrName);
1010

11-
const oppdaterFilter = useCallback(debounce((nyTekst) => {
11+
const oppdaterFilter = useCallback(debounce((nyTekst: string) => {
1212
setFnrOrNameFilter(nyTekst);
1313
}, 500), []);
1414

‎src/mock/data/features.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import { JSONObject } from 'yet-another-fetch-mock';
21
import { Features, PTO_VEDTAKSSTOTTE_PILOT } from '../../rest/feature';
32

4-
const features: Features & JSONObject = {
3+
const features: Features = {
54
[PTO_VEDTAKSSTOTTE_PILOT]: true,
65
};
76

‎src/mock/index.ts‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import FetchMock, { HandlerArgument, MiddlewareUtils, ResponseData } from 'yet-another-fetch-mock';
1+
import FetchMock, { MiddlewareUtils, MockHandler } from 'yet-another-fetch-mock';
22
import { mockBeslutteroversiktSok } from './sok-mock';
33
import { MODIACONTEXTHOLDER_API, VEILARBVEILEDER_API } from '../rest/api';
44
import { innloggetVeileder } from './data/innlogget-veileder';
@@ -7,7 +7,7 @@ import features from './data/features';
77

88
export interface Mock {
99
url: string;
10-
handler: (args: HandlerArgument) => Promise<ResponseData>
10+
handler: MockHandler
1111
}
1212

1313
const fetchMock = FetchMock.configure({
@@ -16,6 +16,10 @@ const fetchMock = FetchMock.configure({
1616
});
1717

1818
fetchMock.post(mockBeslutteroversiktSok.url, mockBeslutteroversiktSok.handler);
19-
fetchMock.get(`${VEILARBVEILEDER_API}/veileder/v2/me`, innloggetVeileder as any);
20-
fetchMock.get(`${MODIACONTEXTHOLDER_API}/context/aktivenhet`, aktivEnhet as any);
21-
fetchMock.get('/veilarbpersonflatefs/api/feature', features);
19+
fetchMock.get(`${VEILARBVEILEDER_API}/veileder/v2/me`, jsonResponse(innloggetVeileder));
20+
fetchMock.get(`${MODIACONTEXTHOLDER_API}/context/aktivenhet`, jsonResponse(aktivEnhet));
21+
fetchMock.get('/veilarbpersonflatefs/api/feature', jsonResponse(features));
22+
23+
function jsonResponse(value: any): MockHandler {
24+
return (req, res, ctx) => res(ctx.json(value));
25+
}

‎src/mock/sok-mock.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { HandlerArgument, ResponseData } from 'yet-another-fetch-mock';
1+
import { MockRequest, ResponseData } from 'yet-another-fetch-mock';
22
import { BeslutteroversiktSok, VEILARBVEDTAKSSTOTTE_API } from '../rest/api';
33
import { lagBrukere } from './data/brukere';
44
import { Mock } from './index';
@@ -9,7 +9,7 @@ const alleBrukere = lagBrukere(85);
99

1010
export const mockBeslutteroversiktSok: Mock = {
1111
url: `${VEILARBVEDTAKSSTOTTE_API}/beslutteroversikt/sok`,
12-
handler: async (args: HandlerArgument): Promise<ResponseData> => {
12+
handler: async (args: MockRequest): Promise<ResponseData> => {
1313
const sok = args.body as BeslutteroversiktSok;
1414
const filtrerteBrukere = filtrerBrukere(sok, alleBrukere);
1515
const paginerteBrukere = filtrerteBrukere.slice(sok.fra, sok.fra + sok.antall);
@@ -43,4 +43,4 @@ const filtrerBrukere = (sok: BeslutteroversiktSok, brukere: Bruker[]): Bruker[]
4343

4444
return true;
4545
});
46-
};
46+
};

‎src/stores/data-fetcher-store.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import createUseContext from 'constate';
1+
import constate from 'constate';
22
import useFetch from '../rest/use-fetch';
33
import {
44
BeslutteroversiktSok,
@@ -12,7 +12,7 @@ import { AktivEnhet } from '../rest/data/aktiv-enhet';
1212
import { OrNothing } from '../utils/types/ornothing';
1313
import { Features } from '../rest/feature';
1414

15-
export const useDataFetcherStore = createUseContext(() => {
15+
export const [DataFetcherStoreProvider, useDataFetcherStore] = constate(() => {
1616
const brukereFetcher = useFetch<BrukereMedAntall, { sok: BeslutteroversiktSok }>(lagHentBrukereFetchInfo);
1717
const innloggetVeilederFetcher = useFetch<InnloggetVeileder>(lagHentInnloggetVeilederFetchInfo);
1818
const aktivEnhetFetcher = useFetch<OrNothing<AktivEnhet>>(lagHentAktivEnhetFetchInfo);

‎src/stores/sok-store.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import createUseContext from 'constate';
1+
import constate from 'constate';
22
import { useMemo, useState } from 'react';
33
import { Enhet } from '../rest/data/innlogget-veileder';
44
import { UtkastStatus } from '../rest/data/bruker';
@@ -13,7 +13,7 @@ export interface Filters {
1313
visMineBrukere: boolean;
1414
}
1515

16-
export const useSokStore = createUseContext(() => {
16+
export const [SokStoreProvider, useSokStore] = constate(() => {
1717
// Paginering
1818
const [totalPages, setTotalPages] = useState(1);
1919
const [currentPage, setCurrentPage] = useState(1);

‎src/stores/store-provider.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
import React from 'react';
2-
import { useDataFetcherStore } from './data-fetcher-store';
3-
import { useSokStore } from './sok-store';
2+
import { DataFetcherStoreProvider } from './data-fetcher-store';
3+
import { SokStoreProvider } from './sok-store';
44
import { ChildrenProps } from '../utils/types/children-props';
55
import { SokSync } from '../components/sok-sync';
66

77
const StoreProvider = (props: ChildrenProps) => {
88
return (
9-
<useDataFetcherStore.Provider>
10-
<useSokStore.Provider>
9+
<DataFetcherStoreProvider>
10+
<SokStoreProvider>
1111
{props.children}
1212
<SokSync />
13-
</useSokStore.Provider>
14-
</useDataFetcherStore.Provider>
13+
</SokStoreProvider>
14+
</DataFetcherStoreProvider>
1515
);
1616
};
1717

0 commit comments

Comments
 (0)