Skip to content

Commit fafebe6

Browse files
magnurh-cxmagnurh-cx
committed
Merge remote-tracking branch 'origin/master' into clean-up-html-converter
2 parents 7d81e05 + 254ede0 commit fafebe6

File tree

92 files changed

+709
-355
lines changed

Some content is hidden

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

92 files changed

+709
-355
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@
410410
"properties": {
411411
"skjemanummer": "accordion-test",
412412
"tema": "AGR",
413-
"innsending": "PAPIR_OG_DIGITAL",
413+
"submissionTypes": ["PAPER", "DIGITAL"],
414414
"ettersending": "PAPIR_OG_DIGITAL",
415415
"signatures": [
416416
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@
533533
"properties": {
534534
"skjemanummer": "testing-activities",
535535
"tema": "AGR",
536-
"innsending": "PAPIR_OG_DIGITAL",
536+
"submissionTypes": ["PAPER", "DIGITAL"],
537537
"ettersending": "PAPIR_OG_DIGITAL",
538538
"signatures": [
539539
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@
221221
"properties": {
222222
"skjemanummer": "ATT-123",
223223
"tema": "CYP",
224-
"innsending": "PAPIR_OG_DIGITAL",
224+
"submissionTypes": ["PAPER", "DIGITAL"],
225225
"hasLabeledSignatures": false,
226226
"modified": "2022-12-08T12:09:17.108Z",
227227
"enhetMaVelgesVedPapirInnsending": false,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@
681681
"properties": {
682682
"skjemanummer": "test-magnus-007",
683683
"tema": "xxx",
684-
"innsending": "KUN_DIGITAL",
684+
"submissionTypes": ["DIGITAL"],
685685
"signatures": [
686686
{
687687
"label": "",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@
606606
"properties": {
607607
"skjemanummer": "containerDatagrid123",
608608
"tema": "GEN",
609-
"innsending": "PAPIR_OG_DIGITAL",
609+
"submissionTypes": ["PAPER", "DIGITAL"],
610610
"ettersending": "PAPIR_OG_DIGITAL",
611611
"signatures": [
612612
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@
687687
"properties": {
688688
"skjemanummer": "container-123",
689689
"tema": "GEN",
690-
"innsending": "PAPIR_OG_DIGITAL",
690+
"submissionTypes": ["PAPER", "DIGITAL"],
691691
"ettersending": "PAPIR_OG_DIGITAL",
692692
"signatures": [
693693
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@
668668
"properties": {
669669
"skjemanummer": "testingalert",
670670
"tema": "AGR",
671-
"innsending": "PAPIR_OG_DIGITAL",
671+
"submissionTypes": ["PAPER", "DIGITAL"],
672672
"ettersending": "PAPIR_OG_DIGITAL",
673673
"signatures": [
674674
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@
605605
"properties": {
606606
"skjemanummer": "checkbox-test",
607607
"tema": "AGR",
608-
"innsending": "PAPIR_OG_DIGITAL",
608+
"submissionTypes": ["PAPER", "DIGITAL"],
609609
"ettersending": "PAPIR_OG_DIGITAL",
610610
"signatures": [
611611
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@
243243
"properties": {
244244
"skjemanummer": "CYP-103",
245245
"tema": "CYP",
246-
"innsending": "PAPIR_OG_DIGITAL",
246+
"submissionTypes": ["PAPER", "DIGITAL"],
247247
"hasLabeledSignatures": false,
248248
"modified": "2022-12-08T12:09:17.108Z",
249249
"enhetMaVelgesVedPapirInnsending": false,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,7 @@
879879
"properties": {
880880
"skjemanummer": "CYP-102",
881881
"tema": "CYP",
882-
"innsending": "PAPIR_OG_DIGITAL",
882+
"submissionTypes": ["PAPER", "DIGITAL"],
883883
"hasLabeledSignatures": false,
884884
"modified": "2022-12-08T12:09:17.108Z",
885885
"enhetMaVelgesVedPapirInnsending": false,

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3248,7 +3248,7 @@
32483248
"properties": {
32493249
"skjemanummer": "cypress-101",
32503250
"tema": "xxx",
3251-
"innsending": "PAPIR_OG_DIGITAL",
3251+
"submissionTypes": ["PAPER", "DIGITAL"],
32523252
"hasLabeledSignatures": false,
32533253
"signatures": {
32543254
"signature1": "",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5723,7 +5723,7 @@
57235723
"properties": {
57245724
"skjemanummer": "cypress-axe",
57255725
"tema": "",
5726-
"innsending": "KUN_PAPIR",
5726+
"submissionTypes": ["PAPER"],
57275727
"hasLabeledSignatures": false,
57285728
"signatures": {
57295729
"signature1": "",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1117,7 +1117,7 @@
11171117
"properties": {
11181118
"skjemanummer": "dg123456",
11191119
"tema": "ENF",
1120-
"innsending": "PAPIR_OG_DIGITAL",
1120+
"submissionTypes": ["PAPER", "DIGITAL"],
11211121
"ettersending": "PAPIR_OG_DIGITAL",
11221122
"signatures": [
11231123
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@
644644
"properties": {
645645
"skjemanummer": "datagrid-react",
646646
"tema": "DAG",
647-
"innsending": "PAPIR_OG_DIGITAL",
647+
"submissionTypes": ["PAPER", "DIGITAL"],
648648
"ettersending": "PAPIR_OG_DIGITAL",
649649
"signatures": [
650650
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@
569569
"properties": {
570570
"skjemanummer": "datagrid-123",
571571
"tema": "DAG",
572-
"innsending": "PAPIR_OG_DIGITAL",
572+
"submissionTypes": ["PAPER", "DIGITAL"],
573573
"ettersending": "PAPIR_OG_DIGITAL",
574574
"signatures": [
575575
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@
165165
"properties": {
166166
"skjemanummer": "test-driving-list",
167167
"tema": "BIL",
168-
"innsending": "PAPIR_OG_DIGITAL",
168+
"submissionTypes": ["PAPER", "DIGITAL"],
169169
"ettersending": "PAPIR_OG_DIGITAL",
170170
"signatures": [
171171
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@
637637
"properties": {
638638
"skjemanummer": "TST 10-11.12",
639639
"tema": "SYK",
640-
"innsending": "PAPIR_OG_DIGITAL",
640+
"submissionTypes": ["PAPER", "DIGITAL"],
641641
"ettersending": "PAPIR_OG_DIGITAL",
642642
"signatures": [
643643
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@
619619
"properties": {
620620
"skjemanummer": "Test-select",
621621
"tema": "BIL",
622-
"innsending": "PAPIR_OG_DIGITAL",
622+
"submissionTypes": ["PAPER", "DIGITAL"],
623623
"ettersending": "PAPIR_OG_DIGITAL",
624624
"signatures": [
625625
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@
526526
"properties": {
527527
"skjemanummer": "Test-select",
528528
"tema": "BIL",
529-
"innsending": "PAPIR_OG_DIGITAL",
529+
"submissionTypes": ["PAPER", "DIGITAL"],
530530
"ettersending": "PAPIR_OG_DIGITAL",
531531
"signatures": [
532532
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@
456456
"properties": {
457457
"skjemanummer": "hidden-test",
458458
"tema": "AAP",
459-
"innsending": "PAPIR_OG_DIGITAL",
459+
"submissionTypes": ["PAPER", "DIGITAL"],
460460
"ettersending": "PAPIR_OG_DIGITAL",
461461
"signatures": [
462462
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -26137,7 +26137,7 @@
2613726137
"properties": {
2613826138
"skjemanummer": "NAV 02-08.05",
2613926139
"tema": "MED",
26140-
"innsending": "PAPIR_OG_DIGITAL",
26140+
"submissionTypes": ["PAPER", "DIGITAL"],
2614126141
"signatures": [
2614226142
{
2614326143
"label": "Søker",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@
697697
"properties": {
698698
"skjemanummer": "monthpicker-test",
699699
"tema": "AGR",
700-
"innsending": "PAPIR_OG_DIGITAL",
700+
"submissionTypes": ["PAPER", "DIGITAL"],
701701
"ettersending": "PAPIR_OG_DIGITAL",
702702
"signatures": [
703703
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -6317,7 +6317,7 @@
63176317
"properties": {
63186318
"skjemanummer": "NAV 08-35.01",
63196319
"tema": "SYK",
6320-
"innsending": "PAPIR_OG_DIGITAL",
6320+
"submissionTypes": ["PAPER", "DIGITAL"],
63216321
"hasLabeledSignatures": false,
63226322
"modified": "2024-02-15T09:25:54.420Z",
63236323
"modifiedBy": "Gagnat, Ann Katrin",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -7058,7 +7058,7 @@
70587058
"properties": {
70597059
"skjemanummer": "NAV 11-12.21B",
70607060
"tema": "TSO",
7061-
"innsending": "PAPIR_OG_DIGITAL",
7061+
"submissionTypes": ["PAPER", "DIGITAL"],
70627062
"ettersending": "PAPIR_OG_DIGITAL",
70637063
"signatures": [
70647064
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@
822822
"properties": {
823823
"skjemanummer": "NAVDATEPICKER",
824824
"tema": "ERS",
825-
"innsending": "PAPIR_OG_DIGITAL",
825+
"submissionTypes": ["PAPER", "DIGITAL"],
826826
"ettersending": "PAPIR_OG_DIGITAL",
827827
"signatures": [
828828
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,7 @@
932932
"properties": {
933933
"skjemanummer": "testing-number",
934934
"tema": "AGR",
935-
"innsending": "PAPIR_OG_DIGITAL",
935+
"submissionTypes": ["PAPER", "DIGITAL"],
936936
"ettersending": "PAPIR_OG_DIGITAL",
937937
"signatures": [
938938
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@
497497
"properties": {
498498
"skjemanummer": "cy-penger",
499499
"tema": "FOS",
500-
"innsending": "KUN_PAPIR",
500+
"submissionTypes": ["PAPER"],
501501
"signatures": [
502502
{
503503
"label": "",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@
422422
"properties": {
423423
"skjemanummer": "radio-test",
424424
"tema": "AAP",
425-
"innsending": "PAPIR_OG_DIGITAL",
425+
"submissionTypes": ["PAPER", "DIGITAL"],
426426
"ettersending": "PAPIR_OG_DIGITAL",
427427
"signatures": [
428428
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@
440440
"properties": {
441441
"skjemanummer": "select-boxes-test",
442442
"tema": "AGR",
443-
"innsending": "PAPIR_OG_DIGITAL",
443+
"submissionTypes": ["PAPER", "DIGITAL"],
444444
"ettersending": "PAPIR_OG_DIGITAL",
445445
"signatures": [
446446
{

‎mocks/mocks/data/formio-api/submission-method.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -849,7 +849,7 @@
849849
"properties": {
850850
"skjemanummer": "BUG 10.10-10",
851851
"tema": "BUG",
852-
"innsending": "PAPIR_OG_DIGITAL",
852+
"submissionTypes": ["PAPER", "DIGITAL"],
853853
"signatures": [
854854
{
855855
"label": "",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1826,7 +1826,7 @@
18261826
"properties": {
18271827
"skjemanummer": "test-mellomlagring",
18281828
"tema": "BAR",
1829-
"innsending": "PAPIR_OG_DIGITAL",
1829+
"submissionTypes": ["PAPER", "DIGITAL"],
18301830
"signatures": [
18311831
{
18321832
"label": "",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2372,7 +2372,7 @@
23722372
"properties": {
23732373
"skjemanummer": "test-mellomlagring",
23742374
"tema": "BAR",
2375-
"innsending": "PAPIR_OG_DIGITAL",
2375+
"submissionTypes": ["PAPER", "DIGITAL"],
23762376
"signatures": [
23772377
{
23782378
"label": "",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@
263263
"properties": {
264264
"skjemanummer": "test-tekstfelt",
265265
"tema": "GEN",
266-
"innsending": "PAPIR_OG_DIGITAL",
266+
"submissionTypes": ["PAPER", "DIGITAL"],
267267
"ettersending": "PAPIR_OG_DIGITAL",
268268
"signatures": [
269269
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@
245245
"properties": {
246246
"skjemanummer": "test-arstall",
247247
"tema": "GEN",
248-
"innsending": "PAPIR_OG_DIGITAL",
248+
"submissionTypes": ["PAPER", "DIGITAL"],
249249
"ettersending": "PAPIR_OG_DIGITAL",
250250
"signatures": [
251251
{

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@
601601
"properties": {
602602
"skjemanummer": "test-your-information",
603603
"tema": "ERS",
604-
"innsending": "PAPIR_OG_DIGITAL",
604+
"submissionTypes": ["PAPER", "DIGITAL"],
605605
"ettersending": "PAPIR_OG_DIGITAL",
606606
"signatures": [
607607
{

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ describe('Migration scripts', () => {
142142
...originalForm,
143143
properties: {
144144
...originalForm.properties,
145-
innsending: 'KUN_DIGITAL',
145+
submissionTypes: ['DIGITAL'],
146146
ettersending: undefined,
147147
},
148148
};
@@ -175,7 +175,7 @@ describe('Migration scripts', () => {
175175
...originalForm,
176176
properties: {
177177
...originalForm.properties,
178-
innsending: 'KUN_DIGITAL',
178+
submissionTypes: ['DIGITAL'],
179179
ettersending: 'KUN_DIGITAL',
180180
},
181181
};
@@ -340,7 +340,7 @@ describe('Migration scripts', () => {
340340
properties: {
341341
...originalForm.properties,
342342
skjemanummer: 'Form1',
343-
innsending: 'KUN_DIGITAL',
343+
submissionTypes: ['DIGITAL'],
344344
ettersending: undefined,
345345
},
346346
};
@@ -350,7 +350,7 @@ describe('Migration scripts', () => {
350350
properties: {
351351
...originalForm.properties,
352352
skjemanummer: 'Form2',
353-
innsending: 'KUN_DIGITAL',
353+
submissionTypes: ['DIGITAL'],
354354
ettersending: 'KUN_DIGITAL',
355355
},
356356
};

‎packages/bygger-backend/src/migration/testData.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ const originalForm: NavFormType = {
6767
properties: {
6868
skjemanummer: 'Test Form',
6969
tema: 'BIL',
70-
innsending: 'KUN_DIGITAL',
70+
submissionTypes: ['DIGITAL'],
7171
},
7272
} as NavFormType;
7373

0 commit comments

Comments
 (0)