Skip to content

Commit bbeca1e

Browse files
tracywai-saptracywai-sap
authored
Merge branch 'sap-tutorials:master' into master
2 parents 389ace0 + 46be70f commit bbeca1e

227 files changed

Lines changed: 289 additions & 2157 deletions

File tree

Some content is hidden

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

‎.vscode/settings.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"SAP HANA Database Explorer.displaySapWebAnalyticsStartupNotification": false,
3-
"SAP HANA Database Artifacts.displaySapWebAnalyticsStartupNotification": false
3+
"SAP HANA Database Artifacts.displaySapWebAnalyticsStartupNotification": false,
4+
"SAP HANA SQLScript LSP.URL": "https://hana-cockpit.cfapps.us10.hana.ondemand.com"
45
}

‎tutorials/aif-idoc-monitoring-interface-create/idoc-struc-gen-interface-definition.png‎

-27.5 KB
Loading

‎tutorials/appgyver-configure-camera/appgyver-configure-camera.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,4 @@ As an example:
101101

102102
If you can't find a barcode, here's an example:
103103

104-
![Barcode example](barcode.gif)
104+
![Barcode example](barcode.gif)

‎tutorials/appstudio-sapui5-integrationcard-create/appstudio-sapui5-integrationcard-create.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Integration cards are UI elements which display concise pieces of information in
6262
<!-- border -->![Image depicting UI Integration Card template option](2-3.PNG)
6363

6464
4. Fill-in the required project details. Use the **Highlight Card** template, which creates an Integration card of type List and select Finish.
65-
>If you are following this tutorial as part of a workshop, please give your card a unique name. Your card name should be `#uid_products_by_category_card` where `#uid` is your unique identifier.
65+
>If you are following this tutorial as part of a workshop, please give your card a unique name. In this case your card name should be `wz<your unique identifier>_products_by_category_card`.
6666
6767
| Description | Value
6868
| :------------- | :-------------
@@ -156,10 +156,10 @@ In the next steps you edit the `manifest.json` file to configure the card.
156156

157157
**Results after Step 3:**
158158

159-
160159
The application displays dynamic data loaded from the SAP Gateway Demo System (ES5). Note, that the actual displayed products may differ depending on the current data in the ES5 demo system. You can also check the [manifest.json](https://raw.githubusercontent.com/SAPDocuments/Tutorials/master/tutorials/appstudio-sapui5-integrationcard-create/manifest_after_step3.json) file at this step. To learn more, see the [Destinations](https://sapui5.hana.ondemand.com/test-resources/sap/ui/integration/demokit/cardExplorer/webapp/index.html#/learn/features/destinations) and [Data](https://sapui5.hana.ondemand.com/test-resources/sap/ui/integration/demokit/cardExplorer/webapp/index.html#/learn/features/data) sections in the Card Explorer.
161160

162161

162+
163163
<!-- border -->![Image depicting the application showing dynamic data](3-4.PNG)
164164

165165
If you would like to deploy the card and see how it looks on SAP Build Work Zone, you can skip to Step 6 and deploy it. In the next steps you add card capabilities that can make your card more interactive.
@@ -286,9 +286,9 @@ To learn more, see the [Manifest Parameters](https://sapui5.hana.ondemand.com/te
286286

287287
**Results after Step 5:**
288288

289-
290289
If you have any issues you can check the [manifest.json](https://raw.githubusercontent.com/SAPDocuments/Tutorials/master/tutorials/appstudio-sapui5-integrationcard-create/manifest.json) file at this step. It is configured with destinations, parameters, and a filter.
291290

291+
292292
The application displays the products from the selected category:
293293

294294
<!-- border -->![Image depicting the application showing dynamic data, parameters, and a filter](5-5.PNG)

‎tutorials/cap-service-deploy/cap-service-deploy.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ The MBT Build tool uses the `mta.yaml` file that has been created using `cds add
112112
> In the previous step, you identified your API endpoint. If that has a format like `...us10-001...`, you need to add the following configuration to your `xs-security.json`:
113113
> ```json
114114
> "oauth2-configuration": {
115-
> "redirect-uris": ["https://*.cfapps.us10-001.hana.ondemand.com/**"]
115+
> "redirect-uris": ["https://*.us10-001.hana.ondemand.com/**"]
116116
> }
117117
> ```
118118
> For other API endpoints you'd need to adapt it accordingly.
@@ -146,7 +146,7 @@ The MBT Build tool uses the `mta.yaml` file that has been created using `cds add
146146
```
147147
This is the URL of the AppRouter, which enforces the authentication flow.
148148
149-
4. Open this URL in the browser and try out the provided links, for example, `.../catalog/Books`. Application data is fetched from SAP HANA. If enabled in step 1.3 you can also try the **Fiori preview**.
149+
4. Open this URL in the browser and try out the provided links, for example, `.../catalog/Books`. Application data is fetched from SAP HANA. If enabled in step 1.4 you can also try the **Fiori preview**.
150150
151151
<!-- border -->![application preview](application_cloud_fiori.png)
152152

‎tutorials/cp-cap-java-custom-handler/cp-cap-java-custom-handler.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import org.springframework.stereotype.Component;
3939

4040
import com.sap.cds.services.cds.CdsCreateEventContext;
4141
import com.sap.cds.services.cds.CdsReadEventContext;
42-
import com.sap.cds.services.cds.CdsService;
42+
import com.sap.cds.services.cds.CqnService;
4343
import com.sap.cds.services.handler.EventHandler;
4444
import com.sap.cds.services.handler.annotations.On;
4545
import com.sap.cds.services.handler.annotations.ServiceName;
@@ -50,13 +50,13 @@ public class AdminService implements EventHandler {
5050

5151
private Map<Object, Map<String, Object>> products = new HashMap<>();
5252

53-
@On(event = CdsService.EVENT_CREATE, entity = "AdminService.Products")
53+
@On(event = CqnService.EVENT_CREATE, entity = "AdminService.Products")
5454
public void onCreate(CdsCreateEventContext context) {
5555
context.getCqn().entries().forEach(e -> products.put(e.get("ID"), e));
5656
context.setResult(context.getCqn().entries());
5757
}
5858

59-
@On(event = CdsService.EVENT_READ, entity = "AdminService.Products")
59+
@On(event = CqnService.EVENT_READ, entity = "AdminService.Products")
6060
public void onRead(CdsReadEventContext context) {
6161
context.setResult(products.values());
6262
}

‎tutorials/cp-cap-java-custom-logic/cp-cap-java-custom-logic.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ You will now add a method to the `OrdersService` Java class to decrease the stoc
6868
@Autowired
6969
PersistenceService db;
7070

71-
@Before(event = CdsService.EVENT_CREATE, entity = OrderItems_.CDS_NAME)
71+
@Before(event = CqnService.EVENT_CREATE, entity = OrderItems_.CDS_NAME)
7272
public void validateBookAndDecreaseStock(List<OrderItems> items) {
7373
for (OrderItems item : items) {
7474
String bookId = item.getBookId();
@@ -92,7 +92,7 @@ You will now add a method to the `OrdersService` Java class to decrease the stoc
9292
}
9393
}
9494

95-
@Before(event = CdsService.EVENT_CREATE, entity = Orders_.CDS_NAME)
95+
@Before(event = CqnService.EVENT_CREATE, entity = Orders_.CDS_NAME)
9696
public void validateBookAndDecreaseStockViaOrders(List<Orders> orders) {
9797
for (Orders order : orders) {
9898
if (order.getItems() != null) {
@@ -114,7 +114,7 @@ You will now add a method to the `OrdersService` Java class to decrease the stoc
114114
import com.sap.cds.ql.cqn.CqnUpdate;
115115
import com.sap.cds.services.ErrorStatuses;
116116
import com.sap.cds.services.ServiceException;
117-
import com.sap.cds.services.cds.CdsService;
117+
import com.sap.cds.services.cds.CqnService;
118118
import com.sap.cds.services.handler.annotations.Before;
119119
import com.sap.cds.services.persistence.PersistenceService;
120120

@@ -160,7 +160,7 @@ import com.sap.cds.ql.cqn.CqnSelect;
160160
import com.sap.cds.ql.cqn.CqnUpdate;
161161
import com.sap.cds.services.ErrorStatuses;
162162
import com.sap.cds.services.ServiceException;
163-
import com.sap.cds.services.cds.CdsService;
163+
import com.sap.cds.services.cds.CqnService;
164164
import com.sap.cds.services.handler.annotations.Before;
165165
import com.sap.cds.services.persistence.PersistenceService;
166166
@@ -177,7 +177,7 @@ public class OrdersService implements EventHandler {
177177
@Autowired
178178
PersistenceService db;
179179
180-
@Before(event = CdsService.EVENT_CREATE, entity = OrderItems_.CDS_NAME)
180+
@Before(event = CqnService.EVENT_CREATE, entity = OrderItems_.CDS_NAME)
181181
public void validateBookAndDecreaseStock(List<OrderItems> items) {
182182
for (OrderItems item : items) {
183183
String bookId = item.getBookId();
@@ -201,7 +201,7 @@ public class OrdersService implements EventHandler {
201201
}
202202
}
203203
204-
@Before(event = CdsService.EVENT_CREATE, entity = Orders_.CDS_NAME)
204+
@Before(event = CqnService.EVENT_CREATE, entity = Orders_.CDS_NAME)
205205
public void validateBookAndDecreaseStockViaOrders(List<Orders> orders) {
206206
for (Orders order : orders) {
207207
if (order.getItems() != null) {
@@ -281,7 +281,7 @@ Next, let's add a method to the `OrdersService` Java class to calculate the `net
281281
1. Add the following code to the class and make sure you **Save** the file:
282282

283283
```Java
284-
@After(event = { CdsService.EVENT_READ, CdsService.EVENT_CREATE }, entity = OrderItems_.CDS_NAME)
284+
@After(event = { CqnService.EVENT_READ, CqnService.EVENT_CREATE }, entity = OrderItems_.CDS_NAME)
285285
public void calculateNetAmount(List<OrderItems> items) {
286286
for (OrderItems item : items) {
287287
String bookId = item.getBookId();
@@ -368,7 +368,7 @@ Finally, add a method to the `OrdersService` Java class to calculate the `total`
368368
1. Add the following code to the class and make sure you **Save** the file:
369369

370370
```Java
371-
@After(event = { CdsService.EVENT_READ, CdsService.EVENT_CREATE }, entity = Orders_.CDS_NAME)
371+
@After(event = { CqnService.EVENT_READ, CqnService.EVENT_CREATE }, entity = Orders_.CDS_NAME)
372372
public void calculateTotal(List<Orders> orders) {
373373
for (Orders order : orders) {
374374
// calculate net amount for expanded items

‎tutorials/cp-cap-java-service-reuse/cp-cap-java-service-reuse.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ From the products service that you created in the previous tutorial, we just wan
4141
4242
```Shell/Bash
4343
mvn -B archetype:generate -DarchetypeArtifactId=cds-services-archetype -DarchetypeGroupId=com.sap.cds \
44-
-DarchetypeVersion=RELEASE \
44+
-DarchetypeVersion=RELEASE -DjdkVersion=11 \
4545
-DgroupId=com.sap.cap -DartifactId=bookstore
4646
```
4747

‎tutorials/hana-cloud-cap-add-authentication/fiori_with_authentication.png‎

20.5 KB
Loading

‎tutorials/hana-cloud-cap-add-authentication/hana-cloud-cap-add-authentication.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ The UAA will provide user identity, as well as assigned roles and user attribute
196196
197197
![CAP Service successful](cap_successful.png)
198198
199-
1. Finally change the ULR path to `/interaction_items/webapp/index.html`. You are now testing the Fiori free style application from the previous tutorial with data from the CAP service but all with authentication. You should also only be seeing a single record thanks to the data restriction we placed on the service as well.
199+
1. Finally change to the `Interaction_Items` from the test page. You are now testing with data from the CAP service but all with authentication. You should also only be seeing a single record thanks to the data restriction we placed on the service as well.
200200
201201
![Fiori with authentication](fiori_with_authentication.png)
202202

0 commit comments

Comments
 (0)