Skip to content
This repository has been archived by the owner on Oct 31, 2023. It is now read-only.

Commit

Permalink
Merge pull request #59 from navikt/dev-stengt
Browse files Browse the repository at this point in the history
Dev stengt
  • Loading branch information
frodehansen2 authored Sep 16, 2020
2 parents 753ad16 + 20fc1ef commit e3d0758
Show file tree
Hide file tree
Showing 24 changed files with 1,210 additions and 2,706 deletions.
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ LOGIN_URL=http://localhost:8081/auth-mock/cookie?subject=mockSubject&redirect_lo
API_URL=http://localhost:8083
PUBLIC_PATH=/familie/sykdom-i-familien/soknad/omsorgspengerutbetaling-arbeidstaker
MELLOMLAGRING=on
STENGT_BHG_SKOLE=on
APPSTATUS_PROJECT_ID=ryujtq87
APPSTATUS_DATASET=staging
7 changes: 4 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ module.exports = {
rules: {
// Place to specify ESLint rules. Can be used to overwrite rules specified from the extended configs
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-var-requires': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'react/display-name': 'off',
'react-hooks/rules-of-hooks': 'error',
'react-hooks/exhaustive-deps': 'warn',
},
plugins: ['jsx-a11y'],
plugins: ['jsx-a11y', 'react-hooks'],
settings: {
react: {
version: 'detect', // Tells eslint-plugin-react to automatically detect the version of React to use
Expand Down
35 changes: 19 additions & 16 deletions __mocks__/mockApiData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,31 @@ export const mock1: SøknadApiData = {
tilOgMed: '2001-01-31',
landkode: 'abc',
landnavn: 'Abcland',
erEØSLand: false
erEØSLand: false,
},
{
fraOgMed: '2002-01-31',
tilOgMed: '2003-01-31',
landkode: 'def',
landnavn: 'Defland',
erEØSLand: false
}
erEØSLand: false,
},
],
opphold: [
{
fraOgMed: '2000-01-31',
tilOgMed: '2001-01-31',
landkode: 'abc',
landnavn: 'Abcland',
erEØSLand: false
erEØSLand: false,
},
{
fraOgMed: '2002-01-31',
tilOgMed: '2003-01-31',
landkode: 'def',
landnavn: 'Defland',
erEØSLand: false
}
erEØSLand: false,
},
],
arbeidsgivere: [
{
Expand All @@ -44,21 +44,21 @@ export const mock1: SøknadApiData = {
ansettelseslengde: {
merEnn4Uker: false,
begrunnelse: Begrunnelse.INGEN_AV_SITUASJONENE,
ingenAvSituasjoneneForklaring: 'En spesiell annen begrunnelse'
ingenAvSituasjoneneForklaring: 'En spesiell annen begrunnelse',
},
perioder: [
{
fraOgMed: '2002-01-21',
tilOgMed: '2002-01-31',
antallTimerPlanlagt: null,
antallTimerBorte: null
}
]
}
antallTimerBorte: null,
},
],
},
],
bekreftelser: {
harBekreftetOpplysninger: true,
harForståttRettigheterOgPlikter: true
harForståttRettigheterOgPlikter: true,
},
andreUtbetalinger: [],
erSelvstendig: false,
Expand All @@ -67,11 +67,14 @@ export const mock1: SøknadApiData = {
{
fødselsnummer: '12345678903',
fornavn: 'Doffen',
etternavn: 'Duck'
}
etternavn: 'Duck',
},
],
hjemmePgaSmittevernhensyn: false,
vedlegg: ['location/1', 'location/3', 'location/1']
vedlegg: ['location/1', 'location/3', 'location/1'],
_vedleggSmittevern: [],
_vedleggStengtBhgSkole: [],
hjemmePgaStengtBhgSkole: false,
};

export const sokerApiData: SøkerApiResponse = {
Expand All @@ -81,7 +84,7 @@ export const sokerApiData: SøkerApiResponse = {
fornavn: 'LOTTE',
mellomnavn: null,
etternavn: 'FAMILIE 5',
myndig: true
myndig: true,
};

export const mellomlagringResponse1 = {};
2 changes: 2 additions & 0 deletions nais/dev-sbs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ spec:
value: https://loginservice-q.nav.no/login?redirect=https://www-q0.nav.no/familie/sykdom-i-familien/soknad/omsorgspengerutbetaling-arbeidstaker/soknad
- name: UTILGJENGELIG
value: "off"
- name: STENGT_BHG_SKOLE
value: "on"
- name: MELLOMLAGRING
value: "on"
- name: APPSTATUS_PROJECT_ID
Expand Down
2 changes: 2 additions & 0 deletions nais/prod-sbs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ spec:
value: "on"
- name: UTILGJENGELIG
value: "off"
- name: STENGT_BHG_SKOLE
value: "on"
- name: MELLOMLAGRING
value: "on"
- name: APPSTATUS_PROJECT_ID
Expand Down
Loading

0 comments on commit e3d0758

Please sign in to comment.