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.

Sign up for GitHub

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

Feature/refaktorering ettersending #1479

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Feature/refaktorering ettersending #1479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
88f6955
Refaktorerer ettersending
nurrebass1 Mar 14, 2025
951cff6
Gjør loggene ved kjøring av tester mindre verbose
nurrebass1 Mar 14, 2025
703e255
Oppdaterer tester
nurrebass1 Mar 14, 2025
addb908
Refaktorerer ettersending til subsequentSubmissionTypes
nurrebass1 Mar 18, 2025
b4ee0f2
Fikser kommentarer etter PR
nurrebass1 Mar 19, 2025
27af1d4
Legger tilbake ettersending
nurrebass1 Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/accordion.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@
"skjemanummer": "accordion-test",
"tema": "AGR",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/activities.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@
"skjemanummer": "testing-activities",
"tema": "AGR",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/container-datagrid.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@
"skjemanummer": "containerDatagrid123",
"tema": "GEN",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/container123.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,7 @@
"skjemanummer": "container-123",
"tema": "GEN",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/custom-components-alert.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@
"skjemanummer": "testingalert",
"tema": "AGR",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/custom-components-checkbox.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@
"skjemanummer": "checkbox-test",
"tema": "AGR",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/datagrid-conditional.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,7 +1118,7 @@
"skjemanummer": "dg123456",
"tema": "ENF",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/datagrid-react-components.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,7 @@
"skjemanummer": "datagrid-react",
"tema": "DAG",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/datagrid.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@
"skjemanummer": "datagrid-123",
"tema": "DAG",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/driving-list.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
"skjemanummer": "test-driving-list",
"tema": "BIL",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/form-email.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@
"skjemanummer": "TST 10-11.12",
"tema": "SYK",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/form-select-v1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,7 +620,7 @@
"skjemanummer": "Test-select",
"tema": "BIL",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/form-select-v2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@
"skjemanummer": "Test-select",
"tema": "BIL",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/hidden-conditional.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@
"skjemanummer": "hidden-test",
"tema": "AAP",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/mellomlagring-nested-values.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26150,7 +26150,7 @@
"published": "2025-02-06T11:04:44.706Z",
"publishedBy": "Rosseland, Rune",
"publishedLanguages": ["nn-NO", "en"],
"ettersending": "PAPIR_OG_DIGITAL"
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"]
},
"project": "628ca77305690db58c974cfd",
"revisions": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/month-picker.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@
"skjemanummer": "monthpicker-test",
"tema": "AGR",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/nav083501.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6324,7 +6324,7 @@
"published": "2024-01-08T08:33:50.638Z",
"publishedBy": "Rosseland, Rune",
"publishedLanguages": [],
"ettersending": "PAPIR_OG_DIGITAL"
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"]
},
"access": [
{
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/nav111221b.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7059,7 +7059,7 @@
"skjemanummer": "NAV 11-12.21B",
"tema": "TSO",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/navdatepicker.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,7 +823,7 @@
"skjemanummer": "NAVDATEPICKER",
"tema": "ERS",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/number.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -933,7 +933,7 @@
"skjemanummer": "testing-number",
"tema": "AGR",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/radio.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@
"skjemanummer": "radio-test",
"tema": "AAP",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/select-boxes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@
"skjemanummer": "select-boxes-test",
"tema": "AGR",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/test-mellomlagring-v2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1837,7 +1837,7 @@
"isTestForm": true,
"modified": "2023-08-30T12:17:45.811Z",
"modifiedBy": "[email protected]",
"ettersending": "PAPIR_OG_DIGITAL"
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"]
},
"project": "628ca77305690db58c974cfd",
"revisions": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/test-mellomlagring.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2383,7 +2383,7 @@
"isTestForm": true,
"modified": "2023-08-30T12:17:45.811Z",
"modifiedBy": "[email protected]",
"ettersending": "PAPIR_OG_DIGITAL"
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"]
},
"project": "628ca77305690db58c974cfd",
"revisions": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/textfield.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
"skjemanummer": "test-tekstfelt",
"tema": "GEN",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/year.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@
"skjemanummer": "test-arstall",
"tema": "GEN",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
2 changes: 1 addition & 1 deletion mocks/mocks/data/formio-api/your-information.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@
"skjemanummer": "test-your-information",
"tema": "ERS",
"submissionTypes": ["PAPER", "DIGITAL"],
"ettersending": "PAPIR_OG_DIGITAL",
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
"signatures": [
{
"label": "",
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"preview:bygger": "yarn workspace @navikt/bygger-backend preview",
"preview:fyllut": "yarn workspace @navikt/fyllut-backend preview",
"test": "concurrently \"yarn workspace @navikt/bygger-frontend test\" \"yarn workspace @navikt/bygger-backend test\" \"yarn workspace @navikt/fyllut-frontend test\" \"yarn workspace @navikt/fyllut-backend test\" \"yarn workspace @navikt/skjemadigitalisering-shared-domain test\" \"yarn workspace @navikt/skjemadigitalisering-shared-components test\"",
"test:nowarnings": "NODE_OPTIONS=--no-warnings yarn test",
"test:bygger": "concurrently \"yarn workspace @navikt/bygger-frontend test\" \"yarn workspace @navikt/bygger-backend test\"",
"test:fyllut": "concurrently \"yarn workspace @navikt/fyllut-frontend test\" \"yarn workspace @navikt/fyllut-backend test\"",
"test:shared-domain": "yarn workspace @navikt/skjemadigitalisering-shared-domain test",
Expand Down
4 changes: 2 additions & 2 deletions packages/bygger-backend/src/migration/migrationScripts.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ describe('Migration scripts', () => {
properties: {
...originalForm.properties,
submissionTypes: ['DIGITAL'],
ettersending: undefined,
subsequentSubmissionTypes: ['PAPER', 'DIGITAL'],
},
};
const { migratedForm: actual } = migrateForm(
Expand Down Expand Up @@ -341,7 +341,7 @@ describe('Migration scripts', () => {
...originalForm.properties,
skjemanummer: 'Form1',
submissionTypes: ['DIGITAL'],
ettersending: undefined,
subsequentSubmissionTypes: ['PAPER', 'DIGITAL'],
},
};

Expand Down
15 changes: 12 additions & 3 deletions packages/bygger-backend/src/services/ReportService.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ describe('ReportService', () => {
skjemanummer: 'TEST1',
signatures: undefined,
submissionTypes: [],
subsequentSubmissionTypes: [],
} as unknown as FormPropertiesType,
},
];
Expand All @@ -125,6 +126,7 @@ describe('ReportService', () => {
skjemanummer: 'TEST1',
signatures: [{ label: '' }],
submissionTypes: [],
subsequentSubmissionTypes: [],
} as unknown as FormPropertiesType,
},
];
Expand All @@ -148,6 +150,7 @@ describe('ReportService', () => {
skjemanummer: 'TEST1',
signatures: [{ label: 'Lege' }, { label: 'Verge' }, { label: 'Søker' }],
submissionTypes: [],
subsequentSubmissionTypes: [],
} as unknown as FormPropertiesType,
},
];
Expand Down Expand Up @@ -179,6 +182,7 @@ describe('ReportService', () => {
published: '2022-07-28T10:00:10.325Z',
modified: '2022-07-28T10:00:10.325Z',
submissionTypes: [],
subsequentSubmissionTypes: [],
} as unknown as FormPropertiesType,
} as Form,
];
Expand Down Expand Up @@ -206,6 +210,7 @@ describe('ReportService', () => {
published: '2022-07-28T10:00:10.325Z',
modified: '2022-07-28T11:00:05.254Z',
submissionTypes: [],
subsequentSubmissionTypes: [],
} as unknown as FormPropertiesType,
} as Form,
];
Expand All @@ -231,6 +236,7 @@ describe('ReportService', () => {
skjemanummer: 'TEST1',
modified: '2022-07-28T11:00:05.254Z',
submissionTypes: [],
subsequentSubmissionTypes: [],
} as unknown as FormPropertiesType,
} as Form,
];
Expand Down Expand Up @@ -332,6 +338,7 @@ describe('ReportService', () => {
] as Component[],
properties: {
submissionTypes: [],
subsequentSubmissionTypes: [],
} as unknown as FormPropertiesType,
} as Form,
{
Expand All @@ -342,6 +349,7 @@ describe('ReportService', () => {
status: 'published',
properties: {
submissionTypes: [],
subsequentSubmissionTypes: [],
} as unknown as FormPropertiesType,
} as Form,
{
Expand All @@ -359,6 +367,7 @@ describe('ReportService', () => {
] as Component[],
properties: {
submissionTypes: [],
subsequentSubmissionTypes: [],
} as unknown as FormPropertiesType,
} as Form,
];
Expand Down Expand Up @@ -427,7 +436,7 @@ describe('ReportService', () => {
published: '2022-07-28T10:00:10.325Z',
publishedLanguages: ['en', 'nn-NO'],
submissionTypes: ['DIGITAL', 'PAPER'],
ettersending: 'PAPIR_OG_DIGITAL',
subsequentSubmissionTypes: ['DIGITAL', 'PAPER'],
},
} as Form,
{
Expand All @@ -443,7 +452,7 @@ describe('ReportService', () => {
published: '2022-07-28T10:00:10.325Z',
publishedLanguages: ['en'],
submissionTypes: [],
ettersending: 'KUN_PAPIR',
subsequentSubmissionTypes: ['PAPER'],
},
} as Form,
{
Expand Down Expand Up @@ -480,7 +489,7 @@ describe('ReportService', () => {
published: '2022-07-28T10:00:10.325Z',
publishedLanguages: undefined,
submissionTypes: ['PAPER'],
ettersending: 'KUN_PAPIR',
subsequentSubmissionTypes: ['PAPER'],
},
} as Form,
];
Expand Down
Loading
Loading