-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1687 from navikt/TAG-2179-fjern-meldingsboks
Fjern integrasjon mot Tiltaksbrev or fra Altinn Innboks
- Loading branch information
Showing
8 changed files
with
39 additions
and
354 deletions.
There are no files selected for viewing
29 changes: 0 additions & 29 deletions
29
src/App/Hovedside/AltinnMeldingsboks/BrevFraAltinnContainer.css
This file was deleted.
Oops, something went wrong.
107 changes: 23 additions & 84 deletions
107
src/App/Hovedside/AltinnMeldingsboks/BrevFraAltinnContainer.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,90 +1,29 @@ | ||
| import React, {useContext} from 'react'; | ||
| import {Ekspanderbartpanel} from '../../../GeneriskeElementer/Ekspanderbartpanel'; | ||
| import {OrganisasjonsDetaljerContext} from '../../OrganisasjonDetaljerProvider'; | ||
| import {AltinnBrev, Status} from '../../../api/altinnApi'; | ||
| import NyFaneLenke from '../../../GeneriskeElementer/NyFaneLenke'; | ||
| import AntallUlest from '../../../GeneriskeElementer/AntallUlest'; | ||
| import Innboksikon from './Innboksikon'; | ||
| import {loggNavigasjon} from '../../../utils/funksjonerForAmplitudeLogging'; | ||
| import './BrevFraAltinnContainer.css'; | ||
| import {BodyShort} from "@navikt/ds-react"; | ||
|
|
||
| const loggNavigering = (href: string, lenketekst: string) => () => { | ||
| if (href === '') { | ||
| loggNavigasjon(undefined, lenketekst); | ||
| import React, { useContext } from 'react'; | ||
| import { OrganisasjonsDetaljerContext } from '../../OrganisasjonDetaljerProvider'; | ||
| import { Alert, Heading, BodyLong } from '@navikt/ds-react'; | ||
| import { useLocalStorage } from '../../hooks/useStorage'; | ||
|
|
||
| const BrevFraAltinnContainer: React.FunctionComponent = (_) => { | ||
| const { valgtOrganisasjon } = useContext(OrganisasjonsDetaljerContext); | ||
| const [kryssetUt, settKryssetUt] = useLocalStorage('tilskuddsbrev-borte-krysset-ut', false); | ||
|
|
||
| if ( | ||
| valgtOrganisasjon !== undefined && | ||
| valgtOrganisasjon.altinntilgang.tilskuddsbrev && | ||
| !kryssetUt | ||
| ) { | ||
| return ( | ||
| <Alert variant="info" closeButton onClose={() => settKryssetUt(true)}> | ||
| <Heading spacing size="small" level="3"> | ||
| Hvor er tilskuddsbrevene? | ||
| </Heading> | ||
| For å finne tilskuddsbrev om NAV-tiltak må du gå til Altinn innboks på aktuell | ||
| virksomhet. Vi har fjernet lenken fra Min side – arbeidsgiver. | ||
| </Alert> | ||
| ); | ||
| } else { | ||
| const {origin, pathname} = new URL(href) | ||
| const url = `${origin}${pathname.replace(/\d/g, 'X')}` | ||
| loggNavigasjon(url, lenketekst); | ||
| } | ||
| } | ||
|
|
||
| const BrevFraAltinnContainer: React.FunctionComponent = _ => { | ||
| const {altinnMeldingsboks} = useContext(OrganisasjonsDetaljerContext); | ||
|
|
||
| if (altinnMeldingsboks === undefined || altinnMeldingsboks.brev.length === 0) { | ||
| return null; | ||
| } | ||
|
|
||
| const ikon = ( | ||
| <> | ||
| <Innboksikon/> | ||
| <AntallUlest antallUlest={altinnMeldingsboks.antallUleste}/> | ||
| </> | ||
| ) | ||
|
|
||
|
|
||
| return ( | ||
| <section className="tilskuddsbrev"> | ||
| <Ekspanderbartpanel | ||
| tittel={"Tilskuddsbrev om NAV-tiltak fra Altinn innboks"} | ||
| ikon={ikon} | ||
| > | ||
| <> | ||
| <ul className="tilskuddsbrev__liste"> | ||
| {altinnMeldingsboks.brev.map(BrevContainer)} | ||
| </ul> | ||
| {altinnMeldingsboks.finnesFlereBrev && ( | ||
| <NyFaneLenke | ||
| href={altinnMeldingsboks.portalview} | ||
| onClick={loggNavigering( | ||
| altinnMeldingsboks.portalview, | ||
| 'se flere i altinn meldingsboks' | ||
| )} | ||
| loggLenketekst="Se flere i Altinn meldingsboks" | ||
| > | ||
| Se flere i Altinn meldingsboks | ||
| </NyFaneLenke> | ||
| )} | ||
| </> | ||
| </Ekspanderbartpanel> | ||
| </section> | ||
| ); | ||
| }; | ||
|
|
||
| const dateFormat = new Intl.DateTimeFormat('no', { | ||
| year: 'numeric', | ||
| month: '2-digit', | ||
| day: '2-digit', | ||
| }); | ||
|
|
||
| const BrevContainer = (brev: AltinnBrev) => { | ||
| const className = `tilskuddsbrev__${brev.status === Status.Lest ? 'lest' : 'ulest'}-lenke`; | ||
| const dato = dateFormat.format(brev.datoSendt); | ||
| return ( | ||
| <li className="tilskuddsbrev__liste-element" key={brev.key}> | ||
| <BodyShort className="tilskuddsbrev__dato">Sendt {dato}</BodyShort> | ||
| <NyFaneLenke | ||
| className={className} | ||
| href={brev.portalview} | ||
| aria-label={`Sendt ${dato}, ${brev.status}, ${brev.tittel}`} | ||
| onClick={loggNavigering(brev.portalview, 'åpn tilskuddsbrev i altinn')} | ||
| loggLenketekst="åpne tilskuddsbrev i altinn" | ||
| > | ||
| {brev.tittel} | ||
| </NyFaneLenke> | ||
| </li> | ||
| ); | ||
| }; | ||
|
|
||
| export default BrevFraAltinnContainer; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.