Skip to content

Commit

Permalink
Oppdaterer nav biblioteker (#916)
Browse files Browse the repository at this point in the history
* Oppgraderer NAV pakker

* Skjuler breadcrumbs ved print

* Fikser det som knakk bygget....
  • Loading branch information
MrFjellstad authored Sep 25, 2024
1 parent 83ded8a commit 5b9a311
Show file tree
Hide file tree
Showing 6 changed files with 93 additions and 323 deletions.
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@
]
},
"dependencies": {
"@navikt/aksel-icons": "^5.9.2",
"@navikt/bedriftsmeny": "^6.12.0",
"@navikt/ds-css": "^5.9.2",
"@navikt/aksel-icons": "^7.0.1",
"@navikt/bedriftsmeny": "^6.13.2-rc2",
"@navikt/ds-css": "^7.0.1",
"@navikt/ds-icons": "^3.4.3",
"@navikt/ds-react": "^5.9.2",
"@navikt/fnrvalidator": "^2.1.0",
"@navikt/nav-dekoratoren-moduler": "^2.1.4",
"@navikt/textparser": "^2.2.0",
"@navikt/ds-react": "^7.0.1",
"@navikt/fnrvalidator": "^2.1.2",
"@navikt/nav-dekoratoren-moduler": "^3.1.0",
"@navikt/textparser": "^2.4.0",
"@sentry/react": "^8.31.0",
"date-fns": "^3.6.0",
"dayjs": "1.11.13",
Expand Down
9 changes: 7 additions & 2 deletions src/components/felles/LoggetUtAdvarsel/LoggetUtAdvarsel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,19 @@ interface LoggetUtAdvarselProps {

const LoggetUtAdvarsel = ({ onClose, loginServiceUrl, tokenFornyet }: LoggetUtAdvarselProps) => {
const { t } = useTranslation();
let { language } = useParams();
const { language } = useParams();
const loginServiceUrlAfterRedirect = injectRedirectPath(loginServiceUrl, tokenFornyet, language as Language);
const handleCloseModal = () => {
onClose();
};

return (
<Modal open={true} onClose={() => handleCloseModal()} className={'logget-ut-advarsel'}>
<Modal
open={true}
onClose={() => handleCloseModal()}
className={'logget-ut-advarsel'}
aria-label={t(LoggetUtAdvarselKeys.LOGGET_UT_ADVARSEL_LOGGET_UT)}
>
<Modal.Body>
<Alert variant='error' className='logget-ut-advarsel__innhold'>
<Heading size='large' level='2'>
Expand Down
1 change: 1 addition & 0 deletions src/components/gravid/GravidKvittering.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#decorator-footer,
.bedriftsmeny,
.skjul-fra-print,
.side__breadcrumb.container,
.side__minside_arbeidsgiver > .lenke,
.lenker-ut-panel {
display: none !important;
Expand Down
1 change: 1 addition & 0 deletions src/components/kronisk/KroniskKvittering.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#decorator-footer,
.skjul-fra-print,
.bedriftsmeny,
.side__breadcrumb.container,
.side__minside_arbeidsgiver > .lenke,
.lenker-ut-panel {
display: none !important;
Expand Down
8 changes: 2 additions & 6 deletions src/context/arbeidsgiver/buildArbeidsgiver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,13 @@ const buildArbeidsgiver = (
Name: string,
OrganizationForm: string,
OrganizationNumber: string,
ParentOrganizationNumber: string,
Status: string,
Type: string
ParentOrganizationNumber: string
): Organisasjon => {
return {
Name,
OrganizationForm,
OrganizationNumber,
ParentOrganizationNumber,
Status,
Type
ParentOrganizationNumber
};
};

Expand Down
Loading

0 comments on commit 5b9a311

Please sign in to comment.