Skip to content

Commit

Permalink
Pakkeoppdateringer020524 (#2855)
Browse files Browse the repository at this point in the history
* pakkeroppdateringer

* pakkeoppdateringer

* named exports på fra css modules

* stylelint

* stylelint

* blabla

* revert chai....

* yarnlock
  • Loading branch information
vebnor committed May 2, 2024
1 parent 2e2d2b4 commit 2cce132
Show file tree
Hide file tree
Showing 96 changed files with 1,325 additions and 1,015 deletions.
2 changes: 1 addition & 1 deletion e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"license": "ISC",
"devDependencies": {
"@playwright/test": "1.43.1",
"@types/node": "20.12.7"
"@types/node": "20.12.8"
}
}
61 changes: 30 additions & 31 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,38 +13,38 @@
"dependencies": {
"@formatjs/intl-datetimeformat": "6.12.3",
"@formatjs/intl-numberformat": "8.10.1",
"@navikt/aksel-icons": "6.6.0",
"@navikt/ds-css": "6.6.0",
"@navikt/aksel-icons": "6.6.1",
"@navikt/ds-css": "6.6.1",
"@navikt/ds-icons": "3.4.3",
"@navikt/ds-react": "6.6.0",
"@navikt/ds-tailwind": "6.6.0",
"@navikt/ds-tokens": "6.6.0",
"@navikt/ds-react": "6.6.1",
"@navikt/ds-tailwind": "6.6.1",
"@navikt/ds-tokens": "6.6.1",
"@navikt/familie-endringslogg": "12.0.0",
"@navikt/fnrvalidator": "1.3.3",
"@navikt/fnrvalidator": "^2.0.7",
"@navikt/ft-form-hooks": "4.4.3",
"@navikt/ft-form-validators": "2.3.3",
"@navikt/ft-plattform-komponenter": "2.5.5",
"@navikt/ft-plattform-komponenter": "2.5.6",
"@popperjs/core": "2.11.8",
"@reach/combobox": "0.18.0",
"@sentry/browser": "7.111.0",
"@sentry/cli": "2.31.0",
"@sentry/react": "^7.111.0",
"@sentry/browser": "7.112.2",
"@sentry/cli": "2.31.1",
"@sentry/react": "^7.112.2",
"@testing-library/jest-dom": "6.4.2",
"@testing-library/user-event": "14.5.2",
"@types/jest": "29.5.12",
"@typescript-eslint/eslint-plugin": "6.21.0",
"@typescript-eslint/parser": "6.21.0",
"@typescript-eslint/eslint-plugin": "7.8.0",
"@typescript-eslint/parser": "7.8.0",
"autoprefixer": "10.4.19",
"axios": "1.6.8",
"babel-runtime": "6.26.0",
"chai": "4.4.1",
"circular-dependency-plugin": "5.2.2",
"classnames": "2.5.1",
"dayjs": "1.11.10",
"dayjs": "1.11.11",
"echarts": "5.5.0",
"express": "4.19.2",
"final-form": "4.20.10",
"formik": "2.4.5",
"formik": "2.4.6",
"history": "5.3.0",
"lodash": "4.17.21",
"moment": "2.30.1",
Expand Down Expand Up @@ -87,40 +87,40 @@
"nav-frontend-typografi-style": "2.0.2",
"prop-types": "15.8.1",
"query-string": "7.1.3",
"react": "18.2.0",
"react": "18.3.1",
"react-collapse": "5.1.1",
"react-day-picker": "7.4.10",
"react-dom": "18.2.0",
"react-dom": "18.3.1",
"react-final-form": "6.5.9",
"react-hook-form": "7.51.3",
"react-idle-timer": "5.7.2",
"react-intl": "6.6.5",
"react-modal": "3.16.1",
"react-popper": "2.3.0",
"react-query": "3.39.3",
"react-router": "6.22.3",
"react-router-dom": "6.22.3",
"react-router": "6.23.0",
"react-router-dom": "6.23.0",
"tailwindcss": "3.4.3",
"uuid": "9.0.1"
},
"devDependencies": {
"@babel/core": "7.24.4",
"@babel/core": "7.24.5",
"@babel/plugin-proposal-class-properties": "7.18.6",
"@babel/plugin-proposal-object-rest-spread": "7.20.7",
"@babel/plugin-transform-runtime": "7.24.3",
"@babel/preset-env": "7.24.4",
"@babel/preset-env": "7.24.5",
"@babel/preset-react": "7.24.1",
"@babel/preset-typescript": "7.24.1",
"@babel/register": "7.23.7",
"@navikt/aksel-stylelint": "6.6.0",
"@navikt/aksel-stylelint": "6.6.1",
"@playwright/test": "1.43.1",
"@testing-library/react": "14.3.1",
"@testing-library/react": "15.0.6",
"@trivago/prettier-plugin-sort-imports": "4.3.0",
"@types/chai": "4.3.14",
"@types/history": "5.0.0",
"@types/react": "18.2.79",
"@types/react": "18.3.1",
"@types/react-collapse": "5.0.4",
"@types/react-dom": "18.2.25",
"@types/react-dom": "18.3.0",
"@types/react-intl": "3.0.0",
"@types/react-redux": "7.1.33",
"@types/react-router-dom": "5.3.3",
Expand All @@ -129,28 +129,28 @@
"babel-loader": "9.1.3",
"copy-webpack-plugin": "12.0.2",
"cross-env": "7.0.3",
"css-loader": "6.11.0",
"css-loader": "7.1.1",
"css-minimizer-webpack-plugin": "6.0.0",
"dotenv": "16.4.5",
"eslint": "8.57.0",
"eslint": "9.1.1",
"eslint-config-airbnb": "19.0.4",
"eslint-config-import": "0.13.0",
"eslint-config-prettier": "9.1.0",
"eslint-import-resolver-typescript": "3.6.1",
"eslint-import-resolver-webpack": "0.13.8",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-jest": "27.9.0",
"eslint-plugin-jest": "28.3.0",
"eslint-plugin-jest-dom": "5.4.0",
"eslint-plugin-jsx-a11y": "6.8.0",
"eslint-plugin-react": "7.34.1",
"eslint-plugin-react-hooks": "4.6.0",
"eslint-plugin-react-hooks": "4.6.2",
"html-webpack-plugin": "5.6.0",
"husky": "9.0.11",
"identity-obj-proxy": "3.0.0",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"jest-transform-stub": "2.0.0",
"jsdom": "23.2.0",
"jsdom": "24.0.0",
"less": "4.2.0",
"less-loader": "12.2.0",
"lint-staged": "15.2.2",
Expand All @@ -159,14 +159,13 @@
"postcss-loader": "8.1.1",
"stylelint": "15.11.0",
"stylelint-config-prettier": "9.0.5",
"stylelint-config-standard": "34.0.0",
"stylelint-order": "6.0.4",
"terser-webpack-plugin": "5.3.10",
"thread-loader": "4.0.2",
"typescript": "5.4.5",
"webpack": "5.91.0",
"webpack-cli": "5.1.4",
"webpack-dev-server": "4.15.2",
"webpack-dev-server": "5.0.4",
"webpack-merge": "5.10.0"
},
"resolutions": {
Expand Down
2 changes: 1 addition & 1 deletion src/client/app/admin/AdminIndex.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import useGlobalStateRestApiData from 'api/rest-api-hooks/src/global-data/useGlo
import LoadingPanel from 'sharedComponents/LoadingPanel';
import { parseQueryString } from 'utils/urlUtils';
import AdminPanels from './AdminPanels';
import styles from './adminIndex.css';
import * as styles from './adminIndex.css';
import AdminDashboard from './components/AdminDashboard';
import IkkeTilgangTilAvdelingslederPanel from './components/IkkeTilgangTilAvdelingslederPanel';
import EndreDriftsmeldingerIndex from './driftsmeldinger/EndreDriftsmeldingerIndex';
Expand Down
2 changes: 1 addition & 1 deletion src/client/app/admin/components/AdminDashboard.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import PropTypes from 'prop-types';
import styles from './adminDashboard.css';
import * as styles from './adminDashboard.css';

type TsProps = Readonly<{
children: React.ReactNode;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { FormattedMessage } from 'react-intl';
import Panel from 'nav-frontend-paneler';
import { Undertittel } from 'nav-frontend-typografi';
import styles from './ikkeTilgangTilAvdelingslederPanel.css';
import * as styles from './ikkeTilgangTilAvdelingslederPanel.css';

/**
* IkkeTilgangTilAvdelingslederPanel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { FormattedMessage } from 'react-intl';
import { Panel } from 'nav-frontend-paneler';
import { Undertittel } from 'nav-frontend-typografi';
import styles from './ikkeTilgangTilKode6AvdelingPanel.css';
import * as styles from './ikkeTilgangTilKode6AvdelingPanel.css';

/**
* IkkeTilgangTilKode6AvdelingPanel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import VerticalSpacer from 'sharedComponents/VerticalSpacer';
import { getDateAndTime } from 'utils/dateUtils';
import { Driftsmelding } from '../driftsmeldingTsType';
import SletteDriftsmeldingerModal from './SletteDriftsmeldingerModal';
import styles from './driftsmeldingerTabell.css';
import * as styles from './driftsmeldingerTabell.css';

const headerTextCodes = ['DriftsmeldingTabell.Tekst', 'DriftsmeldingTabell.Aktiv', 'DriftsmeldingTabell.Dato'];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import VerticalSpacer from 'sharedComponents/VerticalSpacer';
import { FlexColumn, FlexContainer, FlexRow } from 'sharedComponents/flexGrid';
import { hasValidEmailFormat } from 'utils/validation/validators';
import { Driftsmelding } from '../driftsmeldingTsType';
import styles from './leggTilDriftsmeldingForm.css';
import * as styles from './leggTilDriftsmeldingForm.css';

/**
* LeggTilDriftsmeldingForm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Normaltekst } from 'nav-frontend-typografi';
import Image from 'sharedComponents/Image';
import Modal from 'sharedComponents/Modal';
import { Driftsmelding } from '../driftsmeldingTsType';
import styles from './sletteDriftsmeldingerModal.css';
import * as styles from './sletteDriftsmeldingerModal.css';

type TsProps = Readonly<{
valgtDriftsmelding: Driftsmelding;
Expand Down
2 changes: 1 addition & 1 deletion src/client/app/app/components/DriftsmeldingPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Undertekst } from 'nav-frontend-typografi';
import Image from 'sharedComponents/Image';
import { DD_MM_HHMM } from 'utils/formats';
import { Driftsmelding } from '../../admin/driftsmeldinger/driftsmeldingTsType';
import styles from './driftsmeldingPanel.css';
import * as styles from './driftsmeldingPanel.css';

interface OwnProps {
driftsmeldinger: Driftsmelding[];
Expand Down
2 changes: 1 addition & 1 deletion src/client/app/app/components/ErrorMessagePanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Lukknapp from 'nav-frontend-lukknapp';
import { Undertekst } from 'nav-frontend-typografi';
import EventType from 'api/rest-api/src/requestApi/eventType';
import decodeHtmlEntity from 'utils/decodeHtmlEntityUtils';
import styles from './errorMessagePanel.css';
import * as styles from './errorMessagePanel.css';

export const getErrorMessageList = (
intl: IntlShape,
Expand Down
2 changes: 1 addition & 1 deletion src/client/app/app/components/HeaderWithErrorPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { useGlobalStateRestApiData } from 'api/rest-api-hooks';
import useRestApi from 'api/rest-api-hooks/src/local-data/useRestApi';
import { Driftsmelding } from '../../admin/driftsmeldinger/driftsmeldingTsType';
import ErrorMessagePanel from './ErrorMessagePanel';
import styles from './headerWithErrorPanel.css';
import * as styles from './headerWithErrorPanel.css';

interface OwnProps {
queryStrings: {
Expand Down
3 changes: 1 addition & 2 deletions src/client/app/app/components/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import SaksbehandlerIndex from 'saksbehandler/SaksbehandlerIndex';
import AdminIndex from '../../admin/AdminIndex';
import FilterIndex from '../../filter/FilterIndex';
import MissingPage from './MissingPage';
import styles from './home.css';

interface OwnProps {
headerHeight: number;
Expand All @@ -28,7 +27,7 @@ const Home: FunctionComponent<OwnProps> = ({ headerHeight }) => {
const contextValues = useMemo(() => ({ felter: data ? data.felter : [] }), [data]);

return (
<div className={styles.content} style={{ margin: `${headerHeight + 10}px auto 0` }}>
<div style={{ margin: `${headerHeight + 10}px auto 0` }}>
<AppContext.Provider value={contextValues}>
<SentryRoutes>
<Route path="/filter" element={<FilterIndex tittel="Søk på oppgaver" visningV3 />} />
Expand Down
2 changes: 1 addition & 1 deletion src/client/app/avdelingsleder/AvdelingslederIndex.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import LoadingPanel from 'sharedComponents/LoadingPanel';
import VerticalSpacer from 'sharedComponents/VerticalSpacer';
import { avdelingslederTilgangTilNyeKoer } from 'app/envVariablesUtils';
import { parseQueryString } from 'utils/urlUtils';
import styles from './avdelingslederIndex.css';
import * as styles from './avdelingslederIndex.css';
import AvdelingslederPanels from './avdelingslederPanels';
import EndreBehandlingskoerIndex from './behandlingskoer/EndreBehandlingskoerIndex';
import BehandlingskoerIndex from './behandlingskoerV3/BehandlingskoerIndex';
Expand Down
2 changes: 1 addition & 1 deletion src/client/app/avdelingsleder/GrafContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Hjelpetekst from 'nav-frontend-hjelpetekst';
import { Heading, Panel, Select } from '@navikt/ds-react';
import VerticalSpacer from 'sharedComponents/VerticalSpacer';
import { lagreTilLocalStorageCallback } from 'utils/localStorageHelper';
import styles from './grafContainer.css';
import * as styles from './grafContainer.css';
import { fremtidigeUker, uker, ytelseTyper } from './nokkeltall/nokkeltallUtils';

interface OwnProps {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import VerticalSpacer from 'sharedComponents/VerticalSpacer';
import addCircle from '../../../../images/add-circle-bla.svg';
import { Oppgaveko } from '../oppgavekoTsType';
import SletteOppgavekoModal from './SletteOppgavekoModal';
import styles from './gjeldendeOppgavekoerTabell.css';
import * as styles from './gjeldendeOppgavekoerTabell.css';

const headerTextCodes = [
'GjeldendeOppgavekoerTabell.Listenavn',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Hovedknapp, Knapp } from 'nav-frontend-knapper';
import { Normaltekst } from 'nav-frontend-typografi';
import Modal from 'sharedComponents/Modal';
import { Oppgaveko } from '../oppgavekoTsType';
import styles from './sletteOppgavekoModal.css';
import * as styles from './sletteOppgavekoModal.css';

type TsProps = Readonly<{
intl: any;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { CheckboxField, RadioGroupField, RadioOption } from 'form/FinalFields';
import kodeverkTyper from 'kodeverk/kodeverkTyper';
import ArrowBox from 'sharedComponents/ArrowBox';
import VerticalSpacer from 'sharedComponents/VerticalSpacer';
import styles from './andreKriterierVelger.css';
import * as styles from './andreKriterierVelger.css';

interface OwnProps {
valgtOppgavekoId: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import kodeverkTyper from 'kodeverk/kodeverkTyper';
import VerticalSpacer from 'sharedComponents/VerticalSpacer';
import { getKodeverkFraKode, getKodeverknavnFraKode } from 'utils/kodeverkUtils';
import punsjBehandlingstyper from '../../../../types/PunsjBehandlingstyper';
import styles from './utvalgskriterierForOppgavekoForm.css';
import * as styles from './utvalgskriterierForOppgavekoForm.css';

const behandlingstypeOrder = Object.values(behandlingType);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useFormik } from 'formik';
import { Undertekst } from 'nav-frontend-typografi';
import { TextField } from '@navikt/ds-react';
import ArrowBox from 'sharedComponents/ArrowBox';
import styles from './utvalgskriterierForOppgavekoForm.css';
import * as styles from './utvalgskriterierForOppgavekoForm.css';

const validate = (values) => {
const errors: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import VerticalSpacer from 'sharedComponents/VerticalSpacer';
import { FlexColumn, FlexContainer, FlexRow } from 'sharedComponents/flexGrid';
import { DDMMYYYY_DATE_FORMAT, ISO_DATE_FORMAT } from 'utils/formats';
import { hasValidDate } from 'utils/validation/validators';
import styles from './sorteringVelger.css';
import * as styles from './sorteringVelger.css';

const getLagreDatoFn =
(lagreOppgavekoSorteringTidsintervallDato, valgtOppgavekoId, annenDato, erFomDato, hentKo) => (e) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { CheckboxField } from 'form/FinalFields';
import fagsakYtelseType from 'kodeverk/fagsakYtelseType';
import kodeverkTyper from 'kodeverk/kodeverkTyper';
import VerticalSpacer from 'sharedComponents/VerticalSpacer';
import styles from './utvalgskriterierForOppgavekoForm.css';
import * as styles from './utvalgskriterierForOppgavekoForm.css';

const finnFagsakYtelseTypeNavn = (fagsakYtelseTyper, valgtFagsakYtelseType) => {
const type = fagsakYtelseTyper.find((fyt) => fyt.kode === valgtFagsakYtelseType);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import useRestApiRunner from 'api/rest-api-hooks/src/local-data/useRestApiRunner
import { Oppgaveko } from 'avdelingsleder/behandlingskoer/oppgavekoTsType';
import { RadioGroupField, RadioOption } from 'form/FinalFields';
import VerticalSpacer from 'sharedComponents/VerticalSpacer';
import styles from './utvalgskriterierForOppgavekoForm.css';
import * as styles from './utvalgskriterierForOppgavekoForm.css';

interface OwnProps {
valgtOppgaveko: Oppgaveko;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import VerticalSpacer from 'sharedComponents/VerticalSpacer';
import { getKodeverknavnFraKode } from 'utils/kodeverkUtils';
import KriterierType from '../../../../types/KriterierType';
import DatoSorteringValg from './DatoSorteringValg';
import styles from './utvalgskriterierForOppgavekoForm.css';
import * as styles from './utvalgskriterierForOppgavekoForm.css';

interface OwnProps {
intl: any;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import FagsakYtelseTypeVelger from './FagsakYtelseTypeVelger';
import MerknadVelger from './MerknadVelger';
import OppgaveKoKriterieVelger from './OppgaveKøKriterieVelger';
import SorteringVelger from './SorteringVelger';
import styles from './utvalgskriterierForOppgavekoForm.css';
import * as styles from './utvalgskriterierForOppgavekoForm.css';

const minLength3 = minLength(3);
const maxLength100 = maxLength(100);
Expand Down Expand Up @@ -157,7 +157,7 @@ export const UtvalgskriterierForOppgavekoForm: FunctionComponent<OwnProps & Wrap
<Normaltekst className={styles.header}>
<FormattedMessage id="UtvalgskriterierForOppgavekoForm.Saksbehandlere" />
</Normaltekst>
<hr className={styles.line1} />
<hr />
<SaksbehandlereForOppgavekoForm
valgtOppgaveko={valgtOppgaveko}
alleSaksbehandlere={alleSaksbehandlere}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Saksbehandler } from 'avdelingsleder/bemanning/saksbehandlerTsType';
import { CheckboxField } from 'form/FinalFields';
import VerticalSpacer from 'sharedComponents/VerticalSpacer';
import { Oppgaveko } from '../../oppgavekoTsType';
import styles from './saksbehandlereForOppgavekoForm.css';
import * as styles from './saksbehandlereForOppgavekoForm.css';

interface OwnProps {
valgtOppgaveko: Oppgaveko;
Expand Down

0 comments on commit 2cce132

Please sign in to comment.