Skip to content

Commit addb908

Browse files
nurrebass1nurrebass1
committed
Refaktorerer ettersending til subsequentSubmissionTypes
1 parent 703e255 commit addb908

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+104
-96
lines changed

‎mocks/mocks/data/formio-api/accordion.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@
411411
"skjemanummer": "accordion-test",
412412
"tema": "AGR",
413413
"submissionTypes": ["PAPER", "DIGITAL"],
414-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
414+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
415415
"signatures": [
416416
{
417417
"label": "",

‎mocks/mocks/data/formio-api/activities.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -534,7 +534,7 @@
534534
"skjemanummer": "testing-activities",
535535
"tema": "AGR",
536536
"submissionTypes": ["PAPER", "DIGITAL"],
537-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
537+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
538538
"signatures": [
539539
{
540540
"label": "",

‎mocks/mocks/data/formio-api/container-datagrid.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@
607607
"skjemanummer": "containerDatagrid123",
608608
"tema": "GEN",
609609
"submissionTypes": ["PAPER", "DIGITAL"],
610-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
610+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
611611
"signatures": [
612612
{
613613
"label": "",

‎mocks/mocks/data/formio-api/container123.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@
688688
"skjemanummer": "container-123",
689689
"tema": "GEN",
690690
"submissionTypes": ["PAPER", "DIGITAL"],
691-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
691+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
692692
"signatures": [
693693
{
694694
"label": "",

‎mocks/mocks/data/formio-api/custom-components-alert.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@
669669
"skjemanummer": "testingalert",
670670
"tema": "AGR",
671671
"submissionTypes": ["PAPER", "DIGITAL"],
672-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
672+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
673673
"signatures": [
674674
{
675675
"label": "",

‎mocks/mocks/data/formio-api/custom-components-checkbox.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@
606606
"skjemanummer": "checkbox-test",
607607
"tema": "AGR",
608608
"submissionTypes": ["PAPER", "DIGITAL"],
609-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
609+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
610610
"signatures": [
611611
{
612612
"label": "",

‎mocks/mocks/data/formio-api/datagrid-conditional.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1118,7 +1118,7 @@
11181118
"skjemanummer": "dg123456",
11191119
"tema": "ENF",
11201120
"submissionTypes": ["PAPER", "DIGITAL"],
1121-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
1121+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
11221122
"signatures": [
11231123
{
11241124
"label": "",

‎mocks/mocks/data/formio-api/datagrid-react-components.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@
645645
"skjemanummer": "datagrid-react",
646646
"tema": "DAG",
647647
"submissionTypes": ["PAPER", "DIGITAL"],
648-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
648+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
649649
"signatures": [
650650
{
651651
"label": "",

‎mocks/mocks/data/formio-api/datagrid.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@
570570
"skjemanummer": "datagrid-123",
571571
"tema": "DAG",
572572
"submissionTypes": ["PAPER", "DIGITAL"],
573-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
573+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
574574
"signatures": [
575575
{
576576
"label": "",

‎mocks/mocks/data/formio-api/driving-list.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
"skjemanummer": "test-driving-list",
167167
"tema": "BIL",
168168
"submissionTypes": ["PAPER", "DIGITAL"],
169-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
169+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
170170
"signatures": [
171171
{
172172
"label": "",

‎mocks/mocks/data/formio-api/form-email.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -638,7 +638,7 @@
638638
"skjemanummer": "TST 10-11.12",
639639
"tema": "SYK",
640640
"submissionTypes": ["PAPER", "DIGITAL"],
641-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
641+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
642642
"signatures": [
643643
{
644644
"label": "",

‎mocks/mocks/data/formio-api/form-select-v1.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@
620620
"skjemanummer": "Test-select",
621621
"tema": "BIL",
622622
"submissionTypes": ["PAPER", "DIGITAL"],
623-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
623+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
624624
"signatures": [
625625
{
626626
"label": "",

‎mocks/mocks/data/formio-api/form-select-v2.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@
527527
"skjemanummer": "Test-select",
528528
"tema": "BIL",
529529
"submissionTypes": ["PAPER", "DIGITAL"],
530-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
530+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
531531
"signatures": [
532532
{
533533
"label": "",

‎mocks/mocks/data/formio-api/hidden-conditional.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@
457457
"skjemanummer": "hidden-test",
458458
"tema": "AAP",
459459
"submissionTypes": ["PAPER", "DIGITAL"],
460-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
460+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
461461
"signatures": [
462462
{
463463
"label": "",

‎mocks/mocks/data/formio-api/mellomlagring-nested-values.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26150,7 +26150,7 @@
2615026150
"published": "2025-02-06T11:04:44.706Z",
2615126151
"publishedBy": "Rosseland, Rune",
2615226152
"publishedLanguages": ["nn-NO", "en"],
26153-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"]
26153+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"]
2615426154
},
2615526155
"project": "628ca77305690db58c974cfd",
2615626156
"revisions": "",

‎mocks/mocks/data/formio-api/month-picker.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@
698698
"skjemanummer": "monthpicker-test",
699699
"tema": "AGR",
700700
"submissionTypes": ["PAPER", "DIGITAL"],
701-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
701+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
702702
"signatures": [
703703
{
704704
"label": "",

‎mocks/mocks/data/formio-api/nav083501.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6324,7 +6324,7 @@
63246324
"published": "2024-01-08T08:33:50.638Z",
63256325
"publishedBy": "Rosseland, Rune",
63266326
"publishedLanguages": [],
6327-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"]
6327+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"]
63286328
},
63296329
"access": [
63306330
{

‎mocks/mocks/data/formio-api/nav111221b.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7059,7 +7059,7 @@
70597059
"skjemanummer": "NAV 11-12.21B",
70607060
"tema": "TSO",
70617061
"submissionTypes": ["PAPER", "DIGITAL"],
7062-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
7062+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
70637063
"signatures": [
70647064
{
70657065
"label": "",

‎mocks/mocks/data/formio-api/navdatepicker.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@
823823
"skjemanummer": "NAVDATEPICKER",
824824
"tema": "ERS",
825825
"submissionTypes": ["PAPER", "DIGITAL"],
826-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
826+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
827827
"signatures": [
828828
{
829829
"label": "",

‎mocks/mocks/data/formio-api/number.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,7 @@
933933
"skjemanummer": "testing-number",
934934
"tema": "AGR",
935935
"submissionTypes": ["PAPER", "DIGITAL"],
936-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
936+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
937937
"signatures": [
938938
{
939939
"label": "",

‎mocks/mocks/data/formio-api/radio.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@
423423
"skjemanummer": "radio-test",
424424
"tema": "AAP",
425425
"submissionTypes": ["PAPER", "DIGITAL"],
426-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
426+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
427427
"signatures": [
428428
{
429429
"label": "",

‎mocks/mocks/data/formio-api/select-boxes.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@
441441
"skjemanummer": "select-boxes-test",
442442
"tema": "AGR",
443443
"submissionTypes": ["PAPER", "DIGITAL"],
444-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
444+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
445445
"signatures": [
446446
{
447447
"label": "",

‎mocks/mocks/data/formio-api/test-mellomlagring-v2.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1837,7 +1837,7 @@
18371837
"isTestForm": true,
18381838
"modified": "2023-08-30T12:17:45.811Z",
18391839
"modifiedBy": "[email protected]",
1840-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"]
1840+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"]
18411841
},
18421842
"project": "628ca77305690db58c974cfd",
18431843
"revisions": "",

‎mocks/mocks/data/formio-api/test-mellomlagring.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2383,7 +2383,7 @@
23832383
"isTestForm": true,
23842384
"modified": "2023-08-30T12:17:45.811Z",
23852385
"modifiedBy": "[email protected]",
2386-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"]
2386+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"]
23872387
},
23882388
"project": "628ca77305690db58c974cfd",
23892389
"revisions": "",

‎mocks/mocks/data/formio-api/textfield.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@
264264
"skjemanummer": "test-tekstfelt",
265265
"tema": "GEN",
266266
"submissionTypes": ["PAPER", "DIGITAL"],
267-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
267+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
268268
"signatures": [
269269
{
270270
"label": "",

‎mocks/mocks/data/formio-api/year.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246
"skjemanummer": "test-arstall",
247247
"tema": "GEN",
248248
"submissionTypes": ["PAPER", "DIGITAL"],
249-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
249+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
250250
"signatures": [
251251
{
252252
"label": "",

‎mocks/mocks/data/formio-api/your-information.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@
602602
"skjemanummer": "test-your-information",
603603
"tema": "ERS",
604604
"submissionTypes": ["PAPER", "DIGITAL"],
605-
"additionalSubmissionTypes": ["PAPER", "DIGITAL"],
605+
"subsequentSubmissionTypes": ["PAPER", "DIGITAL"],
606606
"signatures": [
607607
{
608608
"label": "",

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
"start:fyllut:env:test": "concurrently --kill-others-on-fail \"yarn workspace @navikt/fyllut-backend start:env:test\" \"yarn workspace @navikt/fyllut-frontend start\"",
3030
"preview:bygger": "yarn workspace @navikt/bygger-backend preview",
3131
"preview:fyllut": "yarn workspace @navikt/fyllut-backend preview",
32-
"test": "NODE_OPTIONS=--no-warnings yarn test:warning",
33-
"test:warning": "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\"",
32+
"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\"",
33+
"test:nowarning": "NODE_OPTIONS=--no-warnings yarn test",
3434
"test:bygger": "concurrently \"yarn workspace @navikt/bygger-frontend test\" \"yarn workspace @navikt/bygger-backend test\"",
3535
"test:fyllut": "concurrently \"yarn workspace @navikt/fyllut-frontend test\" \"yarn workspace @navikt/fyllut-backend test\"",
3636
"test:shared-domain": "yarn workspace @navikt/skjemadigitalisering-shared-domain test",

‎packages/bygger-backend/src/migration/migrationScripts.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ describe('Migration scripts', () => {
143143
properties: {
144144
...originalForm.properties,
145145
submissionTypes: ['DIGITAL'],
146-
additionalSubmissionTypes: [],
146+
subsequentSubmissionTypes: [],
147147
},
148148
};
149149
const { migratedForm: actual } = migrateForm(
@@ -341,7 +341,7 @@ describe('Migration scripts', () => {
341341
...originalForm.properties,
342342
skjemanummer: 'Form1',
343343
submissionTypes: ['DIGITAL'],
344-
additionalSubmissionTypes: [],
344+
subsequentSubmissionTypes: [],
345345
},
346346
};
347347

‎packages/bygger-backend/src/services/ReportService.test.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ describe('ReportService', () => {
102102
skjemanummer: 'TEST1',
103103
signatures: undefined,
104104
submissionTypes: [],
105-
additionalSubmissionTypes: [],
105+
subsequentSubmissionTypes: [],
106106
} as unknown as FormPropertiesType,
107107
},
108108
];
@@ -126,7 +126,7 @@ describe('ReportService', () => {
126126
skjemanummer: 'TEST1',
127127
signatures: [{ label: '' }],
128128
submissionTypes: [],
129-
additionalSubmissionTypes: [],
129+
subsequentSubmissionTypes: [],
130130
} as unknown as FormPropertiesType,
131131
},
132132
];
@@ -150,7 +150,7 @@ describe('ReportService', () => {
150150
skjemanummer: 'TEST1',
151151
signatures: [{ label: 'Lege' }, { label: 'Verge' }, { label: 'Søker' }],
152152
submissionTypes: [],
153-
additionalSubmissionTypes: [],
153+
subsequentSubmissionTypes: [],
154154
} as unknown as FormPropertiesType,
155155
},
156156
];
@@ -182,7 +182,7 @@ describe('ReportService', () => {
182182
published: '2022-07-28T10:00:10.325Z',
183183
modified: '2022-07-28T10:00:10.325Z',
184184
submissionTypes: [],
185-
additionalSubmissionTypes: [],
185+
subsequentSubmissionTypes: [],
186186
} as unknown as FormPropertiesType,
187187
} as Form,
188188
];
@@ -210,7 +210,7 @@ describe('ReportService', () => {
210210
published: '2022-07-28T10:00:10.325Z',
211211
modified: '2022-07-28T11:00:05.254Z',
212212
submissionTypes: [],
213-
additionalSubmissionTypes: [],
213+
subsequentSubmissionTypes: [],
214214
} as unknown as FormPropertiesType,
215215
} as Form,
216216
];
@@ -236,7 +236,7 @@ describe('ReportService', () => {
236236
skjemanummer: 'TEST1',
237237
modified: '2022-07-28T11:00:05.254Z',
238238
submissionTypes: [],
239-
additionalSubmissionTypes: [],
239+
subsequentSubmissionTypes: [],
240240
} as unknown as FormPropertiesType,
241241
} as Form,
242242
];
@@ -338,7 +338,7 @@ describe('ReportService', () => {
338338
] as Component[],
339339
properties: {
340340
submissionTypes: [],
341-
additionalSubmissionTypes: [],
341+
subsequentSubmissionTypes: [],
342342
} as unknown as FormPropertiesType,
343343
} as Form,
344344
{
@@ -349,7 +349,7 @@ describe('ReportService', () => {
349349
status: 'published',
350350
properties: {
351351
submissionTypes: [],
352-
additionalSubmissionTypes: [],
352+
subsequentSubmissionTypes: [],
353353
} as unknown as FormPropertiesType,
354354
} as Form,
355355
{
@@ -367,7 +367,7 @@ describe('ReportService', () => {
367367
] as Component[],
368368
properties: {
369369
submissionTypes: [],
370-
additionalSubmissionTypes: [],
370+
subsequentSubmissionTypes: [],
371371
} as unknown as FormPropertiesType,
372372
} as Form,
373373
];
@@ -436,7 +436,7 @@ describe('ReportService', () => {
436436
published: '2022-07-28T10:00:10.325Z',
437437
publishedLanguages: ['en', 'nn-NO'],
438438
submissionTypes: ['DIGITAL', 'PAPER'],
439-
additionalSubmissionTypes: ['DIGITAL', 'PAPER'],
439+
subsequentSubmissionTypes: ['DIGITAL', 'PAPER'],
440440
},
441441
} as Form,
442442
{
@@ -452,7 +452,7 @@ describe('ReportService', () => {
452452
published: '2022-07-28T10:00:10.325Z',
453453
publishedLanguages: ['en'],
454454
submissionTypes: [],
455-
additionalSubmissionTypes: ['PAPER'],
455+
subsequentSubmissionTypes: ['PAPER'],
456456
},
457457
} as Form,
458458
{
@@ -489,7 +489,7 @@ describe('ReportService', () => {
489489
published: '2022-07-28T10:00:10.325Z',
490490
publishedLanguages: undefined,
491491
submissionTypes: ['PAPER'],
492-
additionalSubmissionTypes: ['PAPER'],
492+
subsequentSubmissionTypes: ['PAPER'],
493493
},
494494
} as Form,
495495
];

0 commit comments

Comments
 (0)