Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bruk nav-office-reception-view #517

Merged
merged 37 commits into from
Apr 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
9f02c56
slett gammel visning av publimkumsmottak
bdahle Feb 13, 2024
d32e33d
importer fra pakken
bdahle Feb 19, 2024
23d62ef
legg til nav-office-reception-info
bdahle Feb 19, 2024
eef788f
midlertig fjern test som feiler
bdahle Feb 19, 2024
9a8475d
bump til ds-react v6
bdahle Feb 20, 2024
2ee7570
Revert "midlertig fjern test som feiler"
bdahle Feb 20, 2024
9044c57
Revert "Revert "midlertig fjern test som feiler""
bdahle Feb 20, 2024
a78fe58
Revert "Revert "Revert "midlertig fjern test som feiler"""
bdahle Feb 20, 2024
187c690
Mock import som feiler i test
bdahle Feb 20, 2024
8db598c
Update npm ci command to use --force flag
bdahle Feb 27, 2024
f952f48
console log publikumsmottak
bdahle Feb 27, 2024
790f962
test med LegacyOfficeAddress
bdahle Feb 27, 2024
5cacf8c
test bruke type AudienceReception fra pakken direkte
bdahle Feb 27, 2024
d7e5938
Revert "test bruke type AudienceReception fra pakken direkte"
bdahle Feb 28, 2024
14414e6
bump nav-office-reception-info
bdahle Feb 29, 2024
51cded4
revert oppgradering ds-react, test om virker
bdahle Mar 4, 2024
9c42220
fjern --force
bdahle Mar 4, 2024
8398c0c
bump nav-office-reception-info
bdahle Mar 4, 2024
732040e
Merge branch 'master' into new-office-reception-view
terjeofnorway Mar 4, 2024
86f8f8b
Oppdatert mock-json-filer
bjornhun Mar 5, 2024
f3d154a
Merge branch 'new-office-reception-view' of https://github.com/navikt…
bjornhun Mar 5, 2024
d75bf91
Fjernet enhetsnavn fra geografisk tilkytning, henter i stedet fra enh…
bjornhun Mar 5, 2024
6f479af
Fjernet ubrukt variabel
bjornhun Mar 5, 2024
42c0590
Refactor DittNavKontor component and EnhetKontaktInfo type
bdahle Mar 8, 2024
b68884f
fjern nå ubrukt geografiskTilknytning
bdahle Mar 8, 2024
7e172bc
Merge branch 'master' into new-office-reception-view
bdahle Mar 8, 2024
08b62e8
Update nav-office-reception-info to version 0.4.1
bdahle Mar 11, 2024
d288162
Merge branch 'cdn-upload-v2' into new-office-reception-view
bdahle Mar 15, 2024
05c86cb
oppdater snapshot DittNavKontor
bdahle Mar 18, 2024
9786d39
Merge branch 'master' into new-office-reception-view
bdahle Mar 18, 2024
b14e85f
Update nav-office-reception-info to version 0.6.1
bdahle Apr 10, 2024
fa51d18
midlertidig skip test som feiler
bdahle Apr 10, 2024
8f375d3
Update nav-office-reception-info to version 1.0.0
bdahle Apr 11, 2024
c6cdd0a
oppdater snapshot
bdahle Apr 11, 2024
7823090
fjern skiping av test
bdahle Apr 11, 2024
302205a
Update nav-office-reception-info to version 1.0.1
bdahle Apr 15, 2024
7754e1f
Update nav-office-reception-info to version 1.0.2
bdahle Apr 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20,426 changes: 1,659 additions & 18,767 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"build": "npm-run-all -p build:*",
"build:js": "react-scripts build",
"build:css": "less-watch-compiler --run-once",
"test": "react-scripts test --watchAll=false",
"test": "react-scripts test --watchAll=false --transformIgnorePatterns \"node_modules/(?!@navikt)/\"",
"preversion": "npm test && npm run build",
"postversion": "git push && git push --tags",
"analyze": "source-map-explorer 'build/static/js/*.js'"
Expand All @@ -36,6 +36,7 @@
"@navikt/ds-react": "6.1.1",
"@navikt/fnrvalidator": "1.3.3",
"@navikt/nav-dekoratoren-moduler": "2.1.6",
"@navikt/nav-office-reception-info": "1.0.2",
"@react-pdf/renderer": "3.3.8",
"buffer": "6.0.3",
"core-js": "3.35.0",
Expand Down
6 changes: 1 addition & 5 deletions src/__tests__/forside/DittNavKontor.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import '@testing-library/jest-dom';
import { IntlProvider } from 'react-intl';
import nbMessages from 'text/nb';
import personInfo from '../../clients/apiMock/app/fetch/person-info.json';
import { GeografiskTilknytning } from 'types/adresser';
import { StoreProvider } from '../../store/Context';
import DittNavKontor from '../../pages/forside/sections/4-personinfo/5-ditt-nav-kontor/DittNavKontor';
import { EnhetKontaktInfo } from '../../types/enhetKontaktInfo';
Expand All @@ -15,10 +14,7 @@ describe('DittNavKontor', () => {
const { asFragment } = render(
<StoreProvider>
<IntlProvider locale={'nb'} messages={nbMessages}>
<DittNavKontor
enhetKontaktInformasjon={personInfo.enhetKontaktInformasjon as unknown as EnhetKontaktInfo}
geografiskTilknytning={personInfo.adresser.geografiskTilknytning as unknown as GeografiskTilknytning}
/>
<DittNavKontor enhetKontaktInformasjon={personInfo.enhetKontaktInformasjon as unknown as EnhetKontaktInfo} />
</IntlProvider>
</StoreProvider>
);
Expand Down
Loading
Loading