Skip to content

Commit 87529b4

Browse files
committed
UI and general updates
1 parent 1c86339 commit 87529b4

38 files changed

+74
-44
lines changed

.vscode/settings.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
22
"SAP HANA Database Explorer.displaySapWebAnalyticsStartupNotification": false,
3-
"SAP HANA Database Artifacts.displaySapWebAnalyticsStartupNotification": false
3+
"SAP HANA Database Artifacts.displaySapWebAnalyticsStartupNotification": false,
4+
"files.exclude": {
5+
"tutorials/{[!b],?[!t],??[!p],???[!-],????[!a],?????[!p],??????[!p]}*":true
6+
}
47
}
Loading

tutorials/btp-app-cap-mta-deployment/btp-app-cap-mta-deployment.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ The `mta.yaml` file consists of different modules (Cloud Foundry apps) and resou
242242
The resources are generated from the `requires` section of `cds` in the `package.json`.
243243

244244
* `cpapp-db` - SAP HANA DB HDMI container
245-
* `cpapp-uaa` - XSUAA service
245+
* `cpapp-auth` - XSUAA service
246246

247247
The resources are Cloud Foundry service instances that are automatically created and updated during the MTA deployment.
248248

Loading
Loading
Loading

tutorials/btp-app-create-ui-fiori-elements/btp-app-create-ui-fiori-elements.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@ An SAP Fiori elements app is an application that leverages SAPUI5, SAPUI5 contro
3636

3737
> VS Code will automatically install `@sap/generator-fiori` if missing and open the **Template Wizard**.
3838
39-
> In case you get an error launching the Application Generator, refer to the [FAQ](https://help.sap.com/viewer/42532dbd1ebb434a80506113970f96e9/Latest/en-US) to find a solution.
39+
> In case you get an error launching the SAP Fiori application generator, refer to the [FAQ](https://help.sap.com/viewer/42532dbd1ebb434a80506113970f96e9/Latest/en-US) to find a solution.
4040
41-
2. Choose application type **SAP Fiori elements** and floor plan **List Report Object Page**.
41+
2. Choose application type **SAP Fiori elements** and template **List Report Object Page**.
4242

4343
![V4 Template](vscv4template.png)
4444

4545
3. Choose **Next**.
4646

47-
4. In the next dialog, choose **Use a Local CAP Project** and point to the folder of your current **`cpapp`** project.
47+
4. In the next dialog, choose **Use a Local CAP Project** and choose your current **`cpapp`** project.
4848

4949
> In case you get the error: `Node module @sap/cds isn't found. Please install it and try again.`
5050
51-
> This is an issue with the App Generator not finding the corresponding CAP modules, due to different repositories. This should be a temporary issue. For the meantime you can work around it by opening a command line and running the following command:
51+
> This is an issue with the SAP Fiori application generator not finding the corresponding CAP modules, due to different repositories. This should be a temporary issue. For the meantime you can work around it by opening a command line and running the following command:
5252
5353
> ```bash
5454
> npm install --global @sap/cds-dk --@sap:registry=https://npmjs.org/
@@ -68,6 +68,8 @@ An SAP Fiori elements app is an application that leverages SAPUI5, SAPUI5 contro
6868
6969
8. Enter `ns` as the namespace and `Risks` as the description for the application.
7070
71+
9. Leave the default values for all other settings.
72+
7173
9. Choose **Finish** to generate the application.
7274
7375
![Project Names](vscrfeapp.png)
@@ -93,7 +95,7 @@ The application is now generated and in a few seconds you can see it in the `app
9395
9496
!![Index HTML Page](feappempty.png)
9597
96-
The table is empty because the application is currently missing UI annotations. You add them in the next step.
98+
There are no visible columns because the application is currently missing UI annotations. You add them in the next step.
9799
98100
4. To add the OData annotations, copy the file `risks-service-ui.cds` from `templates/create-ui-fiori-elements/srv` to the `srv` folder of your app.
99101
@@ -121,15 +123,15 @@ Let's say that at this point you'd like to edit some of the data or create a new
121123
122124
!![Create Risk](createrisk.png)
123125
124-
2. To add a `Mitigation`, click on the value help icon in the input field, select a mitigation, and choose **OK**.
126+
2. To add a `Mitigation`, click on the value help icon in the input field and select a mitigation.
125127
126128
!![Add Mitigation](addmitigation.png)
127129
128130
3. Try and fill in data in the main group fields `Priority` and `Impact` and choose **Create**.
129131
130132
!![Fill Main Data](fillriskdata.png)
131133
132-
4. The new risk is created but it has no title and it has no description.
134+
4. Click on the browser's back button, the new risk is created but it has no title.
133135
134136
!![No Title Risk](notitlerisk.png)
135137
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

tutorials/btp-app-create-ui-freestyle-sapui5/btp-app-create-ui-freestyle-sapui5.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,20 @@ Fortunately, you have also got a choice of several templates that get your appli
4040
1. In VS Code, invoke the Command Palette ( **View** &rarr; **Command Palette** or **⇧⌘P** for macOS / <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>P</kbd> for Windows) and choose **Fiori: Open Application Generator**.
4141

4242

43-
> In case you get an error launching the Application Generator, refer to the [FAQ](https://help.sap.com/viewer/42532dbd1ebb434a80506113970f96e9/Latest/en-US) to find a solution.
43+
> In case you get an error launching the SAP Fiori application generator, refer to the [FAQ](https://help.sap.com/viewer/42532dbd1ebb434a80506113970f96e9/Latest/en-US) to find a solution.
4444
45-
2. Choose application type **SAPUI5 freestyle** and floor plan **SAP Fiori Worklist Application**.
45+
2. Choose application type **SAPUI5 freestyle** and template **SAP Fiori Worklist Application**.
4646

4747
![SAPUI5 freestyle](createSAPUI5freestyle_app.png)
4848

4949

5050
4. Choose **Next**.
5151

52-
5. In the next dialog, choose **Use a Local CAP Project** and point to the folder of your current `cpapp` project.
52+
5. In the next dialog, choose **Use a Local CAP Project** and choose your current **`cpapp`** project.
5353

5454
> In case you get the error: `Node module @sap/cds isn't found. Please install it and try again.`
5555
56-
> This is an issue with the App Generator not finding the corresponding CAP modules, due to different repositories. This should be a temporary issue. For the meantime you can work around it by opening a command line and running the following command:
56+
> This is an issue with the SAP Fiori application generator not finding the corresponding CAP modules, due to different repositories. This should be a temporary issue. For the meantime you can work around it by opening a command line and running the following command:
5757
5858
> ```bash
5959
> npm install --global @sap/cds-dk --@sap:registry=https://npmjs.org/
@@ -73,6 +73,8 @@ Fortunately, you have also got a choice of several templates that get your appli
7373
7474
8. Enter `ns` as the namespace and `Mitigations` as the description for the application.
7575
76+
9. Leave the default values for all other settings.
77+
7678
9. Choose **Finish** to generate the application.
7779
7880
![Project Names Miti](SAPUI5freestyle_appgen.png)
@@ -99,7 +101,7 @@ Fortunately, you have also got a choice of several templates that get your appli
99101
100102
As a result, you can see a list but you can only see the IDs of the mitigations both in the list view and on the detail page. This is because the freestyle template only got the information from you that the `Object Collection ID` is the `ID` property of the `mitigations` service. You now need to add additional SAPUI5 controls that are bound to additional properties of the `mitigations` service.
101103
102-
4. Open the view of the work list `cpapp/app/mitigations/webapp/view/Worklist.view.xml` and add the following code, removing the `ID` and `<> (ObjectNumber)` columns and instead adding `Description`, `Owner` and `Timeline` columns:
104+
4. Open the view of the work list `app/mitigations/webapp/view/Worklist.view.xml` and add the following code, removing the `ID` and `tableUnitNumberColumnTitle` columns and instead adding `Description`, `Owner` and `Timeline` columns:
103105
104106
```XML[2-10,19-23]
105107
<columns>
@@ -130,7 +132,7 @@ Fortunately, you have also got a choice of several templates that get your appli
130132
</items>
131133
```
132134
133-
5. Open the view of the object `cpapp/app/mitigations/webapp/view/Object.view.xml` and also replace `ID` and add `Description`, `Owner`, and `Timeline` using SAPUI5 controls like `ObjectStatus` (you can copy the whole code and replace the existing code in the file):
135+
5. Open the view of the object `app/mitigations/webapp/view/Object.view.xml` and also replace `ID` and add `Description`, `Owner`, and `Timeline` using SAPUI5 controls like `ObjectStatus` (you can copy the whole code and replace the existing code in the file):
134136
135137
```XML[4,16,28-34]
136138
<mvc:View
Loading
Loading
Loading
Loading
Loading
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[VALIDATE_1]
2+
###Rule
3+
single-choice
4+
5+
###Question
6+
For which type of account are SAP HANA instances created automatically??
7+
8+
###Match
9+
[ ] Trial
10+
[ ] Live
11+
[ ] All
12+
[x] None
13+
14+
[VALIDATE_1]

tutorials/btp-app-kyma-add-helm-chart/btp-app-kyma-add-helm-chart.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ primary_tag: software-product-function>sap-cloud-application-programming-model
4848
repository: <your-container-registry>/cpapp-srv
4949
tag: latest
5050
...
51-
hana_deployer:
51+
hana-deployer:
5252
image:
5353
repository: <your-container-registry>/cpapp-hana-deployer
5454
tag: latest
@@ -120,7 +120,7 @@ The HTML5 applications need the Internet-accessible URL of the CAP service. For
120120
[ACCORDION-END]
121121
---
122122
[ACCORDION-BEGIN [Step 5: ](Configure SAP HANA secret)]
123-
2. In the `chart/values.yaml` file, add the binding `db` pointing to the SAP HANA HDI container secret:
123+
2. In the `chart/values.yaml` file, remove the `serviceInstanceName` line and add the binding `db` pointing to the SAP HANA HDI container secret:
124124
125125
```YAML[5-6]
126126
srv:
@@ -131,10 +131,10 @@ The HTML5 applications need the Internet-accessible URL of the CAP service. For
131131
fromSecret: cpapp-db
132132
```
133133
134-
3. Point the binding `hana` of the SAP HANA deployer to the SAP HANA HDI container secret:
134+
3. Replace the `serviceInstanceName` and Point the binding `hana` of the SAP HANA deployer to the SAP HANA HDI container secret:
135135
136136
```YAML[5]
137-
hana_deployer:
137+
hana-deployer:
138138
...
139139
bindings:
140140
hana:

tutorials/btp-app-kyma-deploy-application/btp-app-kyma-deploy-application.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ xsuaa:
3636
servicePlanName: application
3737
parameters:
3838
xsappname: cpapp
39+
tenant-mode: dedicated
3940
role-collections:
4041
- description: Manage Risks
4142
name: RiskManager
@@ -237,12 +238,6 @@ On macOS, if you get the error `ERROR: failed to build: failed to fetch builder
237238
kubectl get jobs
238239
```
239240
240-
You should see an empty list of jobs. This indicates that the deployment job was run successfully because the Helm chart is configured to clean up jobs after completion:
241-
242-
```
243-
NAME COMPLETIONS DURATION AGE
244-
```
245-
246241
If the job fails or if it's still in progress, the job is displayed as incomplete (completions `0/1`) like in this example:
247242
248243
```

tutorials/btp-app-kyma-hana-cloud-setup/btp-app-kyma-hana-cloud-setup.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@ primary_tag: software-product-function>sap-cloud-application-programming-model
2626
[ACCORDION-BEGIN [Step 1: ](Overview)]
2727
> ### To earn your badge for the whole mission, you will need to mark all steps in a tutorial as done, including any optional ones that you may have skipped because they are not relevant for you.
2828
29-
Setting up an SAP HANA Cloud service instance directly on Kyma is not possible. Hence, in this tutorial, you will set up an SAP HANA Cloud service instance on Cloud Foundry (or use an existing one). Afterwards, we'll create an HDI container on Cloud Foundry and will use a script in the templates to create credentials for the SAP HANA Cloud service instance in your Kyma cluster.
29+
Setting up an SAP HANA Cloud service instance directly on Kyma is not possible for trial accounts. Hence, in this tutorial, you will set up an SAP HANA Cloud service instance on Cloud Foundry (or use an existing one). Afterwards, we'll create an HDI container on Cloud Foundry and will use a script in the templates to create credentials for the SAP HANA Cloud service instance in your Kyma cluster.
30+
31+
> For non-trial accounts you can create a mapping from the Kyma Dashboard:
32+
33+
> [Create Service Instances for SAP HANA Cloud](https://cap.cloud.sap/docs/guides/deployment/deploy-to-kyma?q=kyma+hana#hana-cloud-instance) in Capire
3034
3135
[DONE]
3236
[ACCORDION-END]

tutorials/btp-app-kyma-work-zone-setup/btp-app-kyma-work-zone-setup.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
author_name: Manju Shankar
33
author_profile: https://github.com/manjuX
4-
title: Prepare SAP Build Work Zone, Standard Edition Setup
4+
title: Prepare SAP Build Work Zone, Standard Edition Setup for Kyma
55
description: Learn how to prepare your UI applications, add deployment configuration for HTML5 applications to your project, and configure your Helm chart for HTML5 application deployment.
66
keywords: cap
77
auto_validation: true
@@ -301,12 +301,12 @@ The `fiori` command automatically sets some value to the SAP Cloud service prope
301301
cds add html5-repo
302302
```
303303

304-
This adds three new sections `html5_apps_deployer` and `html5_apps_repo_host` and `destinations` to the `chart/values.yaml` file and also copies a few additional files in the `chart/templates` folder. It deploys your HTML5 applications using the `cpapp-html5-deployer` image and creates the required destinations to access the CAP service. The `HTML5Runtime_enabled` option makes the destinations accessible for the SAP Build Work Zone, standard edition.
304+
This adds three new sections `html5-apps-deployer` and `html5_apps_repo_host` and `destinations` to the `chart/values.yaml` file and also copies a few additional files in the `chart/templates` folder. It deploys your HTML5 applications using the `cpapp-html5-deployer` image and creates the required destinations to access the CAP service. The `HTML5Runtime_enabled` option makes the destinations accessible for the SAP Build Work Zone, standard edition.
305305

306-
2. Replace `<your-container-registry>` with your container registry URL in the `html5_apps_deployer` section of your `chart/values.yaml` file:
306+
2. Replace `<your-container-registry>` with your container registry URL in the `html5-apps-deployer` section of your `chart/values.yaml` file:
307307

308308
```YAML[5]
309-
html5_apps_deployer:
309+
html5-apps-deployer:
310310
cloudService: null
311311
backendDestinations: {}
312312
image:
@@ -316,14 +316,16 @@ The `fiori` command automatically sets some value to the SAP Cloud service prope
316316

317317
3. Add the destination and the cloud service to your backend service:
318318

319-
```YAML[2-5]
320-
html5_apps_deployer:
321-
cloudService: cpapp.service
322-
backendDestinations:
323-
cpapp-srv:
324-
service: srv
325-
image:
319+
```YAML[3,7-9]
320+
html5-apps-deployer:
321+
env:
322+
SAP_CLOUD_SERVICE: cpapp.service
323+
envFrom:
326324
...
325+
...
326+
backendDestinations:
327+
cpapp-srv:
328+
service: srv
327329
```
328330

329331
The `backendDestinations` configuration creates a destination with the name `cpapp-srv` that points to the URL for your CAP service `srv`.

tutorials/btp-app-kyma-work-zone-setup/rules.vr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
multiple-choice
44

55
###Question
6-
Which of the following sections are added to the `values.yaml` file after running the `cds add helm:html5_apps_deployer` command?
6+
Which of the following sections are added to the `values.yaml` file after running the `cds add html5-repo` command?
77

88
###Match
99
[x] destinations
10-
[ ] hana_deployer
10+
[ ] hana-deployer
1111
[ ] srv
12-
[x] html5_apps_deployer
12+
[x] html5-apps-deployer
1313
[ ] xsuaa
1414
[x] html5_apps_repo_host
1515

tutorials/btp-app-kyma-work-zone-subscribe/btp-app-kyma-work-zone-subscribe.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
author_name: Manju Shankar
33
author_profile: https://github.com/manjuX
4-
title: Subscribe to the SAP Build Work Zone, Standard Edition
5-
description: Learn how to subscribe to the SAP SAP Build Work Zone, standard edition.
4+
title: Create a SAP Build Work Zone, Standard Edition Site for Your Kyma CAP App
5+
description: Learn how to create a SAP Build Work Zone, standard edition site for your CAP app deployed on Kyma.
66
keywords: cap
77
auto_validation: true
88
time: 10
@@ -140,6 +140,10 @@ You have launched your `Risks` app through the SAP Build Work Zone, standard edi
140140

141141
> If you choose **Go**, you will get an error because you haven't assigned a role collection to your user yet. We'll do it in the next tutorial.
142142
143+
> Do you want to change your Risk Management Site's default theme? Under your avatar, in the User Actions menu, select the Theme Manager.
144+
145+
> !![Theme Managet](theme-manager.png)
146+
143147

144148
[VALIDATE_1]
145149
[ACCORDION-END]
Loading

tutorials/btp-app-launchpage/btp-app-launchpage.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ primary_tag: software-product-function>sap-cloud-application-programming-model
2424
---
2525

2626
[ACCORDION-BEGIN [Step 1: ](Introduction)]
27-
Our `risks` and `mitigations` application have been generated by the SAP Fiori Tools Generator and can be started independently. You can add a launch page for local testing. This page looks like a real SAP Fiori launchpad, but is just a local copy of the otherwise centrally managed SAP Fiori launchpad. It comes with a limited version of the functionality of the original SAP Fiori launchpad. There's no option to add or remove apps via a configuration, user roles aren't at all taken into account, and end-user personalization is also not included. If you want these and other SAP Fiori launchpad functionalities included, you have got to set them up for your project. Find out how to do this in [Add the SAP BTP Launchpad Service](btp-app-launchpad-service). You stick with the launch page for this tutorial though.
27+
Our `risks` and `mitigations` application have been generated by the SAP Fiori application generator and can be started independently. You can add a launch page for local testing. This page looks like a real SAP Build Work Zone, standard edition site, but is just a local copy of the otherwise centrally managed SAP Build Work Zone, standard edition site. It comes with a limited version of the functionality of the original SAP Build Work Zone, standard edition site. There's no option to add or remove apps via a configuration, user roles aren't at all taken into account, and end-user personalization is also not included. If you want these and other SAP Build Work Zone, standard edition functionalities included, you have to set them up for your project. Find out how to do this in [Prepare SAP Build Work Zone, Standard Edition Setup](btp-app-work-zone-setup). You stick with the launch page for this tutorial though.
2828

29-
In the current implementation, the applications are launched without a launch page. You can open the `risks` application through the file `app/risks/webapp/index.html`. If you now create a second application using the SAP Fiori elements generator within your project, it will be generated in the same way, again with its own `index.html` file. Instead, you want to use a launch page for all the applications. You can add a launch page by creating an `.html` file that uses the built-in UI5 shell in the `app` folder, which has both the `risks` and `mitigations` applications.
29+
In the current implementation, the applications are launched without a launch page. You can open the `risks` application through the file `app/risks/webapp/index.html`. If you now create a second application using the SAP Fiori application generator within your project, it will be generated in the same way, again with its own `index.html` file. Instead, you want to use a launch page for all the applications. You can add a launch page by creating an `.html` file that uses the built-in UI5 shell in the `app` folder, which has both the `risks` and `mitigations` applications.
3030

3131
[DONE]
3232
[ACCORDION-END]
-6.72 KB
Loading

tutorials/btp-app-work-zone-subscribe/btp-app-work-zone-subscribe.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,10 @@ You have launched your `Risks` app through the SAP Build Work Zone, standard edi
146146

147147
> If you choose **Go**, you will get an error because you haven't assigned a role collection to your user yet. We'll do it in the next tutorial.
148148
149+
> Do you want to change your Risk Management Site's default theme? Under your avatar, in the User Actions menu, select the Theme Manager.
150+
151+
> !![Theme Managet](theme-manager.png)
152+
149153
[VALIDATE_1]
150154
[ACCORDION-END]
151155
---
Loading

0 commit comments

Comments
 (0)