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

Nytt ferie steg #4631

Merged
merged 90 commits into from
Nov 18, 2024
Merged

Nytt ferie steg #4631

merged 90 commits into from
Nov 18, 2024

Conversation

johannbm
Copy link
Contributor

No description provided.

# Conflicts:
#	apps/svangerskapspengesoknad/src/app/appData/SvpDataContext.tsx
#	apps/svangerskapspengesoknad/src/app/intl/nb_NO.json
#	apps/svangerskapspengesoknad/src/app/intl/nn_NO.json
# Conflicts:
#	apps/svangerskapspengesoknad/src/app/steps/skjema/SkjemaSteg.stories.tsx
# Conflicts:
#	apps/foreldrepengeoversikt/vite.config.ts
#	apps/svangerskapspengesoknad/src/SvangerskapspengesøknadRoutes.tsx
#	apps/svangerskapspengesoknad/src/app-data/SvpDataContext.tsx
#	apps/svangerskapspengesoknad/src/app-data/useStepConfig.ts
#	apps/svangerskapspengesoknad/src/app/steps/egen-næring/EgenNæringStep.stories.tsx
#	apps/svangerskapspengesoknad/src/app/steps/frilans/FrilansStep.stories.tsx
#	apps/svangerskapspengesoknad/src/app/steps/oppsummering/Oppsummering.stories.tsx
#	apps/svangerskapspengesoknad/src/app/steps/perioder/PerioderStep.stories.tsx
#	apps/svangerskapspengesoknad/src/app/steps/skjema/SkjemaSteg.stories.tsx
#	apps/svangerskapspengesoknad/src/app/steps/tilrettelegging/TilretteleggingStep.stories.tsx
#	apps/svangerskapspengesoknad/src/steps/arbeid-i-utlandet/ArbeidIUtlandet.stories.tsx
#	apps/svangerskapspengesoknad/src/steps/arbeidsforhold-og-inntekt/ArbeidsforholdOgInntektSteg.stories.tsx
#	apps/svangerskapspengesoknad/src/steps/oppsummering/FerieOppsummering.tsx
#	apps/svangerskapspengesoknad/src/steps/oppsummering/Oppsummering.tsx
#	apps/svangerskapspengesoknad/src/steps/perioder/PerioderStep.tsx
#	apps/svangerskapspengesoknad/src/steps/tilrettelegging/TilretteleggingStep.tsx
#	apps/svangerskapspengesoknad/src/steps/utenlandsopphold-senere/SenereUtenlandsoppholdSteg.stories.tsx
#	apps/svangerskapspengesoknad/src/steps/utenlandsopphold-tidligere/TidligereUtenlandsoppholdSteg.stories.tsx
#	apps/svangerskapspengesoknad/src/steps/velg-arbeidsforhold/VelgArbeid.stories.tsx
#	apps/svangerskapspengesoknad/vite.config.ts
#	packages/form-hooks/src/form-wrappers/RhfTextField.tsx
Copy link
Contributor

@tor-nav tor-nav left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ryddar du opp i ferie-context om du går tilbake og vel eit anna arbeidsforhold? Sjå useTilretteleggingerHelper

const { Default } = composeStories(stories);

describe('<FerieSteg>', () => {
const user = userEvent.setup();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bør ein alltid gjera dette? Kva er konsekvensen av å ikkje gjera det? Ser forklaringa er "Methods on this instance share one input device state, e.g. which keys are pressed."

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

uhm, godt spørsmål. Her har jeg bare copy-pasted en annen test som utgangspunkt 😇

apps/svangerskapspengesoknad/src/steps/ferie/FerieSteg.tsx Outdated Show resolved Hide resolved
apps/svangerskapspengesoknad/src/steps/ferie/FerieSteg.tsx Outdated Show resolved Hide resolved
apps/svangerskapspengesoknad/src/steps/ferie/FerieSteg.tsx Outdated Show resolved Hide resolved
apps/svangerskapspengesoknad/src/steps/ferie/FerieSteg.tsx Outdated Show resolved Hide resolved
apps/svangerskapspengesoknad/src/steps/ferie/FerieSteg.tsx Outdated Show resolved Hide resolved
apps/svangerskapspengesoknad/src/steps/ferie/FerieSteg.tsx Outdated Show resolved Hide resolved
@johannbm
Copy link
Contributor Author

johannbm commented Nov 4, 2024

Ryddar du opp i ferie-context om du går tilbake og vel eit anna arbeidsforhold? Sjå useTilretteleggingerHelper

Godt poeng, det hadde jeg ikke tenkt på. Fikset nå

}));
const nyeFerieVerdier = {
...ferie,
[arbeidsgiverId]: {

Check failure

Code scanning / CodeQL

Remote property injection High

A property name to write to depends on a
user-provided value
.
Copy link

sonarcloud bot commented Nov 18, 2024

@johannbm johannbm merged commit b556d01 into master Nov 18, 2024
25 of 26 checks passed
@johannbm johannbm deleted the nytt-ferie-steg branch November 18, 2024 07:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants