Skip to content

Commit 625f3a4

Browse files
beckermarcbeckermarc
authored
Switch to SAP Horizon theme (#204)
- Switched to Horizon theme - Temporarily pins UI5 version to 1.110.1 due to issues. - Fixed some quirks on the Orders UI
1 parent ca230e8 commit 625f3a4

File tree

4 files changed

+203
-66
lines changed

4 files changed

+203
-66
lines changed

‎app/appconfig/fioriSandboxConfig.json‎

Lines changed: 185 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
{
2+
"services": {
3+
"LaunchPage": {
4+
"adapter": {
5+
"config": {
6+
"catalogs": [],
7+
"groups": [
8+
{
9+
"id": "Bookshop",
10+
"title": "Bookshop",
11+
"isPreset": true,
12+
"isVisible": true,
13+
"isGroupLocked": false,
14+
"tiles": [
15+
{
16+
"id": "browse-books",
17+
"tileType": "sap.ushell.ui.tile.StaticTile",
18+
"properties": {
19+
"targetURL": "#Books-display",
20+
"title": "Browse Books",
21+
"description": "Find your favorite book"
22+
}
23+
}
24+
]
25+
},
26+
{
27+
"id": "Administration",
28+
"title": "Administration",
29+
"isPreset": true,
30+
"isVisible": true,
31+
"isGroupLocked": false,
32+
"tiles": [
33+
{
34+
"id": "manage-books",
35+
"tileType": "sap.ushell.ui.tile.StaticTile",
36+
"properties": {
37+
"targetURL": "#Books-manage",
38+
"title": "Manage Books",
39+
"description": "Add/edit/delete books"
40+
}
41+
},
42+
{
43+
"id": "manage-orders",
44+
"tileType": "sap.ushell.ui.tile.StaticTile",
45+
"properties": {
46+
"targetURL": "#Orders-manage",
47+
"title": "Manage Orders",
48+
"description": "Find & manage orders"
49+
}
50+
},
51+
{
52+
"id": "manage-reviews",
53+
"tileType": "sap.ushell.ui.tile.StaticTile",
54+
"properties": {
55+
"targetURL": "#Reviews-manage",
56+
"title": "Manage Reviews",
57+
"description": "Add/edit/delete reviews"
58+
}
59+
}
60+
]
61+
},
62+
{
63+
"id": "Shipping",
64+
"title": "Shipping",
65+
"isPreset": true,
66+
"isVisible": true,
67+
"isGroupLocked": false,
68+
"tiles": [
69+
{
70+
"id": "manage-notes",
71+
"tileType": "sap.ushell.ui.tile.StaticTile",
72+
"properties": {
73+
"targetURL": "#Notes-manage",
74+
"title": "Manage Notes",
75+
"description": "Read & create notes for addresses"
76+
}
77+
},
78+
{
79+
"id": "show-addresses",
80+
"tileType": "sap.ushell.ui.tile.StaticTile",
81+
"properties": {
82+
"targetURL": "#Addresses-display",
83+
"title": "Show Shipping Addresses",
84+
"description": "Find the right shipping address"
85+
}
86+
}
87+
]
88+
}
89+
]
90+
}
91+
}
92+
},
93+
"NavTargetResolution": {
94+
"config": {
95+
"enableClientSideTargetResolution": true
96+
}
97+
},
98+
"ClientSideTargetResolution": {
99+
"adapter": {
100+
"config": {
101+
"inbounds": {
102+
"browse-books": {
103+
"semanticObject": "Books",
104+
"action": "display",
105+
"signature": {
106+
"parameters": {},
107+
"additionalParameters": "allowed"
108+
},
109+
"resolutionResult": {
110+
"applicationType": "SAPUI5",
111+
"additionalInformation": "SAPUI5.Component=bookshop",
112+
"url": "/browse/webapp"
113+
}
114+
},
115+
"manage-books": {
116+
"semanticObject": "Books",
117+
"action": "manage",
118+
"signature": {
119+
"parameters": {},
120+
"additionalParameters": "allowed"
121+
},
122+
"resolutionResult": {
123+
"applicationType": "SAPUI5",
124+
"additionalInformation": "SAPUI5.Component=admin",
125+
"url": "/admin/webapp"
126+
}
127+
},
128+
"manage-orders": {
129+
"semanticObject": "Orders",
130+
"action": "manage",
131+
"signature": {
132+
"parameters": {},
133+
"additionalParameters": "allowed"
134+
},
135+
"resolutionResult": {
136+
"applicationType": "SAPUI5",
137+
"additionalInformation": "SAPUI5.Component=orders",
138+
"url": "/orders/webapp"
139+
}
140+
},
141+
"manage-reviews": {
142+
"semanticObject": "Reviews",
143+
"action": "manage",
144+
"signature": {
145+
"parameters": {},
146+
"additionalParameters": "allowed"
147+
},
148+
"resolutionResult": {
149+
"applicationType": "SAPUI5",
150+
"additionalInformation": "SAPUI5.Component=reviews",
151+
"url": "/reviews/webapp"
152+
}
153+
},
154+
"manage-notes": {
155+
"semanticObject": "Notes",
156+
"action": "manage",
157+
"signature": {
158+
"parameters": {},
159+
"additionalParameters": "allowed"
160+
},
161+
"resolutionResult": {
162+
"applicationType": "SAPUI5",
163+
"additionalInformation": "SAPUI5.Component=notes",
164+
"url": "/notes/webapp"
165+
}
166+
},
167+
"show-addresses": {
168+
"semanticObject": "Addresses",
169+
"action": "display",
170+
"signature": {
171+
"parameters": {},
172+
"additionalParameters": "allowed"
173+
},
174+
"resolutionResult": {
175+
"applicationType": "SAPUI5",
176+
"additionalInformation": "SAPUI5.Component=addresses",
177+
"url": "/addresses/webapp"
178+
}
179+
}
180+
}
181+
}
182+
}
183+
}
184+
}
185+
}

‎app/fiori.html‎

Lines changed: 10 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html>
22
<html>
3-
43
<head>
4+
55
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
66
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -10,69 +10,21 @@
1010
<script>
1111
window["sap-ushell-config"] = {
1212
defaultRenderer: "fiori2",
13-
applications: {
14-
"browse-books": {
15-
title: "Browse Books",
16-
description: "Find your favorite book",
17-
additionalInformation: "SAPUI5.Component=bookshop",
18-
applicationType : "URL",
19-
url: "/browse/webapp",
20-
navigationMode: "embedded"
21-
},
22-
"manage-reviews": {
23-
title: "Manage Reviews",
24-
description: "Add/edit/delete reviews",
25-
additionalInformation: "SAPUI5.Component=reviews",
26-
applicationType: "URL",
27-
url: "/reviews/webapp",
28-
navigationMode: "embedded"
29-
},
30-
"manage-books": {
31-
title: "Manage Books",
32-
description: "Add/edit/delete books",
33-
additionalInformation: "SAPUI5.Component=admin",
34-
applicationType: "URL",
35-
url: "/admin/webapp",
36-
navigationMode: "embedded"
37-
},
38-
"manage-orders": {
39-
title: "Manage Orders",
40-
description: "Find & manage orders",
41-
additionalInformation: "SAPUI5.Component=orders",
42-
applicationType: "URL",
43-
url: "/orders/webapp",
44-
navigationMode: "embedded"
45-
},
46-
"manage-notes": {
47-
title: "Manage Notes",
48-
description: "Read & create notes for addresses",
49-
additionalInformation: "SAPUI5.Component=notes",
50-
applicationType: "URL",
51-
url: "/notes/webapp",
52-
navigationMode: "embedded"
53-
},
54-
"show-addresses": {
55-
title: "Show Shipping Addresses",
56-
description: "Find the right shipping address",
57-
additionalInformation: "SAPUI5.Component=addresses",
58-
applicationType: "URL",
59-
url: "/addresses/webapp",
60-
navigationMode: "embedded"
61-
}
62-
}
13+
applications: {}
6314
};
6415
</script>
6516

66-
<script src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
67-
<script src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
68-
data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout" data-sap-ui-compatVersion="edge"
69-
data-sap-ui-theme="sap_fiori_3" data-sap-ui-frameOptions="allow"></script>
17+
<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.110.1/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
18+
<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.110.1/resources/sap-ui-core.js"
19+
data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
20+
data-sap-ui-compatVersion="edge"
21+
data-sap-ui-theme="sap_horizon"
22+
data-sap-ui-frameOptions="allow"
23+
></script>
7024
<script>
71-
sap.ui.getCore().attachInit(() => sap.ushell.Container.createRenderer().placeAt("content"))
25+
sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))
7226
</script>
7327

7428
</head>
75-
7629
<body class="sapUiBody" id="content"></body>
77-
7830
</html>

‎app/orders/fiori-service.cds‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -234,11 +234,6 @@ annotate AdminService.OrderItems with @(
234234
Value : book_ID,
235235
Label : '{i18n>Books}'
236236
},
237-
//The following entry is only used to have the assoication followed in the read event
238-
{
239-
Value : book.price,
240-
Label : '{i18n>BookPrice}'
241-
},
242237
{
243238
Value : quantity,
244239
Label : '{i18n>Quantity}'
@@ -272,16 +267,16 @@ annotate AdminService.OrderItems with @(
272267
Common : {
273268
SideEffects #AmountChanges : {
274269
SourceProperties : [quantity],
275-
TargetProperties : ['Amount']
270+
TargetProperties : ['amount']
276271
},
277272
SideEffects #BookChanges : {
278273
SourceProperties : [book_ID],
279274
TargetEntities : [book],
280-
TargetProperties : ['Amount']
275+
TargetProperties : ['amount']
281276
}
282277
}
283278
) {
284-
Amount
279+
amount
285280
@Common.FieldControl : #ReadOnly;
286281
//ERROR ALERT: The following line refering to the parents currency code will lead to a server error
287282
//@Measures.ISOCurrency:parent.currency.code; //Bind the currency field to the quantity field of the parent

‎app/xs-app.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
"localDir": "./",
1010
"authenticationType": "xsuaa"
1111
},
12+
{
13+
"source": "^/appconfig/(.*)$",
14+
"localDir": "./",
15+
"authenticationType": "xsuaa"
16+
},
1217
{
1318
"source": "^/browse/webapp/(.*)$",
1419
"localDir": "./",

0 commit comments

Comments
 (0)