Skip to content

Commit

Permalink
Bytt Ekspanderbartpanel til Accordion (#2736)
Browse files Browse the repository at this point in the history 
* Byttet I PP

* Fix jest test for PSBPunchForm

* Bytt EkspanderbartpanelBase i PLS

* Fix EndringAvSøknadsperioder

* Bytt EkspanderbartpanelBase i OLP

* Fix EndringAvSoknadsperioder PLS

* Slett pkg nav-frontend-ekspanderbartpanel

* Slett ubrukt gammel ds pakker

* pkg upd
  • Loading branch information
@poroshinaleksei
poroshinaleksei authored Nov 18, 2024
1 parent ebe0e3c commit 7a3157a
Show file tree
Hide file tree
Showing 15 changed files with 1,340 additions and 1,230 deletions.
2 changes: 1 addition & 1 deletion dist/mockServiceWorker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* - Please do NOT serve this file on production.
*/

const PACKAGE_VERSION = '2.6.4'
const PACKAGE_VERSION = '2.6.5'
const INTEGRITY_CHECKSUM = 'ca7800994cc8bfb5eb961e037c877074'
const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
const activeClientIds = new Set()
Expand Down
33 changes: 13 additions & 20 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"license": "MIT",
"dependencies": {
"@babel/runtime": "7.26.0",
"@grafana/faro-web-sdk": "1.11.0",
"@grafana/faro-web-tracing": "1.11.0",
"@grafana/faro-web-sdk": "1.12.0",
"@grafana/faro-web-tracing": "1.12.0",
"@k9-punsj-frontend/server": "workspace:",
"@navikt/aksel-icons": "7.5.1",
"@navikt/ds-css": "7.5.1",
Expand All @@ -28,18 +28,12 @@
"lodash.throttle": "4.1.1",
"mini-css-extract-plugin": "2.9.2",
"mustache-express": "1.3.2",
"nav-frontend-chevron-style": "1.0.4",
"nav-frontend-core": "6.0.1",
"nav-frontend-ekspanderbartpanel": "4.0.4",
"nav-frontend-js-utils": "1.0.20",
"nav-frontend-knapper-style": "2.1.2",
"nav-frontend-lenker": "2.0.2",
"nav-frontend-lenker-style": "2.0.2",
"nav-frontend-paneler-style": "2.0.2",
"nav-frontend-skjema": "4.0.6",
"nav-frontend-tabell-style": "2.1.2",
"nav-frontend-toggle": "2.1.3",
"nav-frontend-toggle-style": "2.1.2",
"nav-frontend-typografi": "4.0.2",
"nav-frontend-typografi-style": "2.0.2",
"object-hash": "3.0.0",
Expand All @@ -50,9 +44,9 @@
"react": "18.3.1",
"react-aria-menubutton": "7.0.3",
"react-collapse": "5.1.1",
"react-day-picker": "9.3.0",
"react-day-picker": "9.3.2",
"react-dom": "18.3.1",
"react-intl": "6.8.7",
"react-intl": "7.0.1",
"react-modal": "3.16.1",
"react-popper": "2.3.0",
"react-query": "3.39.3",
Expand All @@ -63,8 +57,8 @@
"redux-logger": "3.0.6",
"source-map-loader": "5.0.0",
"start-server-and-test": "2.0.8",
"tailwindcss": "3.4.14",
"tsconfig-paths-webpack-plugin": "4.1.0",
"tailwindcss": "3.4.15",
"tsconfig-paths-webpack-plugin": "4.2.0",
"typescript-string-operations": "1.5.1",
"ulid": "2.3.0",
"uuid": "11.0.3",
Expand Down Expand Up @@ -102,10 +96,10 @@
"@babel/preset-typescript": "7.26.0",
"@eslint/js": "^9.14.0",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.15",
"@storybook/addon-essentials": "8.4.2",
"@storybook/addon-interactions": "8.4.2",
"@storybook/addon-links": "8.4.2",
"@storybook/react": "8.4.2",
"@storybook/addon-essentials": "8.4.4",
"@storybook/addon-interactions": "8.4.4",
"@storybook/addon-links": "8.4.4",
"@storybook/react": "8.4.4",
"@testing-library/cypress": "10.0.2",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "6.6.3",
Expand All @@ -129,7 +123,7 @@
"@types/react-router-dom": "5.3.3",
"@types/react-test-renderer": "18.3.0",
"@types/redux-logger": "^3.0.13",
"@types/redux-mock-store": "1.0.6",
"@types/redux-mock-store": "1.5.0",
"@types/regenerator-runtime": "^0.13.8",
"@types/testing-library__cypress": "5.0.13",
"@types/uuid": "^10.0.0",
Expand Down Expand Up @@ -165,16 +159,15 @@
"less": "4.2.0",
"less-loader": "12.2.0",
"lint-staged": "15.2.10",
"msw": "2.6.4",
"nav-frontend-ekspanderbartpanel-style": "2.0.2",
"msw": "2.6.5",
"nav-frontend-skjema-style": "3.0.3",
"postcss": "8.4.49",
"postcss-less": "6.0.0",
"postcss-loader": "8.1.1",
"prettier": "3.3.3",
"react-refresh": "0.14.2",
"regenerator-runtime": "0.14.1",
"storybook": "8.4.2",
"storybook": "8.4.4",
"style-loader": "4.0.0",
"stylelint": "16.10.0",
"terser-webpack-plugin": "5.3.10",
Expand Down
117 changes: 61 additions & 56 deletions src/app/components/arbeidsforhold/containers/ArbeidsforholdPanel.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import * as React from 'react';

import { set } from 'lodash';
import { EkspanderbartpanelBase } from 'nav-frontend-ekspanderbartpanel';
import { CheckboksPanel, CheckboksPanelGruppe, RadioPanelGruppe } from 'nav-frontend-skjema';
import { useIntl } from 'react-intl';
import { Alert, Box, TextField, Textarea } from '@navikt/ds-react';
import { FormattedMessage, useIntl } from 'react-intl';
import { Accordion, Alert, Box, TextField, Textarea } from '@navikt/ds-react';
import ArbeidstidKalender from 'app/components/arbeidstid/ArbeidstidKalender';
import UhaanderteFeilmeldinger from 'app/components/skjema/UhaanderteFeilmeldinger';
import { periodeSpenn } from 'app/components/skjema/skjemaUtils';
Expand Down Expand Up @@ -780,62 +779,68 @@ const ArbeidsforholdPanel = ({
};

return (
<EkspanderbartpanelBase
apen={isOpen}
className="punchform__paneler"
tittel={intlHelper(intl, PunchFormPaneler.ARBEID)}
onClick={() => onPanelClick()}
<Accordion.Item
open={isOpen}
defaultOpen={isOpen}
onOpenChange={() => onPanelClick()}
data-test-id="accordionItem-arbeidsforholdPanel"
>
<CheckboksPanel
label={intlHelper(intl, Arbeidsforhold.ARBEIDSTAKER)}
value={Arbeidsforhold.ARBEIDSTAKER}
onChange={(e) => handleArbeidsforholdChange(Arbeidsforhold.ARBEIDSTAKER, e.target.checked)}
checked={getCheckedValueArbeid(Arbeidsforhold.ARBEIDSTAKER)}
/>
<VerticalSpacer eightPx />
{!!soknad.arbeidstid?.arbeidstakerList?.length && (
<Arbeidstakerperioder
soknad={soknad}
eksisterendeSoknadsperioder={eksisterendePerioder}
initialArbeidstaker={initialArbeidstaker}
updateSoknad={updateSoknad}
updateSoknadState={updateSoknadState}
getErrorMessage={getErrorMessage}
getUhaandterteFeil={getUhaandterteFeil}
<Accordion.Header>
<FormattedMessage id={PunchFormPaneler.ARBEID} />
</Accordion.Header>

<Accordion.Content>
<CheckboksPanel
label={intlHelper(intl, Arbeidsforhold.ARBEIDSTAKER)}
value={Arbeidsforhold.ARBEIDSTAKER}
onChange={(e) => handleArbeidsforholdChange(Arbeidsforhold.ARBEIDSTAKER, e.target.checked)}
checked={getCheckedValueArbeid(Arbeidsforhold.ARBEIDSTAKER)}
/>
)}
<CheckboksPanel
label={intlHelper(intl, Arbeidsforhold.FRILANSER)}
value={Arbeidsforhold.FRILANSER}
onChange={(e) => handleArbeidsforholdChange(Arbeidsforhold.FRILANSER, e.target.checked)}
checked={getCheckedValueArbeid(Arbeidsforhold.FRILANSER)}
/>
<VerticalSpacer eightPx />
{!!soknad.opptjeningAktivitet.frilanser && (
<Box padding="4" borderWidth="1" borderRadius="small" className="frilanserpanel">
{frilanserperioder()}
</Box>
)}
<CheckboksPanel
label={intlHelper(intl, Arbeidsforhold.SELVSTENDIG)}
value={Arbeidsforhold.SELVSTENDIG}
onChange={(e) => handleArbeidsforholdChange(Arbeidsforhold.SELVSTENDIG, e.target.checked)}
checked={getCheckedValueArbeid(Arbeidsforhold.SELVSTENDIG)}
/>
{!!soknad.opptjeningAktivitet.selvstendigNaeringsdrivende && (
<>
<Alert size="small" variant="info" className="sn-alertstripe">
{intlHelper(intl, 'skjema.sn.info')}
</Alert>
<Box padding="4" borderWidth="1" borderRadius="small" className="selvstendigpanel">
{selvstendigperioder()}
<VerticalSpacer eightPx />
{!!soknad.arbeidstid?.arbeidstakerList?.length && (
<Arbeidstakerperioder
soknad={soknad}
eksisterendeSoknadsperioder={eksisterendePerioder}
initialArbeidstaker={initialArbeidstaker}
updateSoknad={updateSoknad}
updateSoknadState={updateSoknadState}
getErrorMessage={getErrorMessage}
getUhaandterteFeil={getUhaandterteFeil}
/>
)}
<CheckboksPanel
label={intlHelper(intl, Arbeidsforhold.FRILANSER)}
value={Arbeidsforhold.FRILANSER}
onChange={(e) => handleArbeidsforholdChange(Arbeidsforhold.FRILANSER, e.target.checked)}
checked={getCheckedValueArbeid(Arbeidsforhold.FRILANSER)}
/>
<VerticalSpacer eightPx />
{!!soknad.opptjeningAktivitet.frilanser && (
<Box padding="4" borderWidth="1" borderRadius="small" className="frilanserpanel">
{frilanserperioder()}
</Box>
</>
)}
<UhaanderteFeilmeldinger
getFeilmeldinger={() => (getUhaandterteFeil && getUhaandterteFeil('ytelse.arbeidstid')) || []}
/>
</EkspanderbartpanelBase>
)}
<CheckboksPanel
label={intlHelper(intl, Arbeidsforhold.SELVSTENDIG)}
value={Arbeidsforhold.SELVSTENDIG}
onChange={(e) => handleArbeidsforholdChange(Arbeidsforhold.SELVSTENDIG, e.target.checked)}
checked={getCheckedValueArbeid(Arbeidsforhold.SELVSTENDIG)}
/>
{!!soknad.opptjeningAktivitet.selvstendigNaeringsdrivende && (
<>
<Alert size="small" variant="info" className="sn-alertstripe">
{intlHelper(intl, 'skjema.sn.info')}
</Alert>
<Box padding="4" borderWidth="1" borderRadius="small" className="selvstendigpanel">
{selvstendigperioder()}
</Box>
</>
)}
<UhaanderteFeilmeldinger
getFeilmeldinger={() => (getUhaandterteFeil && getUhaandterteFeil('ytelse.arbeidstid')) || []}
/>
</Accordion.Content>
</Accordion.Item>
);
};
export default ArbeidsforholdPanel;
Loading

0 comments on commit 7a3157a

Please sign in to comment.