Skip to content

Commit 21536b6

Browse files
etimretimr
authored
Merge branch 'main' into d070615-modify-hierarchy
2 parents 77f9d39 + df31eb0 commit 21536b6

File tree

18 files changed

+372
-239
lines changed

18 files changed

+372
-239
lines changed

‎.cdsrc.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,14 @@
55
"toggles": true
66
},
77
"profile": "with-mtx-sidecar",
8+
"odata": {
9+
"containment": true
10+
},
811
"cdsc": {
9-
"newParser": true
12+
"newParser": true,
13+
"beta": {
14+
"draftMessages": true
15+
}
1016
},
1117
"sql": {
1218
"native_hana_associations": false

‎app/addresses/webapp/manifest.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"name": "sap.fe.templates.ListReport",
8787
"options": {
8888
"settings" : {
89-
"entitySet" : "Addresses",
89+
"contextPath" : "/Addresses",
9090
"navigation" : {
9191
"Addresses" : {
9292
"detail" : {
@@ -103,7 +103,7 @@
103103
"name": "sap.fe.templates.ObjectPage",
104104
"options": {
105105
"settings" : {
106-
"entitySet" : "Addresses",
106+
"contextPath" : "/Addresses",
107107
"navigation" : {
108108
"notes" : {
109109
"detail" : {
@@ -120,7 +120,7 @@
120120
"name": "sap.fe.templates.ObjectPage",
121121
"options": {
122122
"settings" : {
123-
"entitySet": "Notes"
123+
"contextPath": "/Addresses/notes"
124124
}
125125
}
126126
}

‎app/admin/webapp/manifest.json‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@
8585
"id": "BooksList",
8686
"name": "sap.fe.templates.ListReport",
8787
"options": {
88-
"settings": {
89-
"entitySet": "Books",
90-
"navigation": {
91-
"Books": {
92-
"detail": {
93-
"route": "BooksDetails"
88+
"settings" : {
89+
"contextPath" : "/Books",
90+
"navigation" : {
91+
"Books" : {
92+
"detail" : {
93+
"route" : "BooksDetails"
9494
}
9595
}
9696
},
@@ -112,9 +112,14 @@
112112
"id": "BooksDetailsList",
113113
"name": "sap.fe.templates.ObjectPage",
114114
"options": {
115-
"settings": {
116-
"entitySet": "Books",
117-
"navigation": {
115+
"settings" : {
116+
"contextPath" : "/Books",
117+
"navigation" : {
118+
"Authors" : {
119+
"detail" : {
120+
"route" : "AuthorsDetails"
121+
}
122+
},
118123
"contents": {
119124
"detail": {
120125
"route": "ContentsDetails"
@@ -141,6 +146,16 @@
141146
"contextPath": "/Books/contents"
142147
}
143148
}
149+
},
150+
"AuthorsDetails": {
151+
"type": "Component",
152+
"id": "AuthorsDetailsList",
153+
"name": "sap.fe.templates.ObjectPage",
154+
"options": {
155+
"settings" : {
156+
"contextPath" : "/Authors"
157+
}
158+
}
144159
}
145160
}
146161
},

‎app/browse/webapp/manifest.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"name": "sap.fe.templates.ListReport",
8787
"options": {
8888
"settings" : {
89-
"entitySet" : "Books",
89+
"contextPath" : "/Books",
9090
"navigation" : {
9191
"Books" : {
9292
"detail" : {
@@ -103,7 +103,7 @@
103103
"name": "sap.fe.templates.ObjectPage",
104104
"options": {
105105
"settings" : {
106-
"entitySet" : "Books",
106+
"contextPath" : "/Books",
107107
"navigation" : {
108108
"Authors" : {
109109
"detail" : {
@@ -120,7 +120,7 @@
120120
"name": "sap.fe.templates.ObjectPage",
121121
"options": {
122122
"settings" : {
123-
"entitySet" : "Authors"
123+
"contextPath" : "/Authors"
124124
}
125125
}
126126
}

‎app/genres/webapp/manifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"name": "sap.fe.templates.ListReport",
8383
"options": {
8484
"settings" : {
85-
"entitySet" : "GenreHierarchy",
85+
"contextPath" : "/GenreHierarchy",
8686
"navigation" : {
8787
"GenreHierarchy" : {
8888
"detail" : {
@@ -107,7 +107,7 @@
107107
"name": "sap.fe.templates.ObjectPage",
108108
"options": {
109109
"settings" : {
110-
"entitySet": "GenreHierarchy"
110+
"contextPath": "/GenreHierarchy"
111111
}
112112
}
113113
}

‎app/notes/webapp/manifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
"name": "sap.fe.templates.ListReport",
8282
"options": {
8383
"settings" : {
84-
"entitySet" : "Notes",
84+
"contextPath" : "/Notes",
8585
"navigation" : {
8686
"Notes" : {
8787
"detail" : {
@@ -98,7 +98,7 @@
9898
"name": "sap.fe.templates.ObjectPage",
9999
"options": {
100100
"settings" : {
101-
"entitySet" : "Notes"
101+
"contextPath" : "/Notes"
102102
}
103103
}
104104
}

‎app/orders/webapp/manifest.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
"name": "sap.fe.templates.ListReport",
9292
"options": {
9393
"settings" : {
94-
"entitySet" : "Orders",
94+
"contextPath" : "/Orders",
9595
"navigation" : {
9696
"Orders" : {
9797
"detail" : {
@@ -108,7 +108,7 @@
108108
"name": "sap.fe.templates.ObjectPage",
109109
"options": {
110110
"settings" : {
111-
"entitySet": "Orders",
111+
"contextPath": "/Orders",
112112
"navigation" : {
113113
"Items": {
114114
"detail": {
@@ -135,7 +135,7 @@
135135
"name": "sap.fe.templates.ObjectPage",
136136
"options": {
137137
"settings" : {
138-
"entitySet": "OrderItems"
138+
"contextPath": "/Orders/Items"
139139
}
140140
}
141141
},
@@ -145,7 +145,7 @@
145145
"name": "sap.fe.templates.ObjectPage",
146146
"options": {
147147
"settings" : {
148-
"entitySet": "Books",
148+
"contextPath": "/Books",
149149
"navigation": {
150150
"author": {
151151
"detail": {
@@ -162,7 +162,7 @@
162162
"name": "sap.fe.templates.ObjectPage",
163163
"options": {
164164
"settings" : {
165-
"entitySet": "Authors"
165+
"contextPath": "/Authors"
166166
}
167167
}
168168
}

‎app/package-lock.json‎

Lines changed: 54 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/reviews/webapp/manifest.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"name": "sap.fe.templates.ListReport",
8787
"options": {
8888
"settings" : {
89-
"entitySet" : "Reviews",
89+
"contextPath" : "/Reviews",
9090
"navigation" : {
9191
"Reviews" : {
9292
"detail" : {
@@ -103,7 +103,7 @@
103103
"name": "sap.fe.templates.ObjectPage",
104104
"options": {
105105
"settings" : {
106-
"entitySet" : "Reviews",
106+
"contextPath" : "/Reviews",
107107
"navigation" : {
108108
"Books" : {
109109
"detail" : {
@@ -120,7 +120,7 @@
120120
"name": "sap.fe.templates.ObjectPage",
121121
"options": {
122122
"settings" : {
123-
"entitySet" : "Books"
123+
"contextPath" : "/Books"
124124
}
125125
}
126126
}

0 commit comments

Comments
 (0)