Merge branch 'main' of https://github.com/sap-tutorials/btp-dev-guidance

Author: PlamiIG

tutorials/add-authorization/add-authorization.md

@@ -136,8 +136,8 @@ The authorization checks that you added to the CAP model apply not only when dep
 
     ```xml
     <dependency>
-      <groupid>com.sap.cds</groupid>
-      <artifactid>cds-starter-cloudfoundry</artifactid>
+      <groupId>com.sap.cds</groupId>
+      <artifactId>cds-starter-cloudfoundry</artifactId>
     </dependency>
     ```
    

tutorials/add-custom-logic/add-custom-logic.md

@@ -127,15 +127,11 @@ In this tutorial, you add some custom code to the CAP application. Depending on
     @Component
     @ServiceName(ProcessorService_.CDS_NAME)
     public class ProcessorServiceHandler implements EventHandler {
-
         private static final Logger logger = LoggerFactory.getLogger(ProcessorServiceHandler.class);
-
         private final PersistenceService db;
-
         public ProcessorServiceHandler(PersistenceService db) {
             this.db = db;
         }
-
         /*
         * Change the urgency of an incident to "high" if the title contains the word "urgent"
         */
@@ -147,10 +143,8 @@ In this tutorial, you add some custom code to the CAP application. Depending on
                     incident.setUrgencyCode("H");
                     logger.info("Adjusted Urgency for incident '{}' to 'HIGH'.", incident.getTitle());
                 }
-
             }
         }
-
         /*
         * Handler to avoid updating a "closed" incident
         */
@@ -160,9 +154,7 @@ In this tutorial, you add some custom code to the CAP application. Depending on
             if (in.getStatusCode().equals("C")) {
                 throw new ServiceException(ErrorStatuses.CONFLICT, "Can't modify a closed incident");
             }
-
         }
-
     }
     ```
 
@@ -173,7 +165,7 @@ In this tutorial, you add some custom code to the CAP application. Depending on
 
     <!-- border; size:540px --> ![Create new incident](./create-new-incident.png)
     
-    You'll see that the value in the **Urgency** field is automatically set to **high**.
+    You'll see that the value in the **Urgency** field is automatically set to **High**.
 
     <!-- border; size:540px --> ![Fiori Elements Work List](./incidentapp.png)
 

tutorials/add-test-cases/add-test-cases.md

@@ -146,7 +146,6 @@ You have configured the access to your application. Follow the steps in the [Add
           )
           expect(status).to.equal(201)
         })
-
         it(`Should Close the Incident-${draftId}`, async () => {
           const { status } = await PATCH(`/odata/v4/processor/Incidents(ID=${incidentId},IsActiveEntity=false)`, {
             status_code: 'C'
@@ -159,7 +158,6 @@ You have configured the access to your application. Follow the steps in the [Add
           )
           expect(response.status).to.eql(200)
         })
-
         it('+ Test the incident status to be closed', async () => {
           const {
             status,
@@ -178,7 +176,6 @@ You have configured the access to your application. Follow the steps in the [Add
             )
             expect(status).to.equal(201)
           })
-
           it(`Should re-open the Incident-${draftId} but fail`, async () => {
             const { status } = await PATCH(`/odata/v4/processor/Incidents(ID=${incidentId},IsActiveEntity=false)`, {
               status_code: 'N'
@@ -197,12 +194,10 @@ You have configured the access to your application. Follow the steps in the [Add
           })
         })
       })
-
       it('- Delete the Draft', async () => {
         const response = await DELETE(`/odata/v4/processor/Incidents(ID=${draftId},IsActiveEntity=false)`)
         expect(response.status).to.eql(204)
       })
-
       it('- Delete the Incident', async () => {
         const response = await DELETE(`/odata/v4/processor/Incidents(ID=${draftId},IsActiveEntity=true)`)
         expect(response.status).to.eql(204)
@@ -411,7 +406,7 @@ You have configured the access to your application. Follow the steps in the [Add
 
 [OPTION BEGIN [Node.js]]
 
-1. Open the **package.json** file and add the `"test": "jest tests/test.js"` line inside the `scripts` section. This adds a command to start the tests.
+1. Open the **package.json** file and add the `"test": "npx jest tests/test.js"` line inside the `scripts` section. This adds a command to start the tests.
 
     ```json
     {
@@ -428,7 +423,7 @@ You have configured the access to your application. Follow the steps in the [Add
           ...
       },
       "scripts": {
-          "test": "jest tests/test.js",
+          "test": "npx jest tests/test.js",
           "start": "cds-serve",
           "watch-incidents": "cds watch --open incidents/webapp/index.html?sap-ui-xx-viewCache=false"
       },

tutorials/deploy-to-cf/deploy-to-cf.md

@@ -60,19 +60,12 @@ You will use the [Cloud MTA Build Tool](https://sap.github.io/cloud-mta-build-to
     cds add mta
     ```
 
-### Add configuration for SAP Build Work Zone, standard edition
+### Check configuration for SAP Build Work Zone, standard edition
 
 > You can create a CAP project in either Node.js or Java. You have to choose one way or the other and follow through. The tabs **Node.js** and **Java** provide detailed steps for each alternative way.
 
 [OPTION BEGIN [Node.js]]
 
-1. Run the following command in the terminal:
-
-    ```bash
-    cds add workzone-standard
-    ```
-
-
 2. Verify that the destinations module `incident-management-destinations` and resource `incident-management-destination` have been added to the **mta.yaml** file without errors:
 
 
@@ -147,119 +140,10 @@ You will use the [Cloud MTA Build Tool](https://sap.github.io/cloud-mta-build-to
             forwardAuthToken: true
     ```
 
-
-
-
-3. Verify that the navigation target `incidents-display` and the SAP Cloud service `sap.cloud` have been correctly added to the application manifest file **app/incidents/webapp/manifest.json**:
-
-
-    ```json
-    "sap.app": {
-      "id": "ns.incidents",
-      ...
-      "sourceTemplate": {
-        ...
-      },
-      "dataSources": {
-        ...
-      },
-      "crossNavigation": {
-        "inbounds": {
-          "incidents-display": {
-            "semanticObject": "incidents",
-            "action": "display",
-            "title": "{{flpTitle}}",
-            "subTitle": "{{flpSubtitle}}",
-            "signature": {
-              "parameters": {},
-              "additionalParameters": "allowed"
-            }
-          }
-        }
-      }
-    ...
-    "sap.cloud": {
-        "public": true,
-        "service": "incidents"
-      }
-    }   
-    ```
-
-
-4. Open **app/incidents/webapp/manifest.json** and remove the leading `/` from the `uri` parameter.
-
-    ```json
-    {
-        "_version": "1.49.0",
-        "sap.app": {
-            "id": "ns.incidents",
-            "type": "application",
-            "i18n": "i18n/i18n.properties",
-            ...
-            "dataSources": {
-                "mainService": {
-                    "uri": "odata/v4/processor/",
-                    "type": "OData",
-                    "settings": {
-                        "annotations": [],
-                        "localUri": "localService/metadata.xml",
-                        "odataVersion": "4.0"
-                    }
-                }
-            },
-            ...
-        },
-        ...
-    }
-    ```
-
-    This is needed as the dataSource URIs must be relative to the base URL, which means there is no need for a slash as the first character.
-
-    Check [Accessing Business Service UI](https://help.sap.com/docs/btp/sap-business-technology-platform/accessing-business-service-ui?locale=39723061bc4b4b679726b120cbefdf5a.html&q=base%20URL) for more information.
-
-5. Make sure that the line `"welcomeFile": "/index.html"` in the following snippet is added to the **app/incidents/xs-app.json** file. Add if it is missing. 
-
-    ```json
-    {
-      "welcomeFile": "/index.html",
-      "authenticationMethod": "route",
-      "routes": [
-        {
-          "source": "^/?odata/(.*)$",
-          "target": "/odata/$1",
-          "destination": "incident-management-srv-api",
-          "authenticationType": "xsuaa",
-          "csrfProtection": true
-        },
-        {
-          "source": "^(.*)$",
-          "target": "$1",
-          "service": "html5-apps-repo-rt",
-          "authenticationType": "xsuaa"
-        }
-      ]
-    }
-    ```
-
 [OPTION END]
 
 [OPTION BEGIN [Java]]
 
-1. Run the following command in the root folder of your project:
-
-    ```bash
-    cds add workzone
-    ```
-
-    You should see the following output in the terminal:
-
-    ```bash
-    Adding feature 'destination'...
-    Adding feature 'html5-repo'...
-    Adding feature 'workzone'...
-    Adding feature 'workzone-standard'...
-    ```
-
 2. Verify that all required modules (`incident-management-app-deployer`, `incidentmanagementincidents`, and `incident-management-destinations`) and resources (`incident-management-destination` and `incident-management-html5-repo-host`) have been added to the **mta.yaml** file without errors:
 
     ```yaml
@@ -365,50 +249,6 @@ You will use the [Cloud MTA Build Tool](https://sap.github.io/cloud-mta-build-to
         service-plan: app-host
     ```
 
-4. Open **app/incidents/webapp/manifest.json** and remove the leading `/` from the `uri` parameter.
-
-    ```json
-    {
-        "_version": "1.49.0",
-        "sap.app": {
-            "id": "ns.incidents",
-            "type": "application",
-            "i18n": "i18n/i18n.properties",
-            ...
-            "dataSources": {
-                "mainService": {
-                    "uri": "odata/v4/processor/",
-                    "type": "OData",
-                    "settings": {
-                        "annotations": [],
-                        "localUri": "localService/metadata.xml",
-                        "odataVersion": "4.0"
-                    }
-                }
-            },
-            ...
-        },
-        ...
-    }
-    ```
-
-    This is needed as the dataSource URIs must be relative to the base URL, which means there is no need for a slash as the first character.
-
-    Check [Accessing Business Service UI](https://help.sap.com/docs/btp/sap-business-technology-platform/accessing-business-service-ui?locale=39723061bc4b4b679726b120cbefdf5a.html&q=base%20URL) for more information.
-
-6. Navigate to the **db** folder in the terminal and run the following command:
-
-    ```bash
-    npm install
-    ```
-
-7. Navigate to the **app/incidents** folder in the terminal and run the following command:
-
-    ```bash
-    npm install
-    ```
-
-
 [OPTION END]
 
 ### Make additional changes to the mta.yaml file

tutorials/deploy-to-kyma/deploy-to-kyma.md

@@ -539,7 +539,13 @@ Kyma runs on containers. Hence, for this tutorial, you'll need an application th
     cds add xsuaa,hana --for production
     ```  
 
-5. Build the CAP Java image:
+5. Install dependencies added by the `cds add` commands in the previous steps and build the `.jar` file to create the srv image:
+
+    ```bash
+    mvn clean install
+    ```
+
+6. Build the CAP Java image:
 
     ```bash
     pack build <your-container-registry>/incident-management-srv:<image-version> \
@@ -562,7 +568,7 @@ Kyma runs on containers. Hence, for this tutorial, you'll need an application th
 
     > The pack CLI builds the image that contains the build result in the **gen/srv** folder and the required npm packages by using the [Cloud Native Buildpack for Node.JS](https://github.com/paketo-buildpacks/nodejs) provided by Paketo.
 
-6. Build the database image:
+7. Build the database image:
 
     ```bash
     pack build <your-container-registry>/incident-management-hana-deployer:<image-version> \
@@ -600,7 +606,7 @@ Kyma runs on containers. Hence, for this tutorial, you'll need an application th
     "authenticationMethod": "route",
     "routes": [
         {
-        "source": "^/odata/v4/processor/(.*)$",
+        "source": "^/odata/v4/ProcessorService/(.*)$",
         "destination": "srv-api",
         "authenticationType": "xsuaa"
         },