Merge branch 'main' into fiori-ext

Also resolve @sap packages, but forward non-cds packages to default
registry

.eslintrc

@@ -0,0 +1,28 @@
+{
+    "extends": [
+        "eslint:recommended",
+        "plugin:@sap/cds/recommended"
+    ],
+    "env": {
+        "browser": true,
+        "es2022": true,
+        "node": true,
+        "jest": true,
+        "mocha": true
+    },
+    "globals": {
+        "SELECT": true,
+        "INSERT": true,
+        "UPDATE": true,
+        "DELETE": true,
+        "CREATE": true,
+        "DROP": true,
+        "cds": true
+    },
+    "rules": {
+        "no-console": "off",
+        "require-atomic-updates": "off",
+        "require-await":"warn",
+        "no-unused-vars": ["warn", { "argsIgnorePattern": "_" }]
+    }
+}

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: This channel is CLOSED. 
-    about: Use SAP community instead
-    url: https://answers.sap.com/tags/9f13aee1-834c-4105-8e43-ee442775e5ce

.github/ISSUE_TEMPLATE/question--feedback-or-bug-.md

@@ -0,0 +1,10 @@
+---
+name: This channel is CLOSED. 
+about: Use our community at  https://answers.sap.com/tags/9f13aee1-834c-4105-8e43-ee442775e5ce
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Please use our community on https://answers.sap.com/tags/9f13aee1-834c-4105-8e43-ee442775e5ce

.github/dependabot.yml

@@ -5,16 +5,4 @@ updates:
   directory: /
   versioning-strategy: increase-if-necessary
   schedule:
-    interval: weekly
+    interval: daily
-  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"]

.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: [16.x, 14.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

.gitignore

@@ -20,6 +20,3 @@ reviews/db/test.db
 *.openapi3.json
 *.sqlite
 *.db
-
-@types/
-@cds-models/

.registry/.gitignore

@@ -0,0 +1 @@
+*.tgz

.registry/server.js

@@ -0,0 +1,113 @@
+const { exec, execSync } = require ('child_process')
+const isWin = process.platform === 'win32'
+const express = require ('express')
+const fs = require ('fs')
+const { dirname, relative } = require('path')
+const axios = require('axios')
+const app = express()
+
+const cwd = __dirname
+const port=process.env.PORT || 4444
+let scopes = process.argv.filter(a => a.startsWith('@'))
+if (!scopes.length)  scopes = ['@capire']
+
+// clean up on start (exit handler might not complete on Windows)
+exec(isWin ? 'del *.tgz' : 'rm *.tgz', {cwd})
+
+
+app.use('/-/:tarball', async (req,res,next) => {
+  console.debug ('GET', req.params)
+  try {
+    const { tarball } = req.params
+    const pkgFull = tarball.substring(0, tarball.lastIndexOf('-'))
+    const scope = '@'+pkgFull.substring(0, pkgFull.indexOf('-'))
+    const pkg = pkgFull.substring(pkgFull.indexOf('-')+1)
+    fs.lstat(tarball,(err => {
+      if (err) { // no tgz yet
+        const loc = dirname(require.resolve(`${scope}/${pkg}/package.json`))
+        console.debug (`npm pack ${relative(cwd, loc)}`)
+        exec(`npm pack ${loc}`,{cwd},next)
+      }
+      else next() //> express.static below
+    }))
+  } catch (e) {
+    console.error(e)
+    res.sendStatus(500)
+  }
+})
+
+app.use('/-', express.static(__dirname))
+
+app.get('/*', async (req,res)=>{
+  const urlRegex = /^\/(@[\w-]+)\/(.+)/
+  const url = decodeURIComponent(req.url)
+  console.debug ('GET',url)
+  try {
+    if (!urlRegex.test(url))  return res.sendStatus(404)
+    const [, scpe, pkg ] = urlRegex.exec(url)
+    const packageName = `${scpe}/${pkg}`
+
+    // delegate to default registry for @sap/non-cds packages
+    if (scpe === ('@sap') && !packageName.startsWith('@sap/cds')) {
+      return forward(req, res)
+    }
+    const package = require (`${packageName}/package.json`)
+    const tarball = `${scpe.slice(1)}-${pkg}-${package.version}.tgz`
+    // https://github.com/npm/registry/blob/master/docs/responses/package-metadata.md
+    res.json({
+      "name": package.name,
+      "dist-tags": {
+        "latest": package.version
+      },
+      "versions": {
+        [package.version]: {
+          "name": package.name,
+          "version": package.version,
+          "dist": {
+            "tarball": `${server.url}/-/${tarball}`
+          },
+          dependencies: package.dependencies,
+          devDependencies: package.devDependencies
+        }
+      },
+    })
+  } catch (e) {
+    if (e.code === 'MODULE_NOT_FOUND')  return res.sendStatus(404)
+    console.error(e);  throw e
+  }
+})
+
+const server = app.listen(port, ()=>{
+  const url = server.url = `http://localhost:${server.address().port}`
+
+  for (const scope of scopes) {
+    console.log (`npm set ${scope}:registry=${url}`)
+    execSync(`npm set ${scope}:registry=${url}`)
+  }
+  console.log (`registry listening on ${url}`)
+})
+
+
+const _exit = ()=>{
+  server.close()
+  for (const scope of scopes) {
+    execSync(`npm conf rm "${scope}:registry"`)
+  }
+  process.exit()
+}
+
+async function forward(req, res) {
+  try {
+    const url = `https://registry.npmjs.org${req.url}`
+    const resAxios = await axios.get(url)
+    console.debug('->', decodeURI(url), resAxios.status)
+    return res.json(resAxios.data)
+  } catch (e) {
+    return res.sendStatus(e.response.status)
+  }
+}
+
+process.on ('SIGTERM',_exit)
+process.on ('SIGHUP',_exit)
+process.on ('SIGINT',_exit)
+process.on ('SIGUSR2',_exit)

.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"
 	],

.vscode/launch.json

@@ -13,7 +13,7 @@
         "<node_internals>/**",
         "**/node_modules/**",
         "**/cds/lib/lazy.js",
-        "**/cds/lib/req/cds-context.js",
+        "**/cds/lib/req/cls.js",
         "**/odata-v4/okra/**"
       ]
     },
@@ -26,24 +26,10 @@
         "<node_internals>/**",
         "**/node_modules/**",
         "**/cds/lib/lazy.js",
-        "**/cds/lib/req/cds-context.js",
+        "**/cds/lib/req/cls.js",
         "**/odata-v4/okra/**"
       ]
-    },
+    }
-    {
-      "name": "Debug Mocha Tests",
-      "type": "node",
-      "request": "attach",
-      "port": 9229,
-      "continueOnAttach": true,
-      "skipFiles": [
-        "<node_internals>/**",
-        "**/node_modules/**",
-        "**/cds/lib/lazy.js",
-        "**/cds/lib/req/cds-context.js",
-        "**/odata-v4/okra/**",
-      ]
-    },
   ],
   "inputs": [
     {

.vscode/settings.json

@@ -10,8 +10,17 @@
       "<node_internals>/**",
       "**/node_modules/**",
       "**/cds/lib/lazy.js",
-      "**/cds/lib/req/cds-context.js",
+      "**/cds/lib/req/cls.js",
       "**/odata-v4/okra/**"
     ]
-  }
+  },
+  "mochaExplorer.parallel": true,
+  "eslint.validate": [
+    "cds",
+    "csn",
+    "csv",
+    "csv (semicolon)",
+    "tsv",
+    "tab"
+  ]
 }

LICENSES/Apache-2.0.txt

@@ -0,0 +1,73 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+     (a) You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+     (b) You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+     (c) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+
+     (d) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+
+     You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!)  The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

README.md

@@ -1,19 +1,13 @@
 # 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).
+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)
-
-[See **Overview** of contained samples](samples.md):
-
-![](etc/samples.drawio.svg)
 
 ![](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
 
-1. Ensure you have the latest LTS version of Node.js installed (see [Getting Started](https://cap.cloud.sap/docs/get-started/jumpstart))
+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
@@ -36,7 +30,7 @@ cd samples
 In the samples folder run:
 
 ```sh
-npm ci
+npm install
 ```
 
 ### Run
@@ -60,6 +54,24 @@ npx jest
 ```
 > While mocha is a bit smaller and faster, jest runs tests in parallel and isolation, which allows to run all tests.
 
+
+### Serve `npm`
+
+We've included a simple npm registry mock, which allows you to do an `npm install @capire/<package>` locally. Use it as follows:
+
+1. Start the @capire registry:
+```sh
+npm run registry
+```
+> While running this will have `@capire:registry=http://localhost:4444` set with npmrc.
+
+2. Install one of the @capire packages wherever you like, for example:
+
+```sh
+npm add @capire/common @capire/bookshop
+```
+
+
 ## Code Tours
 
 Take one of the [guided tours](.tours) in VS Code through our CAP samples and learn which CAP features are showcased by the different parts of the repository. Just install the [CodeTour extension](https://marketplace.visualstudio.com/items?itemName=vsls-contrib.codetour) for VS Code. We'll add more code tours in the future. Stay tuned!

bookshop/app/vue/app.js

@@ -19,13 +19,13 @@ const books = Vue.createApp ({
         search: ({target:{value:v}}) => books.fetch(v && '&$search='+v),
 
         async fetch (etc='') {
-            const {data} = await GET(`/Books?${etc}`)
+            const {data} = await GET(`/ListOfBooks?$expand=genre,currency${etc}`)
             books.list = data.value
         },
 
         async inspect (eve) {
             const book = books.book = books.list [eve.currentTarget.rowIndex-1]
-            const res = await GET(`/Book/${book.ID}?$select=descr,stock,image`)
+            const res = await GET(`/Books/${book.ID}?$select=descr,stock,image`)
             Object.assign (book, res.data)
             books.order = { quantity:1 }
             setTimeout (()=> $('form > input').focus(), 111)
@@ -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
     })

bookshop/app/vue/index.html

@@ -45,11 +45,11 @@
         <tr v-for="book in list" v-bind:id="book.ID" v-on:click="inspect">
             <td>{{ book.title }}</td>
             <td>{{ book.author }}</td>
-            <td>{{ book.genre }}</td>
+            <td>{{ book.genre.name }}</td>
             <td class="rating-stars">
                 {{ ('★'.repeat(Math.round(book.rating))+'☆☆☆☆☆').slice(0,5) }} ({{ book.numberOfReviews }})
             </td>
-            <td>{{ book.currency }} {{ book.price }}</td>
+            <td>{{ book.currency && book.currency.symbol }} {{ book.price }}</td>
         </tr>
     </table>
 

bookshop/db/data/sap.capire.bookshop-Authors.csv

@@ -1,5 +1,5 @@
-ID,name,dateOfBirth,placeOfBirth,dateOfDeath,placeOfDeath
+ID;name;dateOfBirth;placeOfBirth;dateOfDeath;placeOfDeath
-101,Emily Brontë,1818-07-30,"Thornton, Yorkshire",1848-12-19,"Haworth, Yorkshire"
+101;Emily Brontë;1818-07-30;Thornton, Yorkshire;1848-12-19;Haworth, Yorkshire
-107,Charlotte Brontë,1818-04-21,"Thornton, Yorkshire",1855-03-31,"Haworth, Yorkshire"
+107;Charlotte Brontë;1818-04-21;Thornton, Yorkshire;1855-03-31;Haworth, Yorkshire
-150,Edgar Allen Poe,1809-01-19,"Boston, Massachusetts",1849-10-07,"Baltimore, Maryland"
+150;Edgar Allen Poe;1809-01-19;Boston, Massachusetts;1849-10-07;Baltimore, Maryland
-170,Richard Carpenter,1929-08-14,"King’s Lynn, Norfolk",2012-02-26,"Hertfordshire, England"
+170;Richard Carpenter;1929-08-14;King’s Lynn, Norfolk;2012-02-26;Hertfordshire, England

bookshop/db/data/sap.capire.bookshop-Books.csv

@@ -1,6 +1,6 @@
-ID,title,descr,author_ID,stock,price,currency_code,genre_ID
+ID;title;descr;author_ID;stock;price;currency_code;genre_ID
-201,Wuthering Heights,"Wuthering Heights, Emily Brontë's only novel, was published in 1847 under the pseudonym ""Ellis Bell"". It was written between October 1845 and June 1846. Wuthering Heights and Anne Brontë's Agnes Grey were accepted by publisher Thomas Newby before the success of their sister Charlotte's novel Jane Eyre. After Emily's death, Charlotte edited the manuscript of Wuthering Heights and arranged for the edited version to be published as a posthumous second edition in 1850.",101,12,11.11,GBP,11
+201;Wuthering Heights;"Wuthering Heights, Emily Brontë's only novel, was published in 1847 under the pseudonym ""Ellis Bell"". It was written between October 1845 and June 1846. Wuthering Heights and Anne Brontë's Agnes Grey were accepted by publisher Thomas Newby before the success of their sister Charlotte's novel Jane Eyre. After Emily's death, Charlotte edited the manuscript of Wuthering Heights and arranged for the edited version to be published as a posthumous second edition in 1850.";101;12;11.11;GBP;11
-207,Jane Eyre,"Jane Eyre /ɛər/ (originally published as Jane Eyre: An Autobiography) is a novel by English writer Charlotte Brontë, published under the pen name ""Currer Bell"", on 16 October 1847, by Smith, Elder & Co. of London. The first American edition was published the following year by Harper & Brothers of New York. Primarily a bildungsroman, Jane Eyre follows the experiences of its eponymous heroine, including her growth to adulthood and her love for Mr. Rochester, the brooding master of Thornfield Hall. The novel revolutionised prose fiction in that the focus on Jane's moral and spiritual development is told through an intimate, first-person narrative, where actions and events are coloured by a psychological intensity. The book contains elements of social criticism, with a strong sense of Christian morality at its core and is considered by many to be ahead of its time because of Jane's individualistic character and how the novel approaches the topics of class, sexuality, religion and feminism.",107,11,12.34,GBP,11
+207;Jane Eyre;"Jane Eyre /ɛər/ (originally published as Jane Eyre: An Autobiography) is a novel by English writer Charlotte Brontë, published under the pen name ""Currer Bell"", on 16 October 1847, by Smith, Elder & Co. of London. The first American edition was published the following year by Harper & Brothers of New York. Primarily a bildungsroman, Jane Eyre follows the experiences of its eponymous heroine, including her growth to adulthood and her love for Mr. Rochester, the brooding master of Thornfield Hall. The novel revolutionised prose fiction in that the focus on Jane's moral and spiritual development is told through an intimate, first-person narrative, where actions and events are coloured by a psychological intensity. The book contains elements of social criticism, with a strong sense of Christian morality at its core and is considered by many to be ahead of its time because of Jane's individualistic character and how the novel approaches the topics of class, sexuality, religion and feminism.";107;11;12.34;GBP;11
-251,The Raven,"""The Raven"" is a narrative poem by American writer Edgar Allan Poe. First published in January 1845, the poem is often noted for its musicality, stylized language, and supernatural atmosphere. It tells of a talking raven's mysterious visit to a distraught lover, tracing the man's slow fall into madness. The lover, often identified as being a student, is lamenting the loss of his love, Lenore. Sitting on a bust of Pallas, the raven seems to further distress the protagonist with its constant repetition of the word ""Nevermore"". The poem makes use of folk, mythological, religious, and classical references.",150,333,13.13,USD,16
+251;The Raven;"""The Raven"" is a narrative poem by American writer Edgar Allan Poe. First published in January 1845, the poem is often noted for its musicality, stylized language, and supernatural atmosphere. It tells of a talking raven's mysterious visit to a distraught lover, tracing the man's slow fall into madness. The lover, often identified as being a student, is lamenting the loss of his love, Lenore. Sitting on a bust of Pallas, the raven seems to further distress the protagonist with its constant repetition of the word ""Nevermore"". The poem makes use of folk, mythological, religious, and classical references.";150;333;13.13;USD;16
-252,Eleonora,"""Eleonora"" is a short story by Edgar Allan Poe, first published in 1842 in Philadelphia in the literary annual The Gift. It is often regarded as somewhat autobiographical and has a relatively ""happy"" ending.",150,555,14,USD,15
+252;Eleonora;"""Eleonora"" is a short story by Edgar Allan Poe, first published in 1842 in Philadelphia in the literary annual The Gift. It is often regarded as somewhat autobiographical and has a relatively ""happy"" ending.";150;555;14;USD;16
-271,Catweazle,"Catweazle is a British fantasy television series, starring Geoffrey Bayldon in the title role, and created by Richard Carpenter for London Weekend Television. The first series, produced and directed by Quentin Lawrence, was screened in the UK on ITV in 1970. The second series, directed by David Reid and David Lane, was shown in 1971. Each series had thirteen episodes, most but not all written by Carpenter, who also published two books based on the scripts.",170,22,150,JPY,13
+271;Catweazle;Catweazle is a British fantasy television series, starring Geoffrey Bayldon in the title role, and created by Richard Carpenter for London Weekend Television. The first series, produced and directed by Quentin Lawrence, was screened in the UK on ITV in 1970. The second series, directed by David Reid and David Lane, was shown in 1971. Each series had thirteen episodes, most but not all written by Carpenter, who also published two books based on the scripts.;170;22;150;JPY;13

bookshop/db/data/sap.capire.bookshop-Books.texts.csv

@@ -1,5 +0,0 @@
-ID,locale,title,descr
-201,de,Sturmhöhe,"Sturmhöhe (Originaltitel: Wuthering Heights) ist der einzige Roman der englischen Schriftstellerin Emily Brontë (1818–1848). Der 1847 unter dem Pseudonym Ellis Bell veröffentlichte Roman wurde vom viktorianischen Publikum weitgehend abgelehnt, heute gilt er als ein Klassiker der britischen Romanliteratur des 19. Jahrhunderts."
-201,fr,Les Hauts de Hurlevent,"Les Hauts de Hurlevent (titre original : Wuthering Heights), parfois orthographié Les Hauts de Hurle-Vent, est l'unique roman d'Emily Brontë, publié pour la première fois en 1847 sous le pseudonyme d’Ellis Bell. Loin d'être un récit moralisateur, Emily Brontë achève néanmoins le roman dans une atmosphère sereine, suggérant le triomphe de la paix et du Bien sur la vengeance et le Mal."
-207,de,Jane Eyre,"Jane Eyre. Eine Autobiographie (Originaltitel: Jane Eyre. An Autobiography), erstmals erschienen im Jahr 1847 unter dem Pseudonym Currer Bell, ist der erste veröffentlichte Roman der britischen Autorin Charlotte Brontë und ein Klassiker der viktorianischen Romanliteratur des 19. Jahrhunderts. Der Roman erzählt in Form einer Ich-Erzählung die Lebensgeschichte von Jane Eyre (ausgesprochen /ˌdʒeɪn ˈɛə/), die nach einer schweren Kindheit eine Stelle als Gouvernante annimmt und sich in ihren Arbeitgeber verliebt, jedoch immer wieder um ihre Freiheit und Selbstbestimmung kämpfen muss. Als klein, dünn, blass, stets schlicht dunkel gekleidet und mit strengem Mittelscheitel beschrieben, gilt die Heldin des Romans Jane Eyre nicht zuletzt aufgrund der Kino- und Fernsehversionen der melodramatischen Romanvorlage als die bekannteste englische Gouvernante der Literaturgeschichte"
-252,de,Eleonora,"“Eleonora” ist eine Erzählung von Edgar Allan Poe. Sie wurde 1841 erstveröffentlicht. In ihr geht es um das Paradox der Treue in der Treulosigkeit."

bookshop/db/data/sap.capire.bookshop-Books_texts.csv

@@ -0,0 +1,5 @@
+ID;locale;title;descr
+201;de;Sturmhöhe;Sturmhöhe (Originaltitel: Wuthering Heights) ist der einzige Roman der englischen Schriftstellerin Emily Brontë (1818–1848). Der 1847 unter dem Pseudonym Ellis Bell veröffentlichte Roman wurde vom viktorianischen Publikum weitgehend abgelehnt, heute gilt er als ein Klassiker der britischen Romanliteratur des 19. Jahrhunderts.
+201;fr;Les Hauts de Hurlevent;Les Hauts de Hurlevent (titre original : Wuthering Heights), parfois orthographié Les Hauts de Hurle-Vent, est l'unique roman d'Emily Brontë, publié pour la première fois en 1847 sous le pseudonyme d’Ellis Bell. Loin d'être un récit moralisateur, Emily Brontë achève néanmoins le roman dans une atmosphère sereine, suggérant le triomphe de la paix et du Bien sur la vengeance et le Mal.
+207;de;Jane Eyre;Jane Eyre. Eine Autobiographie (Originaltitel: Jane Eyre. An Autobiography), erstmals erschienen im Jahr 1847 unter dem Pseudonym Currer Bell, ist der erste veröffentlichte Roman der britischen Autorin Charlotte Brontë und ein Klassiker der viktorianischen Romanliteratur des 19. Jahrhunderts. Der Roman erzählt in Form einer Ich-Erzählung die Lebensgeschichte von Jane Eyre (ausgesprochen /ˌdʒeɪn ˈɛə/), die nach einer schweren Kindheit eine Stelle als Gouvernante annimmt und sich in ihren Arbeitgeber verliebt, jedoch immer wieder um ihre Freiheit und Selbstbestimmung kämpfen muss. Als klein, dünn, blass, stets schlicht dunkel gekleidet und mit strengem Mittelscheitel beschrieben, gilt die Heldin des Romans Jane Eyre nicht zuletzt aufgrund der Kino- und Fernsehversionen der melodramatischen Romanvorlage als die bekannteste englische Gouvernante der Literaturgeschichte
+252;de;Eleonora;“Eleonora” ist eine Erzählung von Edgar Allan Poe. Sie wurde 1841 erstveröffentlicht. In ihr geht es um das Paradox der Treue in der Treulosigkeit.

bookshop/db/data/sap.capire.bookshop-Genres.csv

@@ -1,16 +1,16 @@
-ID,parent_ID,name
+ID;parent_ID;name
-10,,Fiction
+10;;Fiction
-11,10,Drama
+11;10;Drama
-12,10,Poetry
+12;10;Poetry
-13,10,Fantasy
+13;10;Fantasy
-14,10,Science Fiction
+14;10;Science Fiction
-15,10,Romance
+15;10;Romance
-16,10,Mystery
+16;10;Mystery
-17,10,Thriller
+17;10;Thriller
-18,10,Dystopia
+18;10;Dystopia
-19,10,Fairy Tale
+19;10;Fairy Tale
-20,,Non-Fiction
+20;;Non-Fiction
-21,20,Biography
+21;20;Biography
-22,21,Autobiography
+22;21;Autobiography
-23,20,Essay
+23;20;Essay
-24,20,Speech
+24;20;Speech

bookshop/db/init.js

@@ -1,21 +1,24 @@
-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
  * currencies, if not obtained through @capire/common.
  */
 
-// NOTE: We use cds.on('served') to delay the UPSERTs after the db init
+module.exports = async (db)=>{
-// to run after all INSERTs from .csv files happened.
+
-module.exports = cds.on('served', ()=>
+  const has_common = db.model.definitions['sap.common.Currencies'].elements.numcode
-  UPSERT.into ('sap.common.Currencies') .columns (
+  if (has_common) return
-    [ 'code', 'symbol', 'name' ]
+
+  const already_filled = await db.exists('sap.common.Currencies',{code:'EUR'})
+  if (already_filled) return
+
+  await INSERT.into ('sap.common.Currencies') .columns (
+    'code','symbol','name'
   ) .rows (
-    [ 'EUR', '€', 'Euro' ],
+    [ 'EUR','€','Euro' ],
-    [ 'USD', '$', 'US Dollar' ],
+    [ 'USD','$','US Dollar' ],
-    [ 'GBP', '£', 'British Pound' ],
+    [ 'GBP','£','British Pound' ],
-    [ 'ILS', '₪', 'Shekel' ],
+    [ 'ILS','₪','Shekel' ],
-    [ 'JPY', '¥', 'Yen' ],
+    [ 'JPY','¥','Yen' ],
   )
-)
+}

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

bookshop/index.js

@@ -0,0 +1,2 @@
+const { CatalogService } = require('./srv/cat-service')
+module.exports = { CatalogService }

bookshop/package.json

@@ -9,16 +9,19 @@
     "index.cds",
     "index.js"
   ],
-  "devDependencies": {
-    "@cap-js/sqlite": "*"
-  },
   "dependencies": {
-    "@sap/cds": ">=7",
+    "@sap/cds": ">=5.9",
-    "express": "^4.17.1"
+    "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": {
+      "db": "sql"
+    }
   }
 }

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)             | [`./`](./)                           |
+| [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-modeling)                               | [`./db/schema.cds`](./db/schema.cds) |
+| [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/providing-services#modeling-services)               | [`./srv/*.cds`](./srv)               |
+| [Defining Services](https://cap.cloud.sap/docs/guides/services#defining-services)                         | [`./srv/*.cds`](./srv)               |
-| [Single-purposed Services](https://cap.cloud.sap/docs/guides/providing-services#single-purposed-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)         |

bookshop/srv/admin-service.cds

@@ -1,5 +1,5 @@
 using { sap.capire.bookshop as my } from '../db/schema';
-service AdminService @(requires:'admin', path:'/admin') {
+service AdminService @(requires:'admin') {
   entity Books as projection on my.Books;
-  // entity Authors as projection on my.Authors;
+  entity Authors as projection on my.Authors;
 }

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','Authors', genid)
-  this.before (['NEW','CREATE'],'Books', 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 cds.tx(req).run (SELECT.one.from(req.target).columns('max(ID) as ID'))
-  const {id} = await SELECT.one.from(req.target).columns('max(ID) as id')
+  req.data.ID = ID - ID % 100 + 100 + 1
-  req.data.ID = id + 4 // Note: that is not safe! ok for this sample only.
 }

bookshop/srv/cat-service.cds

@@ -2,20 +2,15 @@ using { sap.capire.bookshop as my } from '../db/schema';
 service CatalogService @(path:'/browse') {
 
   /** For displaying lists of Books */
-  @readonly entity Books as projection on Book excluding { descr };
+  @readonly entity ListOfBooks as projection on Books
+  excluding { descr };
 
   /** For display in details pages */
-  @readonly entity Book as projection on my.Books { *,
+  @readonly entity Books as projection on my.Books { *,
-    currency.name as currencyName, // flattened
+    author.name as author
-    currency.symbol as currency,  // flattened
+  } excluding { createdBy, modifiedBy };
-    author.name as author,       // flattened
-    genre.name as genre,        // flattened
-  } excluding {
-    createdBy, modifiedBy, // as end users shouldn't see them
-    localized, texts,     // as end users don't need them
-  };
 
   @requires: 'authenticated-user'
-  action submitOrder ( book: Book:ID, quantity: Integer ) returns { stock: Integer };
+  action submitOrder ( book: Books:ID, quantity: Integer ) returns { stock: Integer };
-  event OrderedBook : { book: Book:ID; quantity: Integer; buyer: String };
+  event OrderedBook : { book: Books:ID; quantity: Integer; buyer: String };
 }

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 { Books:Book } = this.entities
+  const { ListOfBooks } = this.entities
-
-  // Add some discount for overstocked books
-  this.after('each', Book, book => {
-    if (book.stock > 111) book.title += ` -- 11% discount!`
-  })
 
   // Reduce stock of ordered books if available stock suffices
-  this.on('submitOrder', async req => {
+  this.on ('submitOrder', async req => {
-    let { book:id, quantity } = req.data
+    const {book,quantity} = req.data
-    let book = await SELECT.from (Books, id, b => b.stock)
+    if (quantity < 1) return req.reject (400,`quantity has to be 1 or more`)
-
+    let b = await SELECT `stock` .from (Books,book)
-    // Validate input data
+    if (!b) return req.error (404,`Book #${book} doesn't exist`)
-    if (!book) return req.error (404, `Book #${id} doesn't exist`)
+    let {stock} = b
-    if (quantity < 1) return req.error (400, `quantity has to be 1 or more`)
+    if (quantity > stock) return req.reject (409,`${quantity} exceeds stock for book #${book}`)
-    if (quantity > book.stock) return req.error (409, `${quantity} exceeds stock for book #${id}`)
+    await UPDATE (Books,book) .with ({ stock: stock -= quantity })
-
+    await this.emit ('OrderedBook', { book, quantity, buyer:req.user.id })
-    // Reduce stock in database and return updated stock value
+    return { stock }
-    await UPDATE (Books, id) .with ({ stock: book.stock -= quantity })
-    return book
   })
 
-  // Emit event when an order has been submitted
+  // Add some discount for overstocked books
-  this.after('submitOrder', async (_,req) => {
+  this.after ('READ', ListOfBooks, each => {
-    let { book, quantity } = req.data
+    if (each.stock > 111) each.title += ` -- 11% discount!`
-    await this.emit('OrderedBook', { book, quantity, buyer: req.user.id })
   })
 
-  // Delegate requests to the underlying generic service
   return super.init()
 }}
 
-module.exports = CatalogService
+module.exports = { CatalogService }

bookshop/srv/user-service.cds

@@ -1,7 +1,7 @@
 /**
  * Exposes user information
  */
-service UserService @(path: '/user') {
+service UserService {
   /**
    * The current user
    */

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

bookshop/test/requests.http

@@ -1,6 +1,5 @@
 @server = http://localhost:4004
 @me = Authorization: Basic {{$processEnv USER}}:
-@alice = Authorization: Basic alice:
 
 
 ### ------------------------------------------------------------------------
@@ -17,11 +16,11 @@ GET {{server}}/browse/$metadata
 
 ### ------------------------------------------------------------------------
 # Browse Books as any user
-GET {{server}}/admin/Books?
+GET {{server}}/browse/ListOfBooks?
   # &$select=title,stock
   &$expand=genre
   # &sap-language=de
-{{alice}}
+{{me}}
 
 
 ### ------------------------------------------------------------------------
@@ -31,13 +30,13 @@ GET {{server}}/admin/Authors?
   # &$expand=books($select=title;$expand=currency)
   # &$filter=ID eq 101
   # &sap-language=de
-{{alice}}
+Authorization: Basic alice:
 
 ### ------------------------------------------------------------------------
 # Create Author
 POST {{server}}/admin/Authors
 Content-Type: application/json;IEEE754Compatible=true
-{{alice}}
+Authorization: Basic alice:
 
 {
   "ID": 112,
@@ -50,7 +49,7 @@ Content-Type: application/json;IEEE754Compatible=true
 # Create book
 POST {{server}}/admin/Books
 Content-Type: application/json;IEEE754Compatible=true
-{{alice}}
+Authorization: Basic alice:
 
 {
   "ID": 2,
@@ -68,7 +67,7 @@ Content-Type: application/json;IEEE754Compatible=true
 # Put image to books
 PUT {{server}}/admin/Books(2)/image
 Content-Type: image/png
-{{alice}}
+Authorization: Basic alice:
 
 data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAANwAAADcCAYAAAAbWs+BAAAGwElEQVR4Ae3cwZFbNxBFUY5rkrDTmKAUk5QT03Aa44U22KC7NHptw+DRikVAXf8fzC3u8Hj4R4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgZzAW26USQT+e4HPx+Mz+RRvj0e0kT+SD2cWAQK1gOBqH6sEogKCi3IaRqAWEFztY5VAVEBwUU7DCNQCgqt9rBKICgguymkYgVpAcLWPVQJRAcFFOQ0jUAsIrvaxSiAqILgop2EEagHB1T5WCUQFBBflNIxALSC42scqgaiA4KKchhGoBQRX+1glEBUQXJTTMAK1gOBqH6sEogKCi3IaRqAWeK+Xb1z9iN558fHxcSPS9p2ezx/ROz4e4TtIHt+3j/61hW9f+2+7/+UXbifjewIDAoIbQDWSwE5AcDsZ3xMYEBDcAKqRBHYCgtvJ+J7AgIDgBlCNJLATENxOxvcEBgQEN4BqJIGdgOB2Mr4nMCAguAFUIwnsBAS3k/E9gQEBwQ2gGklgJyC4nYzvCQwICG4A1UgCOwHB7WR8T2BAQHADqEYS2AkIbifjewIDAoIbQDWSwE5AcDsZ3xMYEEjfTzHwiK91B8npd6Q8n8/oGQ/ckRJ9vvQwv3BpUfMIFAKCK3AsEUgLCC4tah6BQkBwBY4lAmkBwaVFzSNQCAiuwLFEIC0guLSoeQQKAcEVOJYIpAUElxY1j0AhILgCxxKBtIDg0qLmESgEBFfgWCKQFhBcWtQ8AoWA4AocSwTSAoJLi5pHoBAQXIFjiUBaQHBpUfMIFAKCK3AsEUgLCC4tah6BQmDgTpPsHSTFs39p6fQ7Q770UsV/Ov19X+2OFL9wxR+rJQJpAcGlRc0jUAgIrsCxRCAtILi0qHkECgHBFTiWCKQFBJcWNY9AISC4AscSgbSA4NKi5hEoBARX4FgikBYQXFrUPAKFgOAKHEsE0gKCS4uaR6AQEFyBY4lAWkBwaVHzCBQCgitwLBFICwguLWoegUJAcAWOJQJpAcGlRc0jUAgIrsCxRCAt8J4eePq89B0ar3ZnyOnve/rfn1+400/I810lILirjtPLnC4guNNPyPNdJSC4q47Ty5wuILjTT8jzXSUguKuO08ucLiC400/I810lILirjtPLnC4guNNPyPNdJSC4q47Ty5wuILjTT8jzXSUguKuO08ucLiC400/I810lILirjtPLnC4guNNPyPNdJSC4q47Ty5wuILjTT8jzXSUguKuO08ucLiC400/I810l8JZ/m78+szP/zI47fJo7Q37vgJ7PHwN/07/3TOv/9gu3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhAcMPAxhNYBQS3avhMYFhg4P6H9J0maYHXuiMlrXf+vOfA33Turf3C5SxNItAKCK4lsoFATkBwOUuTCLQCgmuJbCCQExBcztIkAq2A4FoiGwjkBASXszSJQCsguJbIBgI5AcHlLE0i0AoIriWygUBOQHA5S5MItAKCa4lsIJATEFzO0iQCrYDgWiIbCOQEBJezNIlAKyC4lsgGAjkBweUsTSLQCgiuJbKBQE5AcDlLkwi0Akff//Dz6U+/I6U1/sUNr3bnytl3kPzi4bXb/cK1RDYQyAkILmdpEoFWQHAtkQ0EcgKCy1maRKAVEFxLZAOBnIDgcpYmEWgFBNcS2UAgJyC4nKVJBFoBwbVENhDICQguZ2kSgVZAcC2RDQRyAoLLWZpEoBUQXEtkA4GcgOByliYRaAUE1xLZQCAnILicpUkEWgHBtUQ2EMgJCC5naRKBVkBwLZENBHIC/4M7TXIv+3PS22d24qvdQfL3C/7N5P5i/MLlLE0i0AoIriWygUBOQHA5S5MItAKCa4lsIJATEFzO0iQCrYDgWiIbCOQEBJezNIlAKyC4lsgGAjkBweUsTSLQCgiuJbKBQE5AcDlLkwi0AoJriWwgkBMQXM7SJAKtgOBaIhsI5AQEl7M0iUArILiWyAYCOQHB5SxNItAKCK4lsoFATkBwOUuTCBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDAvyrwDySEJ2VQgUSoAAAAAElFTkSuQmCC
 

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

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

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

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

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

bookstore/server.js

@@ -5,16 +5,18 @@ 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 ('/bookshop') .from ('@capire/bookshop','app/vue')
+  app.serve ('/reviews') .from ('@capire/reviews','app/vue')
-    app.serve ('/reviews') .from ('@capire/reviews','app/vue')
+  app.serve ('/orders') .from('@capire/orders','app/orders')
-    app.serve ('/orders') .from('@capire/orders','app/orders')
+  app.serve ('/data') .from('@capire/data-viewer','app/viewer')
-    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')
+
+// Returning cds.server
+module.exports = cds.server
+
+// For didactic reasons in capire
+const { ReviewsService, OrdersService } = cds.requires
+if (!ReviewsService?.credentials && !OrdersService?.credentials) cds.requires.messaging = false

bookstore/srv/mashup.cds

@@ -4,16 +4,16 @@
 //    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
+  rating  : Decimal;
-  numberOfReviews : Integer @title : '{i18n>NumberOfReviews}';
+  numberOfReviews : Integer;
 }
 
 
@@ -21,11 +21,18 @@ extend Books with {
 //  Extend Orders with Books as Products
 //
 using { sap.capire.orders.Orders } from '@capire/orders';
-extend Orders:Items with {
+extend Orders with {
-  book : Association to Books on product.ID = book.ID
+  extend Items with {
+    book : Association to Books on product.ID = book.ID
+  }
 }
 
-// Ensure models from all imported packages are loaded
+
+// Add orders fiori app (in case of embedded orders service)
 using from '@capire/orders/app/fiori';
+
+// Add data browser
 using from '@capire/data-viewer';
+
+// Incorporate pre-build extensions from...
 using from '@capire/common';

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)})
   }))
@@ -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)

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

common/cds-plugin.js

@@ -1 +0,0 @@
-// dummy to auto-load the plugin

common/package.json

@@ -4,12 +4,5 @@
   "version": "1.0.0",
   "dependencies": {
     "@sap/cds": "*"
-  },
-  "cds": {
-    "requires": {
-      "@capire/common/data": {
-        "model": "@capire/common"
-      }
-    }
   }
 }

data-viewer/app/viewer/app.js

@@ -1,5 +1,5 @@
 /* global Vue axios */ //> from vue.html
-const GET = (url) => axios.get('/odata/v4/-data'+url)
+const GET = (url) => axios.get('/-data'+url)
 const storageGet = (key, def) => localStorage.getItem('data-viewer:'+key) || def
 const storageSet = (key, val) => localStorage.setItem('data-viewer:'+key, val)
 const columnKeysFirst = (c1, c2) => {

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;

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 }
       })
@@ -36,11 +36,8 @@ class DataService extends cds.ApplicationService { init(){
     const dataSource = findDataSource(dataSourceName, entityName)
     const res = await dataSource.run(query)
     return res.map((line) => {
-      const record = Object.entries(line).map(([column, data]) => ({ column, data }))
+      const record = Object.entries(line).map(([column, data]) => {return {column, data}})
-      return {
+      return { record }
-        record,
-        ID: cds.utils.uuid() // just to be OData-compliant
-      }
     })
   })
 
@@ -49,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 ?

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/**'
-//   ]
-// }]
-//

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;">
+                <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: 242px; margin-left: 180px;">
+                    <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 data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                        <div style="box-sizing: border-box; font-size: 0; 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="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;">
+                <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: 141px; margin-left: 180px;">
+                    <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 data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: center;">
+                        <div style="box-sizing: border-box; font-size: 0; 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="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>
-                                    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;">
                                 @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 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"/>
-        <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"/>
+        <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>

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="box-sizing: border-box; font-size: 0; 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="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="box-sizing: border-box; font-size: 0; 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="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="box-sizing: border-box; font-size: 0; 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="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="box-sizing: border-box; font-size: 0; 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="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="box-sizing: border-box; font-size: 0; 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="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="box-sizing: border-box; font-size: 0; 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="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="box-sizing: border-box; font-size: 0; 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="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="box-sizing: border-box; font-size: 0; 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="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="box-sizing: border-box; font-size: 0; 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="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="box-sizing: border-box; font-size: 0; 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="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="box-sizing: border-box; font-size: 0; 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="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="box-sizing: border-box; font-size: 0; 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="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="box-sizing: border-box; font-size: 0; 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="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="box-sizing: border-box; font-size: 0; 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="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>

fiori-ext/.vscode/settings.json

@@ -0,0 +1,11 @@
+{
+  "eslint.validate": [
+    "cds",
+    "csn",
+    "csv",
+    "csv",
+    "csv (semicolon)",
+    "tsv",
+    "tab"
+  ]
+}

fiori-ext/README.md

@@ -0,0 +1,21 @@
+# Welcome to your Extension Project for the CAP Bookshop Fiori App
+
+It contains these folders and files, following our recommended project layout:
+
+| File or Folder | Purpose                            |
+|----------------|------------------------------------|
+| `app/`         | content for UI frontends goes here |
+| `test/`        | contet for local tests             |
+| `package.json` | project metadata and configuration |
+| `readme.md`    | this getting started guide         |
+
+
+## Next Steps
+
+- Runs `cds login ...`
+- Runs `cds pull ...`
+
+
+## Learn More
+
+Learn more at https://cap.cloud.sap/docs/get-started/.

fiori-ext/app/extension.cds

@@ -0,0 +1,25 @@
+using { OrdersService, sap, sap.capire.orders.Orders } from '@capire/fiori';
+namespace x_bookshop.extension;
+
+// Adding 2 new fields for Orders
+extend Orders with {
+  x_priority    : String @assert.range enum {high; medium; low} default 'medium' ;
+  x_salesRegion : Association to SalesRegion;
+}
+
+/** Value Help for x_salesRegion */
+entity SalesRegion : sap.common.CodeList {
+  key code : String(11);
+}
+
+// --- UI ---
+
+annotate Orders:x_priority with @title : 'Priority';
+annotate SalesRegion:name with @title : 'Sales Region';
+
+annotate OrdersService.Orders with @UI.LineItem : [
+  ... up to { Value: OrderNo },
+  { Value : x_priority },
+  { Value : x_salesRegion.name },
+  ...
+];

fiori-ext/package.json

@@ -0,0 +1,49 @@
+{
+  "name": "@capire/fiori-ext",
+  "version": "1.0.0",
+  "description": "A simple CAP project.",
+  "repository": "<Add your repository here>",
+  "license": "UNLICENSED",
+  "private": true,
+  "dependencies": {
+    "@sap/cds": "^6"
+  },
+  "devDependencies": {
+    "sqlite3": "^5.0.4",
+    "@sap/eslint-plugin-cds": "^2.5.0"
+  },
+  "scripts": {
+    "start": "cds run"
+  },
+  "cds": {
+    "extends": "@capire/fiori"
+  },
+  "eslintConfig": {
+    "extends": [
+      "eslint:recommended",
+      "plugin:@sap/cds/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"
+    }
+  }
+}

fiori-ext/test/data/sap.capire.orders-Orders.csv

@@ -0,0 +1,3 @@
+ID;createdAt;createdBy;buyer;OrderNo;currency_code;Z_priority;Z_SalesRegion_regionCode
+7e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-01-31;john.doe@test.com;john.doe@test.com;1;EUR;high;AMER
+64e718c9-ff99-47f1-8ca3-950c850777d4;2019-01-30;jane.doe@test.com;jane.doe@test.com;2;EUR;low;APJ

fiori-ext/test/data/x_bookshop.extension-SalesRegion.csv

@@ -0,0 +1,4 @@
+code;name;descr
+AMER;Americas;North, Central and South America
+EMEA;Europe, the Middle East and Africa;Europe, the Middle East and Africa
+APJ;Asia Pacific and Japan;Asia Pacific and Japan

fiori/app/_i18n/i18n.properties

@@ -2,20 +2,25 @@ 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
+AuthorID = Author ID
+Stock = Stock
 Name = Name
+AuthorName = Author's Name
 DateOfBirth = Date of Birth
 DateOfDeath = Date of Death
 PlaceOfBirth = Place of Birth
 PlaceOfDeath = Place of Death
+Age = Age
+Authors = Authors
+Order = Order
+Orders = Orders
+Price = Price
 
-Genres = Genres
 Genre = Genre
+Genres = Genres
+SubGenres = Sub Genres
+
+NumCode = Numeric Code
+MinorUnit = Minor Unit
+Exponent = Exponent

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

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

fiori/app/_router/package.json

@@ -0,0 +1,12 @@
+{
+  "name": "approuter",
+  "dependencies": {
+    "@sap/approuter": "^11.0.0"
+  },
+  "engines": {
+    "node": "^16"
+  },
+  "scripts": {
+    "start": "node node_modules/@sap/approuter/approuter.js"
+  }
+}

fiori/app/_router/xs-app.json

@@ -0,0 +1,23 @@
+{
+  "authenticationMethod": "route",
+  "routes": [
+    {
+      "source": "^/app/(.*)$",
+      "target": "$1",
+      "localDir": ".",
+      "authenticationType": "xsuaa",
+      "cacheControl": "no-cache, no-store, must-revalidate"
+    },
+    {
+      "source": "^/-/cds/.*",
+      "destination": "mtx-api",
+      "authenticationType": "none"
+    },
+    {
+      "source": "^/(.*)$",
+      "target": "$1",
+      "destination": "srv-api",
+      "authenticationType": "xsuaa"
+    }
+  ]
+}

fiori/app/admin-authors/fiori-service.cds

@@ -43,10 +43,5 @@ extend sap.capire.bookshop.Authors with {
   virtual lifetime : String;
 }
 
-annotate AdminService.Authors with {
-  age      @Common.Label : '{i18n>Age}';
-  lifetime @Common.Label : '{i18n>Lifetime}'
-}
-
 // Workaround for Fiori popup for asking user to enter a new UUID on Create
 annotate AdminService.Authors with { ID @Core.Computed; }

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

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}}",

fiori/app/admin-books/fiori-service.cds

@@ -62,11 +62,6 @@ annotate AdminService.Books.texts with @(
 	}
 );
 
-annotate AdminService.Books.texts with {
-    ID       @UI.Hidden;
-    ID_texts @UI.Hidden;
-};
-
 // Add Value Help for Locales
 annotate AdminService.Books.texts {
 	locale @(
@@ -81,6 +76,3 @@ extend service AdminService {
 
 // Workaround for Fiori popup for asking user to enter a new UUID on Create
 annotate AdminService.Books with { ID @Core.Computed; }
-
-// Show Genre as drop down, not a dialog
-annotate AdminService.Books with { genre @Common.ValueListWithFixedValues; }

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

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

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

fiori/app/browse/fiori-service.cds

@@ -4,10 +4,10 @@ using CatalogService from '@capire/bookstore';
 //
 //	Books Object Page
 //
-annotate CatalogService.Book with @(UI : {
+annotate CatalogService.Books with @(UI : {
     HeaderInfo        : {
-        TypeName       : '{i18n>Book}',
+        TypeName       : 'Book',
-        TypeNamePlural : '{i18n>Books}',
+        TypeNamePlural : 'Books',
         Description    : {Value : author}
     },
     HeaderFacets      : [{
@@ -24,7 +24,7 @@ annotate CatalogService.Book with @(UI : {
     FieldGroup #Price : {Data : [
         {Value : price},
         {
-            Value : currencyName,
+            Value : currency.symbol,
             Label : '{i18n>Currency}'
         },
     ]},
@@ -33,13 +33,13 @@ annotate CatalogService.Book with @(UI : {
 
 ////////////////////////////////////////////////////////////////////////////
 //
-//	Books List Page
+//	Books Object Page
 //
-annotate CatalogService.Book with @(UI : {
+annotate CatalogService.Books with @(UI : {
     SelectionFields : [
         ID,
         price,
-        currencyName
+        currency_code
     ],
     LineItem        : [
         {
@@ -50,10 +50,11 @@ annotate CatalogService.Book with @(UI : {
             Value : author,
             Label : '{i18n>Author}'
         },
-        {Value : genre},
+        {Value : genre.name},
         {Value : price},
-        {Value : currencyName},
+        {
+            Value : currency.symbol,
+            Label : ' '
+        },
     ]
-}) {
+}, );
-    currencyName @Common.Label : '{i18n>Currency}';
-};

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

fiori/app/common.cds

@@ -4,51 +4,57 @@
 
 using { sap.capire.bookshop as my } from '@capire/bookstore';
 using { sap.common } from '@capire/common';
-using { sap.common.Currencies } from '@sap/cds/common';
 
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books Lists
 //
 annotate my.Books with @(
-  Common.SemanticKey : [ID],
+    Common.SemanticKey : [ID],
-  UI                 : {
+    UI                 : {
-    Identification  : [{ Value: title }],
+        Identification  : [{Value : title}],
-    SelectionFields : [
+        SelectionFields : [
-      ID,
+            ID,
-      author_ID,
+            author_ID,
-      price,
+            price,
-    ],
+            currency_code
-    LineItem        : [
+        ],
-      { Value: ID, Label: '{i18n>Title}' },
+        LineItem        : [
-      { Value: author.ID, Label: '{i18n>Author}' },
+            {
-      { Value: genre.name },
+                Value : ID,
-      { Value: stock },
+                Label : '{i18n>Title}'
-      { Value: price },
+            },
-    ]
+            {
-  }
+                Value : author.ID,
+                Label : '{i18n>Author}'
+            },
+            {Value : genre.name},
+            {Value : stock},
+            {Value : price},
+            {
+                Value : currency.symbol,
+                Label : ' '
+            },
+        ]
+    }
 ) {
-  ID  @Common: {
+    ID  @Common: {
-    SemanticObject : 'Books',
+        SemanticObject : 'Books',
-    Text: title,
+        Text: title,
-    TextArrangement : #TextOnly
+        TextArrangement : #TextOnly
-  };
+    };
-  author @ValueList.entity      : 'Authors';
+    author @ValueList.entity      : 'Authors';
 };
 
-annotate Currencies with {
-  symbol @Common.Label : '{i18n>Currency}';
-}
-
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Books Details
 //
 annotate my.Books with @(UI : {HeaderInfo : {
-  TypeName       : '{i18n>Book}',
+    TypeName       : '{i18n>Book}',
-  TypeNamePlural : '{i18n>Books}',
+    TypeNamePlural : '{i18n>Books}',
-  Title          : { Value: title },
+    Title          : {Value : title},
-  Description    : { Value: author.name }
+    Description    : {Value : author.name}
 }, });
 
 
@@ -57,14 +63,19 @@ annotate my.Books with @(UI : {HeaderInfo : {
 //	Books Elements
 //
 annotate my.Books with {
-  ID     @title: '{i18n>ID}';
+    ID     @title : '{i18n>ID}';
-  title  @title: '{i18n>Title}';
+    title  @title : '{i18n>Title}';
-  genre  @title: '{i18n>Genre}'   @Common: { Text: genre.name, TextArrangement: #TextOnly };
+    genre  @title : '{i18n>Genre}'  @Common               : {
-  author @title: '{i18n>Author}'  @Common: { Text: author.name, TextArrangement: #TextOnly };
+        Text            : genre.name,
-  price  @title: '{i18n>Price}'   @Measures.ISOCurrency : currency;
+        TextArrangement : #TextOnly
-  stock  @title: '{i18n>Stock}';
+    };
-  descr  @title: '{i18n>Description}'  @UI.MultiLineText;
+    author @title : '{i18n>Author}'  @Common              : {
-  image  @title: '{i18n>Image}';
+        Text            : author.name,
+        TextArrangement : #TextOnly
+    };
+    price  @title : '{i18n>Price}'  @Measures.ISOCurrency : currency_code;
+    stock  @title : '{i18n>Stock}';
+    descr  @UI.MultiLineText;
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -72,40 +83,36 @@ annotate my.Books with {
 //	Genres List
 //
 annotate my.Genres with @(
-  Common.SemanticKey : [name],
+    Common.SemanticKey : [name],
-  UI                 : {
+    UI                 : {
-    SelectionFields : [name],
+        SelectionFields : [name],
-    LineItem        : [
+        LineItem        : [
-      { Value: name },
+            {Value : name},
-      {
+            {
-        Value : parent.name,
+                Value : parent.name,
-        Label: 'Main Genre'
+                Label : 'Main Genre'
-      },
+            },
-    ],
+        ],
-  }
+    }
 );
 
-annotate my.Genres with {
-  ID  @Common.Text : name  @Common.TextArrangement : #TextOnly;
-}
-
 ////////////////////////////////////////////////////////////////////////////
 //
 //	Genre Details
 //
 annotate my.Genres with @(UI : {
-  Identification : [{ Value: name}],
+    Identification : [{Value : name}],
-  HeaderInfo     : {
+    HeaderInfo     : {
-    TypeName       : '{i18n>Genre}',
+        TypeName       : '{i18n>Genre}',
-    TypeNamePlural : '{i18n>Genres}',
+        TypeNamePlural : '{i18n>Genres}',
-    Title          : { Value: name },
+        Title          : {Value : name},
-    Description    : { Value: ID }
+        Description    : {Value : ID}
-  },
+    },
-  Facets         : [{
+    Facets         : [{
-    $Type  : 'UI.ReferenceFacet',
+        $Type  : 'UI.ReferenceFacet',
-    Label  : '{i18n>SubGenres}',
+        Label  : '{i18n>SubGenres}',
-    Target : 'children/@UI.LineItem'
+        Target : 'children/@UI.LineItem'
-  }, ],
+    }, ],
 });
 
 ////////////////////////////////////////////////////////////////////////////
@@ -113,8 +120,8 @@ annotate my.Genres with @(UI : {
 //	Genres Elements
 //
 annotate my.Genres with {
-  ID   @title: '{i18n>ID}';
+    ID   @title : '{i18n>ID}';
-  name @title: '{i18n>Genre}';
+    name @title : '{i18n>Genre}';
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -122,24 +129,24 @@ annotate my.Genres with {
 //	Authors List
 //
 annotate my.Authors with @(
-  Common.SemanticKey : [ID],
+    Common.SemanticKey : [ID],
-  UI                 : {
+    UI                 : {
-    Identification  : [{ Value: name}],
+        Identification  : [{Value : name}],
-    SelectionFields : [name],
+        SelectionFields : [name],
-    LineItem        : [
+        LineItem        : [
-      { Value: ID },
+            {Value : ID},
-      { Value: dateOfBirth },
+            {Value : dateOfBirth},
-      { Value: dateOfDeath },
+            {Value : dateOfDeath},
-      { Value: placeOfBirth },
+            {Value : placeOfBirth},
-      { Value: placeOfDeath },
+            {Value : placeOfDeath},
-    ],
+        ],
-  }
+    }
 ) {
-  ID  @Common: {
+    ID  @Common: {
-    SemanticObject : 'Authors',
+        SemanticObject : 'Authors',
-    Text: name,
+        Text: name,
-    TextArrangement : #TextOnly,
+        TextArrangement : #TextOnly,
-  };
+    };
 };
 
 ////////////////////////////////////////////////////////////////////////////
@@ -147,16 +154,16 @@ annotate my.Authors with @(
 //	Author Details
 //
 annotate my.Authors with @(UI : {
-  HeaderInfo : {
+    HeaderInfo : {
-    TypeName       : '{i18n>Author}',
+        TypeName       : '{i18n>Author}',
-    TypeNamePlural : '{i18n>Authors}',
+        TypeNamePlural : '{i18n>Authors}',
-    Title          : { Value: name },
+        Title          : {Value : name},
-    Description    : { Value: dateOfBirth }
+        Description    : {Value : dateOfBirth}
-  },
+    },
-  Facets     : [{
+    Facets     : [{
-    $Type  : 'UI.ReferenceFacet',
+        $Type  : 'UI.ReferenceFacet',
-    Target : 'books/@UI.LineItem'
+        Target : 'books/@UI.LineItem'
-  }, ],
+    }, ],
 });
 
 
@@ -165,12 +172,12 @@ annotate my.Authors with @(UI : {
 //	Authors Elements
 //
 annotate my.Authors with {
-  ID           @title: '{i18n>ID}';
+    ID           @title : '{i18n>ID}';
-  name         @title: '{i18n>Name}';
+    name         @title : '{i18n>Name}';
-  dateOfBirth  @title: '{i18n>DateOfBirth}';
+    dateOfBirth  @title : '{i18n>DateOfBirth}';
-  dateOfDeath  @title: '{i18n>DateOfDeath}';
+    dateOfDeath  @title : '{i18n>DateOfDeath}';
-  placeOfBirth @title: '{i18n>PlaceOfBirth}';
+    placeOfBirth @title : '{i18n>PlaceOfBirth}';
-  placeOfDeath @title: '{i18n>PlaceOfDeath}';
+    placeOfDeath @title : '{i18n>PlaceOfDeath}';
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -178,18 +185,18 @@ annotate my.Authors with {
 //	Languages List
 //
 annotate common.Languages with @(
-  Common.SemanticKey : [code],
+    Common.SemanticKey : [code],
-  Identification     : [{ Value: code}],
+    Identification     : [{Value : code}],
-  UI                 : {
+    UI                 : {
-    SelectionFields : [
+        SelectionFields : [
-      name,
+            name,
-      descr
+            descr
-    ],
+        ],
-    LineItem        : [
+        LineItem        : [
-      { Value: code },
+            {Value : code},
-      { Value: name },
+            {Value : name},
-    ],
+        ],
-  }
+    }
 );
 
 ////////////////////////////////////////////////////////////////////////////
@@ -197,22 +204,22 @@ annotate common.Languages with @(
 //	Language Details
 //
 annotate common.Languages with @(UI : {
-  HeaderInfo          : {
+    HeaderInfo          : {
-    TypeName       : '{i18n>Language}',
+        TypeName       : '{i18n>Language}',
-    TypeNamePlural : '{i18n>Languages}',
+        TypeNamePlural : '{i18n>Languages}',
-    Title          : { Value: name },
+        Title          : {Value : name},
-    Description    : { Value: descr }
+        Description    : {Value : descr}
-  },
+    },
-  Facets              : [{
+    Facets              : [{
-    $Type  : 'UI.ReferenceFacet',
+        $Type  : 'UI.ReferenceFacet',
-    Label  : '{i18n>Details}',
+        Label  : '{i18n>Details}',
-    Target : '@UI.FieldGroup#Details'
+        Target : '@UI.FieldGroup#Details'
-  }, ],
+    }, ],
-  FieldGroup #Details : {Data : [
+    FieldGroup #Details : {Data : [
-    { Value: code },
+        {Value : code},
-    { Value: name },
+        {Value : name},
-    { Value: descr }
+        {Value : descr}
-  ]},
+    ]},
 });
 
 ////////////////////////////////////////////////////////////////////////////
@@ -220,19 +227,19 @@ annotate common.Languages with @(UI : {
 //	Currencies List
 //
 annotate common.Currencies with @(
-  Common.SemanticKey : [code],
+    Common.SemanticKey : [code],
-  Identification     : [{ Value: code}],
+    Identification     : [{Value : code}],
-  UI                 : {
+    UI                 : {
-    SelectionFields : [
+        SelectionFields : [
-      name,
+            name,
-      descr
+            descr
-    ],
+        ],
-    LineItem        : [
+        LineItem        : [
-      { Value: descr },
+            {Value : descr},
-      { Value: symbol },
+            {Value : symbol},
-      { Value: code },
+            {Value : code},
-    ],
+        ],
-  }
+    }
 );
 
 ////////////////////////////////////////////////////////////////////////////
@@ -240,35 +247,35 @@ annotate common.Currencies with @(
 //	Currency Details
 //
 annotate common.Currencies with @(UI : {
-  HeaderInfo           : {
+    HeaderInfo           : {
-    TypeName       : '{i18n>Currency}',
+        TypeName       : '{i18n>Currency}',
-    TypeNamePlural : '{i18n>Currencies}',
+        TypeNamePlural : '{i18n>Currencies}',
-    Title          : { Value: descr },
+        Title          : {Value : descr},
-    Description    : { Value: code }
+        Description    : {Value : code}
-  },
-  Facets               : [
-    {
-      $Type  : 'UI.ReferenceFacet',
-      Label  : '{i18n>Details}',
-      Target : '@UI.FieldGroup#Details'
     },
-    {
+    Facets               : [
-      $Type  : 'UI.ReferenceFacet',
+        {
-      Label  : '{i18n>Extended}',
+            $Type  : 'UI.ReferenceFacet',
-      Target : '@UI.FieldGroup#Extended'
+            Label  : '{i18n>Details}',
-    },
+            Target : '@UI.FieldGroup#Details'
-  ],
+        },
-  FieldGroup #Details  : {Data : [
+        {
-    { Value: name },
+            $Type  : 'UI.ReferenceFacet',
-    { Value: symbol },
+            Label  : '{i18n>Extended}',
-    { Value: code },
+            Target : '@UI.FieldGroup#Extended'
-    { Value: descr }
+        },
-  ]},
+    ],
-  FieldGroup #Extended : {Data : [
+    FieldGroup #Details  : {Data : [
-    { Value: numcode },
+        {Value : name},
-    { Value: minor },
+        {Value : symbol},
-    { Value: exponent }
+        {Value : code},
-  ]},
+        {Value : descr}
+    ]},
+    FieldGroup #Extended : {Data : [
+        {Value : numcode},
+        {Value : minor},
+        {Value : exponent}
+    ]},
 });
 
 ////////////////////////////////////////////////////////////////////////////
@@ -276,7 +283,7 @@ annotate common.Currencies with @(UI : {
 //	Currencies Elements
 //
 annotate common.Currencies with {
-  numcode  @title: '{i18n>NumCode}';
+    numcode  @title : '{i18n>NumCode}';
-  minor    @title: '{i18n>MinorUnit}';
+    minor    @title : '{i18n>MinorUnit}';
-  exponent @title: '{i18n>Exponent}';
+    exponent @title : '{i18n>Exponent}';
 }

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-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://ui5.sap.com/resources/sap-ui-core.js"
+	<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-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
-		data-sap-ui-theme="sap_horizon"></script>
+			data-sap-ui-compatVersion="edge"
+			data-sap-ui-theme="sap_horizon"
+			data-sap-ui-frameOptions="allow"
+	></script>
 	<script>
-		sap.ui.getCore().attachInit(() =>
+		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))
-			sap.ushell.Container.createRenderer().placeAt("content")
-		);
 	</script>
+
 </head>
-
+<body class="sapUiBody" id="content"></body>
-<body class="sapUiBody" id="content">
-</body>
-
 </html>

fiori/app/genres/webapp/manifest.json

@@ -33,7 +33,7 @@
     "resources": "resources.json",
     "dataSources": {
       "main": {
-        "uri": "/odata/v2/browse",
+        "uri": "/v2/browse",
         "type": "OData",
         "settings": {
           "annotations": ["localAnnotations"],

fiori/app/xs-app.json

@@ -0,0 +1,24 @@
+{
+  "authenticationMethod": "route",
+  "routes": [
+    {
+      "source": "^/-/cds/.*",
+      "destination": "mtx-api",
+      "authenticationType": "none"
+    },
+    {
+      "source": "^/app/(.*)$",
+      "target": "$1",
+      "localDir": ".",
+      "authenticationType": "xsuaa",
+      "cacheControl": "no-cache, no-store, must-revalidate"
+    },
+    {
+      "source": "^/(.*)$",
+      "target": "$1",
+      "destination": "srv-api",
+      "authenticationType": "xsuaa",
+      "csrfProtection": true
+    }
+  ]
+}

fiori/db/data/sap.capire.bookshop-Books_texts.csv

@@ -0,0 +1,5 @@
+ID_texts;ID;locale;title;descr
+201_de;201;de;Sturmhöhe;Sturmhöhe (Originaltitel: Wuthering Heights) ist der einzige Roman der englischen Schriftstellerin Emily Brontë (1818–1848). Der 1847 unter dem Pseudonym Ellis Bell veröffentlichte Roman wurde vom viktorianischen Publikum weitgehend abgelehnt, heute gilt er als ein Klassiker der britischen Romanliteratur des 19. Jahrhunderts.
+201_fr;201;fr;Les Hauts de Hurlevent;Les Hauts de Hurlevent (titre original : Wuthering Heights), parfois orthographié Les Hauts de Hurle-Vent, est l'unique roman d'Emily Brontë, publié pour la première fois en 1847 sous le pseudonyme d’Ellis Bell. Loin d'être un récit moralisateur, Emily Brontë achève néanmoins le roman dans une atmosphère sereine, suggérant le triomphe de la paix et du Bien sur la vengeance et le Mal.
+207_de;207;de;Jane Eyre;Jane Eyre. Eine Autobiographie (Originaltitel: Jane Eyre. An Autobiography), erstmals erschienen im Jahr 1847 unter dem Pseudonym Currer Bell, ist der erste veröffentlichte Roman der britischen Autorin Charlotte Brontë und ein Klassiker der viktorianischen Romanliteratur des 19. Jahrhunderts. Der Roman erzählt in Form einer Ich-Erzählung die Lebensgeschichte von Jane Eyre (ausgesprochen /ˌdʒeɪn ˈɛə/), die nach einer schweren Kindheit eine Stelle als Gouvernante annimmt und sich in ihren Arbeitgeber verliebt, jedoch immer wieder um ihre Freiheit und Selbstbestimmung kämpfen muss. Als klein, dünn, blass, stets schlicht dunkel gekleidet und mit strengem Mittelscheitel beschrieben, gilt die Heldin des Romans Jane Eyre nicht zuletzt aufgrund der Kino- und Fernsehversionen der melodramatischen Romanvorlage als die bekannteste englische Gouvernante der Literaturgeschichte
+207_fr;252;de;Eleonora;“Eleonora” ist eine Erzählung von Edgar Allan Poe. Sie wurde 1841 erstveröffentlicht. In ihr geht es um das Paradox der Treue in der Treulosigkeit.

fiori/db/hana/index.cds

@@ -2,9 +2,14 @@
 //  Add Author.age and .lifetime with a DB-specific function
 //
 
-using { AdminService } from '@capire/bookshop';
+using { AdminService, sap.common } from '@capire/bookshop';
 
 extend projection AdminService.Authors with {
   YEARS_BETWEEN(dateOfBirth, dateOfDeath)         as age: Integer,
   YEAR(dateOfBirth) || ' – ' || YEAR(dateOfDeath) as lifetime : String
 }
+
+
+// Workaround: include Countries table because csv files point to it
+// TODO fix by ignoring hdbtabledata generation for unused entities
+annotate common.Countries with @cds.persistence.skip : false;

fiori/index.cds

@@ -1 +0,0 @@
-using from './db/common';

fiori/mta.yaml

@@ -0,0 +1,97 @@
+_schema-version: '3.1'
+ID: capire.fiori
+version: 1.0.0
+description: "fiori"
+parameters:
+  enable-parallel-deployments: true
+build-parameters:
+  before-all:
+    - builder: custom
+      commands:
+        - npx -p @sap/cds-dk cds build --production
+
+modules:
+  - name: fiori-srv
+    type: nodejs
+    path: gen/srv
+    parameters:
+      buildpack: nodejs_buildpack
+    build-parameters:
+      builder: npm
+    provides:
+      - name: srv-api # required by consumers of CAP services (e.g. approuter)
+        properties:
+          srv-url: ${default-url}
+      - name: mtx-api # potentially required by approuter
+        properties:
+          mtx-url: ${default-url}
+    requires:
+      - name: fiori-db
+      - name: fiori-registry
+      - name: fiori-auth
+      - name: app-api
+        properties:
+          SUBSCRIPTION_URL: ~{app-protocol}://\${tenant_subdomain}-~{app-uri}
+
+  - name: fiori
+    type: approuter.nodejs
+    path: app/_router # from cds.env.folders. Consider also cds.env.build.target -> gen/app
+    parameters:
+      keep-existing-routes: true
+      disk-quota: 256M
+      memory: 256M
+    properties:
+      TENANT_HOST_PATTERN: "^(.*)-${default-uri}"
+    requires:
+      - name: srv-api
+        group: destinations
+        properties:
+          name: srv-api # must be used in xs-app.json as well
+          url: ~{srv-url}
+          forwardAuthToken: true
+      - name: mtx-api
+        group: destinations
+        properties:
+          name: mtx-api # must be used in xs-app.json as well
+          url: ~{mtx-url}
+      - name: fiori-auth
+    provides:
+      - name: app-api
+        properties:
+          app-protocol: ${protocol}
+          app-uri: ${default-uri}
+
+resources:
+  - name: fiori-db
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: service-manager
+      service-plan: container
+  - name: fiori-registry
+    type: org.cloudfoundry.managed-service
+    requires:
+      - name: mtx-api
+    parameters:
+      service: saas-registry
+      service-plan: application
+      config:
+        xsappname: fiori-${org}-${space}
+        appName: fiori-${org}-${space}
+        displayName: fiori
+        description: A simple CAP project.
+        category: 'Category'
+        appUrls:
+          getDependencies: ~{mtx-api/mtx-url}/-/cds/saas-provisioning/dependencies
+          onSubscription: ~{mtx-api/mtx-url}/-/cds/saas-provisioning/tenant/{tenantId}
+          onSubscriptionAsync: false
+          onUnSubscriptionAsync: false
+          callbackTimeoutMillis: 300000
+  - name: fiori-auth
+    type: org.cloudfoundry.managed-service
+    parameters:
+      service: xsuaa
+      service-plan: application
+      path: ./xs-security.json
+      config:
+        xsappname: fiori-${org}-${space}
+        tenant-mode: shared

fiori/package.json

@@ -4,17 +4,24 @@
   "dependencies": {
     "@capire/bookstore": "*",
     "@sap/cds": ">=5",
-    "@cap-js-community/odata-v2-adapter": "^1",
+    "@sap/cds-mtxs": "^1",
-    "express": "^4.17.1"
+    "@sap/cds-odata-v2-adapter-proxy": "^1.9.0",
-  },
+    "@sap/xssec": "^3",
-  "devDependencies": {
+    "express": "^4.17.1",
-    "@cap-js/sqlite": "^1"
+    "hdb": "^0.19.5",
+    "passport": ">=0.4.1"
   },
   "scripts": {
-    "start": "cds-serve",
+    "start": "cds run --in-memory?",
     "watch": "cds watch"
   },
+  "engines": {
+    "node": "^16"
+  },
   "cds": {
+    "features": {
+      "deploy_data_onconflict": "replace"
+    },
     "requires": {
       "ReviewsService": {
         "kind": "odata",
@@ -31,12 +38,12 @@
         "[development]": {
           "kind": "file-based-messaging"
         },
-        "[hybrid]": {
+        "[hybrid!]": {
           "kind": "enterprise-messaging-shared"
         }
       },
       "db": {
-        "kind": "sql"
+        "kind": "sql-mt"
       },
       "db-ext": {
         "[development]": {
@@ -45,15 +52,41 @@
         "[production]": {
           "model": "db/hana"
         }
+      },
+      "multitenancy": true,
+      "toggles": true,
+      "extensibility": true,
+      "cds.xt.ExtensibilityService": {
+        "element-prefix": [
+          "x_"
+        ],
+        "extension-allowlist": [
+          {
+            "for": [
+              "sap.capire.orders"
+            ],
+            "kind": "entity",
+            "new-fields": 3
+          },
+          {
+            "for": [
+              "OrdersService"
+            ],
+            "new-entities": 2
+          }
+        ]
+      },
+      "[production]": {
+        "auth": {
+          "kind": "xsuaa"
+        },
+        "db": {
+          "kind": "hana-mt"
+        }
+      },
+      "approuter": {
+        "kind": "cloudfoundry"
       }
-    },
-    "hana": {
-      "deploy-format": "hdbtable"
     }
-  },
+  }
-  "sapux": [
-    "app/admin-authors",
-    "app/admin-books",
-    "app/browse"
-  ]
 }

fiori/server.js

@@ -0,0 +1,15 @@
+const cds = require("@sap/cds")
+
+// install OData v2 adapter
+const proxy = require('@sap/cds-odata-v2-adapter-proxy')
+const proxyOpts = global.it ? { target:'auto' } : {} // for tests, set 'auto' to detect port dynamically
+cds.on('bootstrap', app => app.use(proxy(proxyOpts)))
+
+module.exports = require('@capire/bookstore/server.js')
+
+// For didactic reasons in capire, run below services embedded
+// TODO find a better way to switch this
+if (cds.requires.multitenancy) {
+  delete cds.env.requires.OrdersService
+  delete cds.env.requires.ReviewsService
+}

fiori/srv/index.cds

@@ -0,0 +1 @@
+using from '@capire/bookstore';

fiori/xs-security.json

@@ -0,0 +1,51 @@
+{
+  "scopes": [
+    {
+      "name": "$XSAPPNAME.admin",
+      "description": "admin"
+    },
+    {
+      "name": "$XSAPPNAME.mtcallback",
+      "description": "Subscription via SaaS Registry",
+      "grant-as-authority-to-apps": [
+        "$XSAPPNAME(application,sap-provisioning,tenant-onboarding)"
+      ]
+    },
+    {
+      "name": "$XSAPPNAME.cds.Subscriber",
+      "description": "Subscribe to applications"
+    },
+    {
+      "name": "$XSAPPNAME.cds.ExtensionDeveloper",
+      "description": "Extend CAP applications via extension projects"
+    },
+    {
+      "name": "$XSAPPNAME.cds.UIFlexDeveloper",
+      "description": "Extend CAP applications via UIFlex extensibility"
+    }
+  ],
+  "attributes": [],
+  "role-templates": [
+    {
+      "name": "admin",
+      "description": "admin",
+      "scope-references": [
+        "$XSAPPNAME.admin"
+      ]
+    },
+    {
+      "name": "ExtensionDeveloper",
+      "description": "Extension development including UIFlex extensibility",
+      "scope-references": [
+        "$XSAPPNAME.cds.ExtensionDeveloper",
+        "$XSAPPNAME.cds.UIFlexDeveloper"
+      ]
+    }
+  ],
+  "authorities-inheritance": false,
+  "authorities": [
+    "$XSAPPNAME.cds.Subscriber",
+    "$XSAPPNAME.cds.ExtensionDeveloper",
+    "$XSAPPNAME.cds.UIFlexDeveloper"
+  ]
+}

hello/README.md

@@ -12,4 +12,4 @@ Then call the service at: http://localhost:4004/say/hello(to='world')
 Learn more about:
 
 - [Hello World!](https://cap.cloud.sap/docs/get-started/hello-world)
-- [Using TypeScript](https://cap.cloud.sap/docs/node.js/typescript)
+- [Using TypeScript](https://cap.cloud.sap/docs/get-started/using-typescript)

hello/package.json

@@ -3,10 +3,40 @@
   "version": "1.0.0",
   "scripts": {
     "test": "npx jest --silent",
-    "start": "cds-serve srv/world.cds",
+    "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"
+    }
   }
 }

hello/srv/world.js

@@ -1,7 +1,3 @@
 module.exports = class say {
-  hello(req) {
+  hello(req) { return `Hello ${req.data.to}!` }
-    let {to} = req.data
-    if (to === 'me') to = require('os').userInfo().username
-    return `Hello ${to}!`
-  }
 }

hello/srv/world.ts

@@ -1,4 +1,4 @@
-import { Request } from "@sap/cds"
+import type { Request } from "@sap/cds/apis/services"
 
 module.exports = class say {
     hello(req: Request) {

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)
+    })
+
+})

hello/test/test.http

@@ -1,5 +1 @@
-GET http://localhost:4004/odata/v4/say/hello
+GET http://localhost:4004/say/hello(to='world')
-###
-
-GET http://localhost:4004/odata/v4/say/hello(to='me')
-###

loggers/app/loggers.html

@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-  <title> cds.log </title>
-  <link rel="stylesheet" href="https://unpkg.com/primitive-ui/dist/css/main.css">
-  <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
-  <script src="https://cdn.jsdelivr.net/npm/vue@3/dist/vue.global.prod.js"></script>
-  <style>
-    select { border-color: transparent; padding: 4px 12px; margin: 0px; }
-    button { padding: 2px 11px; margin: 0px 4px; font: 90% italic; }
-  </style>
-</head>
-
-<body class="small-container" , style="margin-top: 70px;">
-  <div id='app'>
-    <h1> Log Levels </h1>
-    <input type="text" placeholder="Search by ID or Log Level..." @input="fetch">
-    <table id='loggers'>
-      <thead>
-        <th> Module ID </th>
-        <th> Log Level </th>
-      </thead>
-      <tr v-for="each in list">
-        <td>{{ each.id }}</td>
-        <td><select v-bind:id="each.id" v-model="each.level" @change="set">
-            <option>SILENT</option>
-            <option>ERROR</option>
-            <option>WARN</option>
-            <option>INFO</option>
-            <option>DEBUG</option>
-            <option>TRACE</option>
-          </select>
-        </td>
-      </tr>
-    </table>
-    <h4>Log Format:</h4>
-    [ <button class="round-button" :class={'muted-button':!format.timestamp} @click="toggle_format" id="timestamp">Timestamp </button>
-    | <button class="round-button" :class={'muted-button':!format.level} @click="toggle_format" id="level">Log Level </button>
-    | <button class="round-button" :class={'muted-button':!format.tenant} @click="toggle_format" id="tenant">Tenant </button>
-    | <button class="round-button" :class={'muted-button':!format.reqid} @click="toggle_format" id="reqid">Request ID </button>
-    | <button class="round-button" :class={'muted-button':!format.id} @click="toggle_format" id="module">Logger ID </button>
-    ] - <i>log message ...</i>
-  </div>
-</body>
-
-<script>
-  axios.defaults.headers['Content-Type'] = 'application/json'
-  axios.defaults.baseURL = '/log'
-  const loggers = Vue.createApp({ el: '#app',
-  data() {
-      return {
-        format: { timestamp:false, level:false, tenant:false, reqid:false, id:true, },
-        list: [],
-      }
-    },
-    methods: {
-      async fetch (eve) {
-        this.list = (await axios.get (`/Loggers${
-          eve && eve.target.value ? `?$search=${eve.target.value}` : ''
-        }`)).data
-      },
-      async set (eve) {
-        const { id, value:level } = eve.target
-        await axios.put (`/Logger/${id}`, {id,level})
-      },
-      async toggle_format (eve) {
-        this.format[eve.target.id] = !this.format[eve.target.id]
-        await axios.post (`/format`, this.format)
-      },
-    },
-  }).mount('#app')
-  loggers.fetch() // initially fill list of loggers
-</script>
-
-</html>

loggers/package.json

@@ -1,17 +0,0 @@
-{
-  "name": "@capire/loggers",
-  "version": "1.0.0",
-  "description": "Simple sample on how to dynamically set cds.log levels and formats.",
-  "files": [
-    "app",
-    "srv"
-  ],
-  "dependencies": {
-    "@sap/cds": ">=5.9",
-    "express": "^4.17.1"
-  },
-  "scripts": {
-    "start": "cds-serve",
-    "watch": "cds watch"
-  }
-}

loggers/readme.md

@@ -1,11 +0,0 @@
-# Dynamically Set `cds.log` Levels and Formats
-
-### Run 
-
-```sh
-cds watch
-```
-
-### Test
-
-Either using the UI through http://localhost:4004/loggers.html, or try the requests in `test/requests.http`

loggers/srv/dummy.cds

@@ -1,3 +0,0 @@
-service Sue {
-  entity Dummy { key ID: UUID; title: String; }
-}

loggers/srv/loggers.cds

@@ -1,20 +0,0 @@
-@rest service LogService {
-
-  @readonly entity Loggers : Logger {};
-  entity Logger {
-    key id : String;
-    level  : String;
-  }
-
-  action format (
-    timestamp : Boolean,
-    level     : Boolean,
-    tenant    : Boolean,
-    reqid     : Boolean,
-    id        : Boolean,
-  );
-
-  action debug (logger : String) returns Logger;
-  action reset (logger : String) returns Logger;
-
-}

loggers/srv/loggers.js

@@ -1,56 +0,0 @@
-const cds = require ('@sap/cds')
-const LOG = cds.log('cds.log')
-
-module.exports = class LogService extends cds.Service {
-  init(){
-
-    this.on('GET','Loggers', (req)=>{
-      let loggers = Object.values(cds.log.loggers).map (_logger)
-      let {$search} = req._.req.query
-      if ($search) {
-        const re = RegExp($search,'i')
-        loggers = loggers.filter (l => re.test(l.id) || re.test(l.level))
-      }
-      return loggers.sort ((a,b) => a.id < b.id ? -1 : 1)
-    })
-
-    this.on('PUT','Logger', (req)=>{
-      const {id} = req.params[0] || req.data
-      if (!id) return req.reject('No logger id specified in request')
-      return _logger (cds.log (id, req.data))
-    })
-
-    this.on('debug', (req)=>{
-      const {logger:id} = req.params[0] || req.data
-      if (!id) return req.reject('No logger id specified in request')
-      return _logger (cds.log (id, {level:'debug'}))
-    })
-
-    this.on('reset', (req)=>{
-      const {logger:id} = req.params[0] || req.data
-      if (!id) return req.reject('No logger id specified in request')
-      return _logger (cds.log (id, {level:'info'}))
-    })
-
-    this.on('format', (req)=>{
-      const $ = req.data; LOG.info('format:',$)
-      // Set format for new loggers constructed subsequently
-      cds.log.format = (id, level, ...args) => {
-        const fmt = []
-        if ($.timestamp) fmt.push ('|', (new Date).toISOString())
-        if ($.level) fmt.push ('|', _levels[level].padEnd(5))
-        if ($.tenant) fmt.push ('|', cds.context && cds.context.tenant)
-        if ($.reqid) fmt.push ('|', cds.context && cds.context.id)
-        if ($.id) fmt.push ('|', id)
-        fmt[0] = '[', fmt.push ('] -', ...args)
-        return fmt
-      }
-      // Apply this format to all existing loggers
-      Object.values(cds.log.loggers).forEach (l => l.setFormat (cds.log.format))
-    })
-  }
-
-}
-
-const _logger = ({id,level}) => ({id, level:_levels[level] })
-const _levels = [ 'SILENT', 'ERROR', 'WARN', 'INFO', 'DEBUG', 'TRACE' ]

loggers/test/requests.http

@@ -1,18 +0,0 @@
-http://localhost:4004/loggers.html
-@body: = Content-Type: application/json\n\n
-
-###
-GET http://localhost:4004/log/Loggers
-
-###
-PUT http://localhost:4004/log/Logger/sqlite
-{{body:}} { "level": "debug" }
-
-###
-POST http://localhost:4004/log/debug(logger='sqlite')
-
-###
-POST http://localhost:4004/log/reset(logger='sqlite')
-
-### Dummy request to see sqlite debug output
-GET http://localhost:4004/sue/Dummy

media/srv/media-service.cds

@@ -1,7 +1,6 @@
 using { sap.capire.media as db } from '../db/data-model';
 namespace sap.capire.media;
 
-@path: '/media-server'
 service MediaServer  {
     entity Media   as projection on db.Media ;
 }

media/srv/media-service.js

@@ -10,7 +10,7 @@ module.exports = srv => {
   })
 
   srv.on('UPDATE', 'Media', (req, next) => {
-    const url = req.path
+    const url = req._.req.path
     if (url.includes('content')) {
       const id = req.data.id
       const obj = mediaDB.get(id)
@@ -32,7 +32,7 @@ module.exports = srv => {
   })
 
   srv.on('READ', 'Media', (req, next) => {
-    const url = req.path
+    const url = req._.req.path
     if (url.includes('content')) {
       const id = req.data.id
       const mediaObj = mediaDB.get(id)
@@ -40,7 +40,7 @@ module.exports = srv => {
         req.reject(404, 'Media not found for the ID')
         return
       }
-      const decodedMedia = Buffer.from(
+      const decodedMedia = new Buffer(
         mediaObj.media.split(';base64,').pop(),
         'base64'
       )

orders/_i18n/i18n_de.properties

@@ -1,3 +0,0 @@
-Order = Bestellung
-Orders = Bestellungen
-Price = Preis

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

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é