Fix ignore version

Bump the production-dependencies group across 1 directory with 2 updates (#737 )
Bumps the production-dependencies group with 2 updates in the / directory: [@sap/cds](https://cap.cloud.sap/) and [@cap-js-community/odata-v2-adapter](https://github.com/cap-js-community/odata-v2-adapter). Updates `@sap/cds` from 7.9.2 to 7.9.3 Updates `@cap-js-community/odata-v2-adapter` from 1.12.10 to 1.12.11 - [Release notes](https://github.com/cap-js-community/odata-v2-adapter/releases) - [Changelog](https://github.com/cap-js-community/odata-v2-adapter/blob/main/CHANGELOG.md) - [Commits](https://github.com/cap-js-community/odata-v2-adapter/compare/v1.12.10...v1.12.11) --- updated-dependencies: - dependency-name: "@sap/cds" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-dependencies - dependency-name: "@cap-js-community/odata-v2-adapter" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: production-dependencies ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-07-01 16:47:56 +02:00 · 2024-07-01 16:46:51 +02:00 · 2024-06-24 14:47:22 +02:00 · 2024-06-17 09:13:47 +02:00 · 2024-06-13 00:22:28 +02:00 · 2024-06-10 14:06:53 +02:00
95 changed files with 1959 additions and 5305 deletions
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,31 +0,0 @@
 {
  "extends": [
    "plugin:@sap/cds/recommended",
    "eslint:recommended"
  ],
  "env": {
    "browser": true,
    "es2022": true,
    "node": true,
    "jest": true,
    "mocha": true
  },
  "globals": {
    "SELECT": true,
    "INSERT": true,
    "UPSERT": true,
    "UPDATE": true,
    "DELETE": true,
    "CREATE": true,
    "DROP": true,
    "CDL": true,
    "CQL": true,
    "cds": true
  },
  "rules": {
    "no-console": "off",
    "require-atomic-updates": "off",
        "require-await":"warn",
        "no-unused-vars": ["warn", { "argsIgnorePattern": "_" }]
  }
 }
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -5,4 +5,16 @@ updates:
  directory: /
  versioning-strategy: increase-if-necessary
  schedule:
-    interval: daily
+    interval: weekly
  groups:
    production-dependencies:
      dependency-type: "production"
    development-dependencies:
      dependency-type: "development"
  ignore:
    - dependency-name: "chai"
        # chai 5 doesn't work atm w/ cds.test, TODO fix that in cds.test
      versions: ["5.x"]
    - dependency-name: "chai-as-promised"
        # chai-as-promised 8 doesn't work atm w/ cds.test, TODO fix that in cds.test
      versions: ["8.x"]
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -11,19 +11,28 @@ on:
 jobs:
  build:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        node-version: [16.x, 14.x]
+        node-version: [20.x, 18.x]
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v4
      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: 20.x
    - run: npm ci
    - run: npm run lint
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,6 @@ reviews/db/test.db
 *.openapi3.json
 *.sqlite
 *.db
@types/
@cds-models/
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -4,13 +4,11 @@
 	// List of extensions which should be recommended for users of this workspace.
 	"recommendations": [
 		"qwtel.sqlite-viewer",
 		"sapse.vscode-cds",
 		"dbaeumer.vscode-eslint",
 		"esbenp.prettier-vscode",
 		"mechatroner.rainbow-csv",
 		"humao.rest-client",
 		"alexcvzz.vscode-sqlite",
 		"hbenl.vscode-mocha-test-adapter",
 		"sdras.night-owl",
 		"vsls-contrib.codetour"
 	],
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -14,9 +14,7 @@
      "**/odata-v4/okra/**"
    ]
  },
-  "mochaExplorer.debuggerConfig": "Debug Mocha Tests",
+  "eslint.probe": [
  "mochaExplorer.parallel": true,
  "eslint.validate": [
    "cds",
    "csn",
    "csv",
--- a/LICENSES/Apache-2.0.txt
+++ b/LICENSES/Apache-2.0.txt
@@ -1,73 +0,0 @@
 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.
--- a/README.md
+++ b/README.md
@@ -1,10 +1,16 @@
 # 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). &rarr; See [**Overview** of contained samples](samples.md)
+Find here a collection of samples for the [SAP Cloud Application Programming Model](https://cap.cloud.sap) organized in a simplistic [monorepo setup](samples.md#all-in-one-monorepo).
 [See **Overview** of contained samples](samples.md):
 ![](etc/samples.drawio.svg)
 ![](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/))
@@ -54,24 +60,6 @@ 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!
--- a/bookshop/app/index.cds
+++ b/bookshop/app/index.cds
@@ -1,2 +0,0 @@
 // Incorporate pre-build extensions from...
 using from '../../common';
--- a/bookshop/db/data/_sap.capire.bookshop-Authors.csv
+++ b/bookshop/db/data/_sap.capire.bookshop-Authors.csv
@@ -1,5 +0,0 @@
 ID;name;dateOfBirth;placeOfBirth;dateOfDeath;placeOfDeath
 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
 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
--- a/bookshop/db/data/_sap.capire.bookshop-Books.csv
+++ b/bookshop/db/data/_sap.capire.bookshop-Books.csv
@@ -1,6 +0,0 @@
 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
 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
 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
 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
--- a/bookshop/db/data/_sap.capire.bookshop-Books_texts.csv
+++ b/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.
--- a/bookshop/db/data/_sap.capire.bookshop-Genres.csv
+++ b/bookshop/db/data/_sap.capire.bookshop-Genres.csv
@@ -1,16 +0,0 @@
 ID;parent_ID;name
 10;;Fiction
 11;10;Drama
 12;10;Poetry
 13;10;Fantasy
 14;10;Science Fiction
 15;10;Romance
 16;10;Mystery
 17;10;Thriller
 18;10;Dystopia
 19;10;Fairy Tale
 20;;Non-Fiction
 21;20;Biography
 22;21;Autobiography
 23;20;Essay
 24;20;Speech
--- a/bookshop/db/data/sap.capire.bookshop-Authors.csv
+++ b/bookshop/db/data/sap.capire.bookshop-Authors.csv
@@ -0,0 +1,5 @@
 ID,name,dateOfBirth,placeOfBirth,dateOfDeath,placeOfDeath
 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"
 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"
--- a/bookshop/db/data/sap.capire.bookshop-Books.csv
+++ b/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;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
-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;15;EUR;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
--- a/bookshop/db/data/sap.capire.bookshop-Books.texts.csv
+++ b/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."
--- a/bookshop/db/data/sap.capire.bookshop-Genres.csv
+++ b/bookshop/db/data/sap.capire.bookshop-Genres.csv
@@ -0,0 +1,16 @@
 ID,parent_ID,name
 10,,Fiction
 11,10,Drama
 12,10,Poetry
 13,10,Fantasy
 14,10,Science Fiction
 15,10,Romance
 16,10,Mystery
 17,10,Thriller
 18,10,Dystopia
 19,10,Fairy Tale
 20,,Non-Fiction
 21,20,Biography
 22,21,Autobiography
 23,20,Essay
 24,20,Speech
--- a/bookshop/db/init.js
+++ b/bookshop/db/init.js
@@ -4,15 +4,10 @@
 * currencies, if not obtained through @capire/common.
 */
-module.exports = async (tx)=>{
+// NOTE: We use cds.on('served') to delay the UPSERTs after the db init
-
+// to run after all INSERTs from .csv files happened.
-  const has_common = tx.model.definitions['sap.common.Currencies']?.elements.numcode
+module.exports = cds.on('served', ()=> cds.run(
-  if (has_common) return
+  UPSERT.into ('sap.common.Currencies') .columns (
  const already_filled = await tx.exists('sap.common.Currencies',{code:'EUR'})
  if (already_filled) return
  await tx.run (INSERT.into ('sap.common.Currencies') .columns (
    [ 'code', 'symbol', 'name' ]
  ) .rows (
    [ 'EUR', '€', 'Euro' ],
@@ -20,5 +15,5 @@ module.exports = async (tx)=>{
    [ 'GBP', '£', 'British Pound' ],
    [ 'ILS', '₪', 'Shekel' ],
    [ 'JPY', '¥', 'Yen' ],
-  ))
+  )
-}
+))
--- a/bookshop/db/schema.cds
+++ b/bookshop/db/schema.cds
@@ -2,25 +2,25 @@ using { Currency, managed, sap } from '@sap/cds/common';
 namespace sap.capire.bookshop;
 entity Books : managed {
-  key ID : Integer;
+  key ID   : Integer;
-  title  : localized String(111);
+  title    : localized String(111)  @mandatory;
-  descr  : localized String(1111);
+  descr    : localized String(1111);
-  author : Association to Authors;
+  author   : Association to Authors @mandatory;
-  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);
+  name         : String(111) @mandatory;
  dateOfBirth  : Date;
  dateOfDeath  : Date;
  placeOfBirth : String;
  placeOfDeath : String;
-  books  : Association to many Books on books.author = $self;
+  books        : Association to many Books on books.author = $self;
 }
 /** Hierarchically organized Code List for Genres */
--- a/bookshop/package.json
+++ b/bookshop/package.json
@@ -9,19 +9,16 @@
    "index.cds",
    "index.js"
  ],
  "devDependencies": {
    "@cap-js/sqlite": "*"
  },
  "dependencies": {
-    "@sap/cds": ">=5.9",
+    "@sap/cds": ">=7",
-    "express": "^4.17.1",
+    "express": "^4.17.1"
    "passport": ">=0.4.1"
  },
  "scripts": {
    "genres": "cds serve test/genres.cds",
-    "start": "cds run",
+    "start": "cds-serve",
    "watch": "cds watch"
  },
  "cds": {
    "requires": {
      "db": "sql"
    }
  }
 }
--- a/bookshop/readme.md
+++ b/bookshop/readme.md
@@ -20,12 +20,12 @@ npm run watch
 | Links to capire                                                                                           | Sample files / folders               |
 | --------------------------------------------------------------------------------------------------------- | ------------------------------------ |
-| [Project Setup & Layouts](https://cap.cloud.sap/docs/get-started/projects#sharing-and-reusing-content)    | [`./`](./)                           |
+| [Project Setup & Layouts](https://cap.cloud.sap/docs/get-started/jumpstart#project-structure)             | [`./`](./)                           |
-| [Domain Modeling with CDS](https://cap.cloud.sap/docs/guides/domain-models)                               | [`./db/schema.cds`](./db/schema.cds) |
+| [Domain Modeling with CDS](https://cap.cloud.sap/docs/guides/domain-modeling)                               | [`./db/schema.cds`](./db/schema.cds) |
-| [Defining Services](https://cap.cloud.sap/docs/guides/services#defining-services)                         | [`./srv/*.cds`](./srv)               |
+| [Defining Services](https://cap.cloud.sap/docs/guides/providing-services#modeling-services)               | [`./srv/*.cds`](./srv)               |
-| [Single-purposed Services](https://cap.cloud.sap/docs/guides/services#single-purposed-services)           | [`./srv/*.cds`](./srv)               |
+| [Single-purposed Services](https://cap.cloud.sap/docs/guides/providing-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/service-impl)                                     | [`./srv/*.js`](./srv)                |
+| [Adding Custom Logic](https://cap.cloud.sap/docs/guides/providing-services#adding-custom-logic)           | [`./srv/*.js`](./srv)                |
 | Adding Tests                                                                                              | [`./test`](./test)                   |
-| [Sharing for Reuse](https://cap.cloud.sap/docs/guides/reuse-and-compose)                                  | [`./index.cds`](./index.cds)         |
+| [Sharing for Reuse](https://cap.cloud.sap/docs/guides/extensibility/composition)                          | [`./index.cds`](./index.cds)         |
--- a/bookshop/srv/admin-service.cds
+++ b/bookshop/srv/admin-service.cds
@@ -1,5 +1,5 @@
 using { sap.capire.bookshop as my } from '../db/schema';
-service AdminService @(requires:'admin') {
+service AdminService @(requires:'admin', path:'/admin') {
  entity Books as projection on my.Books;
  entity Authors as projection on my.Authors;
 }
--- a/bookshop/srv/admin-service.js
+++ b/bookshop/srv/admin-service.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 module.exports = class AdminService extends cds.ApplicationService { init(){
  this.before ('NEW','Authors', genid)
@@ -8,6 +8,6 @@ module.exports = class AdminService extends cds.ApplicationService { init(){
 /** Generate primary keys for target entity in request */
 async function genid (req) {
-  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 - id % 100 + 100 + 1
 }
--- a/bookshop/srv/cat-service.cds
+++ b/bookshop/srv/cat-service.cds
@@ -10,12 +10,7 @@ service CatalogService @(path:'/browse') {
    author.name as author
  } excluding { createdBy, modifiedBy };
 <<<<<<< HEAD
  @requires_: 'authenticated-user'
  action submitOrder (book : Integer, amount: Integer);
 =======
  @requires: 'authenticated-user'
  action submitOrder ( book: Books:ID, quantity: Integer ) returns { stock: Integer };
  event OrderedBook : { book: Books:ID; quantity: Integer; buyer: String };
 >>>>>>> 534af7ffee60e086c563dbaa450e86e5fca5cf2b
 }
--- a/bookshop/srv/cat-service.js
+++ b/bookshop/srv/cat-service.js
@@ -1,29 +1,35 @@
 const cds = require('@sap/cds')
 module.exports = class CatalogService extends cds.ApplicationService { init() {
-class CatalogService extends cds.ApplicationService { init(){
+  const { Books } = cds.entities('sap.capire.bookshop')
  const { Books } = cds.entities ('sap.capire.bookshop')
  const { ListOfBooks } = this.entities
  // Reduce stock of ordered books if available stock suffices
  this.on ('submitOrder', async req => {
    const {book,quantity} = req.data
    if (quantity < 1) return req.reject (400,`quantity has to be 1 or more`)
    let b = await SELECT `stock` .from (Books,book)
    if (!b) return req.error (404,`Book #${book} doesn't exist`)
    let {stock} = b
    if (quantity > stock) return req.reject (409,`${quantity} exceeds stock for book #${book}`)
    await UPDATE (Books,book) .with ({ stock: stock -= quantity })
    await this.emit ('OrderedBook', { book, quantity, buyer:req.user.id })
    return { stock }
  })
  // Add some discount for overstocked books
-  this.after ('READ', ListOfBooks, each => {
+  this.after('each', ListOfBooks, book => {
-    if (each.stock > 111) each.title += ` -- 11% discount!`
+    if (book.stock > 111) book.title += ` -- 11% discount!`
  })
  // Reduce stock of ordered books if available stock suffices
  this.on('submitOrder', async req => {
    let { book:id, quantity } = req.data
    let book = await SELECT.from (Books, id, b => b.stock)
    // Validate input data
    if (!book) return req.error (404, `Book #${id} doesn't exist`)
    if (quantity < 1) return req.error (400, `quantity has to be 1 or more`)
    if (quantity > book.stock) return req.error (409, `${quantity} exceeds stock for book #${id}`)
    // Reduce stock in database and return updated stock value
    await UPDATE (Books, id) .with ({ stock: book.stock -= quantity })
    return book
  })
  // Emit event when an order has been submitted
  this.after('submitOrder', async (_,req) => {
    let { book, quantity } = req.data
    await this.emit('OrderedBook', { book, quantity, buyer: req.user.id })
  })
  // Delegate requests to the underlying generic service
  return super.init()
 }}
 module.exports = { CatalogService }
--- a/bookshop/srv/user-service.cds
+++ b/bookshop/srv/user-service.cds
@@ -1,7 +1,7 @@
 /**
 * Exposes user information
 */
-service UserService {
+service UserService @(path: '/user') {
  /**
   * The current user
   */
--- a/bookstore/server.js
+++ b/bookstore/server.js
@@ -13,10 +13,3 @@ cds.once('bootstrap',(app)=>{
 // 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
--- a/bookstore/srv/mashup.cds
+++ b/bookstore/srv/mashup.cds
@@ -4,20 +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
-  @Common.Label : '{i18n>Rating}'
+  numberOfReviews : Integer @title : '{i18n>NumberOfReviews}';
  rating  : Decimal;
  @Common.Label : '{i18n>NumberOfReviews}'
  numberOfReviews : Integer;
 }
@@ -25,18 +21,11 @@ extend Books with {
 //  Extend Orders with Books as Products
 //
 using { sap.capire.orders.Orders } from '@capire/orders';
-extend Orders with {
+extend Orders:Items with {
-  extend Items with {
+  book : Association to Books on product.ID = book.ID
    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';
--- a/data-viewer/app/viewer/app.js
+++ b/data-viewer/app/viewer/app.js
@@ -1,5 +1,5 @@
 /* global Vue axios */ //> from vue.html
-const GET = (url) => axios.get('/-data'+url)
+const GET = (url) => axios.get('/odata/v4/-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) => {
--- a/data-viewer/srv/data-service.cds
+++ b/data-viewer/srv/data-service.cds
@@ -20,6 +20,7 @@
   * The actual data, organized by column name
   */
  entity Data @cds.persistence.skip {
    key ID   : String;   // to be OData-compliant
    record   : array of {
      column : String;
      data   : String;
--- a/data-viewer/srv/data-service.js
+++ b/data-viewer/srv/data-service.js
@@ -36,8 +36,11 @@ 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]) => {return {column, data}})
+      const record = Object.entries(line).map(([column, data]) => ({ column, data }))
-      return { record }
+      return {
        record,
        ID: cds.utils.uuid() // just to be OData-compliant
      }
    })
  })
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -0,0 +1,36 @@
 const cds = require('@sap/eslint-plugin-cds')
 const globals = require('globals')
 const js = require('@eslint/js')
 module.exports = [
  cds.configs.recommended,
  js.configs.recommended,
  {
    languageOptions: {
      globals: {
        es2022: true,
        ...globals.browser,
        ...globals.node,
        ...globals.jest,
        ...globals.mocha,
        cds: true,
        sap: true,
        CDL: true,
        CQL: true,
        CREATE: true,
        DELETE: true,
        DROP: true,
        INSERT: true,
        SELECT: true,
        UPDATE: true,
        UPSERT: true
      }
    },
    rules: {
      'no-console': 'off',
      'no-unused-vars': ['warn', { argsIgnorePattern: '^_' }],
      'require-atomic-updates': 'off',
      'require-await': 'warn'
    }
  }
 ]
--- a/etc/dark.drawio.svg
+++ b/etc/dark.drawio.svg
@@ -1,13 +1,13 @@
-<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="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);">
+<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);">
    <defs/>
    <g>
-        <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"/>
+        <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"/>
        <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">
+                <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: 188px; margin-left: 173px;">
+                    <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 style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                        <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: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                            <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>
@@ -17,39 +17,39 @@
                        </div>
                    </div>
                </foreignObject>
-                <text x="217" y="192" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="224" y="246" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
                    @capire/...
                </text>
            </switch>
        </g>
-        <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"/>
+        <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"/>
        <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">
+                <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: 173px;">
+                    <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 style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                        <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: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                            <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>
-                                    fiori
+                                    bookstore
                                </b>
                            </div>
                        </div>
                    </div>
                </foreignObject>
-                <text x="217" y="92" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <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 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 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 style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                <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: 138px; margin-left: 257px;">
+                    <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 style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                        <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: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                            <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>
@@ -59,18 +59,18 @@
                        </div>
                    </div>
                </foreignObject>
-                <text x="301" y="142" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <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 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"/>
+        <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 style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                <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: 238px; margin-left: 90px;">
+                    <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 style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                        <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: #333333; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                            <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>
@@ -80,18 +80,18 @@
                        </div>
                    </div>
                </foreignObject>
-                <text x="134" y="242" fill="#333333" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="311" y="197" 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"/>
+        <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 style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                <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: 138px; margin-left: 89px;">
+                    <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 style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                        <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: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                            <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>
@@ -101,26 +101,26 @@
                        </div>
                    </div>
                </foreignObject>
-                <text x="133" y="142" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <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 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 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 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 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 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 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 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 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 217 148 L 217 136.99" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
+        <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 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 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 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 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 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 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 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"/>
+        <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 style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                <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: 88px;">
+                    <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 style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                        <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: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                            <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>
@@ -130,18 +130,18 @@
                        </div>
                    </div>
                </foreignObject>
-                <text x="132" y="45" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <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 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"/>
+        <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 style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                <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: 93px; margin-left: 2px;">
+                    <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 style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                        <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: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                            <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>
@@ -149,23 +149,46 @@
                        </div>
                    </div>
                </foreignObject>
-                <text x="46" y="97" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <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.55 72.11 L 89.76 66.54" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
+        <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 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 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 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 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 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 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 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 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 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"/>
+        <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>
                                    fiori
                                </b>
                            </div>
                        </div>
                    </div>
                </foreignObject>
                <text x="224" y="45" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
                    @capire/...
                </text>
            </switch>
        </g>
        <path d="M 224 101 L 224 89.99" fill="none" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="stroke"/>
        <path d="M 224 83.24 L 228.5 92.24 L 224 89.99 L 219.5 92.24 Z" fill="#ffffff" stroke="#ffffff" stroke-width="2" stroke-miterlimit="10" pointer-events="all"/>
    </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%">
-                Viewer does not support full SVG 1.1
+                Text is not SVG - cannot display
            </text>
        </a>
    </switch>
--- a/etc/incidents.drawio.svg
+++ b/etc/incidents.drawio.svg
@@ -1,13 +1,13 @@
-<svg host="65bd71144e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="569px" height="428px" viewBox="-0.5 -0.5 569 428" content="&lt;mxfile&gt;&lt;diagram id=&quot;QQJxv4aCTC7ZgE7HHOvM&quot; name=&quot;Page-1&quot;&gt;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;">
+<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;">
    <defs/>
    <g>
-        <rect x="1" y="1" width="195" height="122" fill="#ffffff" stroke="#828282" stroke-width="2" pointer-events="all"/>
+        <rect x="1" y="1" width="195" height="122" fill="rgb(255, 255, 255)" stroke="#828282" stroke-width="2" pointer-events="all"/>
        <g transform="translate(-0.5 -0.5)rotate(-90 11 13)">
            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                <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 flex-start; justify-content: unsafe flex-end; width: 107px; height: 1px; padding-top: 13px; margin-left: -96px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: right; ">
+                        <div data-drawio-colors="color: #4D4D4D; " style="box-sizing: border-box; font-size: 0px; text-align: right;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #4D4D4D; line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; word-wrap: normal; ">
+                            <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;">
                                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 style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                <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: 118px; height: 1px; padding-top: 65px; margin-left: 44px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                        <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: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                            <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;">
                                Business
                                <br/>
                                Partner
@@ -32,18 +32,18 @@
                        </div>
                    </div>
                </foreignObject>
-                <text x="103" y="69" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="103" y="69" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
                    Business...
                </text>
            </switch>
        </g>
-        <rect x="221" y="1" width="347" height="349" fill="#ffffff" stroke="#828282" stroke-width="2" pointer-events="all"/>
+        <rect x="221" y="1" width="347" height="349" fill="rgb(255, 255, 255)" stroke="#828282" stroke-width="2" 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">
+                <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 flex-start; justify-content: unsafe flex-start; width: 331px; height: 1px; padding-top: 15px; margin-left: 230px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: left; ">
+                        <div data-drawio-colors="color: #4D4D4D; " style="box-sizing: border-box; font-size: 0px; text-align: left;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #4D4D4D; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                            <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;">
                                <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 style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                <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: 113px; height: 1px; padding-top: 98px; margin-left: 419px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                        <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: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                            <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;">
                                Incidents
                            </div>
                        </div>
                    </div>
                </foreignObject>
-                <text x="476" y="102" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="476" y="102" fill="rgb(0, 0, 0)" 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 style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                <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: 118px; height: 1px; padding-top: 98px; margin-left: 256px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                        <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: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                            <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;">
                                Customers
                            </div>
                        </div>
                    </div>
                </foreignObject>
-                <text x="315" y="102" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="315" y="102" fill="rgb(0, 0, 0)" font-family="Helvetica" font-size="12px" text-anchor="middle">
                    Customers
                </text>
            </switch>
        </g>
-        <rect x="1" y="147" width="196.5" height="202" fill="#ffffff" stroke="#828282" stroke-width="2" pointer-events="all"/>
+        <rect x="1" y="147" width="196.5" height="202" fill="rgb(255, 255, 255)" stroke="#828282" stroke-width="2" pointer-events="all"/>
        <g transform="translate(-0.5 -0.5)rotate(-90 11 159)">
            <switch>
-                <foreignObject style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                <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 flex-start; justify-content: unsafe flex-end; width: 187px; height: 1px; padding-top: 159px; margin-left: -176px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: right; ">
+                        <div data-drawio-colors="color: #4D4D4D; " style="box-sizing: border-box; font-size: 0px; text-align: right;">
-                            <div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: #4D4D4D; line-height: 1.2; pointer-events: all; font-weight: bold; white-space: normal; word-wrap: normal; ">
+                            <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;">
                                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 style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                <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: 118px; height: 1px; padding-top: 209px; margin-left: 44px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                        <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: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                            <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;">
                                Workforce
                                <br/>
                                Person
@@ -126,7 +126,7 @@
                        </div>
                    </div>
                </foreignObject>
-                <text x="103" y="213" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="103" y="213" fill="rgb(0, 0, 0)" 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 style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                <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: 118px; height: 1px; padding-top: 292px; margin-left: 44px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                        <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: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                            <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;">
                                Employee
                                <br/>
                                Timesheet
@@ -145,7 +145,7 @@
                        </div>
                    </div>
                </foreignObject>
-                <text x="103" y="296" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="103" y="296" fill="rgb(0, 0, 0)" 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 style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                <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: 113px; height: 1px; padding-top: 207px; margin-left: 419px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                        <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: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                            <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;">
                                Messages
                            </div>
                        </div>
                    </div>
                </foreignObject>
-                <text x="476" y="211" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="476" y="211" fill="rgb(0, 0, 0)" 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 style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                <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: 118px; height: 1px; padding-top: 209px; margin-left: 256px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                        <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: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                            <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;">
                                Service
                                <br/>
                                Worker
@@ -186,7 +186,7 @@
                        </div>
                    </div>
                </foreignObject>
-                <text x="315" y="213" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="315" y="213" fill="rgb(0, 0, 0)" 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 style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                <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: 118px; height: 1px; padding-top: 292px; margin-left: 256px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                        <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: #000000; line-height: 1.2; pointer-events: all; white-space: normal; word-wrap: normal; ">
+                            <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;">
                                Worker
                                <br/>
                                Availability
@@ -209,7 +209,7 @@
                        </div>
                    </div>
                </foreignObject>
-                <text x="315" y="296" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="315" y="296" fill="rgb(0, 0, 0)" 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 style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                <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 flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 414px; margin-left: 103px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                        <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: #000000; line-height: 1.2; pointer-events: all; white-space: nowrap; ">
+                            <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;">
                                Backend Services
                            </div>
                        </div>
                    </div>
                </foreignObject>
-                <text x="103" y="426" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="103" y="426" fill="rgb(0, 0, 0)" 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 style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                <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 flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 414px; margin-left: 315px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                        <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: #000000; line-height: 1.2; pointer-events: all; white-space: nowrap; ">
+                            <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;">
                                Usage Views
                            </div>
                        </div>
                    </div>
                </foreignObject>
-                <text x="315" y="426" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="315" y="426" fill="rgb(0, 0, 0)" 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 style="overflow: visible; text-align: left;" pointer-events="none" width="100%" height="100%" requiredFeatures="http://www.w3.org/TR/SVG11/feature#Extensibility">
+                <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 flex-start; justify-content: unsafe center; width: 1px; height: 1px; padding-top: 414px; margin-left: 476px;">
-                        <div style="box-sizing: border-box; font-size: 0; text-align: center; ">
+                        <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: #000000; line-height: 1.2; pointer-events: all; white-space: nowrap; ">
+                            <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;">
                                Extension Data
                            </div>
                        </div>
                    </div>
                </foreignObject>
-                <text x="476" y="426" fill="#000000" font-family="Helvetica" font-size="12px" text-anchor="middle">
+                <text x="476" y="426" fill="rgb(0, 0, 0)" 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%">
-                Viewer does not support full SVG 1.1
+                Text is not SVG - cannot display
            </text>
        </a>
    </switch>
--- a/etc/samples.drawio.svg
+++ b/etc/samples.drawio.svg
--- a/fiori/app/admin-authors/webapp/i18n/i18n.properties
+++ b/fiori/app/admin-authors/webapp/i18n/i18n.properties
@@ -2,10 +2,10 @@
 # __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
 # JCI app descriptor contains lower case TITLE
-appTitle=Bookshop Authors
+appTitle=Manage Authors
 # JCI app descriptor contains lower case DESCRIPTION
-appSubTitle=Bookshop Authors
+appSubTitle=CAP Sample Application
 # JCI app descriptor contains lower case DESCRIPTION
 appDescription=Bookshop Authors
--- a/fiori/app/admin-authors/webapp/manifest.json
+++ b/fiori/app/admin-authors/webapp/manifest.json
@@ -35,7 +35,7 @@
            "additionalParameters": "ignored"
          },
          "semanticObject": "Authors",
-          "action": "display",
+          "action": "manage",
          "title": "{{appTitle}}",
          "info": "{{appInfo}}",
          "subTitle": "{{appSubTitle}}",
--- a/fiori/app/admin-books/fiori-service.cds
+++ b/fiori/app/admin-books/fiori-service.cds
@@ -81,3 +81,6 @@ 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; }
--- a/fiori/app/admin-books/webapp/i18n/i18n.properties
+++ b/fiori/app/admin-books/webapp/i18n/i18n.properties
@@ -2,7 +2,7 @@
 # __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
 # JCI app descriptor contains lower case TITLE
-appTitle=Bookshop Sample
+appTitle=Manage Books
 # JCI app descriptor contains lower case DESCRIPTION
 appSubTitle=CAP Sample Application
--- a/fiori/app/admin-books/webapp/manifest.json
+++ b/fiori/app/admin-books/webapp/manifest.json
@@ -19,6 +19,22 @@
            "id": "ui5template.basicSAPUI5ApplicationProject",
            "-id": "ui5template.smartTemplate",
            "-version": "1.40.12"
        },
        "crossNavigation": {
            "inbounds": {
                "intent1": {
                        "signature": {
                        "parameters": {},
                        "additionalParameters": "allowed"
                    },
                    "semanticObject": "Books",
                    "action": "manage",
                    "title": "{{appTitle}}",
                    "info": "{{appInfo}}",
                    "subTitle": "{{appSubTitle}}",
                    "icon": "sap-icon://course-book"
                }
            }
        }
    },
    "sap.ui5": {
--- a/fiori/app/appconfig/fioriSandboxConfig.json
+++ b/fiori/app/appconfig/fioriSandboxConfig.json
@@ -50,7 +50,7 @@
                  "tileType": "sap.ushell.ui.tile.StaticTile",
                  "properties": {
                    "title": "Manage Authors",
-                    "targetURL": "#Authors-display"
+                    "targetURL": "#Authors-manage"
                  }
                },
                {
@@ -99,7 +99,7 @@
            },
            "BrowseAuthors": {
              "semanticObject": "Authors",
-              "action": "display",
+              "action": "manage",
              "title": "Browse Authors",
              "signature": {
                "parameters": {
--- a/fiori/app/browse/webapp/i18n/i18n.properties
+++ b/fiori/app/browse/webapp/i18n/i18n.properties
@@ -2,7 +2,7 @@
 # __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
 # JCI app descriptor contains lower case TITLE
-appTitle=Bookshop Sample
+appTitle=Browse Books
 # JCI app descriptor contains lower case DESCRIPTION
 appSubTitle=CAP Sample Application
--- a/fiori/app/fiori-apps.html
+++ b/fiori/app/fiori-apps.html
@@ -1,7 +1,7 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
 <head>
 <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,21 +10,22 @@
 	<script>
 		window["sap-ushell-config"] = {
 			defaultRenderer: "fiori2",
-			applications: {}
+			applications: {},
 		};
 	</script>
-	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
+	<script id="sap-ushell-bootstrap" src="https://ui5.sap.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
+	<script id="sap-ui-bootstrap" src="https://ui5.sap.com/resources/sap-ui-core.js"
-			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
+		data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout" data-sap-ui-compatVersion="edge"
-			data-sap-ui-compatVersion="edge"
+		data-sap-ui-theme="sap_horizon"></script>
 			data-sap-ui-theme="sap_horizon"
 			data-sap-ui-frameOptions="allow"
 	></script>
 	<script>
-		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))
+		sap.ui.getCore().attachInit(() =>
 			sap.ushell.Container.createRenderer().placeAt("content")
 		);
 	</script>
 </head>
-<body class="sapUiBody" id="content"></body>
+
 <body class="sapUiBody" id="content">
 </body>
 </html>
--- a/fiori/app/genres/webapp/manifest.json
+++ b/fiori/app/genres/webapp/manifest.json
@@ -33,7 +33,7 @@
    "resources": "resources.json",
    "dataSources": {
      "main": {
-        "uri": "/v2/browse",
+        "uri": "/odata/v2/browse",
        "type": "OData",
        "settings": {
          "annotations": ["localAnnotations"],
--- a/fiori/package.json
+++ b/fiori/package.json
@@ -4,12 +4,14 @@
  "dependencies": {
    "@capire/bookstore": "*",
    "@sap/cds": ">=5",
-    "@sap/cds-odata-v2-adapter-proxy": "^1.9.0",
+    "@cap-js-community/odata-v2-adapter": "^1",
-    "express": "^4.17.1",
+    "express": "^4.17.1"
-    "passport": ">=0.4.1"
+  },
  "devDependencies": {
    "@cap-js/sqlite": "^1"
  },
  "scripts": {
-    "start": "cds run --in-memory?",
+    "start": "cds-serve",
    "watch": "cds watch"
  },
  "cds": {
@@ -29,7 +31,7 @@
        "[development]": {
          "kind": "file-based-messaging"
        },
-        "[hybrid!]": {
+        "[hybrid]": {
          "kind": "enterprise-messaging-shared"
        }
      },
@@ -48,5 +50,10 @@
    "hana": {
      "deploy-format": "hdbtable"
    }
-  }
+  },
  "sapux": [
    "app/admin-authors",
    "app/admin-books",
    "app/browse"
  ]
 }
--- a/fiori/server.js
+++ b/fiori/server.js
@@ -1,8 +0,0 @@
 // install OData v2 adapter
 const cds = require("@sap/cds")
 const proxy = require('@sap/cds-odata-v2-adapter-proxy')
 const opts = global.it ? { target:'auto' } : {}   // for tests, set 'auto' to detect port dynamically
 cds.on('bootstrap', app => app.use(proxy(opts)))  // install proxy
 cds.log('cov2ap','silent') // suppress anoying log outpout, e.g. for `npm run mocha -- --reporter nyan`
 module.exports = require('@capire/bookstore/server.js')
--- a/gdpr/.pdm/pdm-config.json
+++ b/gdpr/.pdm/pdm-config.json
@@ -1,18 +0,0 @@
 {
  "fullyQualifiedApplicationName": "gdpr-bookshop",
  "fullyQualifiedModuleName": "gdpr-srv",
  "applicationTitle": "PDM Bookshop",
  "applicationTitleKey": "PDM Bookshop",
  "applicationURL": "https://gdpr-srv.cfapps.sap.hana.ondemand.com/",
  "endPoints": [
    {
      "type": "odatav4",
      "serviceName": "pdm-service",
      "serviceTitle": "GDPR",
      "serviceTitleKey": "GDPR",
      "serviceURI": "pdm",
      "hasGdprV4Annotations": true,
      "cacheControl": "no-cache"
    }
  ]
 }
--- a/gdpr/.pdm/pdm-instance-config.json
+++ b/gdpr/.pdm/pdm-instance-config.json
@@ -1,8 +0,0 @@
 {
  "xs-security": {
    "xsappname": "gdpr-bookshop",
    "authorities": ["$ACCEPT_GRANTED_AUTHORITIES"]
  },
  "fullyQualifiedApplicationName": "gdpr-bookshop",
  "appConsentServiceEnabled": true
 }
--- a/gdpr/db/AuditLogStore.cds
+++ b/gdpr/db/AuditLogStore.cds
@@ -1,23 +0,0 @@
 using { managed, cuid, sap.common.CodeList } from '@sap/cds/common';
 namespace sap.capire.auditLog;
 entity AuditLogStore : cuid {
  Action              : String enum{DataAccess; DataModification};  
  User                : String;    
  Timestamp           : Timestamp;
  Tenant              : String;
  Channel             : String;
  DataSubjectType     : String;         // Bussiness Partner
  DataSubjectRole     : String;         // Customer // Employee // ...
  DataSubjectID       : LargeString;    // key value pair as JSON
  ObjectType          : String;         // like SalesOrder
  ObjectKey           : LargeString;    // key value pair as JSON   
  Blob                : LargeString;    // Payload: DataModification or Data Access as BLOB
 }
--- a/gdpr/db/data-privacy.cds
+++ b/gdpr/db/data-privacy.cds
@@ -1,66 +0,0 @@
 // Proxy for importing schema from bookshop sample
 using {sap.capire.bookshop} from './schema';
 // annotations for Data Privacy
 annotate bookshop.Customers with @PersonalData : {
  DataSubjectRole : 'Customer',
  EntitySemantics : 'DataSubject'
 } 
 {
  ID           @PersonalData.FieldSemantics : 'DataSubjectID';
  email        @PersonalData.IsPotentiallyPersonal;
  firstName    @PersonalData.IsPotentiallyPersonal;
  lastName     @PersonalData.IsPotentiallyPersonal;
 // creditCardNo @PersonalData.IsPotentiallySensitive;
  dateOfBirth  @PersonalData.IsPotentiallyPersonal;
 }
 annotate bookshop.CustomerBillingData with @PersonalData : {
  DataSubjectRole : 'Customer',
  EntitySemantics : 'DataSubjectDetails'
 } 
 {
  creditCardNo @PersonalData.IsPotentiallySensitive;
 }
 annotate bookshop.CustomerPostalAddress with @PersonalData : {
  DataSubjectRole : 'Customer',
  EntitySemantics : 'DataSubjectDetails'
 } 
 {
  Customer @PersonalData.FieldSemantics : 'DataSubjectID';
  street   @PersonalData.IsPotentiallyPersonal;
  town     @PersonalData.IsPotentiallyPersonal;
  country  @PersonalData.IsPotentiallyPersonal;
 }
 annotate bookshop.Orders with @PersonalData.EntitySemantics : 'Other'
 {
  ID              @PersonalData.FieldSemantics : 'ContractRelatedID';
  Customer        @PersonalData.FieldSemantics : 'DataSubjectID';
  personalComment @PersonalData.IsPotentiallyPersonal;
 }
 // annotations for Audit Log
 annotate bookshop.Customers with @AuditLog.Operation : {
  Read   : true,
  Insert : true,
  Update : true,
  Delete : true
 };
 // annotations for Audit Log
 annotate bookshop.CustomerPostalAddress with @AuditLog.Operation : {
  Read   : true,
  Insert : true,
  Update : true,
  Delete : true
 };
 // annotations for Audit Log
 annotate bookshop.Orders with @AuditLog.Operation : {
  Read   : true,
  Insert : true,
  Update : true,
  Delete : true
 };
--- a/gdpr/db/data/sap.capire.bookshop-Authors.csv
+++ b/gdpr/db/data/sap.capire.bookshop-Authors.csv
@@ -1,5 +0,0 @@
 ID;name;dateOfBirth;placeOfBirth;dateOfDeath;placeOfDeath
 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
 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
--- a/gdpr/db/data/sap.capire.bookshop-Books_texts.csv
+++ b/gdpr/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.
--- a/gdpr/db/data/sap.capire.bookshop-CustomerBillingData.csv
+++ b/gdpr/db/data/sap.capire.bookshop-CustomerBillingData.csv
@@ -1,3 +0,0 @@
 ID;modifiedAt;createdAt;createdBy;modifiedBy;Customer_ID;creditCardNo
 1e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-04-04;2019-01-31;admin@business.com;admin@business.com;8e2f2640-6866-4dcf-8f4d-3027aa831cad;2222-1111-6666-7777
 24e718c9-ff99-47f1-8ca3-950c850777d4;2019-04-04;2019-01-30;admin@business.com;admin@business.com;74e718c9-ff99-47f1-8ca3-950c850777d4;3333-2222-5555-8888
--- a/gdpr/db/data/sap.capire.bookshop-CustomerPostalAddress.csv
+++ b/gdpr/db/data/sap.capire.bookshop-CustomerPostalAddress.csv
@@ -1,3 +0,0 @@
 ID;modifiedAt;createdAt;createdBy;modifiedBy;Customer_ID;street;town;country_code;someOtherField
 1e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-04-04;2019-01-31;admin@business.com;admin@business.com;8e2f2640-6866-4dcf-8f4d-3027aa831cad;Hauptstrasse 11;Berlin;DE;Eine Bemerkung
 24e718c9-ff99-47f1-8ca3-950c850777d4;2019-04-04;2019-01-30;admin@business.com;admin@business.com;74e718c9-ff99-47f1-8ca3-950c850777d4;Main Street 22;London;GB;Some Remark
--- a/gdpr/db/data/sap.capire.bookshop-Customers.csv
+++ b/gdpr/db/data/sap.capire.bookshop-Customers.csv
@@ -1,3 +0,0 @@
 ID;modifiedAt;createdAt;createdBy;modifiedBy;email;firstName;lastName;dateOfBirth
 8e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-04-04;2019-01-31;admin@business.com;admin@business.com;john.doe@test.com;John;Doe;1970-01-01
 74e718c9-ff99-47f1-8ca3-950c850777d4;2019-04-04;2019-01-30;admin@business.com;admin@business.com;jane.doe@sap.com;Jane;Doe;1980-11-11
--- a/gdpr/db/data/sap.capire.bookshop-Genres.csv
+++ b/gdpr/db/data/sap.capire.bookshop-Genres.csv
@@ -1,16 +0,0 @@
 ID;parent_ID;name
 10;;Fiction
 11;10;Drama
 12;10;Poetry
 13;10;Fantasy
 14;10;Science Fiction
 15;10;Romance
 16;10;Mystery
 17;10;Thriller
 18;10;Dystopia
 19;10;Fairy Tale
 20;;Non-Fiction
 21;20;Biography
 22;21;Autobiography
 23;20;Essay
 24;20;Speech
--- a/gdpr/db/data/sap.capire.bookshop-OrderItems.csv
+++ b/gdpr/db/data/sap.capire.bookshop-OrderItems.csv
@@ -1,4 +0,0 @@
 ID;amount;parent_ID;book_ID;netAmount
 78040e66-1dcd-4ffb-ab10-fdce32028b79;1;5e2f2640-6866-4dcf-8f4d-3027aa831cad;201;11.11
 84e718c9-ff99-47f1-8ca3-950c850777d4;1;5e2f2640-6866-4dcf-8f4d-3027aa831cad;271;15
 f9641166-e050-4261-bfee-d1e797e6cb7f;2;44e718c9-ff99-47f1-8ca3-950c850777d4;252;28
--- a/gdpr/db/data/sap.capire.bookshop-Orders.csv
+++ b/gdpr/db/data/sap.capire.bookshop-Orders.csv
@@ -1,3 +0,0 @@
 ID;modifiedAt;createdAt;createdBy;modifiedBy;OrderNo;currency_code;Customer_ID
 5e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-04-04;2019-01-31;john.doe@test.com;john.doe@test.com;1;USD;8e2f2640-6866-4dcf-8f4d-3027aa831cad
 44e718c9-ff99-47f1-8ca3-950c850777d4;2019-04-04;2019-01-30;jane.doe@test.com;jane.doe@test.com;2;USD;74e718c9-ff99-47f1-8ca3-950c850777d4
--- a/gdpr/db/schema.cds
+++ b/gdpr/db/schema.cds
@@ -1,37 +0,0 @@
 // Proxy for importing schema from bookshop sample
 using { sap.capire.bookshop.Books }        from '../../bookshop/db/schema';
 using { sap.capire.orders.Orders }         from '../../orders/db/schema';
 using { sap.capire.orders.OrderItems }     from '../../orders/db/schema';
 using { Country, managed, cuid }           from '@sap/cds/common';
 namespace sap.capire.bookshop;
 extend Orders with { 
  Customer        : Association to Customers; 
  personalComment : String;
 }  
 entity Customers : cuid, managed {
  email         : String;
  firstName     : String;
  lastName      : String;
 // creditCardNo  : String;
  dateOfBirth   : Date;
  billingData   : Composition of one CustomerBillingData   on billingData.Customer   = $self;
  postalAddress : Composition of one CustomerPostalAddress on postalAddress.Customer = $self;
 }
 entity CustomerPostalAddress : cuid, managed {
  Customer       : Association to one Customers;
  street         : String(128);
  town           : String(128);
  country        : Country;           
  someOtherField : String(128);
 };
 entity CustomerBillingData : cuid, managed {
  Customer      : Association to one Customers;
  creditCardNo  : String;
 };
--- a/gdpr/db/src/.hdiconfig
+++ b/gdpr/db/src/.hdiconfig
@@ -1,136 +0,0 @@
 {
    "file_suffixes": {
        "csv": {
            "plugin_name": "com.sap.hana.di.tabledata.source"
        },
        "hdbafllangprocedure": {
            "plugin_name": "com.sap.hana.di.afllangprocedure"
        },
        "hdbanalyticprivilege": {
            "plugin_name": "com.sap.hana.di.analyticprivilege"
        },
        "hdbcalculationview": {
            "plugin_name": "com.sap.hana.di.calculationview"
        },
        "hdbcollection": {
            "plugin_name": "com.sap.hana.di.collection"
        },
        "hdbconstraint": {
            "plugin_name": "com.sap.hana.di.constraint"
        },
        "hdbdropcreatetable": {
            "plugin_name": "com.sap.hana.di.dropcreatetable"
        },
        "hdbflowgraph": {
            "plugin_name": "com.sap.hana.di.flowgraph"
        },
        "hdbfunction": {
            "plugin_name": "com.sap.hana.di.function"
        },
        "hdbgraphworkspace": {
            "plugin_name": "com.sap.hana.di.graphworkspace"
        },
        "hdbhadoopmrjob": {
            "plugin_name": "com.sap.hana.di.virtualfunctionpackage.hadoop"
        },
        "hdbindex": {
            "plugin_name": "com.sap.hana.di.index"
        },
        "hdblibrary": {
            "plugin_name": "com.sap.hana.di.library"
        },
        "hdbmigrationtable": {
            "plugin_name": "com.sap.hana.di.table.migration"
        },
        "hdbprocedure": {
            "plugin_name": "com.sap.hana.di.procedure"
        },
        "hdbprojectionview": {
            "plugin_name": "com.sap.hana.di.projectionview"
        },
        "hdbprojectionviewconfig": {
            "plugin_name": "com.sap.hana.di.projectionview.config"
        },
        "hdbreptask": {
            "plugin_name": "com.sap.hana.di.reptask"
        },
        "hdbresultcache": {
            "plugin_name": "com.sap.hana.di.resultcache"
        },
        "hdbrole": {
            "plugin_name": "com.sap.hana.di.role"
        },
        "hdbroleconfig": {
            "plugin_name": "com.sap.hana.di.role.config"
        },
        "hdbsearchruleset": {
            "plugin_name": "com.sap.hana.di.searchruleset"
        },
        "hdbsequence": {
            "plugin_name": "com.sap.hana.di.sequence"
        },
        "hdbstatistics": {
            "plugin_name": "com.sap.hana.di.statistics"
        },
        "hdbstructuredprivilege": {
            "plugin_name": "com.sap.hana.di.structuredprivilege"
        },
        "hdbsynonym": {
            "plugin_name": "com.sap.hana.di.synonym"
        },
        "hdbsynonymconfig": {
            "plugin_name": "com.sap.hana.di.synonym.config"
        },
        "hdbsystemversioning": {
            "plugin_name": "com.sap.hana.di.systemversioning"
        },
        "hdbtable": {
            "plugin_name": "com.sap.hana.di.table"
        },
        "hdbtabledata": {
            "plugin_name": "com.sap.hana.di.tabledata"
        },
        "hdbtabletype": {
            "plugin_name": "com.sap.hana.di.tabletype"
        },
        "hdbtrigger": {
            "plugin_name": "com.sap.hana.di.trigger"
        },
        "hdbview": {
            "plugin_name": "com.sap.hana.di.view"
        },
        "hdbvirtualfunction": {
            "plugin_name": "com.sap.hana.di.virtualfunction"
        },
        "hdbvirtualfunctionconfig": {
            "plugin_name": "com.sap.hana.di.virtualfunction.config"
        },
        "hdbvirtualpackagehadoop": {
            "plugin_name": "com.sap.hana.di.virtualpackage.hadoop"
        },
        "hdbvirtualpackagesparksql": {
            "plugin_name": "com.sap.hana.di.virtualpackage.sparksql"
        },
        "hdbvirtualprocedure": {
            "plugin_name": "com.sap.hana.di.virtualprocedure"
        },
        "hdbvirtualprocedureconfig": {
            "plugin_name": "com.sap.hana.di.virtualprocedure.config"
        },
        "hdbvirtualtable": {
            "plugin_name": "com.sap.hana.di.virtualtable"
        },
        "hdbvirtualtableconfig": {
            "plugin_name": "com.sap.hana.di.virtualtable.config"
        },
        "properties": {
            "plugin_name": "com.sap.hana.di.tabledata.properties"
        },
        "tags": {
            "plugin_name": "com.sap.hana.di.tabledata.properties"
        },
        "txt": {
            "plugin_name": "com.sap.hana.di.copyonly"
        }
    }
 }
--- a/gdpr/index.cds
+++ b/gdpr/index.cds
@@ -1,4 +0,0 @@
 namespace sap.capire.gdpr; //> important for reflection
 using from './db/schema';
 using from './srv/pdm-service';
 using from './srv/log-service';
--- a/gdpr/manifest.yml
+++ b/gdpr/manifest.yml
@@ -1,31 +0,0 @@
 # Generated manifest.yml based on template version 0.1.0
 # appName = gdpr
 # language=nodejs
 # multiTenant=false
 ---
 applications:
 # -----------------------------------------------------------------------------------
 # Backend Service
 # -----------------------------------------------------------------------------------
 - name: gdpr-srv
  path: gen/srv
  memory: 256M
  buildpack: nodejs_buildpack
  services:
  - gdpr-db
  - uaa
 #  - name: pdm
 #    parameters: ./pdm-config.json 
 # -----------------------------------------------------------------------------------
 # HANA Database Content Deployer App
 # -----------------------------------------------------------------------------------
 - name: gdpr-db-deployer
  path: gen/db
  no-route: true
  health-check-type: process
  memory: 256M
  instances: 1
  buildpack: nodejs_buildpack
  services:
  - gdpr-db
--- a/gdpr/mta.yaml
+++ b/gdpr/mta.yaml
@@ -1,72 +0,0 @@
 ## Generated mta.yaml based on template version 0.4.0
 ## appName = gdpr
 ## language=nodejs; multitenant=false
 ## approuter=
 _schema-version: '3.1'
 ID: capire.gdpr
 version: 1.0.0
 description: "gdpr"
 parameters:
  enable-parallel-deployments: true
 build-parameters:
  before-all:
   - builder: custom
     commands:
      - npm install --production
      - npx -p @sap/cds-dk cds build --production
 modules:
 # --------------------- SERVER MODULE ------------------------
 - name: gdpr-srv
 # ------------------------------------------------------------
   type: nodejs
   path: gen/srv
   parameters:
     buildpack: nodejs_buildpack
   requires:
    # Resources extracted from CAP configuration
    - name: gdpr-db
    - name: gdpr-uaa
   provides:
    - name: srv-api      # required by consumers of CAP services (e.g. approuter)
      properties:
        srv-url: ${default-url}
 # -------------------- SIDECAR MODULE ------------------------
 - name: gdpr-db-deployer
 # ------------------------------------------------------------
   type: hdb
   path: gen/db  
   parameters:
     buildpack: nodejs_buildpack
   requires:
    # 'hana' and 'xsuaa' resources extracted from CAP configuration
    - name: gdpr-db
    - name: gdpr-uaa
 resources:
 # services extracted from CAP configuration
 # 'service-plan' can be configured via 'cds.requires.<name>.vcap.plan'
 # ------------------------------------------------------------
 - name: gdpr-db
 # ------------------------------------------------------------
   type: com.sap.xs.hdi-container
   parameters:
     service: hana  # or 'hanatrial' on trial landscapes
     service-plan: hdi-shared
   properties:
     hdi-service-name: ${service-name}
 # ------------------------------------------------------------
 - name: gdpr-uaa
 # ------------------------------------------------------------
   type: org.cloudfoundry.managed-service
   parameters:
     service: xsuaa
     service-plan: application  
     config:
       xsappname: gdpr-${space}    #  name + space dependency
       tenant-mode: dedicated
--- a/gdpr/package-lock.json
+++ b/gdpr/package-lock.json
--- a/gdpr/package.json
+++ b/gdpr/package.json
@@ -1,33 +0,0 @@
 {
    "name": "@capire/gdpr",
    "version": "1.0.0",
    "dependencies": {
        "@capire/bookshop": "../bookshop",
        "@capire/common": "../common",
        "@capire/orders": "../orders",
        "@sap/cds": "^5",
        "@sap/hana-client": "^2.4.177",
        "@sap/xsenv": "^3.1.0",
        "@sap/xssec": "^3.1.1",
        "express": "^4.17.1",
        "passport": "^0.4.1"
    },
    "scripts": {
        "start": "cds run --in-memory?",
        "watch": "cds watch"
    },
    "cds": {
        "requires": {
            "db": {
                "kind": "sql"
            },
            "uaa": {
                "kind": "xsuaa"
            },
            "audit-log": {
                "impl": "srv/customAuditLog.js"
            }
        },
        "features": {"audit_personal_data": true}
    }
 }
--- a/gdpr/services-manifest.yml
+++ b/gdpr/services-manifest.yml
@@ -1,18 +0,0 @@
 # Generated services-manifest.yml based on template version 0.1.0
 # appName = gdpr
 ---
 create-services:
 # ------------------------------------------------------------
  - name:   gdpr-db
    broker: hana  # 'hanatrial' on trial landscapes
    plan: "hdi-shared"
  - name:   pdm
    broker: personal-data-manager-service  
    plan: standard
    parameters: ./.pdm/pdm-instance-config.json
  - name:   uaa
    broker: xsuaa
    plan: application
    parameters: xs-security.json
--- a/gdpr/srv/customAuditLog.js
+++ b/gdpr/srv/customAuditLog.js
@@ -1,143 +0,0 @@
 const cds = require('@sap/cds')
 module.exports = class MyAuditLogService extends cds.AuditLogService {
  async init() {
    // console.log('My Audit Log');
    // call AuditLogService's init
    await super.init()
    const db = await cds.connect.to('db')
    const { AuditLogStore } = db.entities('sap.capire.auditLog')
    // register custom handlers
    this.on('dataAccessLog', async req => {
    const logs = [];
    const action    = 'DataAccess';
    const user      = req.user.id;
    const timestamp = req.timestamp;
    const tenant    = req.tenant;
    const channel   = req.channel;
    req.data.accesses.forEach( dataAccess => {
      logs.push({
          Action:          action,
          User:            user,
          Timestamp:       timestamp,
          Tenant:          tenant,
          Channel:         channel,
          DataSubjectType: dataAccess.dataSubject.type,
          DataSubjectRole: dataAccess.dataSubject.role,
          DataSubjectID:   JSON.stringify(dataAccess.dataSubject.id),
          ObjectType:      dataAccess.dataObject.type,
          ObjectKey:       JSON.stringify(dataAccess.dataObject.id),
          Blob: JSON.stringify(dataAccess)   
      })  }
    )
    await INSERT.into(AuditLogStore).entries(logs)
    }
    )
    this.on('dataModificationLog', async req => {
      const mods = [];
      const action    = 'DataModification';
      const user      = req.user.id;
      const timestamp = req.timestamp;
      const tenant    = req.tenant;
      const channel   = req.channel;
      req.data.modifications.forEach( dataModification => {
        mods.push({
            Action:          action,
            User:            user,
            Timestamp:       timestamp,
            Tenant:          tenant,
            Channel:         channel,
            DataSubjectType: dataModification.dataSubject.type,
            DataSubjectRole: dataModification.dataSubject.role,
            DataSubjectID:   JSON.stringify(dataModification.dataSubject.id),
            ObjectType:      dataModification.dataObject.type,
            ObjectKey:       JSON.stringify(dataModification.dataObject.id),
            Blob: JSON.stringify(dataModification)   
        })  }
      )
      await INSERT.into(AuditLogStore).entries(mods)
      }
      )
    }
    }
 /*
 service AuditLogService {
    // SEC-254: Log read access to sensitive personal data
    event dataAccessLog {
      accesses         : array of Access;
    };
    // SEC-265: Log changes to personal data
    event dataModificationLog : {
      c : array of DataModification;
    };
 }
 */
 /*
 define type KeyValuePair {
  keyName : String;
  value   : String;
 };
 define type DataObject {
  type : String;
  id   : array of KeyValuePair;
 };
 define type DataSubject {
  type : String;
  id   : array of KeyValuePair;
  role : String;
 };
 define type Attribute {
  name : String;
 };
 define type Access {
  dataObject  : DataObject;
  dataSubject : DataSubject;
  attributes  : array of Attribute;
  attachments : array of Attachment;
 };
 define type ChangedAttribute {
  name     : String;
  oldValue : String;
  newValue : String;
 };
 define type DataModification {
  dataObject  : DataObject;
  dataSubject : DataSubject;
  action      : String @assert.range enum { Create; Update; Delete; };
  attributes  : array of ChangedAttribute;
 }
 */
--- a/gdpr/srv/log-service.cds
+++ b/gdpr/srv/log-service.cds
@@ -1,14 +0,0 @@
 using {sap.capire.bookshop as db}   from '../db/data-privacy';
 using {sap.capire.orders   as dbo}   from '../db/data-privacy';
 using {sap.capire.auditLog as log}  from '../db/AuditLogStore.cds';
 //@requires: 'PersonalDataManagerUser' // security check
 service LogService {
  entity Customers             as projection on db.Customers;
  entity CustomerPostalAddress as projection on db.CustomerPostalAddress;
  entity Orders                as projection on dbo.Orders;
  entity AuditLogStore         as projection on log.AuditLogStore;
 };
--- a/gdpr/srv/pdm-service.cds
+++ b/gdpr/srv/pdm-service.cds
@@ -1,44 +0,0 @@
 using {sap.capire.bookshop as db}      from '../db/data-privacy';
 using {sap.capire.bookshop.Books}      from '../db/data-privacy';
 using {sap.capire.orders.Orders}       from '../db/data-privacy';
 using {sap.capire.orders.OrderItems}   from '../db/data-privacy';
 //@requires: 'PersonalDataManagerUser' // security check
 service PDMService {
  entity Customers             as projection on db.Customers;
  entity CustomerPostalAddress as projection on db.CustomerPostalAddress;
  entity CustomerBillingData   as projection on db.CustomerBillingData;
  //   create view on Orders and Items as flat projection
  entity OrderItemView         as
    select from Orders {
          ID,
      key Items.ID        as Item_ID,
          OrderNo,
          Customer.ID     as Customer_ID,
          Customer.email  as Customer_Email,
          Items.book.ID   as Item_Book_ID,
          Items.amount    as Item_Amount,
          Items.netAmount as Item_NetAmount
    };
  //  annotate new view
  annotate PDMService.OrderItemView with @(PersonalData.EntitySemantics : 'Other') {
    Item_ID        @PersonalData.FieldSemantics : 'ContractRelatedID';
    Customer_ID    @PersonalData.FieldSemantics : 'DataSubjectID';
    Customer_Email @PersonalData.IsPotentiallyPersonal;
  };
  // annotations for Personal Data Manager - Search Fields
  annotate Customers with @(Communication.Contact : {
    n    : {
      surname : lastName,
      given   : firstName
    },
    bday : dateOfBirth
  });
  //  Data Privacy annotations on 'Customers' and 'CustomerPostalAddress' are derived from original entity definitions
 };
--- a/gdpr/test.http
+++ b/gdpr/test.http
@@ -1,25 +0,0 @@
 ###
 get http://localhost:4004/log/AuditLogStore
 ###
 get http://localhost:4004/log/Customers
 ###
 post http://localhost:4004/log/Customers
 Content-Type: application/json
 {
            "ID": "22e718c9-ff99-47f1-8ca3-950c850777d4",
            "createdAt": "2019-01-30T00:00:00.000Z",
            "createdBy": "admin@business.com",
            "modifiedAt": "2019-04-04T00:00:00.000Z",
            "modifiedBy": "admin@business.com",
            "email": "johanna.doe@company.org",
            "firstName": "Queen Johanna",
            "lastName": "Doe",
            "creditCardNo": "1313-7171-5656-7878",
            "dateOfBirth": "2001-11-11"
 }
--- a/gdpr/xs-security.json
+++ b/gdpr/xs-security.json
@@ -1,13 +0,0 @@
 {
    "xsappname": "gdpr-bookshop",
    "tenant-mode": "shared",
    "scopes": [
        {
            "name": "$XSAPPNAME.PersonalDataManagerUser",
            "description": "Authority for Personal Data Manager",
            "grant-as-authority-to-apps": [
                "$XSSERVICENAME(pdm)"
            ]
        }
    ]
 }
--- a/hello/README.md
+++ b/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/get-started/using-typescript)
+- [Using TypeScript](https://cap.cloud.sap/docs/node.js/typescript)
--- a/hello/package.json
+++ b/hello/package.json
@@ -12,7 +12,7 @@
  "devDependencies": {
    "@types/jest": "*",
    "@types/node": "*",
-    "typescript": "^4.3.5"
+    "typescript": ">=4.3.5"
  },
  "eslintConfig": {
    "extends": "eslint:recommended",
--- a/hello/srv/world.cds
+++ b/hello/srv/world.cds
@@ -1,3 +1,3 @@
-service say {
+service say @(path: '/say') {
  function hello (to:String) returns String;
 }
--- a/hello/srv/world.ts
+++ b/hello/srv/world.ts
@@ -1,4 +1,4 @@
-import type { Request } from "@sap/cds/apis/services"
+import { Request } from "@sap/cds"
 module.exports = class say {
    hello(req: Request) {
--- a/hello/test/hello-world-test.js
+++ b/hello/test/hello-world-test.js
@@ -1,13 +1,10 @@
 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)
+        expect(data.value).to.match(/Hello world.*typescript.*/i)
    })
 })
--- a/loggers/package.json
+++ b/loggers/package.json
@@ -11,7 +11,7 @@
    "express": "^4.17.1"
  },
  "scripts": {
-    "start": "cds run",
+    "start": "cds-serve",
    "watch": "cds watch"
  },
  "cds": {
--- a/loggers/srv/loggers.js
+++ b/loggers/srv/loggers.js
@@ -1,4 +1,4 @@
-const cds = require ('@sap/cds/lib')
+const cds = require ('@sap/cds')
 const LOG = cds.log('cds.log')
 module.exports = class LogService extends cds.Service {
--- a/orders/app/orders/webapp/i18n/i18n.properties
+++ b/orders/app/orders/webapp/i18n/i18n.properties
@@ -2,7 +2,7 @@
 # __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
 # JCI app descriptor contains lower case TITLE
-appTitle=Bookshop Sample
+appTitle=Manage Orders
 # JCI app descriptor contains lower case DESCRIPTION
 appSubTitle=CAP Sample Application
--- a/orders/app/orders/webapp/manifest.json
+++ b/orders/app/orders/webapp/manifest.json
@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"dataSources": {
 			"OrdersService": {
-				"uri": "/orders/",
+				"uri": "/odata/v4/orders/",
 				"type": "OData",
 				"settings": {
 					"odataVersion": "4.0"
--- a/orders/db/schema.cds
+++ b/orders/db/schema.cds
@@ -1,20 +1,17 @@
-using { sap.capire.bookshop.Books }       from '../../bookshop/db/schema';
+using { Currency, User, managed, cuid } from '@sap/cds/common';
 using { User, Currency, managed, cuid }   from '../../common';
 namespace sap.capire.orders;
 entity Orders : cuid, managed {
  OrderNo  : String(22) @title:'Order Number'; //> readable key
-  Items    : Composition of many OrderItems;
+  Items    : Composition of many {
-  buyer    : User;
+    key ID    : UUID;
-  currency : Currency;
+    product   : Association to Products;
 }
 entity OrderItems : cuid, managed {
    book      : Association to Products;
    quantity  : Integer;
    title     : String; //> intentionally replicated as snapshot from product.title
-    amount    : Double; //> materialized calculated field
+    price     : Double; //> materialized calculated field
-    netAmount : Double; 
+  };
  buyer    : User;
  currency : Currency;
 }
 /** This is a stand-in for arbitrary ordered Products */
@@ -24,4 +21,4 @@ entity Products @(cds.persistence.skip:'always') {
 // this is to ensure we have filled-in currencies
-// using from '@capire/common';
+using from '@capire/common';
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,62 +1,58 @@
 {
-  "name": "@capire/samples",
+    "name": "@capire/samples",
-  "version": "2.0.0",
+    "version": "2.0.0",
-  "description": "A monorepo with several samples for CAP.",
+    "description": "A monorepo with several samples for CAP.",
-  "repository": "https://github.com/sap-samples/cloud-cap-samples.git",
+    "repository": "https://github.com/sap-samples/cloud-cap-samples.git",
-  "author": "daniel.hutzel@sap.com",
+    "author": "daniel.hutzel@sap.com",
-  "dependencies": {
+    "dependencies": {
-    "@capire/bookshop": "./bookshop",
+      "@sap/cds": ">=7"
-    "@capire/common": "./common",
+    },
-    "@capire/fiori": "./fiori",
+    "workspaces": [
-    "@capire/media": "./media",
+      "./bookshop",
-    "@capire/orders": "./orders",
+      "./bookstore",
-    "@capire/reviews": "./reviews",
+      "./common",
-    "@sap/cds": ">=5.5.3"
+      "./data-viewer",
-  },
+      "./fiori",
-  "workspaces": [
+      "./hello",
-    "./bookshop",
+      "./media",
-    "./bookstore",
+      "./orders",
-    "./common",
+      "./loggers",
-    "./data-viewer",
+      "./reviews"
-    "./fiori",
+    ],
-    "./hello",
+    "devDependencies": {
-    "./media",
+      "@cap-js/sqlite": "^1",
-    "./orders",
+      "@sap/eslint-plugin-cds": "^3",
-    "./loggers",
+      "axios": "^1",
-    "./reviews"
+      "chai": "^4.3.4",
-  ],
+      "chai-as-promised": "^7.1.1",
-  "devDependencies": {
+      "chai-subset": "^1.6.0",
-    "@sap/eslint-plugin-cds": "^2.6.1",
+      "eslint": "^9",
-    "axios": "^1",
+      "semver": "^7"
-    "chai": "^4.3.4",
+    },
-    "chai-as-promised": "^7.1.1",
+    "scripts": {
-    "chai-subset": "^1.6.0",
+      "cleanup": "rm -rf node_modules && rm -rf */node_modules && rm -rf */*/node_modules",
-    "semver": "^7",
+      "bookshop": "cds watch bookshop",
-    "sqlite3": "^5"
+      "fiori": "cds watch fiori",
-  },
+      "hello": "cds watch hello",
-  "scripts": {
+      "media": "cds watch media",
-    "cleanup": "rm -rf node_modules && rm -rf */node_modules && rm -rf */*/node_modules",
+      "mocha": "CDS_TEST_SILENT=y npx mocha",
-    "bookshop": "cds watch bookshop",
+      "jest": "npx jest --silent",
-    "fiori": "cds watch fiori",
+      "start": "cds watch fiori",
-    "hello": "cds watch hello",
+      "test": "npm run jest -- --silent",
-    "media": "cds watch media",
+      "test:hello": "cd hello && npm test",
-    "mocha": "CDS_TEST_SILENT=y npx mocha",
+      "lint": "eslint ."
-    "jest": "npx jest --silent",
+    },
-    "start": "cds watch fiori",
+    "jest": {
-    "test": "npm run jest -- --silent",
+      "testTimeout": 20000,
-    "test:hello": "cd hello && npm test"
+      "testMatch": [
-  },
+        "**/*.test.js"
-  "jest": {
+      ]
-    "testTimeout": 20000,
+    },
-    "testMatch": [
+    "mocha": {
-      "**/*.test.js"
+      "recursive": true,
-    ]
+      "parallel": true,
-  },
+      "timeout": 6666
-  "mocha": {
+    },
-    "recursive": true,
+    "license": "SEE LICENSE IN LICENSE",
-    "parallel": true,
+    "private": true
-    "timeout": 6666
+  }
  },
  "license": "SAP SAMPLE CODE LICENSE",
  "private": true
 }
--- a/reviews/srv/reviews-service.cds
+++ b/reviews/srv/reviews-service.cds
@@ -1,6 +1,6 @@
 using { sap.capire.reviews as my } from '../db/schema';
-service ReviewsService {
+service ReviewsService @(path:'/reviews') {
  // Sync API
  entity Reviews as projection on my.Reviews excluding { likes }
--- a/samples.md
+++ b/samples.md
@@ -3,11 +3,13 @@
 The following list gives an overview of the samples provided in subdirectories.
 Each sub directory essentially is an individual npm package arranged in an [all-in-one monorepo](#all-in-one-monorepo) umbrella setup.
 ![](etc/samples.drawio.svg)
 ## [@capire/hello-world](hello)
 - A simplistic [Hello World](https://cap.cloud.sap/docs/get-started/hello-world) service using [CDS](https://cap.cloud.sap/docs/cds/) and [cds.services](https://cap.cloud.sap/docs/node.js/api#services-api).
- [Typescript support](https://cap.cloud.sap/docs/get-started/using-typescript)
+- [Typescript support](https://cap.cloud.sap/docs/node.js/typescript)
 ## [@capire/bookshop](bookshop)
@@ -53,7 +55,7 @@ Each sub directory essentially is an individual npm package arranged in an [all-
 ## [@capire/bookstore](bookstore)
- A [composite app, reusing and combining](https://cap.cloud.sap/docs/guides/verticalize) these packages:
+- A [composite app, reusing and combining](https://cap.cloud.sap/docs/guides/extensibility/composition) these packages:
  - [@capire/bookshop](bookshop)
  - [@capire/reviews](reviews)
  - [@capire/orders](orders)
--- a/test/cds.ql.test.js
+++ b/test/cds.ql.test.js
@@ -1,12 +1,12 @@
 const cds = require('@sap/cds')
 const { expect } = cds.test
 describe('cds.ql → cqn', () => {
  const cds = require('@sap/cds/lib')
  const { expect } = cds.test
  const { cdr } = cds.ql
  const Foo = { name: 'Foo' }
  const Books = { name: 'capire.bookshop.Books' }
-  const STAR = cdr ? '*' : { ref: ['*'] }
+  const STAR = '*'
  const skip = {to:{eql:()=>skip}}
  const srv = new cds.Service
  let cqn
@@ -185,7 +185,7 @@ describe('cds.ql → cqn', () => {
        }},
      })
-      if (cdr) expect.plain (cqn)
+      expect.plain (cqn)
      .to.eql(SELECT`Foo[ID=${11}]`)
      .to.eql(srv.read`Foo[ID=${11}]`)
@@ -242,7 +242,7 @@ describe('cds.ql → cqn', () => {
        },
      })
-      cdr && expect.plain(cqn)
+      expect.plain(cqn)
      .to.eql(CQL`SELECT *,a,b as c from Foo`)
      .to.eql(CQL`SELECT from Foo {*,a,b as c}`)
@@ -341,7 +341,7 @@ describe('cds.ql → cqn', () => {
      expect(SELECT.from(Foo).where({ x: 1, and: { y: 2, or: { z: 3 } } })).to.eql({
        SELECT: {
          from: { ref: ['Foo'] },
-          where: cdr ? [
+          where: [
            { ref: ['x'] },
            '=',
            { val: 1 },
@@ -357,29 +357,12 @@ describe('cds.ql → cqn', () => {
              { val: 3 },
            ]},
            // ')',
          ] : [
            { ref: ['x'] },
            '=',
            { val: 1 },
            'and',
            '(',
            // {xpr:[
              { ref: ['y'] },
              '=',
              { val: 2 },
              'or',
              { ref: ['z'] },
              '=',
              { val: 3 },
            // ]},
            ')',
          ],
        },
      })
    })
    test ("where x='*'", ()=>{
      if (cdr)
      expect (SELECT.from(Foo).where({x:'*'}))
      .to.eql(SELECT.from(Foo).where("x='*'"))
      .to.eql(SELECT.from(Foo).where("x=",'*'))
@@ -387,7 +370,6 @@ describe('cds.ql → cqn', () => {
      .to.eql(
        CQL`SELECT from Foo where x='*'`
      )
      if (cdr)
      expect (SELECT.from(Foo).where({x:['*',1]}))
      .to.eql(SELECT.from(Foo).where("x in ('*',1)"))
      .to.eql(SELECT.from(Foo).where("x in",['*',1]))
@@ -479,19 +461,19 @@ describe('cds.ql → cqn', () => {
        CQL`SELECT from Foo where x=1 and y=2 or z=3`
      )
-      if (cdr) expect (
+      expect (
        SELECT.from(Foo).where({x:1}).and({y:2,or:{z:3}})
      ).to.eql (
        CQL`SELECT from Foo where x=1 and ( y=2 or z=3 )`
      )
-      if (cdr) expect (
+      expect (
        SELECT.from(Foo).where({1:1}).and({x:1,or:{x:2}}).and({y:2,or:{z:3}})
      ).to.eql (
        CQL`SELECT from Foo where 1=1 and ( x=1 or x=2 ) and ( y=2 or z=3 )`
      )
-      if (cdr) expect (
+      expect (
        SELECT.from(Foo).where({x:1,or:{x:2}}).and({y:2,or:{z:3}})
      ).to.eql (
        CQL`SELECT from Foo where ( x=1 or x=2 ) and ( y=2 or z=3 )`
@@ -499,7 +481,7 @@ describe('cds.ql → cqn', () => {
    })
    test('where ({x:[undefined]})', () => {
-      if (cdr) expect (
+      expect (
        SELECT.from(Foo).where({x:[undefined]})
      ).to.eql ({ SELECT: {
        from: {ref:['Foo']},
@@ -526,7 +508,7 @@ describe('cds.ql → cqn', () => {
      ).to.eql({
        SELECT: {
          from: { ref: ['Foo'] },
-          where: cdr ? [
+          where: [
            { ref: ['ID'] },
            '=',
            { val: ID },
@@ -546,24 +528,6 @@ describe('cds.ql → cqn', () => {
                { val: 9 },
              ]
            },
          ] : [
            { ref: ['ID'] },
            '=',
            { val: ID },
            'and',
            { ref: ['args'] },
            'in',
            { list: args.map(val => ({ val })) },
            'and',
            '(',
            { ref: ['x'] },
            'like',
            { val: '%x%' },
            'or',
            { ref: ['y'] },
            '>=',
            { val: 9 },
            ')',
          ],
        }
      })
@@ -657,7 +621,6 @@ describe('cds.ql → cqn', () => {
    })
    it('should consistently handle *', () => {
      if (!cdr) return
      expect({
        SELECT: { from: { ref: ['Foo'] }, columns: ['*'] },
      })
@@ -668,7 +631,6 @@ describe('cds.ql → cqn', () => {
    })
    it('should consistently handle lists', () => {
      if (!cdr) return
      const ID = 11,  args = [{ref:['foo']}, "bar", 3]
      const cqn = CQL`SELECT from Foo where ID=11 and x in (foo,'bar',3)`
      expect(SELECT.from(Foo).where`ID=${ID} and x in ${args}`).to.eql(cqn)
@@ -715,7 +677,7 @@ describe('cds.ql → cqn', () => {
        .to.eql(INSERT.into(Foo).entries(...entries))
        .to.eql(INSERT.into(Foo).entries(entries))
        .to.eql({
-          INSERT: { into: 'Foo', entries },
+          INSERT: { into: cds.env.ql.quirks_mode ? 'Foo' : { ref: ['Foo'] }, entries },
        })
    })
@@ -731,7 +693,7 @@ describe('cds.ql → cqn', () => {
        .to.eql(INSERT.into(Foo).columns('a', 'b').rows([1, 2], [3, 4]))
        .to.eql({
          INSERT: {
-            into: 'Foo',
+            into: cds.env.ql.quirks_mode ? 'Foo' : { ref: ['Foo'] },
            columns: ['a', 'b'],
            rows: [
              [1, 2],
@@ -745,7 +707,7 @@ describe('cds.ql → cqn', () => {
      expect(INSERT.into(Foo).columns('a', 'b').values([1, 2]))
        .to.eql(INSERT.into(Foo).columns('a', 'b').values(1, 2))
        .to.eql({
-          INSERT: { into: 'Foo', columns: ['a', 'b'], values: [1, 2] },
+          INSERT: { into:  cds.env.ql.quirks_mode ? 'Foo' : { ref: ['Foo'] }, columns: ['a', 'b'], values: [1, 2] },
        })
    })
@@ -760,7 +722,7 @@ describe('cds.ql → cqn', () => {
    test('entity (..., <key>)', () => {
      const cqnWhere = {
          UPDATE: {
-            entity: 'capire.bookshop.Books',
+            entity: cds.env.ql.quirks_mode ? 'capire.bookshop.Books' : { ref: ['capire.bookshop.Books'] },
            where: [{ ref: ['ID'] }, '=', { val: 4711 }],
          },
        }
@@ -804,7 +766,7 @@ describe('cds.ql → cqn', () => {
        .to.eql(UPDATE(Foo).with({ foo: 11, bar: { '-=': 22 } }))
        .to.eql({
          UPDATE: {
-            entity: 'Foo',
+            entity: cds.env.ql.quirks_mode ? 'Foo' : { ref: ['Foo'] },
            data: { foo: 11 },
            with: {
              bar: { xpr: [{ ref: ['bar'] }, '-', { val: 22 }] },
@@ -815,7 +777,7 @@ describe('cds.ql → cqn', () => {
      // some more
      expect(UPDATE(Foo).with(`bar = coalesce(x,y), car = 'foo''s bar, car'`)).to.eql({
        UPDATE: {
-          entity: 'Foo',
+          entity: cds.env.ql.quirks_mode ? 'Foo' : { ref: ['Foo'] },
          data: {
            car: "foo's bar, car",
          },
@@ -835,7 +797,7 @@ describe('cds.ql → cqn', () => {
    test('from (..., <key>)', () => {
      const cqnWhere = {
          DELETE: {
-            from: 'capire.bookshop.Books',
+            from: cds.env.ql.quirks_mode ? 'capire.bookshop.Books' : { ref: ['capire.bookshop.Books'] },
            where: [{ ref: ['ID'] }, '=', { val: 4711 }],
          },
        }
--- a/test/consuming-services.test.js
+++ b/test/consuming-services.test.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 describe('cap/samples - Consuming Services locally', () => {
--- a/test/custom-handlers.test.js
+++ b/test/custom-handlers.test.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 describe('cap/samples - Custom Handlers', () => {
@@ -8,9 +8,10 @@ describe('cap/samples - Custom Handlers', () => {
  })
  it('should reject out-of-stock orders', async () => {
-    await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`
+    await expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.fulfilled
-    await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`
+    await expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.fulfilled
-    await expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.rejectedWith(/409 - 5 exceeds stock for book #201/)
+    await expect(POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`).to.be.rejectedWith(
      /409 - 5 exceeds stock for book #201/)
    const { data } = await GET`/admin/Books/201/stock/$value`
    expect(data).to.equal(2)
  })
--- a/test/fiori.test.js
+++ b/test/fiori.test.js
@@ -1,4 +1,8 @@
-const cds = require('@sap/cds/lib')
+// Quick hack: suppress deprecation warnings w/ Node22 caused by http-proxy (used by OData v2 proxy)
 // See also: https://github.com/http-party/node-http-proxy/pull/1666
 require('util')._extend = Object.assign
 const cds = require('@sap/cds')
 describe('cap/samples - Fiori APIs - v2', function() {
@@ -8,7 +12,7 @@ describe('cap/samples - Fiori APIs - v2', function() {
  // if (this.timeout) this.timeout(1e6)
  it('serves $metadata documents in v2', async () => {
-    const { headers, data } = await GET `/v2/browse/$metadata`
+    const { headers, data } = await GET `/odata/v2/browse/$metadata`
    expect(headers).to.contain({
      'content-type': 'application/xml',
      'dataserviceversion': '2.0',
@@ -17,7 +21,7 @@ describe('cap/samples - Fiori APIs - v2', function() {
  })
  it('serves Books in v2', async () => {
-    const { data } = await GET `/v2/browse/Books`
+    const { data } = await GET `/odata/v2/browse/Books`
    expect(data).to.containSubset({d:{results:[]}})
    expect(data.d.results.length).to.be.greaterThanOrEqual(5)
  })
--- a/test/hello-world.test.js
+++ b/test/hello-world.test.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 describe('cap/samples - Hello world!', () => {
--- a/test/hierarchical-data.test.js
+++ b/test/hierarchical-data.test.js
@@ -1,8 +1,9 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 const { expect } = cds.test.in(__dirname,'..')
 describe('cap/samples - Hierarchical Data', ()=>{
-	const model = CDL`
+	const csn = CDL`
 		entity Categories {
 			key ID   : Integer;
 			name     : String;
@@ -10,11 +11,11 @@ describe('cap/samples - Hierarchical Data', ()=>{
 			parent   : Association to Categories;
 		}
 	`
 	const model = cds.compile.for.nodejs(csn)
 	const {Categories:Cats} = model.definitions
 	const {expect} = cds.test
 	before ('bootstrap sqlite in-memory db...', async()=>{
-		await cds.deploy (model) .to ('sqlite::memory:')
+		await cds.deploy (csn) .to ('sqlite::memory:') // REVISIT: cds.compile.to.sql should accept cds.compiled.for.nodejs models
 		expect (cds.db) .to.exist
 		expect (cds.db.model) .to.exist
 	})
@@ -32,83 +33,89 @@ describe('cap/samples - Hierarchical Data', ()=>{
 		]}
 	))
-	it ('supports nested reads', async()=>{
+	it ('should generate correct queries for expands', ()=>{
-		if (require('semver').gte(cds.version, '5.9.0')) {
+		let q = SELECT.from (Cats, c => { c.ID, c.name, c.children (c => c.name) })
-			expect (await
+		expect (q) .to.eql ({
-				SELECT.one.from (Cats, c=>{
+			SELECT: {
-					c.ID, c.name.as('parent'), c.children (c=>{
+				from: { ref:[ "Categories" ] },
-						c.name.as('child')
+				columns: [
-					})
+					{ ref: [ "ID" ] },
-				}) .where ({name:'Cat'})
+					{ ref: [ "name" ] },
-			) .to.eql (
+					{ ref: [ "children" ], expand: [ {ref:['name']} ] },
-				{ ID:101, parent:'Cat', children:[
+				]
-					{ child:'Kitty' },
+			}
-					{ child:'Catwoman' },
+		})
-				]}
+		if (q.forSQL) expect (q.forSQL()) .to.eql ({
-			)
+			SELECT: {
-			return
+				from: { ref:[ "Categories" ], as: "Categories" },
-		}
+				columns: [
-		expect (await
+					{ ref: [ "Categories", "ID" ] },
-			SELECT.one.from (Cats, c=>{
+					{ ref: [ "Categories", "name" ] },
-				c.ID, c.name.as('parent'), c.children (c=>{
+					{ as: "children", SELECT: { expand: true,
-					c.name.as('child')
+						one: false,
-				})
+						columns: [{ ref: [ "children", "name" ]}],
-			}) .where ({name:'Cat'})
+						from: { ref:["Categories"], as: "children" },
-		) .to.eql (
+						where: [
-			{ ID:101, parent:'Cat', children:[
+							{ref:[ "Categories", "ID" ]}, "=", {ref:[ "children", "parent_ID" ]}
-				{ ID:102, child:'Kitty' },
+						],
-				{ ID:106, child:'Catwoman' },
+					}},
-			]}
+				],
 			}
 		})
 		if (q.toSql) expect (q.toSql()) .to.eql (
 			`SELECT json_insert('{}',` +
 				`'$."ID"',ID,` +
 				`'$."name"',name,` +
 				`'$."children"',children->'$'` +
 			`) as _json_ FROM (` +
 				`SELECT Categories.ID,Categories.name,(` +
 					`SELECT jsonb_group_array(jsonb_insert('{}','$."name"',name)) as _json_ FROM (` +
 						`SELECT children.name FROM Categories as children WHERE Categories.ID = children.parent_ID` +
 					`)` +
 				`) as children FROM Categories as Categories` +
 			`)`
 		)
 	})
-	it ('supports deeply nested reads', async()=>{
+	it ('supports nested reads', ()=> expect (
-		if (require('semver').gte(cds.version, '5.9.0')) {
+		SELECT.one.from (Cats, c=>{
-			expect (await SELECT.one.from (Cats, c=>{
+			c.ID, c.name.as('parent'), c.children (c=>{
-				c.ID, c.name, c.children (
+				c.name.as('child')
-					c => { c.name },
+			})
-					{levels:3}
+		}) .where ({name:'Cat'})
-				)
+	) .to.eventually.eql (
-			}) .where ({name:'Cat'})
+		{ ID:101, parent:'Cat', children:[
-			) .to.eql (
+			{ child:'Kitty' },
-				{ ID:101, name:'Cat', children:[
+			{ child:'Catwoman' },
-					{ name:'Kitty', children:[
+		]}
-						{ name:'Kitty Cat', children:[
+	))
-							{ name:'Aristocat' }, ]},  // level 3
+
-						{ name:'Kitty Bat', children:[] }, ]},
+	it ('supports deeply nested reads', ()=> expect (
-					{ name:'Catwoman', children:[
+		SELECT.one.from (Cats, c=>{
 						{ name:'Catalina', children:[] } ]},
 				]}
 			)
 			return
 		}
 		expect (await SELECT.one.from (Cats, c=>{
 			c.ID, c.name, c.children (
 				c => { c.name },
 				{levels:3}
 			)
 		}) .where ({name:'Cat'})
-		) .to.eql (
+	) .to.eventually.eql (
-			{ ID:101, name:'Cat', children:[
+		{ ID:101, name:'Cat', children:[
-				{ ID:102, name:'Kitty', children:[
+			{ name:'Kitty', children:[
-					{ ID:103, name:'Kitty Cat', children:[
+				{ name:'Kitty Cat', children:[
-						{ ID:104, name:'Aristocat' }, ]},  // level 3
+					{ name:'Aristocat' }, ]},  // level 3
-					{ ID:105, name:'Kitty Bat', children:[] }, ]},
+				{ name:'Kitty Bat', children:[] }, ]},
-				{ ID:106, name:'Catwoman', children:[
+			{ name:'Catwoman', children:[
-					{ ID:107, name:'Catalina', children:[] } ]},
+				{ name:'Catalina', children:[] } ]},
-			]}
+		]}
-		)
+	))
 	})
 	it ('supports cascaded deletes', async()=>{
 		const affectedRows = await DELETE.from (Cats) .where ({ID:[102,106]})
 		expect (affectedRows) .to.be.greaterThan (0)
-		const expected = [
+		await expect (SELECT`ID,name`.from(Cats) ).to.eventually.eql ([
 			{ ID:100, name:'Some Cats...' },
 			{ ID:101, name:'Cat' },
 			{ ID:108, name:'Catweazle' }
-		]
+		])
 		expect ( await SELECT`ID,name`.from(Cats) ).to.eql (expected)
 	})
 })
--- a/test/localized-data/package.json
+++ b/test/localized-data/package.json
@@ -0,0 +1,5 @@
 {
  "devDependencies": {
    "@cap-js/sqlite": "^1"
  }
 }
--- a/test/localized-data/services.test.js
+++ b/test/localized-data/services.test.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 describe('cap/samples - Localized Data', () => {
--- a/test/messaging.test.js
+++ b/test/messaging.test.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 describe('cap/samples - Messaging', ()=>{
--- a/test/odata.test.js
+++ b/test/odata.test.js
@@ -1,4 +1,4 @@
-const cds = require('@sap/cds/lib')
+const cds = require('@sap/cds')
 describe('cap/samples - Bookshop APIs', () => {
  const { GET, expect, axios } = cds.test ('@capire/bookshop')
@@ -8,9 +8,10 @@ describe('cap/samples - Bookshop APIs', () => {
    const { headers, status, data } = await GET `/browse/$metadata`
    expect(status).to.equal(200)
    expect(headers).to.contain({
-      'content-type': 'application/xml',
+      // 'content-type': 'application/xml', //> fails with 'application/xml;charset=utf-8', which is set by express
      'odata-version': '4.0',
    })
    expect(headers['content-type']).to.match(/application\/xml/)
    expect(data).to.contain('<EntitySet Name="Books" EntityType="CatalogService.Books">')
    expect(data).to.contain('<Annotation Term="Common.Label" String="Currency"/>')
  })
@@ -22,69 +23,72 @@ describe('cap/samples - Bookshop APIs', () => {
    const { data } = await GET `/browse/ListOfBooks ${{
      params: { $search: 'Po', $select: `title,author`, $expand:`genre,currency` },
    }}`
-    expect(data.value).to.eql([
+    expect(data.value).to.containSubset([
      { ID: 251, title: 'The Raven', author: 'Edgar Allen Poe', genre:Mystery, currency:USD  },
      { ID: 252, title: 'Eleonora', author: 'Edgar Allen Poe', genre:Romance, currency:USD  },
    ])
  })
-  it('supports $search in multiple fields', async () => {
+  describe('query options...', () => {
    const { data } = await GET `/browse/Books ${{
      params: { $search: 'Po', $select: `title,author` },
    }}`
    expect(data.value).to.eql([
      { ID: 201, title: 'Wuthering Heights', author: 'Emily Brontë' },
      { ID: 207, title: 'Jane Eyre', author: 'Charlotte Brontë' },
      { ID: 251, title: 'The Raven', author: 'Edgar Allen Poe' },
      { ID: 252, title: 'Eleonora', author: 'Edgar Allen Poe' },
    ])
  })
-  it('supports $select', async () => {
+    it('supports $search in multiple fields', async () => {
-    const { data } = await GET(`/browse/Books`, {
+      const { data } = await GET `/browse/Books ${{
-      params: { $select: `ID,title` },
+        params: { $search: 'Po', $select: `title,author` },
      }}`
      expect(data.value).to.containSubset([
        { ID: 201, title: 'Wuthering Heights', author: 'Emily Brontë' },
        { ID: 207, title: 'Jane Eyre', author: 'Charlotte Brontë' },
        { ID: 251, title: 'The Raven', author: 'Edgar Allen Poe' },
        { ID: 252, title: 'Eleonora', author: 'Edgar Allen Poe' },
      ])
    })
    expect(data.value).to.eql([
      { ID: 201, title: 'Wuthering Heights' },
      { ID: 207, title: 'Jane Eyre' },
      { ID: 251, title: 'The Raven' },
      { ID: 252, title: 'Eleonora' },
      { ID: 271, title: 'Catweazle' },
    ])
  })
-  it('supports $expand', async () => {
+    it('supports $select', async () => {
-    const { data } = await GET(`/admin/Authors`, {
+      const { data } = await GET(`/browse/Books`, {
-      params: {
+        params: { $select: `ID,title` },
-        $select: `name`,
+      })
-        $expand: `books($select=title)`,
+      expect(data.value).to.containSubset([
-      },
+        { ID: 201, title: 'Wuthering Heights' },
        { ID: 207, title: 'Jane Eyre' },
        { ID: 251, title: 'The Raven' },
        { ID: 252, title: 'Eleonora' },
        { ID: 271, title: 'Catweazle' },
      ])
    })
    expect(data.value).to.containSubset([
      { name: 'Emily Brontë', books: [{ title: 'Wuthering Heights' }] },
      { name: 'Charlotte Brontë', books: [{ title: 'Jane Eyre' }] },
      { name: 'Edgar Allen Poe', books: [{ title: 'The Raven' }, { title: 'Eleonora' }] },
      { name: 'Richard Carpenter', books: [{ title: 'Catweazle' }] },
    ])
  })
-  it('supports $value requests', async () => {
+    it('supports $expand', async () => {
-    const { data } = await GET`/admin/Books/201/stock/$value`
+      const { data } = await GET(`/admin/Authors`, {
-    expect(data).to.equal(12)
+        params: {
-  })
+          $select: `name`,
          $expand: `books($select=title)`,
        },
      })
      expect(data.value).to.containSubset([
        { name: 'Emily Brontë', books: [{ title: 'Wuthering Heights' }] },
        { name: 'Charlotte Brontë', books: [{ title: 'Jane Eyre' }] },
        { name: 'Edgar Allen Poe', books: [{ title: 'The Raven' }, { title: 'Eleonora' }] },
        { name: 'Richard Carpenter', books: [{ title: 'Catweazle' }] },
      ])
    })
-  it('supports $top/$skip paging', async () => {
+    it('supports $value requests', async () => {
-    const { data: p1 } = await GET`/browse/Books?$select=title&$top=3`
+      const { data } = await GET`/admin/Books/201/stock/$value`
-    expect(p1.value).to.eql([
+      expect(data).to.equal(12)
-      { ID: 201, title: 'Wuthering Heights' },
+    })
-      { ID: 207, title: 'Jane Eyre' },
+
-      { ID: 251, title: 'The Raven' },
+    it('supports $top/$skip paging', async () => {
-    ])
+      const { data: p1 } = await GET`/browse/Books?$select=title&$top=3`
-    const { data: p2 } = await GET`/browse/Books?$select=title&$skip=3`
+      expect(p1.value).to.containSubset([
-    expect(p2.value).to.eql([
+        { ID: 201, title: 'Wuthering Heights' },
-      { ID: 252, title: 'Eleonora' },
+        { ID: 207, title: 'Jane Eyre' },
-      { ID: 271, title: 'Catweazle' },
+        { ID: 251, title: 'The Raven' },
-    ])
+      ])
      const { data: p2 } = await GET`/browse/Books?$select=title&$skip=3`
      expect(p2.value).to.containSubset([
        { ID: 252, title: 'Eleonora' },
        { ID: 271, title: 'Catweazle' },
      ])
    })
  })
  it('serves user info', async () => {
		`@@ -1,2 +0,0 @@`
			`// Incorporate pre-build extensions from...`
			`using from '../../common';`
`@@ -1,4 +1,4 @@`
	`const cds = require('@sap/cds/lib')`	`const cds = require('@sap/cds')`

	`describe('cap/samples - Consuming Services locally', () => {`	`describe('cap/samples - Consuming Services locally', () => {`