Skip to content

Commit 177a351

Browse files
pmattmannpmattmann
committed
Index ContentNode.Strategy; ContentNode.RootId not nullable
1 parent ce7201e commit 177a351

15 files changed

+171
-184
lines changed

‎api/fixtures/activity1-aside-top.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Left column (slot 1)
22
App\Entity\ContentNode\MultiSelect:
33
multiSelect1:
4-
root: '@columnLayout1'
54
parent: '@responsiveLayout1'
5+
root: '@columnLayout1'
66
slot: 'aside-top'
77
position: 0
88
instanceName: 'multiSelect1'
@@ -11,25 +11,25 @@ App\Entity\ContentNode\MultiSelect:
1111

1212
App\Entity\ContentNode\MaterialNode:
1313
materialNode1:
14-
root: '@columnLayout1'
1514
parent: '@responsiveLayout1'
15+
root: '@columnLayout1'
1616
slot: 'aside-top'
1717
position: 1
1818
instanceName: 'materialNode1'
1919
contentType: '@contentTypeMaterial'
2020

2121
App\Entity\ContentNode\SingleText:
2222
singleText1:
23-
root: '@columnLayout1'
2423
parent: '@responsiveLayout1'
24+
root: '@columnLayout1'
2525
slot: 'aside-top'
2626
position: 2
2727
instanceName: 'singleText1'
2828
contentType: '@contentTypeNotes'
2929
data: { html: <word()> }
3030
safetyConsiderations1:
31-
root: '@columnLayout1'
3231
parent: '@responsiveLayout1'
32+
root: '@columnLayout1'
3333
slot: 'aside-top'
3434
position: 3
3535
instanceName: 'safetyConsiderations1'

‎api/fixtures/activity1-main-nested.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# nested column - slot1
22
App\Entity\ContentNode\MultiSelect:
33
multiSelect2:
4-
root: '@columnLayout1'
54
parent: '@columnLayoutChild1'
5+
root: '@columnLayout1'
66
slot: '1'
77
position: 0
88
instanceName: 'multiSelect2'
@@ -11,8 +11,8 @@ App\Entity\ContentNode\MultiSelect:
1111

1212
App\Entity\ContentNode\SingleText:
1313
singleText2:
14-
root: '@columnLayout1'
1514
parent: '@columnLayoutChild1'
15+
root: '@columnLayout1'
1616
slot: '1'
1717
position: 1
1818
instanceName: 'singleText2'
@@ -22,8 +22,8 @@ App\Entity\ContentNode\SingleText:
2222
# nested column - slot2
2323
App\Entity\ContentNode\Storyboard:
2424
storyboard2:
25-
root: '@columnLayout1'
2625
parent: '@columnLayoutChild1'
26+
root: '@columnLayout1'
2727
slot: '2'
2828
position: 0
2929
instanceName: 'Storyboard2'

‎api/fixtures/activity1-main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Right column (slot 2)
22
App\Entity\ContentNode\Storyboard:
33
storyboard1:
4-
root: '@columnLayout1'
54
parent: '@responsiveLayout1'
5+
root: '@columnLayout1'
66
slot: 'main'
77
position: 0
88
instanceName: 'storyboard1'
@@ -30,8 +30,8 @@ App\Entity\ContentNode\Storyboard:
3030

3131
App\Entity\ContentNode\ColumnLayout:
3232
columnLayoutChild1:
33-
root: '@columnLayout1'
3433
parent: '@responsiveLayout1'
34+
root: '@columnLayout1'
3535
slot: 'main'
3636
position: 1
3737
data: { columns: [{ slot: '1', width: 7 }, { slot: '2', width: 5 }] }

‎api/fixtures/activity1.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ App\Entity\ScheduleEntry:
2121
# Root node
2222
App\Entity\ContentNode\ColumnLayout:
2323
columnLayout1:
24-
root: '@self'
2524
parent: null
25+
root: '@self'
2626
slot: null
2727
position: 0
2828
data: { columns: [{ slot: '1', width: 12 }] }
@@ -32,8 +32,8 @@ App\Entity\ContentNode\ColumnLayout:
3232
# Reponsive layout
3333
App\Entity\ContentNode\ResponsiveLayout:
3434
responsiveLayout1:
35-
root: '@columnLayout1'
3635
parent: '@columnLayout1'
36+
root: '@columnLayout1'
3737
slot: '1'
3838
position: 0
3939
data: { items: [{ slot: 'main' }, { slot: 'aside-top' }, { slot: 'aside-bottom' }] }

‎api/fixtures/checklistNodes.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
App\Entity\ContentNode\ChecklistNode:
22
checklistNode1:
3-
root: '@columnLayout1'
43
parent: '@columnLayout1'
4+
root: '@columnLayout1'
55
slot: '1'
66
position: 1
77
instanceName: <word()>
88
contentType: '@contentTypeChecklist'
99
checklistItems:
1010
- '@checklistItem1_1_1'
1111
checklistNode3:
12-
root: '@columnLayout3'
1312
parent: '@columnLayout3'
13+
root: '@columnLayout3'
1414
slot: '1'
1515
position: 1
1616
instanceName: <word()>
1717
contentType: '@contentTypeChecklist'
1818
checklistNodeCampUnrelated:
19-
root: '@columnLayout1campUnrelated'
2019
parent: '@columnLayout1campUnrelated'
20+
root: '@columnLayout1campUnrelated'
2121
slot: '1'
2222
position: 5
2323
instanceName: <word()>

‎api/fixtures/columnLayouts.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,95 @@
11
App\Entity\ContentNode\ColumnLayout:
22
columnLayout2:
3-
root: '@self'
43
parent: null
4+
root: '@self'
55
slot: null
66
position: 0
77
data: { columns: [{ slot: '1', width: 12 }] }
88
instanceName: 'columnLayout2'
99
contentType: '@contentTypeColumnLayout'
1010
columnLayout2Child1:
11-
root: '@columnLayout2'
1211
parent: '@columnLayout2'
12+
root: '@columnLayout2'
1313
slot: '2'
1414
position: 0
1515
data: { columns: [{ slot: '1', width: 12 }] }
1616
instanceName: 'columnLayout2Child'
1717
contentType: '@contentTypeColumnLayout'
1818
columnLayout3:
19-
root: '@self'
2019
parent: null
20+
root: '@self'
2121
slot: null
2222
position: 0
2323
data: { columns: [{ slot: '1', width: 12 }] }
2424
instanceName: <word()>
2525
contentType: '@contentTypeColumnLayout'
2626
columnLayout4:
27-
root: '@self'
2827
parent: null
28+
root: '@self'
2929
slot: null
3030
position: 0
3131
data: { columns: [{ slot: '1', width: 12 }] }
3232
instanceName: <word()>
3333
contentType: '@contentTypeColumnLayout'
3434
columnLayout5:
35-
root: '@self'
3635
parent: null
36+
root: '@self'
3737
slot: null
3838
position: 0
3939
data: { columns: [{ slot: '1', width: 12 }] }
4040
instanceName: <word()>
4141
contentType: '@contentTypeColumnLayout'
4242
columnLayout1camp2:
43-
root: '@self'
4443
parent: null
44+
root: '@self'
4545
slot: null
4646
position: 0
4747
data: { columns: [{ slot: '1', width: 12 }] }
4848
instanceName: <word()>
4949
contentType: '@contentTypeColumnLayout'
5050
columnLayout2camp2:
51-
root: '@self'
5251
parent: null
52+
root: '@self'
5353
slot: null
5454
position: 0
5555
data: { columns: [{ slot: '1', width: 12 }] }
5656
instanceName: <word()>
5757
contentType: '@contentTypeColumnLayout'
5858
columnLayout1campUnrelated:
59-
root: '@self'
6059
parent: null
60+
root: '@self'
6161
slot: null
6262
position: 0
6363
data: { columns: [{ slot: '1', width: 12 }] }
6464
instanceName: <word()>
6565
contentType: '@contentTypeColumnLayout'
6666
columnLayout2campUnrelated:
67-
root: '@self'
6867
parent: null
68+
root: '@self'
6969
slot: null
7070
position: 0
7171
data: { columns: [{ slot: '1', width: 12 }] }
7272
instanceName: <word()>
7373
contentType: '@contentTypeColumnLayout'
7474
columnLayout1campPrototype:
75-
root: '@self'
7675
parent: null
76+
root: '@self'
7777
slot: null
7878
position: 0
7979
data: { columns: [{ slot: '1', width: 12 }] }
8080
instanceName: <word()>
8181
contentType: '@contentTypeColumnLayout'
8282
columnLayout2campPrototype:
83-
root: '@self'
8483
parent: null
84+
root: '@self'
8585
slot: null
8686
position: 0
8787
data: { columns: [{ slot: '1', width: 12 }] }
8888
instanceName: <word()>
8989
contentType: '@contentTypeColumnLayout'
9090
columnLayoutWithResponsiveLayout:
91-
root: '@self'
9291
parent: null
92+
root: '@self'
9393
slot: null
9494
position: 0
9595
data: { columns: [{ slot: '1', width: 12 }] }

‎api/fixtures/materialNodes.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
App\Entity\ContentNode\MaterialNode:
22
materialNode2:
3-
root: '@columnLayout1camp2'
43
parent: '@columnLayout1camp2'
4+
root: '@columnLayout1camp2'
55
slot: '1'
66
position: 0
77
instanceName: <word()>
88
contentType: '@contentTypeMaterial'
99
materialNodeCampUnrelated:
10-
root: '@columnLayout1campUnrelated'
1110
parent: '@columnLayout1campUnrelated'
11+
root: '@columnLayout1campUnrelated'
1212
slot: '1'
1313
position: 2
1414
instanceName: <word()>

‎api/fixtures/multiSelects.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
App\Entity\ContentNode\MultiSelect:
22
multiSelectCampUnrelated:
3-
root: '@columnLayout1campUnrelated'
43
parent: '@columnLayout1campUnrelated'
4+
root: '@columnLayout1campUnrelated'
55
slot: '1'
66
position: 3
77
instanceName: <word()>

‎api/fixtures/responsiveLayouts.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
App\Entity\ContentNode\ResponsiveLayout:
22
responsiveLayoutCampUnrelated:
3-
root: '@columnLayout1campUnrelated'
43
parent: '@columnLayout1campUnrelated'
4+
root: '@columnLayout1campUnrelated'
55
slot: '1'
66
position: 0
77
data: { items: [{ slot: 'main' }, {slot: 'aside-top' }, {slot: 'aside-bottom'}] }

‎api/fixtures/singleTexts.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
App\Entity\ContentNode\SingleText:
22
singleTextCampUnrelated:
3-
root: '@columnLayout1campUnrelated'
43
parent: '@columnLayout1campUnrelated'
4+
root: '@columnLayout1campUnrelated'
55
slot: '1'
66
position: 1
77
instanceName: <word()>

0 commit comments

Comments
 (0)