Merge branch 'sap-tutorials:master' into master

Author: tracywai-sap

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
     "SAP HANA Database Explorer.displaySapWebAnalyticsStartupNotification": false,
-    "SAP HANA Database Artifacts.displaySapWebAnalyticsStartupNotification": false
+    "SAP HANA Database Artifacts.displaySapWebAnalyticsStartupNotification": false,
+    "SAP HANA SQLScript LSP.URL": "https://hana-cockpit.cfapps.us10.hana.ondemand.com"
 }

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

@@ -101,4 +101,4 @@ As an example:
 
 If you can't find a barcode, here's an example:
 
-![Barcode example](barcode.gif) 
+![Barcode example](barcode.gif)  

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

@@ -62,7 +62,7 @@ Integration cards are UI elements which display concise pieces of information in
     <!-- border -->![Image depicting UI Integration Card template option](2-3.PNG)
 
 4. Fill-in the required project details. Use the **Highlight Card** template, which creates an Integration card of type List and select Finish.
->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.
+>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`.
 
     | Description                                        | Value   
     | :-------------                                     | :-------------
@@ -156,10 +156,10 @@ In the next steps you edit the `manifest.json` file to configure the card.
 
 **Results after Step 3:**
 
-
 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.
 
 
+
 <!-- border -->![Image depicting the application showing dynamic data](3-4.PNG)
 
 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
 
 **Results after Step 5:**
 
-
 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. 
 
+
 The application displays the products from the selected category:
 
 <!-- border -->![Image depicting the application showing dynamic data, parameters, and a filter](5-5.PNG)

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

@@ -112,7 +112,7 @@ The MBT Build tool uses the `mta.yaml` file that has been created using `cds add
 > 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`:
 > ```json
 > "oauth2-configuration": {
->     "redirect-uris": ["https://*.cfapps.us10-001.hana.ondemand.com/**"]
+>     "redirect-uris": ["https://*.us10-001.hana.ondemand.com/**"]
 > }
 > ```
 > 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
     ```
     This is the URL of the AppRouter, which enforces the authentication flow.
 
-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**.
+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**.
 
     <!-- border -->![application preview](application_cloud_fiori.png)
 

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

@@ -39,7 +39,7 @@ import org.springframework.stereotype.Component;
 
 import com.sap.cds.services.cds.CdsCreateEventContext;
 import com.sap.cds.services.cds.CdsReadEventContext;
-import com.sap.cds.services.cds.CdsService;
+import com.sap.cds.services.cds.CqnService;
 import com.sap.cds.services.handler.EventHandler;
 import com.sap.cds.services.handler.annotations.On;
 import com.sap.cds.services.handler.annotations.ServiceName;
@@ -50,13 +50,13 @@ public class AdminService implements EventHandler {
 
     private Map<Object, Map<String, Object>> products = new HashMap<>();
 
-    @On(event = CdsService.EVENT_CREATE, entity = "AdminService.Products")
+    @On(event = CqnService.EVENT_CREATE, entity = "AdminService.Products")
     public void onCreate(CdsCreateEventContext context) {
         context.getCqn().entries().forEach(e -> products.put(e.get("ID"), e));
         context.setResult(context.getCqn().entries());
     }
 
-    @On(event = CdsService.EVENT_READ, entity = "AdminService.Products")
+    @On(event = CqnService.EVENT_READ, entity = "AdminService.Products")
     public void onRead(CdsReadEventContext context) {
         context.setResult(products.values());
     }

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

@@ -68,7 +68,7 @@ You will now add a method to the `OrdersService` Java class to decrease the stoc
     @Autowired
     PersistenceService db;
 
-    @Before(event = CdsService.EVENT_CREATE, entity = OrderItems_.CDS_NAME)
+    @Before(event = CqnService.EVENT_CREATE, entity = OrderItems_.CDS_NAME)
     public void validateBookAndDecreaseStock(List<OrderItems> items) {
         for (OrderItems item : items) {
             String bookId = item.getBookId();
@@ -92,7 +92,7 @@ You will now add a method to the `OrdersService` Java class to decrease the stoc
         }
     }
 
-    @Before(event = CdsService.EVENT_CREATE, entity = Orders_.CDS_NAME)
+    @Before(event = CqnService.EVENT_CREATE, entity = Orders_.CDS_NAME)
     public void validateBookAndDecreaseStockViaOrders(List<Orders> orders) {
         for (Orders order : orders) {
             if (order.getItems() != null) {
@@ -114,7 +114,7 @@ You will now add a method to the `OrdersService` Java class to decrease the stoc
     import com.sap.cds.ql.cqn.CqnUpdate;
     import com.sap.cds.services.ErrorStatuses;
     import com.sap.cds.services.ServiceException;
-    import com.sap.cds.services.cds.CdsService;
+    import com.sap.cds.services.cds.CqnService;
     import com.sap.cds.services.handler.annotations.Before;
     import com.sap.cds.services.persistence.PersistenceService;
 
@@ -160,7 +160,7 @@ import com.sap.cds.ql.cqn.CqnSelect;
 import com.sap.cds.ql.cqn.CqnUpdate;
 import com.sap.cds.services.ErrorStatuses;
 import com.sap.cds.services.ServiceException;
-import com.sap.cds.services.cds.CdsService;
+import com.sap.cds.services.cds.CqnService;
 import com.sap.cds.services.handler.annotations.Before;
 import com.sap.cds.services.persistence.PersistenceService;
 
@@ -177,7 +177,7 @@ public class OrdersService implements EventHandler {
     @Autowired
     PersistenceService db;
 
-    @Before(event = CdsService.EVENT_CREATE, entity = OrderItems_.CDS_NAME)
+    @Before(event = CqnService.EVENT_CREATE, entity = OrderItems_.CDS_NAME)
     public void validateBookAndDecreaseStock(List<OrderItems> items) {
         for (OrderItems item : items) {
             String bookId = item.getBookId();
@@ -201,7 +201,7 @@ public class OrdersService implements EventHandler {
         }
     }
 
-    @Before(event = CdsService.EVENT_CREATE, entity = Orders_.CDS_NAME)
+    @Before(event = CqnService.EVENT_CREATE, entity = Orders_.CDS_NAME)
     public void validateBookAndDecreaseStockViaOrders(List<Orders> orders) {
         for (Orders order : orders) {
             if (order.getItems() != null) {
@@ -281,7 +281,7 @@ Next, let's add a method to the `OrdersService` Java class to calculate the `net
 1. Add the following code to the class and make sure you **Save** the file:
 
     ```Java
-    @After(event = { CdsService.EVENT_READ, CdsService.EVENT_CREATE }, entity = OrderItems_.CDS_NAME)
+    @After(event = { CqnService.EVENT_READ, CqnService.EVENT_CREATE }, entity = OrderItems_.CDS_NAME)
     public void calculateNetAmount(List<OrderItems> items) {
         for (OrderItems item : items) {
             String bookId = item.getBookId();
@@ -368,7 +368,7 @@ Finally, add a method to the `OrdersService` Java class to calculate the `total`
 1. Add the following code to the class and make sure you **Save** the file:
 
     ```Java
-    @After(event = { CdsService.EVENT_READ, CdsService.EVENT_CREATE }, entity = Orders_.CDS_NAME)
+    @After(event = { CqnService.EVENT_READ, CqnService.EVENT_CREATE }, entity = Orders_.CDS_NAME)
     public void calculateTotal(List<Orders> orders) {
         for (Orders order : orders) {
             // calculate net amount for expanded items

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

@@ -41,7 +41,7 @@ From the products service that you created in the previous tutorial, we just wan
 
     ```Shell/Bash
     mvn -B archetype:generate -DarchetypeArtifactId=cds-services-archetype -DarchetypeGroupId=com.sap.cds \
-    -DarchetypeVersion=RELEASE \
+    -DarchetypeVersion=RELEASE -DjdkVersion=11 \
     -DgroupId=com.sap.cap -DartifactId=bookstore
     ```
 

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

@@ -196,7 +196,7 @@ The UAA will provide user identity, as well as assigned roles and user attribute
 
     ![CAP Service successful](cap_successful.png)
 
-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.
+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.
 
     ![Fiori with authentication](fiori_with_authentication.png)
 

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

@@ -101,7 +101,7 @@ Before we create our SAP HANA project, we want to do a few more one-time configu
 1. The final input will ask you for your Space. Press **Apply**.
     ![Space](space.png)
 
-1. Upon completion of all the inputs, you should see that the Organization and Space have been set and you will see any service instances or application instances from the target space. It's normally to see many less options in this tree display than the screenshot.
+1. Upon completion of all the inputs, you should see that the Organization and Space have been set and you will see any service instances or application instances from the target space. It's normal to see less options in this tree display than the screenshot depending upon how much other development you might have already done in your BTP account.
 
     ![Org and Space Set Correctly](org_space_set_correctly.png)
 

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

@@ -135,15 +135,15 @@ We want to create a Fiori freestyle UI for our CAP service.  We will use the wiz
 
     ![Fiori Application Generator](fiori_app_gen.png)
 
-1. Choose **SAPUI5 freestyle** as the application type, select **SAP Fiori Worklist Application** as the floor plan and press **Next**
+1. Choose **SAP Fiori** as the template type, select **Worklist Page** as the template and press **Next**
 
     ![Fiori Application Type](application_type.png)
 
-1. At the Data Source and Service Selection screen, choose **Use a Local CAP Node.js Project**. Select your project root as the **CAP project folder path**. Select `CatalogService` as your OData service. Press **Next**
+1. At the Data Source and Service Selection screen, choose **Use a Local CAP Project**. Select your project as the **Choose your CAP project**. Select `CatalogService (Node.js)` as your OData service. Press **Next**
 
     ![Data Source and Service Selection](data_source.png)
 
-1. Choose `Interactions_Items` as the Object collection, `INTHeader_ID` for the remaining columns and press **Next**
+1. Choose `Interactions_Header` as the main entity, `ITEMS` for the Navigation entity, leave the `YES` value for the "Automatically add table columns to the list page and a section to the object page if none already exists?" option and press **Next**
 
     ![Entity Selection](entity_selection.png)
 

tutorials/hana-cloud-cap-add-authentication/unauthorized_cap.png

@@ -9,34 +9,34 @@ tags: [  tutorial>beginner, products>sap-business-technology-platform, topic>sap
 
 ---
 
-# Tour the SAP API Business Hub
-<!-- description --> Explore the various features of the SAP API Business Hub, and learn how to find and test APIs.
+# Tour the SAP Business Accelerator Hub
+<!-- description --> Explore the various features of the SAP SAP Business Accelerator Hub, and learn how to find and test APIs.
 
 ## You will learn
-- How to get started with SAP API Business Hub
+- How to get started with SAP Business Accelerator Hub
 
 ## Intro
-SAP API Business Hub is a website to discover, explore, and test APIs from various SAP products such as SAP S/4HANA, SAP SuccessFactors, SAP Customer Experience, SAP BTP, and selected partners. Apart from various product APIs, you can find detailed information on business processes and partner assets. The new workspace feature also enables you to consume integration and workflow content.
+SAP Business Accelerator Hub is a website to discover, explore, and test APIs from various SAP products such as SAP S/4HANA, SAP SuccessFactors, SAP Customer Experience, SAP BTP, and selected partners. Apart from various product APIs, you can find detailed information on business processes and partner assets. The new workspace feature also enables you to consume integration and workflow content.
 
-Want to learn more about the new SAP API Business Hub? Not sure where to get started? Go to [api.sap.com] (https://api.sap.com), and begin your journey.
+Want to learn more about the new SAP SAP Business Accelerator Hub? Not sure where to get started? Go to [api.sap.com] (https://api.sap.com), and begin your journey.
 
 ---
 
-### Go to the SAP API Business Hub
-In your browser, open [SAP API Business Hub](https://api.sap.com/).
+### Go to the SAP Business Accelerator Hub
+In your browser, open [SAP Business Accelerator Hub](https://api.sap.com/).
 
-<!-- border -->![SAP API Business Hub page](1.png)
+<!-- border -->![SAP Business Accelerator Hub page](1.png)
 
-You can explore products, business processes, as well as different categories of assets, along with partner and featured content. Choose Explore for quick access to the various sections of the SAP API Business Hub.
+You can explore products, business processes as well as different categories of assets, along with partner and featured content. Choose **Explore** for quick access to the various sections of the SAP Business Accelerator Hub.
 
 ### Explore API content
-On the SAP API Business Hub homepage, choose **Categories**.
+On the SAP Business Accelerator Hub homepage, choose **Categories**.
 
-<!-- border -->![SAP API Business Hub homepage API tile](2.png)
+<!-- border -->![SAP Business Accelerator Hub homepage API tile](2.png)
 
 Choose APIs from the different categories available.
 
-<!-- border -->![SAP API Business Hub APIs section](2a.png)
+<!-- border -->![SAP Business Accelerator Hub APIs section](2a.png)
 
 ### Search for an API
 
@@ -52,7 +52,6 @@ For the purpose of this tutorial, we are going to choose the `SAP Cloud for Cust
 
 <!-- border -->![SAP Cloud for Customer Package Search](4a.png)
 
-
 ### Explore the API
 
 On choosing the **SAP Cloud for Customer** package, you can view the available APIs in the package. Select the Campaign API to explore it in detail.
@@ -73,7 +72,7 @@ Various HTTP methods of API are used to address the functionality of endpoints.
 
 ### Test an API endpoint
 
-The SAP API Business Hub allows you to test APIs. A sandbox environment is provided to test the Campaign API. To take advantage of this, ensure you are logged on. Select Login at the top of the page.
+The SAP Business Accelerator Hub allows you to test APIs. A sandbox environment is provided to test the Campaign API. To take advantage of this, ensure you are logged on. Select Login at the top of the page.
 
 <!-- border -->![Login](6.png)
 
@@ -104,5 +103,4 @@ The response section displays various entities fetched calling the `GET` method.
 
 Feel free to explore other endpoints in this Campaign API.
 
-
-Congratulations, you have just taken your first steps with the SAP API Business Hub and should now be able to navigate it and the content within, confidently.
+Congratulations, you have just taken your first steps with the SAP Business Accelerator Hub and should now be able to navigate it and the content within, confidently.

tutorials/hana-cloud-cap-calc-view/add_proxy_entity.png

@@ -8,7 +8,7 @@ time: 20
 tags: [  tutorial>beginner, products>sap-business-technology-platform, topic>sap-api-business-hub ]
 ---
 
-# Test SAP API Business Hub APIs with curl
+# Test SAP Business Accelerator Hub APIs with curl
 <!-- description --> Try out an SAP API locally on your machine.
 
 ## Prerequisites
@@ -20,7 +20,7 @@ tags: [  tutorial>beginner, products>sap-business-technology-platform, topic>sap
 - How to use command line tools like curl and jq with REST / OData APIs locally.
 
 ## Intro
-You have already discovered the SAP API Business Hub and accomplished testing an API on the website. In this tutorial, you will learn how to use command-line tools like curl and jq to test REST/OData APIs locally on your machine.
+You have already discovered the SAP Business Accelerator Hub and accomplished testing an API on the website. In this tutorial, you will learn how to use command-line tools like curl and jq to test REST and OData APIs locally on your machine.
 
 ---
 
@@ -32,7 +32,7 @@ Go to <https://api.sap.com> and navigate to the [Campaign](https://api.sap.com/a
 
 ### Generate sample API call code
 
-Select `GET/CampaignCollection` method under **API Reference**. Glance through the `GET/CampaignCollection` to understand the parameters. The SAP API Business Hub provides you with starter code in a variety of languages and tools for each API.
+Select `GET/CampaignCollection` method under **API Reference**. Glance through the `GET/CampaignCollection` to understand the parameters. The SAP Business Accelerator Hub provides you with starter code in a variety of languages and tools for each API.
 
 ![Get/CampaignCollection method](2.png)
 
@@ -52,7 +52,7 @@ Copy the highlighted curl code to the clipboard.
 
 ### Run sample API call code
 
-Paste the content of the clipboard in a terminal or command line window. Hit **Enter** to run the command. It may take a few seconds before data is seen on your screen.
+Paste the content of the clipboard in a terminal or command line window. Hit **Enter** to run the command. Please note that it may take a few seconds before data is seen on your screen.
 
 > You can use `CTRL+C` to stop the command from running.
 
@@ -72,7 +72,6 @@ You can limit the number of results retrieved with the `$top` value provided in
 You can then switch back to the Code Snippet section, and copy the updated code from the Curl section to paste it into your terminal. When you execute the curl command, and pipe the output into jq again, you should see a nicely formatted list of three campaigns.
 
 ### Add multiple parameters to the API call
-
 Besides the `$top` parameter, you can add multiple parameters to the [Query String](https://en.wikipedia.org/wiki/Query_string) of your API call.
 Now add in a second parameter for `$select`. You only want the `StatusText` and `Status` for the top 3 users. Use the same approach as before - switch to the Parameters section, specify the two values for the `$select` parameter using the drop down menu, then switch back to the Code Snippet section and copy the Curl content again. It should look something like this: