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.

Sign up for GitHub

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

Jump to bottom

[PROD][OPP-1532] fjern feature toggle for ny meldingsvisning endringer #2049

Merged
merged 13 commits into from
Jul 18, 2023
Merged

[PROD][OPP-1532] fjern feature toggle for ny meldingsvisning endringer #2049

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5e0de2c
Bump webpack from 5.65.0 to 5.76.1
dependabot[bot] Mar 14, 2023
25ebc5a
[OPP-1532] ny meldingsvisning endringer - clean up
abrhanav Feb 23, 2023
f56870f
[OPP-1532] fjern feature toggle for ny meldingsvisning endringer
abrhanav Feb 23, 2023
98ac737
Merge pull request #2028 from navikt/feature/OPP-1532-fjern-feature-t…
abrhanav Apr 21, 2023
8a1c06a
[KAIZEN-0] Bump modialogin
abrhanav May 2, 2023
198e3be
[KAIZEN-0] oppdatere dev ingress
abrhanav May 4, 2023
89dc94b
Merge pull request #2051 from navikt/fix/ny-dev-ingress
abrhanav May 4, 2023
ba65372
Merge pull request #2050 from navikt/feature/bump_modialogin
abrhanav May 4, 2023
5f32e55
[OPP-1542] Kun vise datoer 3 år tilbake i tid
Jesperpaulsen May 30, 2023
ba3cd74
Merge pull request #2053 from navikt/fix/egendefinert-dato-utbetaling…
Jesperpaulsen May 31, 2023
37e21d8
Merge pull request #2037 from navikt/dependabot/npm_and_yarn/webpack-…
Jesperpaulsen May 31, 2023
fc7d0b1
Merge branch 'master' into dev
Jesperpaulsen Jun 30, 2023
0df91ae
[KAIZEN-0] Oppdatere snapshot
Jesperpaulsen Jul 3, 2023
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
17 changes: 10 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 6 additions & 29 deletions src/app/personside/dialogpanel/DialogPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ import useVisTraadTilknyttetPlukketOppgave from './fortsettDialog/useVisTraadTil
import { OppgavelisteValg } from './sendMelding/SendNyMelding';
import LazySpinner from '../../../components/LazySpinner';
import innstillingerResource from '../../../rest/resources/innstillingerResource';
import IfFeatureToggleOn from '../../../components/featureToggle/IfFeatureToggleOn';
import { FeatureToggles } from '../../../components/featureToggle/toggleIDs';
import IfFeatureToggleOff from '../../../components/featureToggle/IfFeatureToggleOff';
import NyFortsettDialogContainer from './fortsettDialog/NyFortsettDialogContainer';
import NySendNyMeldingContainer from './sendMelding/NySendNyMeldingContainer';

const DialogPanelWrapper = styled.div`
flex-grow: 1;
Expand All @@ -38,31 +33,13 @@ function DialogPanel() {
<ErrorBoundary boundaryName="Dialogpanel">
<DialogPanelWrapper>
{dialogpanelTraad ? (
<>
<IfFeatureToggleOn toggleID={FeatureToggles.useNewDialogComponents}>
<NyFortsettDialogContainer
traad={dialogpanelTraad}
defaultOppgaveDestinasjon={defaultOppgaveDestinasjon}
key={dialogpanelTraad.traadId} // for å tvinge refresh dersom man velger en ny tråd
/>
</IfFeatureToggleOn>
<IfFeatureToggleOff toggleID={FeatureToggles.useNewDialogComponents}>
<FortsettDialogContainer
traad={dialogpanelTraad}
defaultOppgaveDestinasjon={defaultOppgaveDestinasjon}
key={dialogpanelTraad.traadId} // for å tvinge refresh dersom man velger en ny tråd
/>
</IfFeatureToggleOff>
</>
<FortsettDialogContainer
traad={dialogpanelTraad}
defaultOppgaveDestinasjon={defaultOppgaveDestinasjon}
key={dialogpanelTraad.traadId} // for å tvinge refresh dersom man velger en ny tråd
/>
) : (
<>
<IfFeatureToggleOn toggleID={FeatureToggles.useNewDialogComponents}>
<NySendNyMeldingContainer defaultOppgaveDestinasjon={defaultOppgaveDestinasjon} />
</IfFeatureToggleOn>
<IfFeatureToggleOff toggleID={FeatureToggles.useNewDialogComponents}>
<SendNyMeldingContainer defaultOppgaveDestinasjon={defaultOppgaveDestinasjon} />
</IfFeatureToggleOff>
</>
<SendNyMeldingContainer defaultOppgaveDestinasjon={defaultOppgaveDestinasjon} />
)}
</DialogPanelWrapper>
</ErrorBoundary>
Expand Down
198 changes: 127 additions & 71 deletions src/app/personside/dialogpanel/__snapshots__/DialogPanel.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,21 @@ exports[`viser dialogpanel 1`] = `
padding-left: 2.25rem;
}

.c16 {
margin-top: 1rem;
}

.c16 label {
position: absolute !important;
height: 1px;
width: 1px;
overflow: hidden;
-webkit-clip: rect(1px 1px 1px 1px);
clip: rect(1px 1px 1px 1px);
-webkit-clip: rect(1px,1px,1px,1px);
clip: rect(1px,1px,1px,1px);
}

.c5 {
display: -webkit-box;
display: -webkit-flex;
Expand Down Expand Up @@ -158,7 +173,7 @@ exports[`viser dialogpanel 1`] = `
padding: 1rem .5rem;
}

.c16 {
.c18 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
Expand All @@ -168,14 +183,18 @@ exports[`viser dialogpanel 1`] = `
flex-direction: column;
}

.c16 > * {
.c18 > * {
margin-bottom: 0.7rem;
}

.c14 {
margin-top: 1rem;
}

.c17 {
margin-top: 1rem;
}

.c4 {
margin-bottom: 1rem !important;
}
Expand Down Expand Up @@ -477,7 +496,7 @@ exports[`viser dialogpanel 1`] = `
className="skjemaelement__label"
htmlFor="Helt tilfeldig ID"
>
Referat telefon
Referat
</label>
</div>
<div
Expand All @@ -496,26 +515,7 @@ exports[`viser dialogpanel 1`] = `
className="skjemaelement__label"
htmlFor="Helt tilfeldig ID"
>
Referat oppmøte
</label>
</div>
<div
className="skjemaelement"
>
<input
aria-invalid={false}
checked={false}
className="skjemaelement__input radioknapp"
id="Helt tilfeldig ID"
name="dialogtype"
onChange={[Function]}
type="radio"
/>
<label
className="skjemaelement__label"
htmlFor="Helt tilfeldig ID"
>
Spørsmål
Samtale
</label>
</div>
<div
Expand All @@ -538,9 +538,7 @@ exports[`viser dialogpanel 1`] = `
</label>
</div>
</div>
<div
className="SendNyMelding__Margin-h55t11-3"
>
<div>
<fieldset
aria-invalid={false}
className="skjemagruppe"
Expand Down Expand Up @@ -650,65 +648,123 @@ exports[`viser dialogpanel 1`] = `
</div>
</div>
<div
className="c15"
className="panel"
>
<button
className="knapp knapp--hoved knapp--mini"
disabled={false}
onClick={[Function]}
type="button"
<div
className="c15"
>
Velg sak
</button>
<p
className="typo-normal"
<button
className="knapp knapp--hoved knapp--mini"
disabled={false}
onClick={[Function]}
type="button"
>
Velg sak
</button>
<p
className="typo-normal"
>
Ingen valgt sak
</p>
</div>
<div
className="skjemaelement c16"
>
Ingen valgt sak
</p>
</div>
<div
className="alertstripe c14 alertstripe--info"
>
<span
className="alertstripe__ikon"
<label
className="skjemaelement__label"
htmlFor="Helt tilfeldig ID"
>
Oppgaveliste
</label>
<div
className="selectContainer input--fullbredde"
>
<select
aria-invalid={false}
className="skjemaelement__input"
disabled={false}
id="Helt tilfeldig ID"
onChange={[Function]}
value="MinListe"
>
<option
value="MinListe"
>
Svar skal til min oppgaveliste hos
valgt enhet
</option>
<option
value="Enhetensliste"
>
Svar skal til
valgt enhet
sin oppgaveliste
</option>
</select>
</div>
</div>
<div
className="alertstripe c14 alertstripe--info"
>
<span
className="sr-only"
className="alertstripe__ikon"
>
info
<span
className="sr-only"
>
info
</span>
<svg
aria-label="info-ikon"
focusable="false"
height="1.5em"
kind="info-sirkel-fyll"
role="img"
viewBox="0 0 24 24"
width="1.5em"
>
<g
fill="none"
>
<path
d="M12 0C5.382 0 0 5.382 0 12s5.382 12 12 12c6.617 0 12-5.382 12-12S18.617 0 12 0z"
fill="#337C9B"
/>
<path
d="M12 5a1.566 1.566 0 1 1 .11 3.13A1.566 1.566 0 0 1 12 5zm2.976 12.01c.563 0 1.043.431 1.043.991s-.48.992-1.043.992H9.39c-.564 0-1.043-.431-1.043-.992 0-.56.479-.99 1.043-.99h1.6v-5.016h-.986c-.565 0-1.044-.43-1.044-.991 0-.56.48-.991 1.044-.991h2.03c.563 0 1.043.43 1.043.99v6.007h1.899z"
fill="#FFF"
/>
</g>
</svg>
</span>
<svg
aria-label="info-ikon"
focusable="false"
height="1.5em"
kind="info-sirkel-fyll"
role="img"
viewBox="0 0 24 24"
width="1.5em"
<div
className="typo-normal alertstripe__tekst"
>
<g
fill="none"
>
<path
d="M12 0C5.382 0 0 5.382 0 12s5.382 12 12 12c6.617 0 12-5.382 12-12S18.617 0 12 0z"
fill="#337C9B"
/>
<path
d="M12 5a1.566 1.566 0 1 1 .11 3.13A1.566 1.566 0 0 1 12 5zm2.976 12.01c.563 0 1.043.431 1.043.991s-.48.992-1.043.992H9.39c-.564 0-1.043-.431-1.043-.992 0-.56.479-.99 1.043-.99h1.6v-5.016h-.986c-.565 0-1.044-.43-1.044-.991 0-.56.48-.991 1.044-.991h2.03c.563 0 1.043.43 1.043.99v6.007h1.899z"
fill="#FFF"
/>
</g>
</svg>
</span>
Gir varsel, bruker må svare
</div>
</div>
<div
className="typo-normal alertstripe__tekst"
className="skjemaelement c17"
>
Gir varsel, bruker kan ikke svare
<input
aria-invalid={false}
checked={false}
className="skjemaelement__input checkboks"
id="Helt tilfeldig ID"
onChange={[Function]}
type="checkbox"
/>
<label
className="skjemaelement__label"
htmlFor="Helt tilfeldig ID"
>
Avslutt samtale etter sending
</label>
</div>
</div>
</div>
<div
className="c16"
className="c18"
>
<button
className="knapp knapp--hoved"
Expand Down
Loading