Skip to content

UI and General Updates #22901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified tutorials/btp-app-cap-business-logic/feappcriticality.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ The `mta.yaml` file consists of different modules (Cloud Foundry apps) and resou
The resources are generated from the `requires` section of `cds` in the `package.json`.

* `cpapp-db` - SAP HANA DB HDMI container
* `cpapp-uaa` - XSUAA service
* `cpapp-auth` - XSUAA service

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

Expand Down
Binary file modified tutorials/btp-app-cap-roles/risks_management_application.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tutorials/btp-app-cap-roles/role_risks_management.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tutorials/btp-app-create-ui-fiori-elements/addmitigation.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,19 @@ An SAP Fiori elements app is an application that leverages SAPUI5, SAPUI5 contro

> VS Code will automatically install `@sap/generator-fiori` if missing and open the **Template Wizard**.

> 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.
> 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.

2. Choose application type **SAP Fiori elements** and floor plan **List Report Object Page**.
2. Choose application type **SAP Fiori elements** and template **List Report Object Page**.

![V4 Template](vscv4template.png)

3. Choose **Next**.

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

> In case you get the error: `Node module @sap/cds isn't found. Please install it and try again.`

> 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:
> 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:

> ```bash
> npm install --global @sap/cds-dk --@sap:registry=https://npmjs.org/
Expand All @@ -68,6 +68,8 @@ An SAP Fiori elements app is an application that leverages SAPUI5, SAPUI5 contro

8. Enter `ns` as the namespace and `Risks` as the description for the application.

9. Leave the default values for all other settings.

9. Choose **Finish** to generate the application.

![Project Names](vscrfeapp.png)
Expand All @@ -93,7 +95,7 @@ The application is now generated and in a few seconds you can see it in the `app

!![Index HTML Page](feappempty.png)

The table is empty because the application is currently missing UI annotations. You add them in the next step.
There are no visible columns because the application is currently missing UI annotations. You add them in the next step.

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.

Expand Down Expand Up @@ -121,15 +123,15 @@ Let's say that at this point you'd like to edit some of the data or create a new

!![Create Risk](createrisk.png)

2. To add a `Mitigation`, click on the value help icon in the input field, select a mitigation, and choose **OK**.
2. To add a `Mitigation`, click on the value help icon in the input field and select a mitigation.

!![Add Mitigation](addmitigation.png)

3. Try and fill in data in the main group fields `Priority` and `Impact` and choose **Create**.

!![Fill Main Data](fillriskdata.png)

4. The new risk is created but it has no title and it has no description.
4. Click on the browser's back button, the new risk is created but it has no title.

!![No Title Risk](notitlerisk.png)

Expand Down
Binary file modified tutorials/btp-app-create-ui-fiori-elements/createrisk.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tutorials/btp-app-create-ui-fiori-elements/feappempty.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tutorials/btp-app-create-ui-fiori-elements/feappworklist.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tutorials/btp-app-create-ui-fiori-elements/fillriskdata.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tutorials/btp-app-create-ui-fiori-elements/mynewrisk.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tutorials/btp-app-create-ui-fiori-elements/notitlerisk.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tutorials/btp-app-create-ui-fiori-elements/vscrfeapp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tutorials/btp-app-create-ui-fiori-elements/vscv4template.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@ Fortunately, you have also got a choice of several templates that get your appli
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**.


> 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.
> 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.

2. Choose application type **SAPUI5 freestyle** and floor plan **SAP Fiori Worklist Application**.
2. Choose application type **SAPUI5 freestyle** and template **SAP Fiori Worklist Application**.

![SAPUI5 freestyle](createSAPUI5freestyle_app.png)


4. Choose **Next**.

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

> In case you get the error: `Node module @sap/cds isn't found. Please install it and try again.`

> 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:
> 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:

> ```bash
> npm install --global @sap/cds-dk --@sap:registry=https://npmjs.org/
Expand All @@ -73,6 +73,8 @@ Fortunately, you have also got a choice of several templates that get your appli

8. Enter `ns` as the namespace and `Mitigations` as the description for the application.

9. Leave the default values for all other settings.

9. Choose **Finish** to generate the application.

![Project Names Miti](SAPUI5freestyle_appgen.png)
Expand All @@ -99,7 +101,7 @@ Fortunately, you have also got a choice of several templates that get your appli

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.

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:
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:

```XML[2-10,19-23]
<columns>
Expand Down Expand Up @@ -130,7 +132,7 @@ Fortunately, you have also got a choice of several templates that get your appli
</items>
```

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):
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):

```XML[4,16,28-34]
<mvc:View
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions tutorials/btp-app-hana-cloud-setup/rules.vr
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
[VALIDATE_1]
###Rule
single-choice

###Question
For which type of account are SAP HANA instances created automatically??

###Match
[ ] Trial
[ ] Live
[ ] All
[x] None

[VALIDATE_1]
2 changes: 1 addition & 1 deletion tutorials/btp-app-introduction/btp-app-introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ SAP BTP is an open set of Software, Platform, and Infrastructure as a Service sy

SAP BTP is also constantly evolving. SAP continuously updates the services we provide, the platforms that run the custom code, and the infrastructure that supports everything. This allows developers to focus on the custom code, and not worry about hardware maintenance or software upgrades. SAP BTP offers you the ability to turn data into business value, compose end-to-end business processes, and build and extend SAP applications quickly.

The central point of entry to the cloud platform is SAP BTP cockpit, where you can access your accounts and applications and manage all activities associated with them.
The central point of entry to the platform is SAP BTP cockpit, where you can access your accounts and applications and manage all activities associated with them.

[DONE]
[ACCORDION-END]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ primary_tag: software-product-function>sap-cloud-application-programming-model
repository: <your-container-registry>/cpapp-srv
tag: latest
...
hana_deployer:
hana-deployer:
image:
repository: <your-container-registry>/cpapp-hana-deployer
tag: latest
Expand Down Expand Up @@ -120,7 +120,7 @@ The HTML5 applications need the Internet-accessible URL of the CAP service. For
[ACCORDION-END]
---
[ACCORDION-BEGIN [Step 5: ](Configure SAP HANA secret)]
2. In the `chart/values.yaml` file, add the binding `db` pointing to the SAP HANA HDI container secret:
2. In the `chart/values.yaml` file, remove the `serviceInstanceName` line and add the binding `db` pointing to the SAP HANA HDI container secret:

```YAML[5-6]
srv:
Expand All @@ -131,10 +131,10 @@ The HTML5 applications need the Internet-accessible URL of the CAP service. For
fromSecret: cpapp-db
```

3. Point the binding `hana` of the SAP HANA deployer to the SAP HANA HDI container secret:
3. Replace the `serviceInstanceName` and Point the binding `hana` of the SAP HANA deployer to the SAP HANA HDI container secret:

```YAML[5]
hana_deployer:
hana-deployer:
...
bindings:
hana:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ xsuaa:
servicePlanName: application
parameters:
xsappname: cpapp
tenant-mode: dedicated
role-collections:
- description: Manage Risks
name: RiskManager
Expand Down Expand Up @@ -237,12 +238,6 @@ On macOS, if you get the error `ERROR: failed to build: failed to fetch builder
kubectl get jobs
```

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:

```
NAME COMPLETIONS DURATION AGE
```

If the job fails or if it's still in progress, the job is displayed as incomplete (completions `0/1`) like in this example:

```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ primary_tag: software-product-function>sap-cloud-application-programming-model
[ACCORDION-BEGIN [Step 1: ](Overview)]
> ### 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.

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.
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.

> For non-trial accounts you can create a mapping from the Kyma Dashboard:

> [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

[DONE]
[ACCORDION-END]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
author_name: Manju Shankar
author_profile: https://github.com/manjuX
title: Prepare SAP Build Work Zone, Standard Edition Setup
title: Prepare SAP Build Work Zone, Standard Edition Setup for Kyma
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.
keywords: cap
auto_validation: true
Expand Down Expand Up @@ -301,12 +301,12 @@ The `fiori` command automatically sets some value to the SAP Cloud service prope
cds add html5-repo
```

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.
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.

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

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

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

```YAML[2-5]
html5_apps_deployer:
cloudService: cpapp.service
backendDestinations:
cpapp-srv:
service: srv
image:
```YAML[3,7-9]
html5-apps-deployer:
env:
SAP_CLOUD_SERVICE: cpapp.service
envFrom:
...
...
backendDestinations:
cpapp-srv:
service: srv
```

The `backendDestinations` configuration creates a destination with the name `cpapp-srv` that points to the URL for your CAP service `srv`.
Expand Down
6 changes: 3 additions & 3 deletions tutorials/btp-app-kyma-work-zone-setup/rules.vr
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
multiple-choice

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

###Match
[x] destinations
[ ] hana_deployer
[ ] hana-deployer
[ ] srv
[x] html5_apps_deployer
[x] html5-apps-deployer
[ ] xsuaa
[x] html5_apps_repo_host

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
author_name: Manju Shankar
author_profile: https://github.com/manjuX
title: Subscribe to the SAP Build Work Zone, Standard Edition
description: Learn how to subscribe to the SAP SAP Build Work Zone, standard edition.
title: Create a SAP Build Work Zone, Standard Edition Site for Your Kyma CAP App
description: Learn how to create a SAP Build Work Zone, standard edition site for your CAP app deployed on Kyma.
keywords: cap
auto_validation: true
time: 10
Expand Down Expand Up @@ -140,6 +140,10 @@ You have launched your `Risks` app through the SAP Build Work Zone, standard edi

> 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.

> Do you want to change your Risk Management Site's default theme? Under your avatar, in the User Actions menu, select the Theme Manager.

> !![Theme Managet](theme-manager.png)


[VALIDATE_1]
[ACCORDION-END]
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions tutorials/btp-app-launchpage/btp-app-launchpage.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ primary_tag: software-product-function>sap-cloud-application-programming-model
---

[ACCORDION-BEGIN [Step 1: ](Introduction)]
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.
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.

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.
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.

[DONE]
[ACCORDION-END]
Expand Down
Binary file modified tutorials/btp-app-launchpage/launchpage2apps.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,10 @@ You have launched your `Risks` app through the SAP Build Work Zone, standard edi

> 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.

> Do you want to change your Risk Management Site's default theme? Under your avatar, in the User Actions menu, select the Theme Manager.

> !![Theme Managet](theme-manager.png)

[VALIDATE_1]
[ACCORDION-END]
---
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.