Merge branch 'main' into compose-with-cds-plugins

similar behavior cds w bookstore cds w compose
2023-08-25 17:33:56 +02:00 · 2023-08-18 15:45:22 +02:00 · 2023-08-18 11:48:30 +02:00 · 2023-08-18 11:47:46 +02:00 · 2023-08-18 11:46:27 +02:00 · 2023-08-03 10:02:33 +02:00
124 changed files with 3275 additions and 5562 deletions
--- a/.eslintrc
+++ b/.eslintrc
@@ -0,0 +1,31 @@
+{
+  "extends": [
+    "plugin:@sap/cds/recommended",
+    "eslint:recommended"
+  ],
+  "env": {
+    "browser": true,
+    "es2022": true,
+    "node": true,
+    "jest": true,
+    "mocha": true
+  },
+  "globals": {
+    "SELECT": true,
+    "INSERT": true,
+    "UPSERT": true,
+    "UPDATE": true,
+    "DELETE": true,
+    "CREATE": true,
+    "DROP": true,
+    "CDL": true,
+    "CQL": true,
+    "cds": true
+  },
+  "rules": {
+    "no-console": "off",
+    "require-atomic-updates": "off",
+        "require-await":"warn",
+        "no-unused-vars": ["warn", { "argsIgnorePattern": "_" }]
+  }
+}
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,16 +5,4 @@ updates:
  directory: /
  versioning-strategy: increase-if-necessary
  schedule:
-    interval: weekly
-  groups:
-    production-dependencies:
-      dependency-type: "production"
-    development-dependencies:
-      dependency-type: "development"
-  ignore:
-    - dependency-name: "chai"
-        # chai 5 doesn't work atm w/ cds.test, TODO fix that in cds.test
-      versions: ["5.x"]
-    - dependency-name: "chai-as-promised"
-        # chai-as-promised 8 doesn't work atm w/ cds.test, TODO fix that in cds.test
-      versions: ["8.x"]
+    interval: daily
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -11,28 +11,19 @@ on:

 jobs:
  build:
+
    runs-on: ubuntu-latest

    strategy:
      matrix:
-        node-version: [22.x, 20.x, 18.x]
+        node-version: [18.x, 16.x]

    steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+      uses: actions/setup-node@v1
      with:
        node-version: ${{ matrix.node-version }}
+    - run: npm i -g npm@8
    - run: npm ci
    - run: npm test
-
-  lint:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version: 22.x
-    - run: npm ci
-    - run: npm run lint
--- a/.gitignore
+++ b/.gitignore
@@ -21,5 +21,4 @@ reviews/db/test.db
 *.sqlite
 *.db

-@types/
-@cds-models/
+**/@types
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -24,6 +24,6 @@ Disclaimer: The code in this project may include calls to APIs (“API Calls”)
 you any rights to use or access any SAP External Product, or provide any third
 parties the right to use of access any SAP External Product, through API Calls.

-Files: *.*
-Copyright: 2019-2025 SAP SE or an SAP affiliate company and cap-cloud-samples
+Files: *
+Copyright: 2019-2020 SAP SE or an SAP affiliate company and cap-cloud-samples
 License: Apache-2.0
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -4,11 +4,13 @@

 	// List of extensions which should be recommended for users of this workspace.
 	"recommendations": [
-		"qwtel.sqlite-viewer",
 		"sapse.vscode-cds",
 		"dbaeumer.vscode-eslint",
+		"esbenp.prettier-vscode",
 		"mechatroner.rainbow-csv",
 		"humao.rest-client",
+		"alexcvzz.vscode-sqlite",
+		"hbenl.vscode-mocha-test-adapter",
 		"sdras.night-owl",
 		"vsls-contrib.codetour"
 	],
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -13,5 +13,15 @@
      "**/cds/lib/req/cds-context.js",
      "**/odata-v4/okra/**"
    ]
-  }
+  },
+  "mochaExplorer.debuggerConfig": "Debug Mocha Tests",
+  "mochaExplorer.parallel": true,
+  "eslint.probe": [
+    "cds",
+    "csn",
+    "csv",
+    "csv (semicolon)",
+    "tsv",
+    "tab"
+  ]
 }
--- a/README.md
+++ b/README.md
@@ -1,20 +1,20 @@
-
-
 # Welcome to cap/samples

-Find here a collection of samples for the [SAP Cloud Application Programming Model](https://cap.cloud.sap) organized in a simplistic [monorepo setup](samples.md#all-in-one-monorepo).
-
-[See **Overview** of contained samples](samples.md):
-
-![](etc/samples.drawio.svg)
+Find here a collection of samples for the [SAP Cloud Application Programming Model](https://cap.cloud.sap) organized in a simplistic [monorepo setup](samples.md#all-in-one-monorepo). &rarr; See [**Overview** of contained samples](samples.md)

 ![](https://github.com/SAP-samples/cloud-cap-samples/workflows/CI/badge.svg)
-
-
+[![REUSE status](https://api.reuse.software/badge/github.com/SAP-samples/cloud-cap-samples)](https://api.reuse.software/info/github.com/SAP-samples/cloud-cap-samples)

 ### Preliminaries

-Ensure you have the latest LTS version of Node.js, [`@sap/cds-dk`](https://www.npmjs.com/package/@sap/cds-dk) installed globally, `git` and your IDE ready (see [Initial Setup](https://cap.cloud.sap/docs/get-started/#setup))
+1. Ensure you have the latest LTS version of Node.js installed (see [Getting Started](https://cap.cloud.sap/docs/get-started/))
+2. Install [**@sap/cds-dk**](https://cap.cloud.sap/docs/get-started/) globally:
+
+   ```sh
+   npm i -g @sap/cds-dk
+   ```
+
+3. _Optional:_ [Use Visual Studio Code](https://cap.cloud.sap/docs/get-started/tools#vscode)

 ### Download

@@ -30,7 +30,7 @@ cd samples
 In the samples folder run:

 ```sh
-npm ci
+npm install
 ```

 ### Run
--- a/app/router/bookshop
+++ b/app/router/bookshop
@@ -1 +0,0 @@
-../../bookshop/app/vue
--- a/app/router/orders
+++ b/app/router/orders
@@ -1 +0,0 @@
-../../orders/app/orders
--- a/app/router/package-lock.json
+++ b/app/router/package-lock.json
--- a/app/router/package.json
+++ b/app/router/package.json
@@ -1,12 +0,0 @@
-{
-  "name": "approuter",
-  "dependencies": {
-    "@sap/approuter": "^19.0.0"
-  },
-  "engines": {
-    "node": "^20"
-  },
-  "scripts": {
-    "start": "node node_modules/@sap/approuter/approuter.js"
-  }
-}
--- a/app/router/reviews
+++ b/app/router/reviews
@@ -1 +0,0 @@
-../../reviews/app/vue
--- a/app/router/xs-app.json
+++ b/app/router/xs-app.json
@@ -1,52 +0,0 @@
-{
-  "welcomeFile": "app/bookshop/index.html",
-  "routes": [
-    {
-      "source": "^/app/(.*)$",
-      "target": "$1",
-      "localDir": ".",
-      "cacheControl": "no-cache, no-store, must-revalidate"
-    },
-    {
-      "source": "^/appconfig/",
-      "localDir": ".",
-      "cacheControl": "no-cache, no-store, must-revalidate"
-    },
-    {
-      "source": "^/admin/(.*)$",
-      "target": "/admin/$1",
-      "destination": "bookstore-api",
-      "csrfProtection": true
-    },
-    {
-      "source": "^/browse/(.*)$",
-      "target": "/browse/$1",
-      "destination": "bookstore-api",
-      "csrfProtection": true
-    },
-    {
-      "source": "^/user/(.*)$",
-      "target": "/user/$1",
-      "destination": "bookstore-api",
-      "csrfProtection": true
-    },
-    {
-      "source": "^/odata/v4/orders/(.*)$",
-      "target": "/odata/v4/orders/$1",
-      "destination": "orders-api",
-      "csrfProtection": true
-    },
-    {
-      "source": "^/reviews/(.*)$",
-      "target": "/reviews/$1",
-      "destination": "reviews-api",
-      "csrfProtection": true
-    },
-    {
-      "source": "^(.*)$",
-      "target": "$1",
-      "localDir": ".",
-      "cacheControl": "no-cache, no-store, must-revalidate"
-    }
-  ]
-}
--- a/bookshop/app/vue/app.js
+++ b/bookshop/app/vue/app.js
@@ -19,7 +19,7 @@ const books = Vue.createApp ({
        search: ({target:{value:v}}) => books.fetch(v && '&$search='+v),

        async fetch (etc='') {
-            const {data} = await GET(`/ListOfBooks?$expand=genre($select=name),currency($select=symbol)${etc}`)
+            const {data} = await GET(`/ListOfBooks?$expand=genre,currency${etc}`)
            books.list = data.value
        },

@@ -77,7 +77,7 @@ function csrfToken (request) {
        document.csrfToken = token
        request.headers['x-csrf-token'] = document.csrfToken
        return request
-    }).catch(() => {
+    }).catch(_ => {
        document.csrfToken = null // set mark to not try again
        return request
    })
--- a/bookshop/cds-plugin.js
+++ b/bookshop/cds-plugin.js
@@ -0,0 +1,3 @@
+cds.once('bootstrap',(app)=>{
+  app.serve ('/bookshop') .from ('@capire/bookshop','app/vue')
+})
--- a/bookshop/db/init.js
+++ b/bookshop/db/init.js
@@ -1,5 +1,3 @@
-const cds = require('@sap/cds')
-
 /**
 * In order to keep basic bookshop sample as simple as possible, we don't add
 * reuse dependencies. This db/init.js ensures we still have a minimum set of
@@ -8,7 +6,7 @@ const cds = require('@sap/cds')

 // NOTE: We use cds.on('served') to delay the UPSERTs after the db init
 // to run after all INSERTs from .csv files happened.
-module.exports = cds.on('served', ()=>
+module.exports = cds.on('served', ()=> cds.run(
  UPSERT.into ('sap.common.Currencies') .columns (
    [ 'code', 'symbol', 'name' ]
  ) .rows (
@@ -18,4 +16,4 @@ module.exports = cds.on('served', ()=>
    [ 'ILS', '₪', 'Shekel' ],
    [ 'JPY', '¥', 'Yen' ],
  )
-)
+))
--- a/bookshop/db/schema.cds
+++ b/bookshop/db/schema.cds
@@ -2,25 +2,25 @@ using { Currency, managed, sap } from '@sap/cds/common';
 namespace sap.capire.bookshop;

 entity Books : managed {
-  key ID   : Integer;
-  title    : localized String(111)  @mandatory;
-  descr    : localized String(1111);
-  author   : Association to Authors @mandatory;
-  genre    : Association to Genres;
-  stock    : Integer;
-  price    : Decimal;
+  key ID : Integer;
+  title  : localized String(111) @mandatory ;
+  descr  : localized String(1111);
+  author : Association to Authors @mandatory;
+  genre  : Association to Genres;
+  stock  : Integer;
+  price  : Decimal;
  currency : Currency;
-  image    : LargeBinary @Core.MediaType: 'image/png';
+  image : LargeBinary @Core.MediaType : 'image/png';
 }

 entity Authors : managed {
-  key ID       : Integer;
-  name         : String(111) @mandatory;
+  key ID : Integer;
+  name   : String(111) @mandatory;
  dateOfBirth  : Date;
  dateOfDeath  : Date;
  placeOfBirth : String;
  placeOfDeath : String;
-  books        : Association to many Books on books.author = $self;
+  books  : Association to many Books on books.author = $self;
 }

 /** Hierarchically organized Code List for Genres */
--- a/bookshop/index.js
+++ b/bookshop/index.js
@@ -0,0 +1,2 @@
+const { CatalogService } = require('./srv/cat-service')
+module.exports = { CatalogService }
--- a/bookshop/package.json
+++ b/bookshop/package.json
@@ -13,12 +13,20 @@
    "@cap-js/sqlite": "*"
  },
  "dependencies": {
-    "@sap/cds": ">=7",
-    "express": "^4.17.1"
+    "@sap/cds": ">=5.9",
+    "express": "^4.17.1",
+    "passport": ">=0.4.1"
  },
  "scripts": {
    "genres": "cds serve test/genres.cds",
-    "start": "cds-serve",
+    "start": "cds run",
    "watch": "cds watch"
+  },
+  "cds": {
+    "requires": {
+      "bookshop-services": {
+        "model": "@capire/bookshop"
+      }
+    }
  }
-}
+}
--- a/bookshop/readme.md
+++ b/bookshop/readme.md
@@ -20,12 +20,12 @@ npm run watch

 | Links to capire                                                                                           | Sample files / folders               |
 | --------------------------------------------------------------------------------------------------------- | ------------------------------------ |
-| [Project Setup & Layouts](https://cap.cloud.sap/docs/get-started/jumpstart#project-structure)             | [`./`](./)                           |
-| [Domain Modeling with CDS](https://cap.cloud.sap/docs/guides/domain-modeling)                               | [`./db/schema.cds`](./db/schema.cds) |
-| [Defining Services](https://cap.cloud.sap/docs/guides/providing-services#modeling-services)               | [`./srv/*.cds`](./srv)               |
-| [Single-purposed Services](https://cap.cloud.sap/docs/guides/providing-services#single-purposed-services) | [`./srv/*.cds`](./srv)               |
+| [Project Setup & Layouts](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)    | [`./`](./)                           |
+| [Domain Modeling with CDS](https://cap.cloud.sap/docs/guides/domain-models)                               | [`./db/schema.cds`](./db/schema.cds) |
+| [Defining Services](https://cap.cloud.sap/docs/guides/services#defining-services)                         | [`./srv/*.cds`](./srv)               |
+| [Single-purposed Services](https://cap.cloud.sap/docs/guides/services#single-purposed-services)           | [`./srv/*.cds`](./srv)               |
 | [Providing & Consuming Providers](https://cap.cloud.sap/docs/guides/providing-services)                   | http://localhost:4004                |
 | [Using Databases](https://cap.cloud.sap/docs/guides/databases)                                            | [`./db/data/*.csv`](./db/data)       |
-| [Adding Custom Logic](https://cap.cloud.sap/docs/guides/providing-services#adding-custom-logic)           | [`./srv/*.js`](./srv)                |
+| [Adding Custom Logic](https://cap.cloud.sap/docs/guides/service-impl)                                     | [`./srv/*.js`](./srv)                |
 | Adding Tests                                                                                              | [`./test`](./test)                   |
-| [Sharing for Reuse](https://cap.cloud.sap/docs/guides/extensibility/composition)                          | [`./index.cds`](./index.cds)         |
+| [Sharing for Reuse](https://cap.cloud.sap/docs/guides/reuse-and-compose)                                  | [`./index.cds`](./index.cds)         |
--- a/bookshop/srv/admin-service.js
+++ b/bookshop/srv/admin-service.js
@@ -1,14 +1,13 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')

 module.exports = class AdminService extends cds.ApplicationService { init(){
-  this.before (['NEW','CREATE'],'Authors', genid)
-  this.before (['NEW','CREATE'],'Books', genid)
+  this.before ('NEW','Authors', genid)
+  this.before ('NEW','Books', genid)
  return super.init()
 }}

 /** Generate primary keys for target entity in request */
 async function genid (req) {
-  if (req.data.ID) return
-  const {id} = await SELECT.one.from(req.target).columns('max(ID) as id')
-  req.data.ID = id + 4 // Note: that is not safe! ok for this sample only.
+  const {ID} = await cds.tx(req).run (SELECT.one.from(req.target).columns('max(ID) as ID'))
+  req.data.ID = ID - ID % 100 + 100 + 1
 }
--- a/bookshop/srv/cat-service.js
+++ b/bookshop/srv/cat-service.js
@@ -1,38 +1,29 @@
 const cds = require('@sap/cds')

-class CatalogService extends cds.ApplicationService { init() {
+class CatalogService extends cds.ApplicationService { init(){

-  const { Books } = cds.entities('sap.capire.bookshop')
+  const { Books } = cds.entities ('sap.capire.bookshop')
  const { ListOfBooks } = this.entities

-  // Add some discount for overstocked books
-  this.after('each', ListOfBooks, book => {
-    if (book.stock > 111) book.title += ` -- 11% discount!`
-  })
-
  // Reduce stock of ordered books if available stock suffices
-  this.on('submitOrder', async req => {
-    let { book:id, quantity } = req.data
-    let book = await SELECT.from (Books, id, b => b.stock)
-
-    // Validate input data
-    if (!book) return req.error (404, `Book #${id} doesn't exist`)
-    if (quantity < 1) return req.error (400, `quantity has to be 1 or more`)
-    if (quantity > book.stock) return req.error (409, `${quantity} exceeds stock for book #${id}`)
-
-    // Reduce stock in database and return updated stock value
-    await UPDATE (Books, id) .with ({ stock: book.stock -= quantity })
-    return book
+  this.on ('submitOrder', async req => {
+    const {book,quantity} = req.data
+    if (quantity < 1) return req.reject (400,`quantity has to be 1 or more`)
+    let b = await SELECT `stock` .from (Books,book)
+    if (!b) return req.error (404,`Book #${book} doesn't exist`)
+    let {stock} = b
+    if (quantity > stock) return req.reject (409,`${quantity} exceeds stock for book #${book}`)
+    await UPDATE (Books,book) .with ({ stock: stock -= quantity })
+    await this.emit ('OrderedBook', { book, quantity, buyer:req.user.id })
+    return { stock }
  })

-  // Emit event when an order has been submitted
-  this.after('submitOrder', async (_,req) => {
-    let { book, quantity } = req.data
-    await this.emit('OrderedBook', { book, quantity, buyer: req.user.id })
+  // Add some discount for overstocked books
+  this.after ('READ', ListOfBooks, each => {
+    if (each.stock > 111) each.title += ` -- 11% discount!`
  })

-  // Delegate requests to the underlying generic service
  return super.init()
 }}

-module.exports = CatalogService
+module.exports = { CatalogService }
--- a/bookshop/test/genres.http
+++ b/bookshop/test/genres.http
@@ -3,15 +3,15 @@
 #   Genres
 #

-GET http://localhost:4004/odata/v4/test/Genres?
+GET http://localhost:4004/test/Genres?
 ###

-GET http://localhost:4004/odata/v4/test/Genres?
+GET http://localhost:4004/test/Genres?
 &$filter=parent_ID eq null&$select=name
 &$expand=children($select=name)
 ###

-POST http://localhost:4004/odata/v4/test/Genres?
+POST http://localhost:4004/test/Genres?
 Content-Type: application/json

 { "ID":100, "name":"Some Sample Genres...", "children":[
@@ -26,13 +26,13 @@ Content-Type: application/json
 ]}
 ###

-GET http://localhost:4004/odata/v4/test/Genres(100)?
+GET http://localhost:4004/test/Genres(100)?
 # &$expand=children
 # &$expand=children($expand=children($expand=children($expand=children)))
 ###

-DELETE http://localhost:4004/odata/v4/test/Genres(103)
+DELETE http://localhost:4004/test/Genres(103)
 ###

-DELETE http://localhost:4004/odata/v4/test/Genres(100)
+DELETE http://localhost:4004/test/Genres(100)
 ###
--- a/bookstore/_i18n/i18n_de.properties
+++ b/bookstore/_i18n/i18n_de.properties
@@ -1,12 +0,0 @@
-Books = Bücher
-Book = Buch
-Title = Titel
-Description = Beschreibung
-Stock = Bestand
-Image = Bild
-Price = Preis
-Currency = Währung
-
-Authors = Autoren
-Author = Autor
-AuthorID = ID des Autors
--- a/bookstore/_i18n/i18n_en.properties
+++ b/bookstore/_i18n/i18n_en.properties
@@ -1,21 +0,0 @@
-Books = Books
-Book = Book
-ID = ID
-Title = Title
-Description = Description
-Stock = Stock
-Image = Image
-Price = Price
-Currency = Currency
-
-Authors = Authors
-Author = Author
-AuthorID = Author''s ID
-Name = Name
-DateOfBirth = Date of Birth
-DateOfDeath = Date of Death
-PlaceOfBirth = Place of Birth
-PlaceOfDeath = Place of Death
-
-Genres = Genres
-Genre = Genre
--- a/bookstore/_i18n/i18n_fr.properties
+++ b/bookstore/_i18n/i18n_fr.properties
@@ -1,20 +0,0 @@
-Books = Livres
-Book = Livre
-Title = Titre
-Description = Description
-Stock = Action
-Image = Image
-Price = Prix
-Currency = Devise
-
-Authors = Auteurs
-Author = Auteur
-AuthorID = ID de l''auteur
-Name = Nom
-DateOfBirth = Date de naissance
-DateOfDeath = Date de décès
-PlaceOfBirth = Lieu de naissance
-PlaceOfDeath = Lieu de décès
-
-Genres = Genre
-Genre = Genre
--- a/bookstore/_i18n/messages_de.properties
+++ b/bookstore/_i18n/messages_de.properties
@@ -1,34 +0,0 @@
-400 = Ungültige Anfrage
-401 = Nicht autorisiert
-403 = Verboten
-404 = Nicht gefunden
-405 = Methode nicht zulässig
-406 = Nicht akzeptabel
-407 = Proxy-Authentifizierung erforderlich
-408 = Anfrage-Timeout
-409 = Konflikt
-410 = Weg
-411 = Erforderliche Länge
-412 = Vorbedingung fehlgeschlagen
-413 = Nutzlast zu groß
-414 = URI zu lang
-415 = Nicht unterstützter Medientyp
-416 = Bereich nicht erfüllbar
-417 = Erwartung fehlgeschlagen
-422 = Nicht verarbeitbarer Inhalt
-424 = Fehlgeschlagene Abhängigkeit
-428 = Vorbedingung erforderlich
-429 = Zu viele Anfragen
-431 = Anfrage-Headerfelder zu groß
-451 = Aus rechtlichen Gründen nicht verfügbar
-500 = Interner Serverfehler
-501 = Der Server unterstützt die zur Erfüllung der Anfrage erforderliche Funktionalität nicht
-502 = Ungültiges Gateway
-503 = Dienst nicht verfügbar
-504 = Gateway-Timeout
-
-ASSERT_RANGE = Wert {0} liegt nicht im angegebenen Bereich [{1}, {2}]
-ASSERT_FORMAT = Wert "{0}" liegt nicht im angegebenen Format "{1}"
-ASSERT_ARRAY = Wert muss ein Array sein
-ASSERT_ENUM = Wert {0} ist gemäß Enumerationsdeklaration {{1}} ungültig
-ASSERT_NOT_NULL = Wert ist erforderlich
--- a/bookstore/_i18n/messages_en.properties
+++ b/bookstore/_i18n/messages_en.properties
@@ -1,34 +0,0 @@
-400 = Bad Request
-401 = Unauthorized
-403 = Forbidden
-404 = Not Found
-405 = Method Not Allowed
-406 = Not Acceptable
-407 = Proxy Authentication Required
-408 = Request Timeout
-409 = Conflict
-410 = Gone
-411 = Length Required
-412 = Precondition Failed
-413 = Payload Too Large
-414 = URI Too Long
-415 = Unsupported Media Type
-416 = Range Not Satisfiable
-417 = Expectation Failed
-422 = Unprocessable Content
-424 = Failed Dependency
-428 = Precondition Required
-429 = Too Many Requests
-431 = Request Header Fields Too Large
-451 = Unavailable For Legal Reasons
-500 = Internal Server Error
-501 = The server does not support the functionality required to fulfill the request
-502 = Bad Gateway
-503 = Service Unavailable
-504 = Gateway Timeout
-
-ASSERT_RANGE = Value {0} is not in specified range [{1}, {2}]
-ASSERT_FORMAT = Value "{0}" is not in specified format "{1}"
-ASSERT_ARRAY = Value must be an array
-ASSERT_ENUM = Value {0} is invalid according to enum declaration {{1}}
-ASSERT_NOT_NULL = Value is required
--- a/bookstore/_i18n/messages_fr.properties
+++ b/bookstore/_i18n/messages_fr.properties
@@ -1,34 +0,0 @@
-400 = Requête incorrecte
-401 = Non autorisée
-403 = Interdite
-404 = Introuvable
-405 = Méthode non autorisée
-406 = Non acceptable
-407 = Authentification proxy requise
-408 = Délai d''expiration de la requête
-409 = Conflit
-410 = Disparu
-411 = Longueur requise
-412 = Échec de la condition préalable
-413 = Charge utile trop importante
-414 = URI trop longue
-415 = Type de média non pris en charge
-416 = Plage non satisfaisante
-417 = Échec de l''attente
-422 = Contenu non traitable
-424 = Dépendance échouée
-428 = Condition préalable requise
-429 = Trop de requêtes
-431 = Champs d''en-tête de requête trop importants
-451 = Indisponible pour des raisons juridiques
-500 = Erreur interne du serveur
-501 = Le serveur ne prend pas en charge la fonctionnalité requise pour répondre à la requête
-502 = Passerelle incorrecte
-503 = Service indisponible
-504 = Délai d''attente de la passerelle
-
-ASSERT_RANGE = La valeur {0} n''est pas dans la plage spécifiée [{1}, {2}]
-ASSERT_FORMAT = La valeur "{0}" n''est pas au format spécifié "{1}"
-ASSERT_ARRAY = La valeur doit être un tableau
-ASSERT_ENUM = La valeur {0} n''est pas valide selon la déclaration d''énumération {{1}}
-ASSERT_NOT_NULL = La valeur est obligatoire
--- a/bookstore/package.json
+++ b/bookstore/package.json
@@ -2,21 +2,15 @@
  "name": "@capire/bookstore",
  "version": "1.0.0",
  "dependencies": {
-    "@cap-js/hana": "^1.7.0",
    "@capire/bookshop": "*",
-    "@capire/common": "*",
-    "@capire/data-viewer": "*",
-    "@capire/orders": "*",
    "@capire/reviews": "*",
-    "@sap-cloud-sdk/http-client": "^3.26.4",
-    "@sap-cloud-sdk/resilience": "^3.26.4",
+    "@capire/orders": "*",
+    "@capire/common": "*",
+    "@capire/fiori": "*",    
+    "@capire/data-viewer": "*",
    "@sap/cds": ">=5",
-    "@sap/xssec": "^4.4.0",
    "express": "^4.17.1"
  },
-  "scripts": {
-    "start": "cds-serve"
-  },
  "cds": {
    "requires": {
      "ReviewsService": {
@@ -27,13 +21,15 @@
        "kind": "odata",
        "model": "@capire/orders"
      },
-      "messaging": true,
+      "messaging": {
+        "[development]": { "kind": "file-based-messaging" },
+        "[hybrid]": { "kind": "enterprise-messaging-shared" },
+        "[production]": { "kind": "enterprise-messaging" }
+      },
      "db": {
        "kind": "sql"
      }
    },
-    "log": {
-      "service": true
-    }
+    "log": { "service": true }
  }
-}
+}
--- a/bookstore/server.js
+++ b/bookstore/server.js
@@ -1,20 +1,18 @@
 const cds = require ('@sap/cds')

+// Add routes to UIs from imported packages
+cds.once('bootstrap',(app)=>{
+  app.serve ('/admin-authors') .from ('@capire/fiori','app/admin-authors')
+  app.serve ('/admin-books') .from ('@capire/fiori','app/admin-books')
+  app.serve ('/browse-books') .from ('@capire/fiori','app/browse')
+})
+
 // Add mashup logic
 cds.once('served', require('./srv/mashup'))

-// Add routes to UIs from imported packages
-cds.once('bootstrap',(app)=>{
-  try {
-    app.serve ('/bookshop') .from ('@capire/bookshop','app/vue')
-    app.serve ('/reviews') .from ('@capire/reviews','app/vue')
-    app.serve ('/orders') .from('@capire/orders','app/orders')
-    app.serve ('/data') .from('@capire/data-viewer','app/viewer')
-  } catch (err) {
-    if (err.code === 'MODULE_NOT_FOUND') throw new Error('Run "npm ci" to install the required dependencies', { cause: err })
-    throw err
-  }
-})
-
 // Add Swagger UI
 require('./srv/swagger-ui')
+
+// For didactic reasons in capire
+const { ReviewsService, OrdersService } = cds.requires
+if (!ReviewsService?.credentials && !OrdersService?.credentials) cds.requires.messaging = false
--- a/bookstore/srv/mashup.cds
+++ b/bookstore/srv/mashup.cds
@@ -4,16 +4,20 @@
 //    respective reuse packages and services
 //

+using { sap.capire.bookshop.Books } from '@capire/bookshop';

 //
 //  Extend Books with access to Reviews and average ratings
 //
-using { sap.capire.bookshop.Books } from '@capire/bookshop';
 using { ReviewsService.Reviews } from '@capire/reviews';
 extend Books with {
  reviews : Composition of many Reviews on reviews.subject = $self.ID;
-  rating  : type of Reviews:rating; // average rating
-  numberOfReviews : Integer @title : '{i18n>NumberOfReviews}';
+
+  @Common.Label : '{i18n>Rating}'
+  rating  : Decimal;
+
+  @Common.Label : '{i18n>NumberOfReviews}'
+  numberOfReviews : Integer;
 }


@@ -21,11 +25,8 @@ extend Books with {
 //  Extend Orders with Books as Products
 //
 using { sap.capire.orders.Orders } from '@capire/orders';
-extend Orders:Items with {
-  book : Association to Books on product.ID = book.ID
+extend Orders with {
+  extend Items with {
+    book : Association to Books on product.ID = book.ID
+  }
 }
-
-// Ensure models from all imported packages are loaded
-using from '@capire/orders/app/fiori';
-using from '@capire/data-viewer';
-using from '@capire/common';
--- a/bookstore/srv/mashup.js
+++ b/bookstore/srv/mashup.js
@@ -18,7 +18,7 @@ module.exports = async()=>{ // called by server.js
  // Note: prepend is neccessary to intercept generic default handler
  //
  CatalogService.prepend (srv => srv.on ('READ', 'Books/reviews', (req) => {
-    console.debug ('> delegating request to ReviewsService') // eslint-disable-line no-console
+    console.debug ('> delegating request to ReviewsService')
    const [id] = req.params, { columns, limit } = req.query.SELECT
    return ReviewsService.read ('Reviews',columns).limit(limit).where({subject:String(id)})
  }))
@@ -28,8 +28,8 @@ module.exports = async()=>{ // called by server.js
  //
  CatalogService.on ('OrderedBook', async (msg) => {
    const { book, quantity, buyer } = msg.data
-    const { title, price } = await db.read (Books, book, b => { b.title, b.price })
-    return OrdersService.create ('OrdersNoDraft').entries({
+    const { title, price } = await db.tx(msg).read (Books, book, b => { b.title, b.price })
+    return OrdersService.tx(msg).create ('Orders').entries({
      OrderNo: 'Order at '+ (new Date).toLocaleString(),
      Items: [{ product:{ID:`${book}`}, title, price, quantity }],
      buyer, createdBy: buyer
@@ -40,7 +40,7 @@ module.exports = async()=>{ // called by server.js
  // Update Books' average ratings when ReviewsService signals updated reviews
  //
  ReviewsService.on ('reviewed', (msg) => {
-    console.debug ('> received:', msg.event, msg.data) // eslint-disable-line no-console
+    console.debug ('> received:', msg.event, msg.data)
    const { subject, count, rating } = msg.data
    return UPDATE(Books,subject).with({ numberOfReviews:count, rating })
  })
@@ -49,7 +49,7 @@ module.exports = async()=>{ // called by server.js
  // Reduce stock of ordered books for orders are created from Orders admin UI
  //
  OrdersService.on ('OrderChanged', (msg) => {
-    console.debug ('> received:', msg.event, msg.data) // eslint-disable-line no-console
+    console.debug ('> received:', msg.event, msg.data)
    const { product, deltaQuantity } = msg.data
    return UPDATE (Books) .where ('ID =', product)
    .and ('stock >=', deltaQuantity)
--- a/bookstore/test/requests.http
+++ b/bookstore/test/requests.http
@@ -12,12 +12,11 @@
 #

 GET {{reviews-service}}/Reviews
-Authorization: Basic me:

 ###

 POST {{reviews-service}}/Reviews
-Authorization: Basic me:
+Authorization: Basic {{$processEnv USER}}:
 Content-Type: application/json

 {"subject":"201", "title":"boo", "rating":3 }
@@ -42,7 +41,7 @@ GET {{bookshop}}/browse/Books(201)?
 ###

 GET {{bookshop}}/browse/Books?
-&$select=title,author&$expand=currency
+  &$select=title,author&$expand=currency
 Accept-Language: de

 #################################################
@@ -51,23 +50,23 @@ Accept-Language: de
 #
@newOrderID = e939604c-ab83-4d4f-bdb6-95fe30b3773e

-GET {{bookshop}}/odata/v4/orders/Orders
+GET {{bookshop}}/orders/Orders

 ### Create order, still inactive
-POST {{bookshop}}/odata/v4/orders/Orders
+POST {{bookshop}}/orders/Orders
 Content-Type: application/json

 {"ID": "{{newOrderID}}"}

 ### Get inactive order.  We have to specify `IsActiveEntity`.
-GET {{bookshop}}/odata/v4/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)
+GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)

 ### Activate order using `.../<servicename>.draftActivate`
-POST {{bookshop}}/odata/v4/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)/OrdersService.draftActivate
+POST {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)/OrdersService.draftActivate
 Content-Type: application/json

 ### Get active order
-GET {{bookshop}}/odata/v4/orders/Orders(ID={{newOrderID}},IsActiveEntity=true)
+GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=true)

 ### Create author
 POST {{bookshop}}/admin/Authors
--- a/common/cds-plugin.js
+++ b/common/cds-plugin.js
@@ -1 +0,0 @@
-// dummy to auto-load the plugin
--- a/common/package.json
+++ b/common/package.json
@@ -7,9 +7,9 @@
  },
  "cds": {
    "requires": {
-      "@capire/common/data": {
+      "common-data": {
        "model": "@capire/common"
      }
    }
  }
-}
+}
--- a/compose/app/appconfig/fioriSandboxConfig.json
+++ b/compose/app/appconfig/fioriSandboxConfig.json
@@ -0,0 +1,168 @@
+{
+  "services": {
+    "LaunchPage": {
+      "adapter": {
+        "config": {
+          "catalogs": [],
+          "groups": [
+            {
+              "id": "Bookshop",
+              "title": "Bookshop",
+              "isPreset": true,
+              "isVisible": true,
+              "isGroupLocked": false,
+              "tiles": [
+                {
+                  "id": "BrowseBooks",
+                  "tileType": "sap.ushell.ui.tile.StaticTile",
+                  "properties": {
+                    "title": "Browse Books",
+                    "targetURL": "#Books-display"
+                  }
+                },
+                {
+                  "id": "BrowseGenres",
+                  "tileType": "sap.ushell.ui.tile.StaticTile",
+                  "properties": {
+                    "title": "Browse Genres (OData v2)",
+                    "targetURL": "#Genres-display"
+                  }
+                }
+              ]
+            },
+            {
+              "id": "Administration",
+              "title": "Administration",
+              "isPreset": true,
+              "isVisible": true,
+              "isGroupLocked": false,
+              "tiles": [
+                {
+                  "id": "ManageBooks",
+                  "tileType": "sap.ushell.ui.tile.StaticTile",
+                  "properties": {
+                    "title": "Manage Books",
+                    "targetURL": "#Books-manage"
+                  }
+                },
+                {
+                  "id": "ManageAuthors",
+                  "tileType": "sap.ushell.ui.tile.StaticTile",
+                  "properties": {
+                    "title": "Manage Authors",
+                    "targetURL": "#Authors-display"
+                  }
+                },
+                {
+                  "id": "ManageOrders",
+                  "tileType": "sap.ushell.ui.tile.StaticTile",
+                  "properties": {
+                    "title": "Manage Orders",
+                    "targetURL": "#Orders-manage"
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      }
+    },
+    "NavTargetResolution": {
+      "config": {
+        "enableClientSideTargetResolution": true
+      }
+    },
+    "ClientSideTargetResolution": {
+      "adapter": {
+        "config": {
+          "inbounds": {
+            "BrowseBooks": {
+              "semanticObject": "Books",
+              "action": "display",
+              "title": "Browse Books",
+              "signature": {
+                "parameters": {
+                  "Books.ID": {
+                    "renameTo": "ID"
+                  },
+                  "Authors.books.ID": {
+                    "renameTo": "ID"
+                  }
+                },
+                "additionalParameters": "ignored"
+              },
+              "resolutionResult": {
+                "applicationType": "SAPUI5",
+                "additionalInformation": "SAPUI5.Component=bookshop",
+                "url": "/browse/webapp"
+              }
+            },
+            "BrowseAuthors": {
+              "semanticObject": "Authors",
+              "action": "display",
+              "title": "Browse Authors",
+              "signature": {
+                "parameters": {
+                  "Books.author.ID":{
+                    "renameTo": "ID"
+                  }
+                },
+                "additionalParameters": "ignored"
+              },
+              "resolutionResult": {
+                "applicationType": "SAPUI5",
+                "additionalInformation": "SAPUI5.Component=authors",
+                "url": "/admin-authors/webapp"
+              }
+            },
+            "BrowseGenres": {
+              "semanticObject": "Genres",
+              "action": "display",
+              "title": "Browse Genres",
+              "signature": {
+                "parameters": {
+                  "Genre.ID": {
+                    "renameTo": "ID"
+                  }
+                },
+                "additionalParameters": "ignored"
+              },
+              "resolutionResult": {
+                "applicationType": "SAPUI5",
+                "additionalInformation": "SAPUI5.Component=genres",
+                "url": "/genres/webapp"
+              }
+            },
+            "ManageBooks": {
+              "semanticObject": "Books",
+              "action": "manage",
+              "title": "Manage Books",
+              "signature": {
+                "parameters": {},
+                "additionalParameters": "allowed"
+              },
+              "resolutionResult": {
+                "applicationType": "SAPUI5",
+                "additionalInformation": "SAPUI5.Component=books",
+                "url": "/admin-books/webapp"
+              }
+            },
+            "ManageOrders": {
+              "semanticObject": "Orders",
+              "action": "manage",
+              "signature": {
+                "parameters": {},
+                "additionalParameters": "allowed"
+              },
+              "resolutionResult": {
+                "applicationType": "SAPUI5",
+                "additionalInformation": "SAPUI5.Component=orders",
+                "url": "/orders/webapp"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
--- a/compose/package.json
+++ b/compose/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "@capire/bookstore",
+  "version": "1.0.0",
+  "dependencies": {
+    "@capire/bookshop": "*",
+    "@capire/reviews": "*",
+    "@capire/fiori": "*",
+    "@capire/orders": "*",
+    "@sap/cds": ">=5",
+    "express": "^4.17.1"
+  }
+}
--- a/compose/server.js
+++ b/compose/server.js
@@ -0,0 +1,8 @@
+const cds = require ('@sap/cds')
+
+// Add Swagger UI
+require('./srv/swagger-ui')
+
+// For didactic reasons in capire
+const { ReviewsService, OrdersService } = cds.requires
+if (!ReviewsService?.credentials && !OrdersService?.credentials) cds.requires.messaging = false
--- a/compose/srv/swagger-ui.js
+++ b/compose/srv/swagger-ui.js
@@ -0,0 +1,10 @@
+
+// -----------------------------------------------------------------------
+// Adding Swagger UI - see https://cap.cloud.sap/docs/advanced/openapi
+const cds = require ('@sap/cds')
+try {
+  const cds_swagger = require ('cds-swagger-ui-express')
+  cds.once ('bootstrap', app => app.use (cds_swagger()) )
+} catch (err) {
+  if (err.code !== 'MODULE_NOT_FOUND')  throw err
+}
--- a/etc/data-viewer/app/viewer/app.js
+++ b/etc/data-viewer/app/viewer/app.js
--- a/etc/data-viewer/app/viewer/index.html
+++ b/etc/data-viewer/app/viewer/index.html
--- a/data-viewer/cds-plugin.js
+++ b/data-viewer/cds-plugin.js
@@ -0,0 +1,3 @@
+cds.once('bootstrap',(app)=>{
+  app.serve ('/data') .from('@capire/data-viewer','app/viewer')
+})
--- a/etc/data-viewer/index.cds
+++ b/etc/data-viewer/index.cds
--- a/etc/data-viewer/package.json
+++ b/etc/data-viewer/package.json
@@ -9,5 +9,12 @@
    "app",
    "srv",
    "index.cds"
-  ]
-}
+  ],
+  "cds": {
+    "requires": {
+      "orders-service": {
+        "model": "@capire/data-viewer"
+      }
+    }
+  }
+}
--- a/etc/data-viewer/srv/data-service.cds
+++ b/etc/data-viewer/srv/data-service.cds
@@ -20,7 +20,6 @@
   * The actual data, organized by column name
   */
  entity Data @cds.persistence.skip {
-    key ID   : String;   // to be OData-compliant
    record   : array of {
      column : String;
      data   : String;
--- a/etc/data-viewer/srv/data-service.js
+++ b/etc/data-viewer/srv/data-service.js
@@ -18,7 +18,7 @@ class DataService extends cds.ApplicationService { init(){
      .sort((e1, e2) => e1.name.localeCompare(e2.name))
      .map(e => {
        const columns = Object.entries(e.elements)
-          .filter(([,el]) => !(el instanceof cds.Association)) // exclude assocs+compositions
+          .filter(([_, el]) => !(el instanceof cds.Association)) // exclude assocs+compositions
          .map(([name, el]) => { return { name, type: el.type, isKey:!!el.key }})
        return { name: e.name, columns }
      })
@@ -34,14 +34,10 @@ class DataService extends cds.ApplicationService { init(){
    query.SELECT.limit = req.query.SELECT.limit  // forward $skip / $top

    const dataSource = findDataSource(dataSourceName, entityName)
-    let res = await dataSource.run(query)
-    if (!Array.isArray(res))  res = [res] // singleton result
+    const res = await dataSource.run(query)
    return res.map((line) => {
-      const record = Object.entries(line).map(([column, data]) => ({ column, data }))
-      return {
-        record,
-        ID: cds.utils.uuid() // just to be OData-compliant
-      }
+      const record = Object.entries(line).map(([column, data]) => {return {column, data}})
+      return { record }
    })
  })

@@ -50,7 +46,6 @@ class DataService extends cds.ApplicationService { init(){

 module.exports = { DataService }

-/** @returns {cds.Service} */
 function findDataSource(dataSourceName, entityName) {
  for (let srv of Object.values(cds.services)) { // all connected services
    if (!srv.name)  continue // FIXME intermediate/pending in cds.services ?
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -1,20 +0,0 @@
-import cds from '@sap/cds/eslint.config.mjs'
-export default [ ...cds.recommended ]
-
-//
-// The above is the recommended minimalistic eslint config, just using
-// recommended defaults provided by cds. Alternatively, go for enhanced
-// project-specific options, but only if really required, like this:
-//
-// export default [ ...cds.recommended, {
-//   rules: {
-//     'complexity': [ 'warn', 66 ],
-//     'require-await': 'warn',
-//     'no-await-in-loop': 'warn',
-//   },
-// }, {
-//   ignores: [
-//     '**/webapp/**'
-//   ]
-// }]
-//
--- a/etc/dark.drawio.svg
+++ b/etc/dark.drawio.svg
@@ -1,13 +1,13 @@
-<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="357px" height="283px" viewBox="-0.5 -0.5 357 283" content="&lt;mxfile&gt;&lt;diagram id=&quot;QQJxv4aCTC7ZgE7HHOvM&quot; name=&quot;Page-1&quot;&gt;7VrZcqM4FP0av7q0L4+T9DIvU9VVeZhnFtlQwRYly7HTX98XgzBgOpNJG7eZGlKVwNECuudwdSSyoI+b41cXldlfNjXFgqD0uKCfFoQIIuF3BbzWACO6BtYuT2sInYGn/LupQRzQfZ6aXYPVkLe28HnZBxO73ZrE97DIOXvoV1vZIu0BZbQ2vceogKckKsxFtb/z1Gc1qsKwKvxPk6+zcGcsmvHFUfK8dna/be63IBQxXpdtotBRc9NdFqX20IHo5wV9dNb6+mxzfDRFFdd+zL78pLR9aGe2/j0NSN3gJSr2zbgXDCVRmTtTNSIi2pQL+rCNd9UfuC6g24fYwdnad5EAxNY+7zJbhgLoJT5XPg3Zv4YYw+jL6jQzx2htt1ClNC7fGG/cGf0WIAjOwyHLvXkqo6RqdgDhAZb5TQFXGE5X+dEELVXXu2fjkyri6FRYFI+2sO50c7paGZEkVSXv7LPplKRSxwi1JYF+0g6hG98m5C/GeXPsQE28vxoLD+9eoUpTSiSrm4QXQ9L6+nCWmW7kkXUUphosaoS9bns+8wsnDcXjdNNJ6Pa2an73fKvEjPMdK874zfimktyMb3Ztvp15yQ2k1rtnO+VGpWyMbUViKsRUbFOB+2xjfTO2+bXZTuxmA8TdPdkrXv1UuN36Dl4fYyIQp+NWImDhRbyBCMS1RWBdatwc3vjIqNVofheJMvFqKrKxEr+NbHlJ9pATs03/qOwwXCVFtNvlST/EvZBeBgiaN/GXp/LI+d71INRfTsdbgd3ZvUtML2FBp2vjew7FpMGd/yT4neDykeAGzJki8vlL39OPRby5wzebw/OeuSW4P3lzRPp91MNpmnWN9kVPYmD7+KCnOgoXPZ0k0A78XapQ81aFuHdVwKu75Iq2B+knAKrJslNKqfyYZIhmS4ZFewzXDQgvO6VC0Kn0pOetJzJzPTH+NtHX0hN7W7bX01PY4pmroNjMBcWHgppET3ygJzaZnIJlu5rl3e3Lssj/d73/wvXecp2LyUj+GFD4BJ2A4tD9M2hwys1oVtJC0miyRaoeEHjDbSk8sg85pwkgCLA7A4QsNI8pYOgp5CA7T+QpyGCqueIkMLLVOXdJibtSFAaqJVKcICw1ZIuw+dAuRzQoQSKGKFeSsY+aVIyXRGMmtSJIEBk+jrRrKw2yJpprwTAYmek86shm6qz0FL6Z3q1JxVpAClKnL8MaCc4HmUMuYaUDVhXWuUroD267EFClolhKLhHSlA1uwtmSUsGY4lphitRkarr6ruwqty7/T5ubCyczovl3f3Qjt3Q3974rO0gA/5hL6IjbEb/V3Ei9FFIpyBuKcKF0f5KozA3lEqYQLDimUvyCuaGQSSFzYMkoHtwFvI1gkGGwokwJWHBdKXvA5fkfQOrq5/+woZ9/AA==&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(0, 68, 85);">
+<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="347px" height="279px" viewBox="-0.5 -0.5 347 279" content="&lt;mxfile&gt;&lt;diagram id=&quot;QQJxv4aCTC7ZgE7HHOvM&quot; name=&quot;Page-1&quot;&gt;7Vlbb+I4FP41vCLfL4/T7szuy0oj9WGfczEkasCRMYXur98TEufeqpoBCtUGCezv+Hq+z/bBWdDHzfFPF5XZ3zY1xYKg9LigfywI0QLBdwW81oDUrAbWLk9rCHXAU/6vqUEc0H2eml2D1ZC3tvB5OQQTu92axA+wyDl7GBZb2SIdAGW0NoNhVMBTEhVmUuyfPPVZjSoiO/wvk6+z0DMWurbEUfK8dna/bfpbEIq/VZ/avIlCW02/uyxK7aEH0e8L+uis9XVqc3w0ReXaodt+vGFtx+3M1n+kAqkrvETFvpn6gqEkKnNnqkpERJtyQR+28a76gXwBzT7EDlJr30cCEFv7vMtsGQzQStwVPk3ZvwY3w+zLKpmZY7S2WyhSGpdvjDeuQ38GCJzzcMhyb57KKKmqHUB7gGV+U0AOQ3KVH02QU5XfPRufVB5HJ2NRPNrCulPndLUyIkmqQt7ZZ9OzpFLHCLWWoADSTuHFOG+Ob7oct0TC+jAWBu9eoUhTgcimSrM2KG9UdeiUpht5ZD2RqQaLGm2v25Y7fiHRUDxPNz033avcuvwOuFaJmec6Vpzxq3FNrsg1OzfXzrzkBnbWm2c75UalbI5tRWIqxKXYppwPVza6Htv83GwndrMB4m6e7BWvPhVut76H18+cCMTpuZQIsFIDEbArikCcWwTWpcbdw4qPjFrN7u8iUSZeXY5s+WkrXk7JHnNitum3KhqGXFJEu12eDF08cOnUQVC98b882SPnB/mRq3+cntaxJg0x9ltuhbHavUvMYAeDXtbG96LTqfN7zuUzzg2YM0Xk85fhIOY83vTw0+YwvI5bCOuH5AayQxv16Jtq/SB70pIYtURHLdWTnrR0kkA78Q+pQn0xVYipKuhnqoJIueSKtk8Y4Gtn7lknRH9UMkTjJcOifSQbdqPEsmcVgl5KT/qL6Yncl54ofZ/oM+mJkvdlez49hRueLyModl+CYtcRFLueoPBUUL8X9O72ZVnk/8e978a9o2MvLOsrxL145s5yTOETNAKCRLfPoMEpN7P7khaSRpf7m4rQkEFBrsfgzDXkXZ8BQZL9QwC/4f+bOAXGYUXYvS8cVoRRXOAUmLnt/HKSEp+pKAxUS6Q4QVhqKtv7h7B/aAZKkIghypVk7FfDCqSWIComtSJIgIrpsBfFQNZEcy0YJpxfLqqYuU+9bz2F16i3EqdiTWELUlWoqDUS46tzSpYQm3KOGYJgQ5NflZOADQhLySVCmrJxJ3oJOyFjimuFKVJnUhNkuze4dfHuLTn9/h8=&lt;/diagram&gt;&lt;/mxfile&gt;" style="background-color: rgb(26, 26, 26);">
    <defs/>
    <g>
-        <path d="M 199 202 L 249 202 L 269 242 L 249 282 L 199 282 L 179 242 Z" fill="#ffe6cc" stroke="#d79b00" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 192 148 L 242 148 L 262 188 L 242 228 L 192 228 L 172 188 Z" fill="#ffe6cc" stroke="#d79b00" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
        <g transform="translate(-0.5 -0.5)">
            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 242px; margin-left: 180px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 188px; margin-left: 173px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
                                @capire/
                                <br/>
                                <b>
@@ -17,156 +17,18 @@
                        </div>
                    </div>
                </foreignObject>
-                <text x="224" y="246" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="217" y="192" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
                    @capire/...
                </text>
            </switch>
        </g>
-        <path d="M 199 101 L 249 101 L 269 141 L 249 181 L 199 181 L 179 141 Z" fill="#f8cecc" stroke="#b85450" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 192 48 L 242 48 L 262 88 L 242 128 L 192 128 L 172 88 Z" fill="#f8cecc" stroke="#b85450" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
        <g transform="translate(-0.5 -0.5)">
            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 141px; margin-left: 180px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                @capire/
-                                <br/>
-                                <b>
-                                    bookstore
-                                </b>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="224" y="145" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    @capire/...
-                </text>
-            </switch>
-        </g>
-        <path d="M 286 48 L 336 48 L 356 88 L 336 128 L 286 128 L 266 88 Z" fill="#d5e8d4" stroke="#82b366" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 88px; margin-left: 267px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                @capire/
-                                <br/>
-                                <b>
-                                    reviews
-                                </b>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="311" y="92" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    @capire/...
-                </text>
-            </switch>
-        </g>
-        <path d="M 286 153 L 336 153 L 356 193 L 336 233 L 286 233 L 266 193 Z" fill="#f5f5f5" stroke="#666666" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 193px; margin-left: 267px;">
-                        <div data-drawio-colors="color: #333333; " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(51, 51, 51); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                @capire/
-                                <br/>
-                                <b>
-                                    common
-                                </b>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="311" y="197" fill="#333333" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    @capire/...
-                </text>
-            </switch>
-        </g>
-        <path d="M 111 153 L 161 153 L 181 193 L 161 233 L 111 233 L 91 193 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 193px; margin-left: 92px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                @capire/
-                                <br/>
-                                <b>
-                                    orders
-                                </b>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="136" y="197" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    @capire/...
-                </text>
-            </switch>
-        </g>
-        <path d="M 276.35 172.29 L 266.36 166.32" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 260.57 162.86 L 270.6 163.61 L 266.36 166.32 L 265.98 171.34 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 170.74 172.47 L 181.53 166.1" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 187.34 162.66 L 181.88 171.12 L 181.53 166.1 L 177.3 163.37 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 224 202 L 224 189.99" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 224 183.24 L 228.5 192.24 L 224 189.99 L 219.5 192.24 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 276.51 109.01 L 266.17 115.31" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 260.4 118.82 L 265.75 110.3 L 266.17 115.31 L 270.43 117.98 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 111 48 L 161 48 L 181 88 L 161 128 L 111 128 L 91 88 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 88px; margin-left: 92px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                @capire/
-                                <br/>
-                                <b>
-                                    suppliers
-                                </b>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="136" y="92" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    @capire/...
-                </text>
-            </switch>
-        </g>
-        <path d="M 21 101 L 71 101 L 91 141 L 71 181 L 21 181 L 1 141 Z" fill="#e1d5e7" stroke="#9673a6" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 141px; margin-left: 2px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
-                                <b>
-                                    S/4
-                                </b>
-                            </div>
-                        </div>
-                    </div>
-                </foreignObject>
-                <text x="46" y="145" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
-                    S/4
-                </text>
-            </switch>
-        </g>
-        <path d="M 80.76 120.53 L 93.49 113.03" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 99.31 109.61 L 93.84 118.05 L 93.49 113.03 L 89.27 110.3 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 80.91 161.17 L 93.31 168.33" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 99.15 171.71 L 89.11 171.1 L 93.31 168.33 L 93.61 163.31 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 170.59 108.83 L 181.72 115.53" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 187.5 119.02 L 177.47 118.23 L 181.72 115.53 L 182.11 110.52 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <path d="M 199 1 L 249 1 L 269 41 L 249 81 L 199 81 L 179 41 Z" fill="#e1d5e7" stroke="#9673a6" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
-        <g transform="translate(-0.5 -0.5)">
-            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
-                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 41px; margin-left: 180px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 88px; margin-left: 173px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
                                @capire/
                                <br/>
                                <b>
@@ -176,19 +38,134 @@
                        </div>
                    </div>
                </foreignObject>
-                <text x="224" y="45" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="217" y="92" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
                    @capire/...
                </text>
            </switch>
        </g>
-        <path d="M 224 101 L 224 89.99" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
-        <path d="M 224 83.24 L 228.5 92.24 L 224 89.99 L 219.5 92.24 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 276 98 L 326 98 L 346 138 L 326 178 L 276 178 L 256 138 Z" fill="#d5e8d4" stroke="#82b366" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 138px; margin-left: 257px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                @capire/
+                                <br/>
+                                <b>
+                                    reviews
+                                </b>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="301" y="142" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    @capire/...
+                </text>
+            </switch>
+        </g>
+        <path d="M 109 198 L 159 198 L 179 238 L 159 278 L 109 278 L 89 238 Z" fill="#f5f5f5" stroke="#666666" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 238px; margin-left: 90px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #333333; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                @capire/
+                                <br/>
+                                <b>
+                                    common
+                                </b>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="134" y="242" fill="#333333" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    @capire/...
+                </text>
+            </switch>
+        </g>
+        <path d="M 108 98 L 158 98 L 178 138 L 158 178 L 108 178 L 88 138 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 138px; margin-left: 89px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                @capire/
+                                <br/>
+                                <b>
+                                    orders
+                                </b>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="133" y="142" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    @capire/...
+                </text>
+            </switch>
+        </g>
+        <path d="M 168.58 217.17 L 174.72 213.47" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 180.5 209.99 L 175.11 218.49 L 174.72 213.47 L 170.47 210.78 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 167.68 117.36 L 174.6 113.24" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 180.4 109.79 L 174.97 118.26 L 174.6 113.24 L 170.36 110.52 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 217 148 L 217 136.99" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 217 130.24 L 221.5 139.24 L 217 136.99 L 212.5 139.24 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 266.32 117.36 L 259.4 113.24" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 253.6 109.79 L 263.64 110.52 L 259.4 113.24 L 259.03 118.26 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 107 1 L 157 1 L 177 41 L 157 81 L 107 81 L 87 41 Z" fill="#dae8fc" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 41px; margin-left: 88px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                @capire/
+                                <br/>
+                                <b>
+                                    suppliers
+                                </b>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="132" y="45" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    @capire/...
+                </text>
+            </switch>
+        </g>
+        <path d="M 21 53 L 71 53 L 91 93 L 71 133 L 21 133 L 1 93 Z" fill="#e1d5e7" stroke="#9673a6" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
+        <g transform="translate(-0.5 -0.5)">
+            <switch>
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 88px; height: 1px; padding-top: 93px; margin-left: 2px;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                                <b>
+                                    S/4
+                                </b>
+                            </div>
+                        </div>
+                    </div>
+                </foreignObject>
+                <text x="46" y="97" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                    S/4
+                </text>
+            </switch>
+        </g>
+        <path d="M 80.55 72.11 L 89.76 66.54" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 95.53 63.05 L 90.16 71.56 L 89.76 66.54 L 85.5 63.86 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 81.75 111.49 L 89.27 115.38" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 95.26 118.48 L 85.2 118.34 L 89.27 115.38 L 89.33 110.35 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
+        <path d="M 167.25 60.49 L 173.88 64.16" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
+        <path d="M 179.79 67.42 L 169.74 67.01 L 173.88 64.16 L 174.09 59.13 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
    </g>
    <switch>
        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
        <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
-                Text is not SVG - cannot display
+                Viewer does not support full SVG 1.1
            </text>
        </a>
    </switch>
--- a/etc/incidents.drawio.svg
+++ b/etc/incidents.drawio.svg
@@ -1,13 +1,13 @@
-<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="569px" height="428px" viewBox="-0.5 -0.5 569 428" content="&lt;mxfile&gt;&lt;diagram id=&quot;QQJxv4aCTC7ZgE7HHOvM&quot; name=&quot;Page-1&quot;&gt;7Vpbc9soFP41fqxHCF0f7VyanWl2O3W3fcYSltkg4UH41l+/EIEtGdl1HTlRM508RBzDMfB9h/NxrAG8yTcfOVrMH1mK6cB10s0A3g5cFwAQy3/Ksq0sgQcrQ8ZJWpmcvWFCfmA90liXJMWltlUmwRgVZNE0JqwocCIaNsQ5Wze7zRhNG4YFynBjGsowSRDFVrfvJBXzyhq54d7+gEk2N98MAr3gHJnO2nE5Rylb10zwbgBvOGOieso3N5iqzWvuy/2RT3cT47gQ5wxwqwErRJd6bRPZ2ZOmh9HfIz1HsTUL52xZpFiNdQZwvJ4TgScLlKhP1xJqaZuLnMoWkI8Jy0miu5ZPWCRz3fiPZNmzR082ZqwQ9ygnVHHhAdMVFiRBaojg7Gm3v3JnxoiSrJDPvNra8Qpz1ZeOtF0wNYNSTogUmWz7Oy83jDL+vAQYuepPzZRx8kN+OaJmjtXALxq4UE9uopcPdLvmy7tVf9Jub7tGQk0Rb2omDcNHzHIs+FZ20Z9+AIHmhA4KYDiy3lMMxH5lm9fpZVBEmtbZzvkeefmgwW8nArSIMF6WpMBlOVDzCKja8CmXT5l6+oy4KDA/QRDwSgSpwTGNfM93WqkzI5TWes6iBCdJV8CBaOg3ofNjGzoDZx0633k5cp6F3A4ug9ZfRSIPTLlC13nMclFDVDrf9bJRvtsIXJSEFXLEaLHo6XFA8eyc0yA+eRpcMbLPiGvohTY5oBe/nB2+xQ5DhrJfwRskEZ7OzgneFOFo1lHwun7YBCd27cgFLYduF5EbtETuASS4SEdKsMhWSlDOivTrnEh2j+UH94QaMGRLqyQQNGG6KgClkGnAzO/uS46KrbHqyTmmracXn4KtZEueGIml90KOzbDZ88qEU6POjmBbx84EH8cUCbJqCrg28LS7z4w8n5cmhr0GTTzgmyPf+Kgmr4fVFdeBp92BfdxVtWbL1TOddss8i2GhxbCbZSmkB96z6E/DeOqcl7pnOOgqdcdNKFqD/1ppO7KgmSyTROqte5QIdhKf3197t0htS46/pfZ2g8BmQhwMWxKB63SgvmOLDN8Zf5oxdRy2ym8ZwEqV9SmEe6O+oQNfL4xNSaIG3V2+oGyL25H7SnJczjEWf8BrBy9qibyrgQcs8E4psCllyZNceYokggaovRBzmkLMvVSIdZkL65IK2ooqfENF1RTePggv1VM/cdSdmjKatEaXR5mwUYZ7pqb6cZeCDrBD+Vp3KWAXsE6Fcl8vU7Vr0nmXq7Mi3+9V5LshbPIEwgtD3/yOcMxRh6FvV9kmmK/IEX2m1FvfqqO9uGK9rjazi1/vOL3HdpAb1r5FlINDYQeDSxN8fOAq8A9m02Gc/1pNrmAFPkWS3uQPtsDFpdnDsKgnpTgQuEMnigNVlAO+E0O3QQ43iC/jGQjg0AMODEPoR17sBFHTL7hecrHLdCaBtOSW0QoRiqaEErH9k2HsDPOqF0i7iveOM4ypdTRSzBsKSWDlGO/CHAMc77SjDoPdrvWNUfIkcZdGrSnt66Qpt35CU0w/s5II9ausZBQTguUKavMiiVPnl1Or3CYSWnmkNDh1pIpr0UZ6X6iZ5JtMvdEzzCWPl4thjrj6lyw53Y758zFzorT0wuOGM4H0qp0TZakZJYtvenkdnC4fwMHvNb7Tcr5AYJ8vbgfni2tXF/9V9QZp+kbw+l3xZHdqXZcn5sTrmCfRYSHzdXliFzLr727cIoHeE1V26viqVNkp646p4nrxGzLFrmFazDDQJFtKpJrk8OdSclrpzk/TnUHmtOxZjf6zFNIN1vayEjfuMIaxH4cQ+B4MXAgOATx+yzn/ptQBViBqYgXi0MYqtqEC/i9DJZv79z4rYbF/exbe/Q8=&lt;/diagram&gt;&lt;/mxfile&gt;">
+<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="569px" height="428px" viewBox="-0.5 -0.5 569 428" content="&lt;mxfile&gt;&lt;diagram id=&quot;QQJxv4aCTC7ZgE7HHOvM&quot; name=&quot;Page-1&quot;&gt;7Vpdd9o4EP01PJZjWf7SY8jHds9pd3tKt30WtjDayBZHFknor18ployNDCXEELbtyUPsQRpLvndmrgZG8Lp4+kPg5eIjzwgb+V72NII3I98HMPLUP21Z15YYBbUhFzQzgzaGKf1OjNHMy1c0I1VnoOScSbrsGlNeliSVHRsWgj92h8056z51iXPzRG9jmKaYEWfYN5rJRW1N/Hhjf09ovrBPBhGqPymwHWwcVwuc8ceWCd6O4LXgXNZXxdM1Yfrl2fdSz7vb8WmzMEFKecgEv57wgNnK7G2qBis0vPdXf12ZNcq13bjgqzIjeq43gpPHBZVkusSp/vRRQa1sC1kwdQfUZcoLmpqh1T2R6cLc/Evz/NljoG7mvJR3uKBMc+E9YQ9E0hTrKVLw++b9qjczwYzmpboW9audPBChx7IrY5dcr6BSC6Jlru7Dxss1Z1w8bwEmvv7TK+WCflcPx8yusZ742QAXm8VNzfaBuW/5Cm70n7Kbt6jWQ552IgEafFVgEF4QKdZqiJnwDtioMEEBLEceNxQDKKxtiza9LIrY0DpvnG+QVxcG/H4iQIcIk1VFS1JVI72OiOkXPhPqKtdXn7CQJRF7CALORJAWHLMkDEKvlzpzylhr5DxJSZoOBRxIxmEXuhC50Fk429CF3uuRCxzkGrgsWn+WqUqYaju+9zEvZAtR5bwZ5aJ8+yRJWVFeqhlXy+WFpgNG5odkA7Q3G5wwsg+IaxjELjlggF7PjtBhhyVDdVnBG6UJmc0PCd4Mk2Q+UPD6YdwFB/lu5IKepDtE5EY9kbsFCSmzKy1Y1F1GccHL7MuCKnZP1Ad3lFkw1J1RSSDqwnRSACqpyoBd3+3nApdrazWL8+y9WR5qYCOZ1Vi7QFMvgq9EakeZl6Oc5cSC0I9tGzsbfIIwLOlD95F94Bl3nzh9zpc2hoMOTQIQ2pRvfdRrNdPaimvLU5Owd7uqt+i4eqZTs82DGBY7DLteVVJ5EBcW/VmMZt5hpXtOoqFKN+pC0Rv8pyrbiQPNdJWmSm/d4VTyvfj8/7V3j9R25Phbam8/ilwmoGjcUwh8bwD1jRwyfOPifs519uuV3yqAtSq7pBC+GPUNPXi+MLYtiRZ0t8WS8TXpR+4LLUi1IET+Bq8fvKQn8k4GHniRApsxnt6rnWdYIWiB2ggxryvE/GOF2NG18KWSCrqKKj6fouoK7xDEx+qpHzgaTk1ZCdqiy0dVsHFOLkxNXcZZCnrADeVTnaWA28DaF8qXephqHZMOO1wdF/nhW0a+H8MuTyA8MvQB2u9owNB3u2xTIh7oDn2m1duldUcv4oh1Xm3mNr9+pfKO3CCvaXyWKAfbwg5GxxZ4tOUqCrdWM2Ccv6wnV/KS7CPJxdQPviTlYNXDJsO3acWByB97CYp0Uw6EHoJ+hxx+hI7jGYjgOAAejGMYJgHyoqTrF5yuuLhtOltAemrL1QOmDM8oo3L9u8K4FeasB0i3i/crVRjb/OiUmPMJSeDUmODIGgO8YL+jAYPd7fVNcHqvcFdGoynd46Rtt37AM8I+8YpK/a2sYhSXkhcaavtDEq/NL6/VuU0VkiqldDi1o4vr0EZ5X+qVFE+5/kXPuFA8Xi3HBRb6X7oSbD0Rz2lmT2vplelGcInNrr09bak5o8uvZnsDZJd3YOv7mtDryS8QuPnFHyC/+G538R/db1Cmr5Q8/lQ8abLWaXliM97APEm2G5nn5YnbyGz/duMGS/wzUaVRxyelSqOsB6aKH6A3ZIrbw3SYYaFJ14wqNSngj6XkrNadH2aNQdW0/FmN/r2Syg0x9qoWN/4YQRSiGIIwgJEPwTaAu085h5+UBsAKJF2sAIpdrJALFQhfDJW63fzusxYWm1/Pwtv/AA==&lt;/diagram&gt;&lt;/mxfile&gt;">
    <defs/>
    <g>
-        <rect x="1" y="1" width="195" height="122" fill="rgb(255, 255, 255)" stroke="#828282" stroke-width="2" pointer-events="all"/>
+        <rect x="1" y="1" width="195" height="122" fill="#ffffff" stroke="#828282" stroke-width="2" pointer-events="all"/>
        <g transform="translate(-0.5 -0.5)rotate(-90 11 13)">
            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe flex-end; width: 107px; height: 1px; padding-top: 13px; margin-left: -96px;">
-                        <div data-drawio-colors="color: #4D4D4D; " style="box-sizing: border-box; font-size: 0px; text-align: right;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(77, 77, 77); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: right; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #4D4D4D; line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; word-wrap: normal; ">
                                S/4 HANA
                            </div>
                        </div>
@@ -21,10 +21,10 @@
        <rect x="42.5" y="40" width="120" height="50" rx="7.5" ry="7.5" fill="#f8cecc" stroke="#b85450" stroke-width="2" pointer-events="all"/>
        <g transform="translate(-0.5 -0.5)">
            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 65px; margin-left: 44px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
                                Business
                                <br/>
                                Partner
@@ -32,18 +32,18 @@
                        </div>
                    </div>
                </foreignObject>
-                <text x="103" y="69" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="103" y="69" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
                    Business...
                </text>
            </switch>
        </g>
-        <rect x="221" y="1" width="347" height="349" fill="rgb(255, 255, 255)" stroke="#828282" stroke-width="2" pointer-events="all"/>
+        <rect x="221" y="1" width="347" height="349" fill="#ffffff" stroke="#828282" stroke-width="2" pointer-events="all"/>
        <g transform="translate(-0.5 -0.5)">
            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe flex-start; width: 331px; height: 1px; padding-top: 15px; margin-left: 230px;">
-                        <div data-drawio-colors="color: #4D4D4D; " style="box-sizing: border-box; font-size: 0px; text-align: left;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(77, 77, 77); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: left; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #4D4D4D; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
                                <b>
                                    Incident Mgmt
                                </b>
@@ -61,16 +61,16 @@
        <rect x="418" y="73" width="115" height="50" rx="7.5" ry="7.5" fill="#dae8fc" stroke="#6c8ebf" stroke-width="2" pointer-events="all"/>
        <g transform="translate(-0.5 -0.5)">
            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 113px; height: 1px; padding-top: 98px; margin-left: 419px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
                                Incidents
                            </div>
                        </div>
                    </div>
                </foreignObject>
-                <text x="476" y="102" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="476" y="102" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
                    Incidents
                </text>
            </switch>
@@ -81,27 +81,27 @@
        <rect x="255" y="73" width="120" height="50" rx="7.5" ry="7.5" fill="#ffe6cc" stroke="#d79b00" stroke-width="2" pointer-events="all"/>
        <g transform="translate(-0.5 -0.5)">
            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 98px; margin-left: 256px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
                                Customers
                            </div>
                        </div>
                    </div>
                </foreignObject>
-                <text x="315" y="102" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="315" y="102" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
                    Customers
                </text>
            </switch>
        </g>
-        <rect x="1" y="147" width="196.5" height="202" fill="rgb(255, 255, 255)" stroke="#828282" stroke-width="2" pointer-events="all"/>
+        <rect x="1" y="147" width="196.5" height="202" fill="#ffffff" stroke="#828282" stroke-width="2" pointer-events="all"/>
        <g transform="translate(-0.5 -0.5)rotate(-90 11 159)">
            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe flex-end; width: 187px; height: 1px; padding-top: 159px; margin-left: -176px;">
-                        <div data-drawio-colors="color: #4D4D4D; " style="box-sizing: border-box; font-size: 0px; text-align: right;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(77, 77, 77); line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; overflow-wrap: normal;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: right; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #4D4D4D; line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; word-wrap: normal; ">
                                SuccessFactors
                            </div>
                        </div>
@@ -115,10 +115,10 @@
        <rect x="42.5" y="184" width="120" height="50" rx="7.5" ry="7.5" fill="#f8cecc" stroke="#b85450" stroke-width="2" pointer-events="all"/>
        <g transform="translate(-0.5 -0.5)">
            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 209px; margin-left: 44px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
                                Workforce
                                <br/>
                                Person
@@ -126,7 +126,7 @@
                        </div>
                    </div>
                </foreignObject>
-                <text x="103" y="213" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="103" y="213" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
                    Workforce...
                </text>
            </switch>
@@ -134,10 +134,10 @@
        <rect x="42.5" y="267" width="120" height="50" rx="7.5" ry="7.5" fill="#f8cecc" stroke="#b85450" stroke-width="2" pointer-events="all"/>
        <g transform="translate(-0.5 -0.5)">
            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 292px; margin-left: 44px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
                                Employee
                                <br/>
                                Timesheet
@@ -145,7 +145,7 @@
                        </div>
                    </div>
                </foreignObject>
-                <text x="103" y="296" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="103" y="296" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
                    Employee...
                </text>
            </switch>
@@ -155,16 +155,16 @@
        <rect x="418" y="182" width="115" height="50" rx="7.5" ry="7.5" fill="#dae8fc" stroke="#6c8ebf" stroke-width="2" pointer-events="all"/>
        <g transform="translate(-0.5 -0.5)">
            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 113px; height: 1px; padding-top: 207px; margin-left: 419px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
                                Messages
                            </div>
                        </div>
                    </div>
                </foreignObject>
-                <text x="476" y="211" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="476" y="211" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
                    Messages
                </text>
            </switch>
@@ -175,10 +175,10 @@
        <rect x="255" y="184" width="120" height="50" rx="7.5" ry="7.5" fill="#ffe6cc" stroke="#d79b00" stroke-width="2" pointer-events="all"/>
        <g transform="translate(-0.5 -0.5)">
            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 209px; margin-left: 256px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
                                Service
                                <br/>
                                Worker
@@ -186,7 +186,7 @@
                        </div>
                    </div>
                </foreignObject>
-                <text x="315" y="213" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="315" y="213" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
                    Service...
                </text>
            </switch>
@@ -198,10 +198,10 @@
        <rect x="255" y="267" width="120" height="50" rx="7.5" ry="7.5" fill="#ffe6cc" stroke="#d79b00" stroke-width="2" pointer-events="all"/>
        <g transform="translate(-0.5 -0.5)">
            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe center; justify-content: unsafe center; width: 118px; height: 1px; padding-top: 292px; margin-left: 256px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: normal; overflow-wrap: normal;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
                                Worker
                                <br/>
                                Availability
@@ -209,7 +209,7 @@
                        </div>
                    </div>
                </foreignObject>
-                <text x="315" y="296" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="315" y="296" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
                    Worker...
                </text>
            </switch>
@@ -219,16 +219,16 @@
        <path d="M 37 407 C 37 401.48 41.48 397 47 397 L 92.5 397 C 98.02 397 102.5 392.52 102.5 387 C 102.5 392.52 106.98 397 112.5 397 L 158 397 C 163.52 397 168 401.48 168 407" fill="none" stroke="#b85450" stroke-width="2" stroke-miterlimit="10" transform="translate(0,397)scale(1,-1)translate(0,-397)" pointer-events="all"/>
        <g transform="translate(-0.5 -0.5)">
            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 414px; margin-left: 103px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: nowrap; ">
                                Backend Services
                            </div>
                        </div>
                    </div>
                </foreignObject>
-                <text x="103" y="426" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="103" y="426" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
                    Backend Services
                </text>
            </switch>
@@ -236,16 +236,16 @@
        <path d="M 249.5 407 C 249.5 401.48 253.98 397 259.5 397 L 305 397 C 310.52 397 315 392.52 315 387 C 315 392.52 319.48 397 325 397 L 370.5 397 C 376.02 397 380.5 401.48 380.5 407" fill="none" stroke="#d79b00" stroke-width="2" stroke-miterlimit="10" transform="translate(0,397)scale(1,-1)translate(0,-397)" pointer-events="all"/>
        <g transform="translate(-0.5 -0.5)">
            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 414px; margin-left: 315px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: nowrap; ">
                                Usage Views
                            </div>
                        </div>
                    </div>
                </foreignObject>
-                <text x="315" y="426" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="315" y="426" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
                    Usage Views
                </text>
            </switch>
@@ -253,16 +253,16 @@
        <path d="M 410 407 C 410 401.48 414.48 397 420 397 L 465.5 397 C 471.02 397 475.5 392.52 475.5 387 C 475.5 392.52 479.98 397 485.5 397 L 531 397 C 536.52 397 541 401.48 541 407" fill="none" stroke="#6c8ebf" stroke-width="2" stroke-miterlimit="10" transform="translate(0,397)scale(1,-1)translate(0,-397)" pointer-events="all"/>
        <g transform="translate(-0.5 -0.5)">
            <switch>
-                <foreignObject pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility" style="overflow: visible; text-align: left;">
+                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
                    <div xmlns="http://www.w3.org/1999/xhtml" style="display: flex; align-items: unsafe flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 414px; margin-left: 476px;">
-                        <div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: all; white-space: nowrap;">
+                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #000000; line-height: 1.2; pointer-events: all; white-space: nowrap; ">
                                Extension Data
                            </div>
                        </div>
                    </div>
                </foreignObject>
-                <text x="476" y="426" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="476" y="426" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
                    Extension Data
                </text>
            </switch>
@@ -274,7 +274,7 @@
        <g requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility"/>
        <a transform="translate(0,-5)" xlink:href="https://www.diagrams.net/doc/faq/svg-export-text-problems" target="_blank">
            <text text-anchor="middle" font-size="10px" x="50%" y="100%">
-                Text is not SVG - cannot display
+                Viewer does not support full SVG 1.1
            </text>
        </a>
    </switch>
--- a/etc/samples.drawio.svg
+++ b/etc/samples.drawio.svg
--- a/event-mesh.json
+++ b/event-mesh.json
@@ -1,29 +0,0 @@
-{
-  "version": "1.1.0",
-  "options": {
-    "management": true,
-    "messagingrest": true,
-    "messaging": true
-  },
-  "rules": {
-    "topicRules": {
-      "publishFilter": [
-        "*"
-      ],
-      "subscribeFilter": [
-        "*"
-      ]
-    },
-    "queueRules": {
-      "publishFilter": [
-        "*"
-      ],
-      "subscribeFilter": [
-        "*"
-      ]
-    }
-  },
-  "authorities": [
-    "$ACCEPT_GRANTED_AUTHORITIES"
-  ]
-}
--- a/fiori/app/_i18n/i18n.properties
+++ b/fiori/app/_i18n/i18n.properties
@@ -0,0 +1,43 @@
+Books = Books
+Book = Book
+ID = ID
+Title = Title
+Author = Author
+AuthorID = Author ID
+Stock = Stock
+Name = Name
+Description = Description
+Image = Image
+AuthorName = Author's Name
+DateOfBirth = Date of Birth
+DateOfDeath = Date of Death
+PlaceOfBirth = Place of Birth
+PlaceOfDeath = Place of Death
+Age = Age
+Lifetime = Lifetime
+Authors = Authors
+
+Order = Order
+Orders = Orders
+OrderNo = Order Number
+OrderItems = Order Items
+Customer = Customer
+Product = Product
+ProductID = Product ID
+ProductTitle = Product Title
+UnitPrice = Unit Price
+Quantity = Quantity
+
+Price = Price
+Currency = Currency
+Date = Date
+Rating = Rating
+NumberOfReviews = Number of Reviews
+
+Genre = Genre
+Genres = Genres
+SubGenres = Sub Genres
+
+NumCode = Numeric Code
+MinorUnit = Minor Unit
+Exponent = Exponent
--- a/fiori/app/_i18n/i18n_de.properties
+++ b/fiori/app/_i18n/i18n_de.properties
@@ -1,5 +1,14 @@
+Books = Bücher
+Book = Buch
+ID = ID
+Title = Titel
+Authors = Autoren
+Author = Autor
+AuthorID = ID des Autors
 AuthorName = Name des Autors
 Age = Alter
-rder = Bestellung
+Name = Name
+Stock = Bestand
+Order = Bestellung
 Orders = Bestellungen
 Price = Preis
--- a/fiori/app/_i18n/i18n_en.properties
+++ b/fiori/app/_i18n/i18n_en.properties
@@ -1,8 +0,0 @@
-Age = Age
-Lifetime = Lifetime
-
-SubGenres = Sub Genres
-
-NumCode = Numeric Code
-MinorUnit = Minor Unit
-Exponent = Exponent
--- a/fiori/app/admin-authors/webapp/i18n/i18n.properties
+++ b/fiori/app/admin-authors/webapp/i18n/i18n.properties
@@ -2,10 +2,10 @@
 # __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459

 # JCI app descriptor contains lower case TITLE
-appTitle=Manage Authors
+appTitle=Bookshop Authors

 # JCI app descriptor contains lower case DESCRIPTION
-appSubTitle=CAP Sample Application
+appSubTitle=Bookshop Authors

 # JCI app descriptor contains lower case DESCRIPTION
 appDescription=Bookshop Authors
--- a/fiori/app/admin-authors/webapp/manifest.json
+++ b/fiori/app/admin-authors/webapp/manifest.json
@@ -35,7 +35,7 @@
            "additionalParameters": "ignored"
          },
          "semanticObject": "Authors",
-          "action": "manage",
+          "action": "display",
          "title": "{{appTitle}}",
          "info": "{{appInfo}}",
          "subTitle": "{{appSubTitle}}",
--- a/fiori/app/admin-books/webapp/i18n/i18n.properties
+++ b/fiori/app/admin-books/webapp/i18n/i18n.properties
@@ -2,7 +2,7 @@
 # __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459

 # JCI app descriptor contains lower case TITLE
-appTitle=Manage Books
+appTitle=Bookshop Sample

 # JCI app descriptor contains lower case DESCRIPTION
 appSubTitle=CAP Sample Application
--- a/fiori/app/admin-books/webapp/manifest.json
+++ b/fiori/app/admin-books/webapp/manifest.json
@@ -19,22 +19,6 @@
            "id": "ui5template.basicSAPUI5ApplicationProject",
            "-id": "ui5template.smartTemplate",
            "-version": "1.40.12"
-        },
-        "crossNavigation": {
-            "inbounds": {
-                "intent1": {
-                        "signature": {
-                        "parameters": {},
-                        "additionalParameters": "allowed"
-                    },
-                    "semanticObject": "Books",
-                    "action": "manage",
-                    "title": "{{appTitle}}",
-                    "info": "{{appInfo}}",
-                    "subTitle": "{{appSubTitle}}",
-                    "icon": "sap-icon://course-book"
-                }
-            }
        }
    },
    "sap.ui5": {
--- a/fiori/app/appconfig/fioriSandboxConfig.json
+++ b/fiori/app/appconfig/fioriSandboxConfig.json
@@ -50,7 +50,7 @@
                  "tileType": "sap.ushell.ui.tile.StaticTile",
                  "properties": {
                    "title": "Manage Authors",
-                    "targetURL": "#Authors-manage"
+                    "targetURL": "#Authors-display"
                  }
                },
                {
@@ -99,7 +99,7 @@
            },
            "BrowseAuthors": {
              "semanticObject": "Authors",
-              "action": "manage",
+              "action": "display",
              "title": "Browse Authors",
              "signature": {
                "parameters": {
--- a/fiori/app/browse/fiori-service.cds
+++ b/fiori/app/browse/fiori-service.cds
@@ -6,8 +6,8 @@ using CatalogService from '@capire/bookstore';
 //
 annotate CatalogService.Books with @(UI : {
    HeaderInfo        : {
-        TypeName       : '{i18n>Book}',
-        TypeNamePlural : '{i18n>Books}',
+        TypeName       : 'Book',
+        TypeNamePlural : 'Books',
        Description    : {Value : author}
    },
    HeaderFacets      : [{
--- a/fiori/app/browse/webapp/i18n/i18n.properties
+++ b/fiori/app/browse/webapp/i18n/i18n.properties
@@ -2,7 +2,7 @@
 # __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459

 # JCI app descriptor contains lower case TITLE
-appTitle=Browse Books
+appTitle=Bookshop Sample

 # JCI app descriptor contains lower case DESCRIPTION
 appSubTitle=CAP Sample Application
--- a/fiori/app/fiori-apps.html
+++ b/fiori/app/fiori-apps.html
@@ -1,7 +1,7 @@
-<!doctype html>
+<!DOCTYPE html>
 <html>
-
 <head>
+
 	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -10,22 +10,21 @@
 	<script>
 		window["sap-ushell-config"] = {
 			defaultRenderer: "fiori2",
-			applications: {},
+			applications: {}
 		};
 	</script>

-	<script id="sap-ushell-bootstrap" src="https://ui5.sap.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://ui5.sap.com/resources/sap-ui-core.js"
-		data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout" data-sap-ui-compatVersion="edge"
-		data-sap-ui-theme="sap_horizon"></script>
+	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
+	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
+			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
+			data-sap-ui-compatVersion="edge"
+			data-sap-ui-theme="sap_horizon"
+			data-sap-ui-frameOptions="allow"
+	></script>
 	<script>
-		sap.ui.getCore().attachInit(() =>
-			sap.ushell.Container.createRenderer().placeAt("content")
-		);
+		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))
 	</script>
+
 </head>
-
-<body class="sapUiBody" id="content">
-</body>
-
+<body class="sapUiBody" id="content"></body>
 </html>
--- a/fiori/cds-plugin.js
+++ b/fiori/cds-plugin.js
@@ -0,0 +1,9 @@
+// install OData v2 adapter
+const cds = require("@sap/cds")
+const proxy = require('@cap-js-community/odata-v2-adapter')
+const opts = global.it ? { target:'auto' } : {}   // for tests, set 'auto' to detect port dynamically
+cds.once('bootstrap', app => {
+    app.use(proxy(opts))  // install proxy
+    // cds.log('cov2ap','silent') // suppress anoying log outpout, e.g. for `npm run mocha -- --reporter nyan`
+    app.serve ('/fiori-apps') .from ('@capire/fiori','app/fiori-apps.html')
+})
--- a/fiori/index.cds
+++ b/fiori/index.cds
@@ -1 +1,8 @@
+using from './db/sqlite/index';
+using from './app/services';
+using from './app/genres/fiori-service';
+using from './app/browse/fiori-service';
+using from './app/admin-books/fiori-service';
+using from './app/admin-authors/fiori-service';
 using from './db/common';
+using from './app/common';
--- a/fiori/package.json
+++ b/fiori/package.json
@@ -5,13 +5,11 @@
    "@capire/bookstore": "*",
    "@sap/cds": ">=5",
    "@cap-js-community/odata-v2-adapter": "^1",
-    "express": "^4.17.1"
-  },
-  "devDependencies": {
-    "@cap-js/sqlite": "^1"
+    "express": "^4.17.1",
+    "passport": ">=0.4.1"
  },
  "scripts": {
-    "start": "cds-serve",
+    "start": "cds run --in-memory?",
    "watch": "cds watch"
  },
  "cds": {
@@ -24,6 +22,9 @@
        "kind": "odata",
        "model": "@capire/orders"
      },
+      "self": {
+        "model": "@capire/fiori"
+      },
      "messaging": {
        "[production]": {
          "kind": "enterprise-messaging"
@@ -50,10 +51,5 @@
    "hana": {
      "deploy-format": "hdbtable"
    }
-  },
-  "sapux": [
-    "app/admin-authors",
-    "app/admin-books",
-    "app/browse"
-  ]
+  }
 }
--- a/fiori/server.js
+++ b/fiori/server.js
@@ -0,0 +1,8 @@
+// install OData v2 adapter
+const cds = require("@sap/cds")
+const proxy = require('@cap-js-community/odata-v2-adapter')
+const opts = global.it ? { target:'auto' } : {}   // for tests, set 'auto' to detect port dynamically
+cds.on('bootstrap', app => app.use(proxy(opts)))  // install proxy
+// cds.log('cov2ap','silent') // suppress anoying log outpout, e.g. for `npm run mocha -- --reporter nyan`
+
+module.exports = require('@capire/bookstore/server.js')
--- a/hello/README.md
+++ b/hello/README.md
@@ -0,0 +1,15 @@
+# Hello World Getting Started Sample
+
+## Next Steps
+
+- To run the JavaScript implementation, open a new terminal and run `cds watch`.
+- To run the TypeScript implementation, open a new terminal and run `cds-ts watch`.
+
+Then call the service at: http://localhost:4004/say/hello(to='world')
+
+## Learn More
+
+Learn more about:
+
+- [Hello World!](https://cap.cloud.sap/docs/get-started/hello-world)
+- [Using TypeScript](https://cap.cloud.sap/docs/node.js/typescript)
--- a/hello/package.json
+++ b/hello/package.json
@@ -0,0 +1,42 @@
+{
+  "name": "@capire/hello-world",
+  "version": "1.0.0",
+  "scripts": {
+    "test": "npx jest --silent",
+    "start": "cds serve srv/world.cds",
+    "start:ts": "cds-ts serve srv/world.cds"
+  },
+  "dependencies": {
+    "@sap/cds": ">=5.0.4"
+  },
+  "devDependencies": {
+    "@types/jest": "*",
+    "@types/node": "*",
+    "typescript": ">=4.3.5"
+  },
+  "eslintConfig": {
+    "extends": "eslint:recommended",
+    "env": {
+      "es2020": true,
+      "node": true,
+      "jest": true,
+      "mocha": true
+    },
+    "globals": {
+      "SELECT": true,
+      "INSERT": true,
+      "UPDATE": true,
+      "DELETE": true,
+      "CREATE": true,
+      "DROP": true,
+      "CDL": true,
+      "CQL": true,
+      "CXL": true,
+      "cds": true
+    },
+    "rules": {
+      "no-console": "off",
+      "require-atomic-updates": "off"
+    }
+  }
+}
--- a/hello/srv/world.cds
+++ b/hello/srv/world.cds
@@ -0,0 +1,3 @@
+service say @(path: '/say') {
+  function hello (to:String) returns String;
+}
--- a/hello/srv/world.js
+++ b/hello/srv/world.js
@@ -0,0 +1,7 @@
+module.exports = class say {
+  hello(req) {
+    let {to} = req.data
+    if (to === 'me') to = require('os').userInfo().username
+    return `Hello ${to}!`
+  }
+}
--- a/hello/srv/world.ts
+++ b/hello/srv/world.ts
@@ -0,0 +1,7 @@
+import type { Request } from "@sap/cds/apis/services"
+
+module.exports = class say {
+    hello(req: Request) {
+        return `Hello ${req.data.to} from a TypeScript file!`
+    }
+}
--- a/hello/test/hello-world-test.js
+++ b/hello/test/hello-world-test.js
@@ -0,0 +1,13 @@
+const cds = require ('@sap/cds')
+describe('Hello world!', () => {
+
+    beforeAll (()=> process.env.CDS_TYPESCRIPT = true)
+    afterAll (()=> delete process.env.CDS_TYPESCRIPT)
+    const {GET} = cds.test.in(__dirname,'../srv').run('serve', 'world.cds')
+
+    it('should say hello with class impl', async () => {
+        const {data} = await GET`/say/hello(to='world')`
+        expect(data.value).toMatch(/Hello world.*typescript.*/i)
+    })
+
+})
--- a/hello/test/test.http
+++ b/hello/test/test.http
@@ -0,0 +1 @@
+GET http://localhost:4004/say/hello(to='world')
--- a/etc/loggers/app/loggers.html
+++ b/etc/loggers/app/loggers.html
--- a/etc/loggers/package.json
+++ b/etc/loggers/package.json
@@ -11,7 +11,12 @@
    "express": "^4.17.1"
  },
  "scripts": {
-    "start": "cds-serve",
+    "start": "cds run",
    "watch": "cds watch"
+  },
+  "cds": {
+    "requires": {
+      "db": "sql"
+    }
  }
 }
--- a/etc/loggers/readme.md
+++ b/etc/loggers/readme.md
--- a/etc/loggers/srv/dummy.cds
+++ b/etc/loggers/srv/dummy.cds
--- a/etc/loggers/srv/loggers.cds
+++ b/etc/loggers/srv/loggers.cds
--- a/etc/loggers/srv/loggers.js
+++ b/etc/loggers/srv/loggers.js
@@ -1,4 +1,4 @@
-const cds = require ('@sap/cds')
+const cds = require ('@sap/cds/lib')
 const LOG = cds.log('cds.log')

 module.exports = class LogService extends cds.Service {
--- a/etc/loggers/test/requests.http
+++ b/etc/loggers/test/requests.http
--- a/media/db/data-model.cds
+++ b/media/db/data-model.cds
@@ -0,0 +1,13 @@
+namespace sap.capire.media;
+
+entity Media {
+
+   key id:Integer;
+   @Core.MediaType: mediaType
+   content : LargeBinary ;
+
+   @Core.IsMediaType: true
+   mediaType : String;
+   fileName : String;
+   applicationName:String;
+}
--- a/media/index.cds
+++ b/media/index.cds
@@ -0,0 +1,2 @@
+using from './db/data-model';
+using from './srv/media-service';
--- a/media/package.json
+++ b/media/package.json
@@ -0,0 +1,19 @@
+{
+  "name": "@capire/media",
+  "version": "1.0.0",
+  "dependencies": {
+    "lokijs": "^1.5.6"
+  },
+  "files": [
+    "db",
+    "srv",
+    "index.cds"
+  ],
+  "cds": {
+    "requires": {
+      "db": {
+        "kind": "sql"
+      }
+    }
+  }
+}
--- a/media/srv/media-service.cds
+++ b/media/srv/media-service.cds
@@ -0,0 +1,8 @@
+using { sap.capire.media as db } from '../db/data-model';
+namespace sap.capire.media;
+
+service MediaServer  {
+    entity Media   as projection on db.Media ;
+}
+
+ 
--- a/media/srv/media-service.js
+++ b/media/srv/media-service.js
@@ -0,0 +1,68 @@
+const loki = require('lokijs')
+const db = new loki('DB')
+const mediaDB = db.addCollection('Media')
+const { Readable, PassThrough } = require('stream')
+
+module.exports = srv => {
+  srv.before('CREATE', 'Media', req => {
+    const obj = mediaDB.insert({ media: '' })
+    req.data.id = obj.$loki
+  })
+
+  srv.on('UPDATE', 'Media', (req, next) => {
+    const url = req._.req.path
+    if (url.includes('content')) {
+      const id = req.data.id
+      const obj = mediaDB.get(id)
+      if (!obj) {
+        req.reject(404, 'No record found for the ID')
+        return
+      }
+      const stream = new PassThrough()
+      const chunks = []
+      stream.on('data', chunk => {
+        chunks.push(chunk)
+      })
+      stream.on('end', () => {
+        obj.media = Buffer.concat(chunks).toString('base64')
+        mediaDB.update(obj)
+      })
+      req.data.content.pipe(stream)
+    } else return next()
+  })
+
+  srv.on('READ', 'Media', (req, next) => {
+    const url = req._.req.path
+    if (url.includes('content')) {
+      const id = req.data.id
+      const mediaObj = mediaDB.get(id)
+      if (!mediaObj) {
+        req.reject(404, 'Media not found for the ID')
+        return
+      }
+      const decodedMedia = Buffer.from(
+        mediaObj.media.split(';base64,').pop(),
+        'base64'
+      )
+      return _formatResult(decodedMedia)
+    } else return next() //> delegate to next/default handlers
+  })
+
+  srv.on('DELETE', 'Media', (req, next) => {
+    const id = req.data.id
+    mediaDB
+      .chain()
+      .find({ $loki: id })
+      .remove()
+    return next() //> delegate to next/default handlers
+  })
+
+  function _formatResult (decodedMedia) {
+    const readable = new Readable()
+    const result = new Array()
+    readable.push(decodedMedia)
+    readable.push(null)
+    result.push({ value: readable })
+    return result
+  }
+}
--- a/media/test/Test.png
+++ b/media/test/Test.png
--- a/media/test/media.http
+++ b/media/test/media.http
@@ -0,0 +1,35 @@
+### Requires REST Client for VS Code
+### https://marketplace.visualstudio.com/items?itemName=humao.rest-client
+###
+@protocol = http
+@host = localhost
+@port = 4004
+### Read Pictures
+GET {{protocol}}://{{host}}:{{port}}/media-server/Media
+Authorization: Basic admin:
+
+### Create Picture with mediatype
+POST {{protocol}}://{{host}}:{{port}}/media-server/Media
+Authorization: Basic admin:
+Accept: application/json
+Content-Type: application/json
+
+{ 
+  "id": 1,
+  "mediaType": "image/png" 
+}
+
+### Upload Binary PNG
+PUT {{protocol}}://{{host}}:{{port}}/media-server/Media(1)/content
+Authorization: Basic admin:
+Content-Type: image/png
+
+< ./Test.png
+
+### Read Binary
+GET {{protocol}}://{{host}}:{{port}}/media-server/Media(1)/content
+Authorization: Basic admin:
+
+### Delete Image
+DELETE {{protocol}}://{{host}}:{{port}}/media-server/Media(1)
+Authorization: Basic admin:
--- a/mta.yaml
+++ b/mta.yaml
@@ -1,177 +0,0 @@
-_schema-version: 3.3.0
-ID: capire.samples
-version: 3.0.0
-description: "A monorepo with several samples for CAP."
-parameters:
-  enable-parallel-deployments: true
-build-parameters:
-  before-all:
-    - builder: custom
-      commands:
-        - npm ci
-        - npx cds build ./shared-db --for hana --production
-        - npx cds build ./orders --for nodejs --production --ws-pack
-        - npx cds build ./reviews --for nodejs --production
-        - npx cds build ./bookstore --for nodejs --production --ws-pack
-modules:
-  - name: bookstore-srv
-    type: nodejs
-    path: bookstore/gen/srv
-    parameters:
-      instances: 1
-      buildpack: nodejs_buildpack
-    build-parameters:
-      builder: npm
-    properties:
-      cds_requires_ReviewsService_credentials: {"destination": "reviews-dest","path": "/reviews"} 
-      cds_requires_OrdersService_credentials: {"destination": "orders-dest","path": "/odata/v4/orders"} 
-    provides:
-      - name: bookstore-api # required by consumers of CAP services (e.g. approuter)
-        properties:
-          srv-url: ${default-url}
-    requires:
-      - name: samples-db
-      - name: samples-auth
-      - name: samples-messaging
-      - name: samples-destination
-
-  - name: orders-srv
-    type: nodejs
-    path: orders/gen/srv
-    parameters:
-      instances: 1
-      buildpack: nodejs_buildpack
-    build-parameters:
-      builder: npm
-    provides:
-      - name: orders-api # required by consumers of CAP services (e.g. approuter)
-        properties:
-          srv-url: ${default-url}
-    requires:
-      - name: samples-db
-      - name: samples-auth
-      - name: samples-messaging
-      - name: samples-destination
-
-  - name: reviews-srv
-    type: nodejs
-    path: reviews/gen/srv
-    parameters:
-      instances: 1
-      buildpack: nodejs_buildpack
-    build-parameters:
-      builder: npm
-    provides:
-      - name: reviews-api # required by consumers of CAP services (e.g. approuter)
-        properties:
-          srv-url: ${default-url}
-    requires:
-      - name: samples-db
-      - name: samples-auth
-      - name: samples-messaging
-      - name: samples-destination
-
-  - name: samples-db-deployer
-    type: hdb
-    path: shared-db/gen/db
-    parameters:
-      buildpack: nodejs_buildpack
-    requires:
-      - name: samples-db
-
-  - name: samples
-    type: approuter.nodejs
-    path: app/router
-    parameters:
-      keep-existing-routes: true
-      disk-quota: 256M
-      memory: 256M
-    requires:
-      - name: orders-api
-        group: destinations
-        properties:
-          name: orders-api
-          url: ~{srv-url}
-          forwardAuthToken: true
-      - name: reviews-api
-        group: destinations
-        properties:
-          name: reviews-api
-          url: ~{srv-url}
-          forwardAuthToken: true
-      - name: bookstore-api
-        group: destinations
-        properties:
-          name: bookstore-api
-          url: ~{srv-url}
-          forwardAuthToken: true
-      - name: samples-auth
-      - name: samples-destination
-    provides:
-      - name: app-api
-        properties:
-          app-protocol: ${protocol}
-          app-uri: ${default-uri}
-
-  - name: destination-content
-    type: com.sap.application.content
-    requires:
-      - name: orders-api
-      - name: reviews-api
-      - name: bookstore-api
-      - name: samples-auth
-        parameters:
-          service-key:
-            name: xsuaa_service-key
-      - name: samples-destination
-        parameters:
-          content-target: true
-    build-parameters:
-      no-source: true
-    parameters:
-      content:
-        instance:
-          existing_destinations_policy: update
-          destinations:
-            - Name: orders-dest
-              URL: ~{orders-api/srv-url}
-              Authentication: OAuth2ClientCredentials
-              TokenServiceInstanceName: samples-auth
-              TokenServiceKeyName: xsuaa_service-key
-            - Name: reviews-dest
-              URL: ~{reviews-api/srv-url}
-              Authentication: OAuth2ClientCredentials
-              TokenServiceInstanceName: samples-auth
-              TokenServiceKeyName: xsuaa_service-key
-
-resources:
-  - name: samples-db
-    type: com.sap.xs.hdi-container
-    parameters:
-      service: hana
-      service-plan: hdi-shared
-  - name: samples-auth
-    type: org.cloudfoundry.managed-service
-    processed-after:
-      - samples-messaging
-    parameters:
-      service: xsuaa
-      service-plan: application
-      path: ./xs-security.json
-      config:
-        xsappname: samples-${org}-${space}
-        tenant-mode: dedicated
-  - name: samples-messaging
-    type: org.cloudfoundry.managed-service
-    parameters:
-      service: enterprise-messaging
-      service-plan: default
-      path: ./event-mesh.json
-      config:
-        emname: bookstore-${org}-${space}
-        namespace: cap/samples/${space}
-  - name: samples-destination
-    type: org.cloudfoundry.managed-service
-    parameters:
-      service: destination
-      service-plan: lite
--- a/orders/_i18n/i18n_de.properties
+++ b/orders/_i18n/i18n_de.properties
@@ -1,3 +0,0 @@
-Order = Bestellung
-Orders = Bestellungen
-Price = Preis
--- a/orders/_i18n/i18n_en.properties
+++ b/orders/_i18n/i18n_en.properties
@@ -1,10 +0,0 @@
-Order = Order
-Orders = Orders
-OrderNo = Order Number
-OrderItems = Order Items
-Customer = Customer
-Product = Product
-ProductID = Product ID
-ProductTitle = Product Title
-UnitPrice = Unit Price
-Quantity = Quantity
--- a/orders/_i18n/i18n_fr.properties
+++ b/orders/_i18n/i18n_fr.properties
@@ -1,10 +0,0 @@
-Order = Order
-Orders = Orders
-OrderNo = Numéro de commande
-OrderItems = Articles de la commande
-Customer = Client
-Product = Produit
-ProductID = ID du produit
-ProductTitle = Titre du produit
-UnitPrice = Prix unitaire
-Quantity = Quantité
--- a/orders/app/orders/webapp/i18n/i18n.properties
+++ b/orders/app/orders/webapp/i18n/i18n.properties
@@ -2,7 +2,7 @@
 # __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459

 # JCI app descriptor contains lower case TITLE
-appTitle=Manage Orders
+appTitle=Bookshop Sample

 # JCI app descriptor contains lower case DESCRIPTION
 appSubTitle=CAP Sample Application
--- a/orders/cds-plugin.js
+++ b/orders/cds-plugin.js
@@ -0,0 +1,3 @@
+cds.once('bootstrap',(app)=>{
+  app.serve ('/orders') .from('@capire/orders','app/orders')
+})
--- a/orders/db/schema.cds
+++ b/orders/db/schema.cds
@@ -2,7 +2,7 @@ using { Currency, User, managed, cuid } from '@sap/cds/common';
 namespace sap.capire.orders;

 entity Orders : cuid, managed {
-  OrderNo  : String(44) @title:'Order Number'; //> readable key
+  OrderNo  : String(22) @title:'Order Number'; //> readable key
  Items    : Composition of many {
    key ID    : UUID;
    product   : Association to Products;
--- a/orders/package.json
+++ b/orders/package.json
@@ -2,18 +2,14 @@
  "name": "@capire/orders",
  "version": "1.0.0",
  "dependencies": {
-    "@cap-js/hana": "^1.7.0",
    "@capire/common": "*",
-    "@sap/cds": ">=5",
-    "@sap/xssec": "^4.4.0"
-  },
-  "scripts": {
-    "start": "cds-serve"
+    "@sap/cds": ">=5"
  },
  "cds": {
    "requires": {
-      "messaging": true,
-      "db": true
+      "orders-service": {
+        "model": "@capire/orders"
+      }
    }
  }
-}
+}
--- a/orders/srv/orders-service.cds
+++ b/orders/srv/orders-service.cds
@@ -2,14 +2,4 @@ using { sap.capire.orders as my } from '../db/schema';

 service OrdersService {
  entity Orders as projection on my.Orders;
-
-  event OrderChanged {
-    product: String;
-    deltaQuantity: Integer;
-  }
-
-  @odata.draft.bypass
-  @(requires: 'system-user')
-  entity OrdersNoDraft as projection on my.Orders;
-
 }
--- a/orders/srv/orders-service.js
+++ b/orders/srv/orders-service.js
@@ -29,7 +29,7 @@ class OrdersService extends cds.ApplicationService {
  /** order changed -> broadcast event */
  orderChanged (product, deltaQuantity) {
    // Emit events to inform subscribers about changes in orders
-    console.log ('> emitting:', 'OrderChanged', { product, deltaQuantity }) // eslint-disable-line no-console
+    console.log ('> emitting:', 'OrderChanged', { product, deltaQuantity })
    return this.emit ('OrderChanged', { product, deltaQuantity })
  }

--- a/package-lock.json
+++ b/package-lock.json
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Lothar Bender	8c5a20bdb0	Merge branch 'main' into compose-with-cds-plugins	2023-08-25 17:33:56 +02:00
Daniel Schlachter	afd4df3f39	similar behavior cds w bookstore cds w compose	2023-08-18 15:45:22 +02:00
Daniel Schlachter	0228841260	Merge branch 'main' into compose-with-cds-plugins	2023-08-18 11:48:30 +02:00
Daniel Schlachter	24ad8a84da	Merge branch 'compose-with-cds-plugins' of https://github.com/SAP-samples/cloud-cap-samples into compose-with-cds-plugins	2023-08-18 11:47:46 +02:00
Daniel Schlachter	e3acbb9832	compose adjustments	2023-08-18 11:46:27 +02:00
Daniel Schlachter	2e0a5aeb73	Merge branch 'main' into compose-with-cds-plugins	2023-08-03 10:02:33 +02:00
Daniel Schlachter	191e577e51	Merge branch 'main' into compose-with-cds-plugins	2023-08-01 10:47:09 +02:00
Daniel Hutzel	a9f040edcc	Merge branch 'main' into compose-with-cds-plugins	2023-07-26 17:10:21 +02:00
Daniel Hutzel	86fb1d20d3	my-project -> compose	2023-07-26 17:06:08 +02:00
Daniel Hutzel	dfb7d80849	Compose with cds-plugins	2023-07-26 17:01:15 +02:00
				`@@ -0,0 +1 @@`
				`GET http://localhost:4004/say/hello(to='world')`