Skip to content

Commit

Permalink
Flytter inn k9-saksbehandling-frontend (#5299)
Browse files Browse the repository at this point in the history
* Flytter inn etablert tilsyn

* inntektsmelding

* k9-frontend-modules

* medisinsk vilkår

* om barnet

* omsorgen for

* omsorgsdager

* endret stier til frontend modules som er flyttet inn i repoet

* fix imports

* Fiks tester
OBS! Noen er utkommentert i fakta-medisinsk-vilkår
Må fikses

* css lint fix

* Fikser tester

* fikser sirkulære deps

* fikser sirkulære deps

* tar bort unøvdenvig fil

* bruker bare msw for test

* stylingjusteringer

* Bruker framleis pakker fra annet repo

* Bruker framleis pakker fra annet repo

* Bruker framleis k9-frontend-modules-pakker fra annet repo

* nødvendig bump av ft-pakker

* bumper pakker

* endrer referanse

---------

Co-authored-by: Thomas H. Wiberg <thomas@thawi.no>
  • Loading branch information
hallvardastark and thomashwi authored Nov 29, 2023
1 parent 88e15ec commit 6e8694c
Show file tree
Hide file tree
Showing 652 changed files with 31,875 additions and 1,330 deletions.
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
mockServiceWorker.js
dev-fss-k9saksbehandling.yml
prod-fss-k9saksbehandling.yml
prod-fss-k9saksbehandling.yml
17 changes: 17 additions & 0 deletions cypress.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/* eslint-disable import/extensions */
/* eslint-disable @typescript-eslint/no-var-requires */
/* eslint-disable global-require */
import { defineConfig } from 'cypress';

export default defineConfig({
video: false,
e2e: {
// We've imported your old cypress plugins here.
// You may want to clean this up later by importing these.
setupNodeEvents(on, config) {
return require('./cypress/plugins/index.js')(on, config);
},
baseUrl: 'http://localhost:8484',
testIsolation: false,
},
});
5 changes: 5 additions & 0 deletions cypress/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"extends": [
"plugin:cypress/recommended"
]
}
20 changes: 20 additions & 0 deletions cypress/plugins/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/// <reference types="cypress" />
// ***********************************************************
// This example plugins/index.js can be used to load plugins
//
// You can change the location of this file or turn off loading
// the plugins file with the 'pluginsFile' configuration option.
//
// You can read more here:
// https://on.cypress.io/plugins-guide
// ***********************************************************

// This function is called when a project is opened or re-opened (e.g. due to
// the project's config changing)

/**
* @type {Cypress.PluginConfig}
*/
// eslint-disable-next-line no-unused-vars

module.exports = (on, config) => {};
26 changes: 26 additions & 0 deletions cypress/support/commands.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// ***********************************************
// This example commands.js shows you how to
// create various custom commands and overwrite
// existing commands.
//
// For more comprehensive examples of custom
// commands please read more here:
// https://on.cypress.io/custom-commands
// ***********************************************
//
//
// -- This is a parent command --
// Cypress.Commands.add('login', (email, password) => { ... })
//
//
// -- This is a child command --
// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
//
//
// -- This is a dual command --
// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
//
//
// -- This will overwrite an existing command --
// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
import '@testing-library/cypress/add-commands';
19 changes: 19 additions & 0 deletions cypress/support/e2e.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// ***********************************************************
// This example support/index.js is processed and
// loaded automatically before your test files.
//
// This is a great place to put global configuration and
// behavior that modifies Cypress.
//
// You can change the location of this file or turn off
// automatically serving support files with the
// 'supportFile' configuration option.
//
// You can read more here:
// https://on.cypress.io/configuration
// ***********************************************************

// Import commands.js using ES2015 syntax:
import './commands';
// Alternatively you can use CommonJS syntax:
// require('./commands')
3 changes: 2 additions & 1 deletion eslint/eslintrc.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const config = {
'import/extensions': ['error', 'ignorePackages', { js: 'never', jsx: 'never', ts: 'never', tsx: 'never' }],
'linebreak-style': OFF,
'import/no-named-as-default': OFF,
'max-len': [ERROR, 160],
'max-len': [1, 160],
'no-undef': ERROR,
'react/require-default-props': OFF,
'react/jsx-filename-extension': OFF,
Expand All @@ -61,6 +61,7 @@ const config = {
unnamedComponents: 'arrow-function',
},
],
'import/prefer-default-export': OFF,

// note you must disable the base rule as it can report incorrect errors
'no-nested-ternary': OFF,
Expand Down
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = {
moduleNameMapper: {
'\\.(svg)$': '<rootDir>/_mocks/fileMock.js',
'\\.(less|css)$': 'identity-obj-proxy',
uuid: require.resolve('uuid'),
'^uuid': require.resolve('uuid'),
},
roots: ['<rootDir>/packages/'],
setupFiles: ['<rootDir>/setup/setup.js'],
Expand Down
10 changes: 7 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
"@formatjs/intl-numberformat": "8.8.0",
"@hookform/error-message": "^2.0.1",
"@navikt/aksel-icons": "5.10.0",
"@navikt/ds-css": "5.10.0",
"@navikt/ds-react": "5.10.0",
"@navikt/ds-css": "5.11.2",
"@navikt/ds-react": "5.11.2",
"@navikt/ds-tailwind": "^5.10.0",
"@navikt/familie-endringslogg": "10.0.0",
"@navikt/ft-plattform-komponenter": "2.3.10",
"@navikt/ft-plattform-komponenter": "2.3.14",
"@popperjs/core": "2.11.8",
"@sentry/browser": "7.80.1",
"@storybook/testing-react": "2.0.1",
Expand Down Expand Up @@ -95,6 +95,7 @@
"@storybook/storybook-deployer": "2.8.16",
"@storybook/theming": "7.5.3",
"@svgr/webpack": "8.1.0",
"@testing-library/cypress": "^10.0.1",
"@testing-library/dom": "8.20.1",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "12.1.5",
Expand Down Expand Up @@ -124,13 +125,15 @@
"cross-env": "7.0.3",
"css-loader": "6.8.1",
"css-minimizer-webpack-plugin": "5.0.1",
"cypress": "^13.5.1",
"enzyme": "3.11.0",
"eslint": "8.54.0",
"eslint-config-airbnb": "19.0.4",
"eslint-config-prettier": "9.0.0",
"eslint-import-resolver-lerna": "2.0.0",
"eslint-import-resolver-webpack": "0.13.8",
"eslint-loader": "4.0.2",
"eslint-plugin-cypress": "^2.15.1",
"eslint-plugin-import": "2.29.0",
"eslint-plugin-jest": "27.6.0",
"eslint-plugin-jest-dom": "4.0.3",
Expand All @@ -144,6 +147,7 @@
"identity-obj-proxy": "3.0.0",
"ignore-styles": "5.0.1",
"jest": "29.7.0",
"jest-axe": "^8.0.0",
"jest-environment-jsdom": "29.7.0",
"jest-runner-eslint": "2.1.2",
"jest-transform-stub": "2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/behandling-anke/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"nav-frontend-typografi": "4.0.2",
"nav-frontend-typografi-style": "2.0.2",
"react": "18.2.0",
"react-intl": "6.5.2",
"react-intl": "6.5.5",
"react-redux": "8.1.3",
"redux": "4.2.1",
"redux-form": "8.3.10",
Expand Down
8 changes: 2 additions & 6 deletions packages/behandling-felles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,7 @@
"@k9-sak-web/modal-sett-pa-vent": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-plattform-komponenter": "2.3.10",
"@navikt/k9-fe-array-utils": "1.0.6",
"@navikt/k9-fe-bem-utils": "1.0.4",
"@navikt/k9-fe-date-utils": "1.0.9",
"@navikt/k9-fe-period-utils": "1.0.12",
"@navikt/ft-plattform-komponenter": "2.3.14",
"classnames": "2.3.2",
"nav-frontend-core": "6.0.1",
"nav-frontend-grid": "2.0.2",
Expand All @@ -35,7 +31,7 @@
"nav-frontend-typografi": "4.0.2",
"nav-frontend-typografi-style": "2.0.2",
"react": "18.2.0",
"react-intl": "6.5.2",
"react-intl": "6.5.5",
"react-redux": "8.1.3",
"redux-form": "8.3.10",
"reselect": "4.1.8"
Expand Down
8 changes: 4 additions & 4 deletions packages/behandling-frisinn/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
"@k9-sak-web/rest-api": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-fakta-beregning": "5.0.13",
"@navikt/ft-fakta-beregning-redesign": "1.0.12",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.16",
"@navikt/ft-fakta-beregning": "5.0.17",
"@navikt/ft-fakta-beregning-redesign": "1.0.16",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.20",
"react": "18.2.0",
"react-intl": "6.5.2",
"react-intl": "6.5.5",
"react-redux": "8.1.3",
"redux": "4.2.1",
"redux-form": "8.3.10",
Expand Down
2 changes: 1 addition & 1 deletion packages/behandling-innsyn/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"nav-frontend-typografi": "4.0.2",
"nav-frontend-typografi-style": "2.0.2",
"react": "18.2.0",
"react-intl": "6.5.2",
"react-intl": "6.5.5",
"react-redux": "8.1.3",
"redux": "4.2.1",
"redux-form": "8.3.10",
Expand Down
2 changes: 1 addition & 1 deletion packages/behandling-klage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"nav-frontend-typografi": "4.0.2",
"nav-frontend-typografi-style": "2.0.2",
"react": "18.2.0",
"react-intl": "6.5.2",
"react-intl": "6.5.5",
"react-redux": "8.1.3",
"redux": "4.2.1",
"redux-form": "8.3.10",
Expand Down
15 changes: 7 additions & 8 deletions packages/behandling-omsorgspenger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,21 @@
"@k9-sak-web/behandling-felles": "1.0.0",
"@k9-sak-web/fakta-barn-og-overfoeringsdager": "1.0.0",
"@k9-sak-web/fakta-barn-oms": "1.0.0",
"@k9-sak-web/fakta-inntektsmelding": "1.0.0",
"@k9-sak-web/fakta-omsorgen-for": "1.0.0",
"@k9-sak-web/konstanter": "1.0.0",
"@k9-sak-web/prosess-aarskvantum-oms": "1.0.0",
"@k9-sak-web/prosess-vilkar-soknadsfrist": "1.0.0",
"@k9-sak-web/rest-api": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-fakta-beregning": "5.0.13",
"@navikt/ft-fakta-beregning-redesign": "1.0.12",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.3.16",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.16",
"@navikt/k9-fe-http-utils": "1.0.8",
"@navikt/k9-fe-inntektsmelding": "1.0.2",
"@navikt/k9-fe-omsorgen-for": "1.0.2",
"@navikt/ft-fakta-beregning": "5.0.17",
"@navikt/ft-fakta-beregning-redesign": "1.0.16",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.3.20",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.20",
"nav-frontend-popover": "2.0.4",
"react": "18.2.0",
"react-intl": "6.5.2",
"react-intl": "6.5.5",
"react-redux": "8.1.3",
"redux": "4.2.1",
"redux-form": "8.3.10",
Expand Down
25 changes: 15 additions & 10 deletions packages/behandling-opplaeringspenger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@
"@fpsak-frontend/shared-components": "1.0.0",
"@fpsak-frontend/utils": "1.0.0",
"@k9-sak-web/behandling-felles": "1.0.0",
"@k9-sak-web/fakta-etablert-tilsyn": "1.0.0",
"@k9-sak-web/fakta-inntektsmelding": "1.0.0",
"@k9-sak-web/fakta-institusjon": "1.0.0",
"@k9-sak-web/fakta-medisinsk-vilkar": "1.0.0",
"@k9-sak-web/fakta-om-barnet": "1.0.0",
"@k9-sak-web/fakta-omsorgen-for": "1.0.0",
"@k9-sak-web/konstanter": "1.0.0",
"@k9-sak-web/prosess-uttak": "1.0.0",
"@k9-sak-web/prosess-vilkar-soknadsfrist": "1.0.0",
Expand All @@ -34,20 +39,20 @@
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/sak-app": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-fakta-beregning": "5.0.13",
"@navikt/ft-fakta-beregning-redesign": "1.0.12",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.3.16",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.16",
"@navikt/k9-fe-etablert-tilsyn": "1.0.2",
"@navikt/ft-fakta-beregning": "5.0.17",
"@navikt/ft-fakta-beregning-redesign": "1.0.16",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.3.20",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.20",
"@navikt/k9-fe-etablert-tilsyn": "1.0.3",
"@navikt/k9-fe-http-utils": "1.0.8",
"@navikt/k9-fe-inntektsmelding": "1.0.2",
"@navikt/k9-fe-medisinsk-vilkar": "1.0.2",
"@navikt/k9-fe-om-barnet": "1.0.2",
"@navikt/k9-fe-omsorgen-for": "1.0.2",
"@navikt/k9-fe-inntektsmelding": "1.0.3",
"@navikt/k9-fe-medisinsk-vilkar": "1.0.3",
"@navikt/k9-fe-om-barnet": "1.0.3",
"@navikt/k9-fe-omsorgen-for": "1.0.3",
"axios": "1.6.2",
"nav-frontend-alertstriper": "4.0.2",
"react": "18.2.0",
"react-intl": "6.5.2",
"react-intl": "6.5.5",
"react-redux": "8.1.3",
"redux": "4.2.1",
"redux-form": "8.3.10",
Expand Down
16 changes: 9 additions & 7 deletions packages/behandling-pleiepenger-sluttfase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
"@fpsak-frontend/shared-components": "1.0.0",
"@fpsak-frontend/utils": "1.0.0",
"@k9-sak-web/behandling-felles": "1.0.0",
"@k9-sak-web/fakta-inntektsmelding": "1.0.0",
"@k9-sak-web/fakta-medisinsk-vilkar": "1.0.0",
"@k9-sak-web/fakta-utenlandsopphold": "1.0.0",
"@k9-sak-web/konstanter": "1.0.0",
"@k9-sak-web/prosess-uttak": "1.0.0",
Expand All @@ -33,17 +35,17 @@
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/sak-app": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/ft-fakta-beregning": "5.0.13",
"@navikt/ft-fakta-beregning-redesign": "1.0.12",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.3.16",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.16",
"@navikt/ft-fakta-beregning": "5.0.17",
"@navikt/ft-fakta-beregning-redesign": "1.0.16",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.3.20",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.20",
"@navikt/k9-fe-http-utils": "1.0.8",
"@navikt/k9-fe-inntektsmelding": "1.0.2",
"@navikt/k9-fe-medisinsk-vilkar": "1.0.2",
"@navikt/k9-fe-inntektsmelding": "1.0.3",
"@navikt/k9-fe-medisinsk-vilkar": "1.0.3",
"axios": "1.6.2",
"nav-frontend-alertstriper": "4.0.2",
"react": "18.2.0",
"react-intl": "6.5.2",
"react-intl": "6.5.5",
"react-redux": "8.1.3",
"redux": "4.2.1",
"redux-form": "8.3.10",
Expand Down
25 changes: 15 additions & 10 deletions packages/behandling-pleiepenger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
"@fpsak-frontend/shared-components": "1.0.0",
"@fpsak-frontend/utils": "1.0.0",
"@k9-sak-web/behandling-felles": "1.0.0",
"@k9-sak-web/fakta-etablert-tilsyn": "1.0.0",
"@k9-sak-web/fakta-inntektsmelding": "1.0.0",
"@k9-sak-web/fakta-medisinsk-vilkar": "1.0.0",
"@k9-sak-web/fakta-om-barnet": "1.0.0",
"@k9-sak-web/fakta-omsorgen-for": "1.0.0",
"@k9-sak-web/fakta-utenlandsopphold": "1.0.0",
"@k9-sak-web/konstanter": "1.0.0",
"@k9-sak-web/prosess-uttak": "1.0.0",
Expand All @@ -35,20 +40,20 @@
"@k9-sak-web/sak-app": "1.0.0",
"@k9-sak-web/types": "1.0.0",
"@navikt/diagnosekoder": "^1.2023.0",
"@navikt/ft-fakta-beregning": "5.0.13",
"@navikt/ft-fakta-beregning-redesign": "1.0.12",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.3.16",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.16",
"@navikt/k9-fe-etablert-tilsyn": "1.0.2",
"@navikt/ft-fakta-beregning": "5.0.17",
"@navikt/ft-fakta-beregning-redesign": "1.0.16",
"@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.3.20",
"@navikt/ft-prosess-beregningsgrunnlag": "6.3.20",
"@navikt/k9-fe-etablert-tilsyn": "1.0.3",
"@navikt/k9-fe-http-utils": "1.0.8",
"@navikt/k9-fe-inntektsmelding": "1.0.2",
"@navikt/k9-fe-medisinsk-vilkar": "1.0.2",
"@navikt/k9-fe-om-barnet": "1.0.2",
"@navikt/k9-fe-omsorgen-for": "1.0.2",
"@navikt/k9-fe-inntektsmelding": "1.0.3",
"@navikt/k9-fe-medisinsk-vilkar": "1.0.3",
"@navikt/k9-fe-om-barnet": "1.0.3",
"@navikt/k9-fe-omsorgen-for": "1.0.3",
"axios": "1.6.2",
"nav-frontend-alertstriper": "4.0.2",
"react": "18.2.0",
"react-intl": "6.5.2",
"react-intl": "6.5.5",
"react-redux": "8.1.3",
"redux": "4.2.1",
"redux-form": "8.3.10",
Expand Down
Loading

0 comments on commit 6e8694c

Please sign in to comment.