Use common-content 1.1.0

Thus all modules (except standalone bookshop) get the content.

.eslintrc

@@ -1,28 +1,31 @@
 {
-    "extends": "eslint:recommended",
-    "env": {
-        "browser": true,
-        "node": true,
-        "es6": true,
-        "jest": true,
-        "mocha": true
-    },
-    "parserOptions": {
-        "ecmaVersion": 2020
-    },
-    "globals": {
-        "SELECT": true,
-        "INSERT": true,
-        "UPDATE": true,
-        "DELETE": true,
-        "CREATE": true,
-        "DROP": true,
-        "cds": true
-    },
-    "rules": {
-        "no-console": "off",
-        "require-atomic-updates": "off",
+  "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": "_" }]
-    }
+  }
 }

.github/ISSUE_TEMPLATE/config.yml

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

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

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

.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+
+updates:
+- package-ecosystem: npm
+  directory: /
+  versioning-strategy: increase-if-necessary
+  schedule:
+    interval: daily

.github/workflows/node.js.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x, 14.x, 12.x]
+        node-version: [18.x, 16.x, 14.x]
 
     steps:
     - uses: actions/checkout@v2
@@ -24,5 +24,6 @@ jobs:
       uses: actions/setup-node@v1
       with:
         node-version: ${{ matrix.node-version }}
+    - run: npm i -g npm@8
     - run: npm ci
     - run: npm test

.gitignore

@@ -12,8 +12,13 @@ target/
 *.mtar
 connection.properties
 default-env.json
+.cdsrc-private.json
 packages/messageBox
 reviews/msg-box
 reviews/db/test.db
 
 *.openapi3.json
+*.sqlite
+*.db
+
+**/@types

.registry/.gitignore

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

.registry/server.js

@@ -1,80 +0,0 @@
-const { exec } = require ('child_process')
-const isWin = process.platform === 'win32'
-const express = require ('express')
-const fs = require ('fs')
-const app = express()
-
-const { PORT=4444 } = process.env
-const [,,port=PORT,scope='@capire'] = process.argv
-const cwd = __dirname
-
-// clean up on start (exit handler might not complete on Windows)
-exec(isWin ? 'del *.tgz' : 'rm *.tgz', {cwd})
-
-
-app.use('/-/:tarball', (req,res,next) => {
-  console.debug ('GET', req.params)
-  try {
-    const { tarball } = req.params
-    const [, pkg ] = /^\w+-(\w+)/.exec(tarball)
-    fs.lstat(tarball,(err => {
-      if (err) console.debug (`npm pack ../${pkg}`)
-      if (err) exec(`npm pack ../${pkg}`,{cwd},next)
-      else next()
-    }))
-  } catch (e) {
-    console.error(e)
-    res.sendStatus(500)
-  }
-})
-
-app.use('/-', express.static(__dirname))
-
-app.get('/*', (req,res)=>{
-  const urlRegex = /^\/(@\w+)\/(\w+)/
-  const url = decodeURIComponent(req.url)
-  console.debug ('GET',url)
-  try {
-    if (!urlRegex.test(url))  return res.sendStatus(404)
-    const [, scpe, pkg ] = urlRegex.exec(url)
-    const package = require (`${scpe}/${pkg}/package.json`)
-    const tarball = `${scpe.slice(1)}-${pkg}-${package.version}.tgz`
-    // https://github.com/npm/registry/blob/master/docs/responses/package-metadata.md
-    res.json({
-      "name": package.name,
-      "dist-tags": {
-        "latest": package.version
-      },
-      "versions": {
-        [package.version]: {
-          "name": package.name,
-          "version": package.version,
-          "dist": {
-            "tarball": `${server.url}/-/${tarball}`
-          },
-        }
-      },
-    })
-  } catch (e) {
-    if (e.code === 'MODULE_NOT_FOUND')  return res.sendStatus(404)
-    console.error(e);  throw e
-  }
-})
-
-const server = app.listen(port, ()=>{
-  const url = server.url = `http://localhost:${server.address().port}`
-  console.log (`npm set ${scope}:registry=${url}`)
-  exec(`npm set ${scope}:registry=${url}`)
-  console.log (`${scope} registry listening on ${url}`)
-})
-
-
-const _exit = ()=>{
-  server.close()
-  exec(`npm conf rm "${scope}:registry"`, ()=> { process.exit() })
-}
-
-process.on ('SIGTERM',_exit)
-process.on ('SIGHUP',_exit)
-process.on ('SIGINT',_exit)
-process.on ('SIGUSR2',_exit)

.tours/samples.tour

@@ -104,7 +104,7 @@
     },
     {
       "file": "fiori/app/services.cds",
-      "description": "### Annotations for SAP Fiori Elements\n\n- [Adds an SAP Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookstore, thereby introducing to:\n- [OData Annotations](https://cap.cloud.sap/docs/guides/fiori#adding-odata-annotations) in `.cds` files\n- Support for [Fiori Draft](https://cap.cloud.sap/docs/guides/fiori#draft)\n- Support for [Value Helps](https://cap.cloud.sap/docs/guides/fiori#value-help)\n- Serving SAP Fiori apps locally\n",
+      "description": "### Annotations for SAP Fiori Elements\n\nAdds an SAP Fiori elements application to bookstore, thereby introducing:\n- OData Annotations in `.cds` files\n- Support for Fiori Draft\n- Support for Value Helps\n- Serving SAP Fiori apps locally\n\nSee the [Serving Fiori UIs](https://cap.cloud.sap/docs/advanced/fiori) documentation for more information.",
       "line": 1,
       "selection": {
         "start": {
@@ -136,4 +136,4 @@
   ],
   "isPrimary": true,
   "description": "Overview of CAP Samples for Node.js"
-}
+}

.vscode/launch.json

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

.vscode/settings.json

@@ -10,9 +10,18 @@
       "<node_internals>/**",
       "**/node_modules/**",
       "**/cds/lib/lazy.js",
-      "**/cds/lib/req/cls.js",
+      "**/cds/lib/req/cds-context.js",
       "**/odata-v4/okra/**"
     ]
   },
-  "mochaExplorer.parallel": true
+  "mochaExplorer.debuggerConfig": "Debug Mocha Tests",
+  "mochaExplorer.parallel": true,
+  "eslint.probe": [
+    "cds",
+    "csn",
+    "csv",
+    "csv (semicolon)",
+    "tsv",
+    "tab"
+  ]
 }

README.md

@@ -7,13 +7,14 @@ Find here a collection of samples for the [SAP Cloud Application Programming Mod
 
 ### Preliminaries
 
-1. Install [**@sap/cds-dk**](https://cap.cloud.sap/docs/get-started/) globally:
+1. Ensure you have the latest LTS version of Node.js installed (see [Getting Started](https://cap.cloud.sap/docs/get-started/))
+2. Install [**@sap/cds-dk**](https://cap.cloud.sap/docs/get-started/) globally:
 
    ```sh
    npm i -g @sap/cds-dk
    ```
 
-2. _Optional:_ [Use Visual Studio Code](https://cap.cloud.sap/docs/get-started/tools#vscode)
+3. _Optional:_ [Use Visual Studio Code](https://cap.cloud.sap/docs/get-started/tools#vscode)
 
 ### Download
 

bookshop/app/vue/app.js

@@ -3,14 +3,15 @@ const $ = sel => document.querySelector(sel)
 const GET = (url) => axios.get('/browse'+url)
 const POST = (cmd,data) => axios.post('/browse'+cmd,data)
 
-const books = new Vue ({
+const books = Vue.createApp ({
 
-    el:'#app',
-
-    data: {
+    data() {
+      return {
         list: [],
         book: undefined,
-        order: { quantity:1, succeeded:'', failed:'' }
+        order: { quantity:1, succeeded:'', failed:'' },
+        user: undefined
+      }
     },
 
     methods: {
@@ -37,12 +38,52 @@ const books = new Vue ({
                 book.stock = res.data.stock
                 books.order = { quantity, succeeded: `Successfully ordered ${quantity} item(s).` }
             } catch (e) {
-                books.order = { quantity, failed: e.response.data.error.message }
+                books.order = { quantity, failed: e.response.data.error ? e.response.data.error.message : e.response.data }
             }
-        }
+        },
 
+        async login() {
+            try {
+                const { data:user } = await axios.post('/user/login',{})
+                if (user.id !== 'anonymous') books.user = user
+            } catch (err) { books.user = { id: err.message } }
+        },
+
+        async getUserInfo() {
+            try {
+                const { data:user } = await axios.get('/user/me')
+                if (user.id !== 'anonymous') books.user = user
+            } catch (err) { books.user = { id: err.message } }
+        },
     }
+}).mount('#app')
+
+books.getUserInfo()
+books.fetch() // initially fill list of books
+
+document.addEventListener('keydown', (event) => {
+    // hide user info on request
+    if (event.key === 'u')  books.user = undefined
 })
 
-// initially fill list of books
-books.fetch()
+axios.interceptors.request.use(csrfToken)
+function csrfToken (request) {
+    if (request.method === 'head' || request.method === 'get') return request
+    if ('csrfToken' in document) {
+        request.headers['x-csrf-token'] = document.csrfToken
+        return request
+    }
+    return fetchToken().then(token => {
+        document.csrfToken = token
+        request.headers['x-csrf-token'] = document.csrfToken
+        return request
+    }).catch(_ => {
+        document.csrfToken = null // set mark to not try again
+        return request
+    })
+
+    function fetchToken() {
+        return axios.get('/', { headers: { 'x-csrf-token': 'fetch' } })
+        .then(res => res.headers['x-csrf-token'])
+    }
+}

bookshop/app/vue/index.html

@@ -5,19 +5,32 @@
     <title> Capire Books </title>
     <link rel="stylesheet" href="https://unpkg.com/primitive-ui/dist/css/main.css">
     <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/vue"></script>
+    <script src="https://cdn.jsdelivr.net/npm/vue@3/dist/vue.global.prod.js"></script>
     <style>
         .hovering tr:hover td { color:cyan; background: #123; cursor: pointer; }
         .rating-stars { color:teal }
         .succeeded { color:teal }
         .failed { color:red }
+        .user {text-align: end; color: grey;}
     </style>
 </head>
 
 <body class="small-container", style="margin-top: 70px;">
 <div id='app'>
 
-    <h1> {{ document.title }} </h1>
+    <form class="user" @submit.prevent="login">
+        <div v-if="user">
+            <div v-if="user.tenant">Tenant: {{ user.tenant }}</div>
+            <div> User: {{ user.id }}</div>
+            <div>Locale: {{ user.locale }}</div>
+        </div>
+        <div v-else>
+            <input type="submit" value="Login" class="muted-button">
+            <!-- <a href="/user/login()">Login</a> -->
+        </div>
+    </form>
+
+    <h1> Capire Books </h1>
 
     <input type="text" placeholder="Search..." @input="search">
 

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

@@ -1,5 +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
+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"

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

@@ -1,6 +1,6 @@
-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;16
-271;Catweazle;Catweazle is a British fantasy television series, starring Geoffrey Bayldon in the title role, and created by Richard Carpenter for London Weekend Television. The first series, produced and directed by Quentin Lawrence, was screened in the UK on ITV in 1970. The second series, directed by David Reid and David Lane, was shown in 1971. Each series had thirteen episodes, most but not all written by Carpenter, who also published two books based on the scripts.;170;22;150;JPY;13
+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

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

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

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

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

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

@@ -1,16 +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
+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

bookshop/db/init.js

@@ -4,21 +4,21 @@
  * currencies, if not obtained through @capire/common.
  */
 
-module.exports = async (db)=>{
+module.exports = async (tx)=>{
 
-  const has_common = db.model.definitions['sap.common.Currencies'].elements.numcode
+  const has_common = tx.model.definitions['sap.common.Currencies']?.elements.numcode
   if (has_common) return
 
-  const already_filled = await db.exists('sap.common.Currencies',{code:'EUR'})
+  const already_filled = await tx.exists('sap.common.Currencies',{code:'EUR'})
   if (already_filled) return
 
-  await INSERT.into ('sap.common.Currencies') .columns (
-    'code','symbol','name'
+  await tx.run (INSERT.into ('sap.common.Currencies') .columns (
+    [ 'code', 'symbol', 'name' ]
   ) .rows (
-    [ 'EUR','€','Euro' ],
-    [ 'USD','$','US Dollar' ],
-    [ 'GBP','£','British Pound' ],
-    [ 'ILS','₪','Shekel' ],
-    [ 'JPY','¥','Yen' ],
-  )
+    [ 'EUR', '€', 'Euro' ],
+    [ 'USD', '$', 'US Dollar' ],
+    [ 'GBP', '£', 'British Pound' ],
+    [ 'ILS', '₪', 'Shekel' ],
+    [ 'JPY', '¥', 'Yen' ],
+  ))
 }

bookshop/index.cds

@@ -2,3 +2,4 @@ namespace sap.capire.bookshop; //> important for reflection
 using from './db/schema';
 using from './srv/cat-service';
 using from './srv/admin-service';
+using from './srv/user-service';

bookshop/package.json

@@ -2,10 +2,17 @@
   "name": "@capire/bookshop",
   "version": "1.0.0",
   "description": "A simple self-contained bookshop service.",
+  "files": [
+    "app",
+    "srv",
+    "db",
+    "index.cds",
+    "index.js"
+  ],
   "dependencies": {
-    "@sap/cds": "^5.0.4",
+    "@sap/cds": ">=5.9",
     "express": "^4.17.1",
-    "passport": "0.4.1"
+    "passport": ">=0.4.1"
   },
   "scripts": {
     "genres": "cds serve test/genres.cds",
@@ -14,9 +21,7 @@
   },
   "cds": {
     "requires": {
-      "db": {
-        "kind": "sql"
-      }
+      "db": "sql"
     }
   }
 }

bookshop/srv/admin-service.js

@@ -1,9 +1,10 @@
-const cds = require('@sap/cds')
+const cds = require('@sap/cds/lib')
 
-module.exports = cds.service.impl (function(){
+module.exports = class AdminService extends cds.ApplicationService { init(){
   this.before ('NEW','Authors', genid)
   this.before ('NEW','Books', genid)
-})
+  return super.init()
+}}
 
 /** Generate primary keys for target entity in request */
 async function genid (req) {

bookshop/srv/cat-service.js

@@ -3,6 +3,7 @@ const cds = require('@sap/cds')
 class CatalogService extends cds.ApplicationService { init(){
 
   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 => {
@@ -18,7 +19,7 @@ class CatalogService extends cds.ApplicationService { init(){
   })
 
   // Add some discount for overstocked books
-  this.after ('READ','ListOfBooks', each => {
+  this.after ('READ', ListOfBooks, each => {
     if (each.stock > 111) each.title += ` -- 11% discount!`
   })
 

bookshop/srv/user-service.cds

@@ -0,0 +1,15 @@
+/**
+ * Exposes user information
+ */
+service UserService {
+  /**
+   * The current user
+   */
+  @odata.singleton entity me @cds.persistence.skip {
+    id     : String; // user id
+    locale : String;
+    tenant : String;
+  }
+
+  action login() returns me;
+}

bookshop/srv/user-service.js

@@ -0,0 +1,9 @@
+const cds = require('@sap/cds')
+module.exports = class UserService extends cds.Service { init(){
+  this.on('READ', 'me', ({ tenant, user, locale }) => ({ id: user.id, locale, tenant }))
+  this.on('login', (req) => {
+    if (req.user._is_anonymous)
+      req._.res.set('WWW-Authenticate','Basic realm="Users"').sendStatus(401)
+    else return this.read('me')
+  })
+}}

bookshop/test/requests.http

@@ -16,9 +16,9 @@ GET {{server}}/browse/$metadata
 
 ### ------------------------------------------------------------------------
 # Browse Books as any user
-GET {{server}}/browse/Books?
+GET {{server}}/browse/ListOfBooks?
   # &$select=title,stock
-  # &$expand=currency
+  &$expand=genre
   # &sap-language=de
 {{me}}
 

bookstore/package.json

@@ -7,7 +7,8 @@
     "@capire/orders": "*",
     "@capire/common": "*",
     "@capire/data-viewer": "*",
-    "@sap/cds": "^5",
+    "@sap/cds": ">=5",
+    "@sap/cds-common-content": "^1.0.0",
     "express": "^4.17.1"
   },
   "cds": {
@@ -26,7 +27,8 @@
         "[production]": { "kind": "enterprise-messaging" }
       },
       "db": {
-        "kind": "sql"
+        "kind": "sql",
+        "schema_evolution": "auto"
       }
     },
     "log": { "service": true }

bookstore/server.js

@@ -19,4 +19,4 @@ module.exports = cds.server
 
 // For didactic reasons in capire
 const { ReviewsService, OrdersService } = cds.requires
-if (!ReviewsService.credentials && !OrdersService.credentials) cds.requires.messaging = false
+if (!ReviewsService?.credentials && !OrdersService?.credentials) cds.requires.messaging = false

bookstore/srv/mashup.cds

@@ -12,7 +12,11 @@ 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;
+
+  @Common.Label : '{i18n>Rating}'
   rating  : Decimal;
+
+  @Common.Label : '{i18n>NumberOfReviews}'
   numberOfReviews : Integer;
 }
 

common/data/sap.common-Countries.csv

@@ -1,12 +0,0 @@
-code;name;descr
-AU;Australia;Commonwealth of Australia
-CA;Canada;Canada
-CN;China;People's Republic of China (PRC)
-FR;France;French Republic
-DE;Germany;Federal Republic of Germany
-IN;India;Republic of India
-IL;Israel;State of Israel
-MM;Myanmar;Republic of the Union of Myanmar
-GB;United Kingdom;United Kingdom of Great Britain and Northern Ireland
-US;United States;United States of America (USA)
-EU;European Union;European Union

common/data/sap.common-Countries_texts.csv

@@ -1,12 +0,0 @@
-code;locale;name;descr
-AU;de;Australien;Commonwealth Australien
-CA;de;Kanada;Canada
-CN;de;China;Volksrepublik China
-FR;de;Frankreich;Republik Frankreich
-DE;de;Deutschland;Bundesrepublik Deutschland
-IN;de;Indien;Republik Indien
-IL;de;Israel;Staat Israel
-MM;de;Myanmar;Republik der Union Myanmar
-GB;de;Vereinigtes Königreich;Vereinigtes Königreich Großbritannien und Nordirland
-US;de;Vereinigte Staaten;Vereinigte Staaten von Amerika
-EU;de;Europäische Union;Europäische Union

common/data/sap.common-Currencies.csv

@@ -1,12 +1,12 @@
-code;symbol;name;descr;numcode;minor;exponent
-EUR;€;Euro;European Euro;978;Cent;2
-USD;$;US Dollar;United States Dollar;840;Cent;2
-CAD;$;Canadian Dollar;Canadian Dollar;124;Cent;2
-AUD;$;Australian Dollar;Australian Dollar;036;Cent;2
-GBP;£;British Pound;Great Britain Pound;826;Penny;2
-ILS;₪;Shekel;Israeli New Shekel;376;Agorat;2
-INR;₹;Rupee;Indian Rupee;356;Paise;2
-QAR;﷼;Riyal;Katar Riyal;356;Dirham;2
-SAR;﷼;Riyal;Saudi Riyal;682;Halala;2
-JPY;¥;Yen;Japanese Yen;392;Sen;2
-CNY;¥;Yuan;Chinese Yuan Renminbi;156;Jiao;1
+code;symbol;numcode;minor;exponent
+EUR;€;978;Cent;2
+USD;$;840;Cent;2
+CAD;$;124;Cent;2
+AUD;$;036;Cent;2
+GBP;£;826;Penny;2
+ILS;₪;376;Agorat;2
+INR;₹;356;Paise;2
+QAR;﷼;634;Dirham;2
+SAR;﷼;682;Halala;2
+JPY;¥;392;Sen;2
+CNY;¥;156;Jiao;1

common/data/sap.common-Currencies_texts.csv

@@ -1,15 +0,0 @@
-code;locale;name;descr
-EUR;de;Euro;European Euro
-USD;de;US-Dollar;United States Dollar
-CAD;de;Kanadischer Dollar;Kanadischer Dollar
-AUD;de;Australischer Dollar;Australischer Dollar
-GBP;de;Pfund;Britische Pfund
-ILS;de;Schekel;Israelische Schekel
-JPY;de;Yen;Japanische Yen
-EUR;fr;euro;de la Zone euro
-USD;fr;dollar;dollar des États-Unis
-CAD;fr;dollar canadien;dollar canadien
-AUD;fr;dollar australien;dollar australien
-GBP;fr;livre sterling;pound sterling
-ILS;fr;Shekel;shekel israelien
-JPY;fr;Yen;Yen japonais

common/data/sap.common-Languages.csv

@@ -1,5 +0,0 @@
-code;name
-de;German
-fr;French
-en;English
-en_GB;British English

common/data/sap.common-Languages_texts.csv

@@ -1,10 +0,0 @@
-code;locale;name
-de;en;German
-de;de;Deutsch
-de;fr;Allemande
-fr;en;French
-fr;de;Französisch
-fr;fr;Francais
-en;en;English
-en;de;Englisch
-en;fr;Anglais

common/index.cds

@@ -1,5 +1,7 @@
 using { sap } from '@sap/cds/common';
 
+using from '@sap/cds-common-content';
+
 extend sap.common.Currencies with {
   // Currencies.code = ISO 4217 alphabetic three-letter code
   // with the first two letters being equal to ISO 3166 alphabetic country codes

data-viewer/package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "description": "A generic browser for data",
   "dependencies": {
-    "@sap/cds": "^5.0.4"
+    "@sap/cds": ">=5.0.4"
   },
   "files": [
     "app",

data-viewer/srv/data-service.cds

@@ -2,12 +2,12 @@
  * Exposes data + entity metadata
  */
 @requires:'authenticated-user'
-service DataService @( path:'-data' ) {
+@odata service DataService @( path:'-data' ) {
 
   /**
    * Metadata like name and columns/elements
    */
-  entity Entities {
+  entity Entities @cds.persistence.skip {
     key name : String;
     columns: Composition of many {
       name :  String;
@@ -19,7 +19,7 @@ service DataService @( path:'-data' ) {
   /**
    * The actual data, organized by column name
    */
-  entity Data {
+  entity Data @cds.persistence.skip {
     record   : array of {
       column : String;
       data   : String;

fiori/app/_i18n/i18n.properties

@@ -6,16 +6,33 @@ Author = Author
 AuthorID = Author ID
 Stock = Stock
 Name = Name
+Description = Description
+Image = Image
 AuthorName = Author's Name
 DateOfBirth = Date of Birth
 DateOfDeath = Date of Death
 PlaceOfBirth = Place of Birth
 PlaceOfDeath = Place of Death
 Age = Age
+Lifetime = Lifetime
 Authors = Authors
+
 Order = Order
 Orders = Orders
+OrderNo = Order Number
+OrderItems = Order Items
+Customer = Customer
+Product = Product
+ProductID = Product ID
+ProductTitle = Product Title
+UnitPrice = Unit Price
+Quantity = Quantity
+
 Price = Price
+Currency = Currency
+Date = Date
+Rating = Rating
+NumberOfReviews = Number of Reviews
 
 Genre = Genre
 Genres = Genres

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

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

fiori/app/admin-authors/webapp/manifest.json

@@ -11,7 +11,7 @@
     },
     "dataSources": {
       "AdminService": {
-        "uri": "/admin/",
+        "uri": "admin/",
         "type": "OData",
         "settings": {
           "odataVersion": "4.0"

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

@@ -62,6 +62,11 @@ annotate AdminService.Books.texts with @(
 	}
 );
 
+annotate AdminService.Books.texts with {
+    ID       @UI.Hidden;
+    ID_texts @UI.Hidden;
+};
+
 // Add Value Help for Locales
 annotate AdminService.Books.texts {
 	locale @(
@@ -76,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; }

fiori/app/admin-books/webapp/manifest.json

@@ -8,7 +8,7 @@
         "i18n": "i18n/i18n.properties",
         "dataSources": {
             "AdminService": {
-                "uri": "/admin/",
+                "uri": "admin/",
                 "type": "OData",
                 "settings": {
                     "odataVersion": "4.0"

fiori/app/appconfig/fioriSandboxConfig.json

@@ -19,6 +19,14 @@
                     "title": "Browse Books",
                     "targetURL": "#Books-display"
                   }
+                },
+                {
+                  "id": "BrowseGenres",
+                  "tileType": "sap.ushell.ui.tile.StaticTile",
+                  "properties": {
+                    "title": "Browse Genres (OData v2)",
+                    "targetURL": "#Genres-display"
+                  }
                 }
               ]
             },
@@ -107,6 +115,24 @@
                 "url": "/admin-authors/webapp"
               }
             },
+            "BrowseGenres": {
+              "semanticObject": "Genres",
+              "action": "display",
+              "title": "Browse Genres",
+              "signature": {
+                "parameters": {
+                  "Genre.ID": {
+                    "renameTo": "ID"
+                  }
+                },
+                "additionalParameters": "ignored"
+              },
+              "resolutionResult": {
+                "applicationType": "SAPUI5",
+                "additionalInformation": "SAPUI5.Component=genres",
+                "url": "/genres/webapp"
+              }
+            },
             "ManageBooks": {
               "semanticObject": "Books",
               "action": "manage",

fiori/app/browse/fiori-service.cds

@@ -33,7 +33,7 @@ annotate CatalogService.Books with @(UI : {
 
 ////////////////////////////////////////////////////////////////////////////
 //
-//	Books Object Page
+//	Books List Page
 //
 annotate CatalogService.Books with @(UI : {
     SelectionFields : [
@@ -52,9 +52,6 @@ annotate CatalogService.Books with @(UI : {
         },
         {Value : genre.name},
         {Value : price},
-        {
-            Value : currency.symbol,
-            Label : ' '
-        },
+        {Value : currency.symbol},
     ]
 }, );

fiori/app/browse/webapp/manifest.json

@@ -11,7 +11,7 @@
     },
     "dataSources": {
       "CatalogService": {
-        "uri": "/browse/",
+        "uri": "browse/",
         "type": "OData",
         "settings": {
           "odataVersion": "4.0"
@@ -32,7 +32,7 @@
                 "renameTo": "ID"
               },
               "Authors.books.ID": {
-                "renameTo": "ID"                    
+                "renameTo": "ID"
               }
             },
             "additionalParameters": "ignored"

fiori/app/common.cds

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

fiori/app/fiori-apps.html

@@ -16,10 +16,10 @@
 
 	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
 	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
-    	data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
-    	data-sap-ui-compatVersion="edge"
-    	data-sap-ui-theme="sap_fiori_3"
-    	data-sap-ui-frameOptions="allow"
+			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
+			data-sap-ui-compatVersion="edge"
+			data-sap-ui-theme="sap_horizon"
+			data-sap-ui-frameOptions="allow"
 	></script>
 	<script>
 		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))

fiori/app/genres/fiori-service.cds

@@ -0,0 +1,8 @@
+using { sap.capire.bookshop } from '../../db/common';
+
+annotate bookshop.GenreHierarchy {
+  ID             @sap.hierarchy.node.for;
+  parent         @sap.hierarchy.parent.node.for;
+  hierarchyLevel @sap.hierarchy.level.for;
+  drillState     @sap.hierarchy.drill.state.for;
+}

fiori/app/genres/webapp/Component.js

@@ -0,0 +1,7 @@
+sap.ui.define(["sap/suite/ui/generic/template/lib/AppComponent"], (AppComponent) =>
+  AppComponent.extend("genres.Component", {
+    metadata: {
+      manifest: "json",
+    },
+  })
+);

fiori/app/genres/webapp/i18n/i18n.properties

@@ -0,0 +1,4 @@
+#XTIT
+appTitle=Genres
+#XTXT
+appDescription=Browse Genres

fiori/app/genres/webapp/manifest.json

@@ -0,0 +1,155 @@
+{
+  "_version": "1.8.0",
+  "sap.app": {
+    "id": "genres",
+    "type": "application",
+    "i18n": "i18n/i18n.properties",
+    "applicationVersion": {
+      "version": "1.0.0"
+    },
+    "title": "Browse Genres Hierarchy (OData v2)",
+    "description": "{{appDescription}}",
+    "tags": {
+      "keywords": []
+    },
+    "crossNavigation": {
+      "inbounds": {
+        "appShow": {
+          "title": "{{appTitle}}",
+          "semanticObject": "GenreHierarchy",
+          "action": "display",
+          "deviceTypes": {
+            "desktop": true,
+            "tablet": true,
+            "phone": true
+          },
+          "icon": "sap-icon://settings",
+          "size": "1x1"
+        }
+      },
+      "outbounds": {}
+    },
+    "ach": "",
+    "resources": "resources.json",
+    "dataSources": {
+      "main": {
+        "uri": "/v2/browse",
+        "type": "OData",
+        "settings": {
+          "annotations": ["localAnnotations"],
+          "localUri": "localService/metadata.xml"
+        }
+      },
+      "localAnnotations": {
+        "type": "ODataAnnotation",
+        "uri": "annotations/localAnnotations.xml",
+        "settings": {
+          "localUri": "annotations/localAnnotations.xml"
+        }
+      }
+    },
+    "offline": false,
+    "sourceTemplate": {
+      "id": "ui5template.smartTemplate",
+      "version": "1.40.12"
+    }
+  },
+  "sap.ui": {
+    "technology": "UI5",
+    "icons": {
+      "icon": "",
+      "favIcon": "",
+      "phone": "",
+      "phone@2": "",
+      "tablet": "",
+      "tablet@2": ""
+    },
+    "deviceTypes": {
+      "desktop": true,
+      "tablet": true,
+      "phone": true
+    },
+    "supportedThemes": ["sap_hcb", "sap_belize", "sap_belize_deep", "sap_fiori_3"]
+  },
+  "sap.ui5": {
+    "resources": {
+      "js": [],
+      "css": []
+    },
+    "dependencies": {
+      "minUI5Version": "1.65.6",
+      "libs": {},
+      "components": {}
+    },
+    "models": {
+      "i18n": {
+        "type": "sap.ui.model.resource.ResourceModel",
+        "uri": "i18n/i18n.properties"
+      },
+      "@i18n": {
+        "type": "sap.ui.model.resource.ResourceModel",
+        "uri": "i18n/i18n.properties"
+      },
+      "json": {
+        "type": "sap.ui.model.json.JSONModel"
+      },
+      "i18n|sap.suite.ui.generic.template.ListReport|Genres": {
+        "type": "sap.ui.model.resource.ResourceModel",
+        "uri": "i18n/ListReport/Genres/i18n.properties"
+      },
+      "": {
+        "dataSource": "main",
+        "preload": true,
+        "settings": {
+          "useBatch": true,
+          "defaultBindingMode": "TwoWay",
+          "defaultCountMode": "Inline",
+          "refreshAfterChange": true,
+          "metadataUrlParams": {
+            "sap-value-list": "none"
+          }
+        }
+      }
+    },
+    "contentDensities": {
+      "compact": true,
+      "cozy": true
+    }
+  },
+  "sap.ui.generic.app": {
+    "_version": "1.3.0",
+    "settings": {
+      "forceGlobalRefresh": false,
+      "useColumnLayoutForSmartForm": false,
+      "showBasicSearch": false
+    },
+    "pages": {
+      "ListReport|Genres": {
+        "entitySet": "GenreHierarchy",
+        "component": {
+          "name": "sap.suite.ui.generic.template.ListReport",
+          "list": true,
+          "settings": {
+            "condensedTableLayout": true,
+            "smartVariantManagement": true,
+            "tableType": "TreeTable",
+            "enableTableFilterInPageVariant": true,
+            "dataLoadSettings": {
+              "loadDataOnAppLaunch": "always"
+            }
+          }
+        }
+      }
+    }
+  },
+  "sap.fiori": {
+    "registrationIds": [],
+    "archeType": "transactional"
+  },
+  "sap.platform.hcp": {
+    "uri": ""
+  },
+  "sap.platform.cf": {
+    "oAuthScopes": []
+  }
+}

fiori/app/services.cds

@@ -5,5 +5,6 @@
 using from './admin-authors/fiori-service';
 using from './admin-books/fiori-service';
 using from './browse/fiori-service';
+using from './genres/fiori-service';
 using from './common';
 using from '@capire/bookstore/srv/mashup';

fiori/db/common.cds

@@ -0,0 +1,14 @@
+namespace sap.capire.bookshop;
+
+using { sap.capire.bookshop } from '@capire/bookstore/srv/mashup';
+
+entity GenreHierarchy : bookshop.Genres {
+  hierarchyLevel : Integer default 0;
+  drillState     : String default 'leaf';
+  parent         : Association to GenreHierarchy;
+  children       : Composition of many GenreHierarchy on children.parent = $self;
+}
+
+extend service CatalogService with {
+  @readonly entity GenreHierarchy as projection on bookshop.GenreHierarchy;
+}

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

@@ -0,0 +1,5 @@
+ID_TEXTS;ID;locale;title;descr
+a5fe2682-fe60-4dc0-9218-695e501e42e6;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.
+4edebff3-8cde-4761-8cd3-bae7834fc5f5;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.
+b649031b-aacc-4dc3-838f-c36bae5d266e;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
+aa62f0e1-763c-4c92-a304-50c2b86e21f4;252;de;Eleonora;“Eleonora” ist eine Erzählung von Edgar Allan Poe. Sie wurde 1841 erstveröffentlicht. In ihr geht es um das Paradox der Treue in der Treulosigkeit.

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

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

fiori/index.cds

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

fiori/package.json

@@ -3,9 +3,10 @@
   "version": "1.0.0",
   "dependencies": {
     "@capire/bookstore": "*",
-    "@sap/cds": "^5",
+    "@sap/cds": ">=5",
+    "@cap-js-community/odata-v2-adapter": "^1",
     "express": "^4.17.1",
-    "passport": "^0.4.1"
+    "passport": ">=0.4.1"
   },
   "scripts": {
     "start": "cds run --in-memory?",
@@ -13,9 +14,6 @@
   },
   "cds": {
     "requires": {
-      "auth": {
-        "strategy": "dummy"
-      },
       "ReviewsService": {
         "kind": "odata",
         "model": "@capire/reviews"
@@ -31,12 +29,13 @@
         "[development]": {
           "kind": "file-based-messaging"
         },
-        "[hybrid!]": {
+        "[hybrid]": {
           "kind": "enterprise-messaging-shared"
         }
       },
       "db": {
-        "kind": "sql"
+        "kind": "sql",
+        "schema_evolution": "auto"
       },
       "db-ext": {
         "[development]": {
@@ -45,10 +44,10 @@
         "[production]": {
           "model": "db/hana"
         }
-      },
-      "hana": {
-        "deploy-format": "hdbtable"
       }
+    },
+    "hana": {
+      "deploy-format": "hdbtable"
     }
   }
-}
+}

fiori/server.js

@@ -1 +1,8 @@
+// install OData v2 adapter
+const cds = require("@sap/cds")
+const proxy = require('@cap-js-community/odata-v2-adapter')
+const opts = global.it ? { target:'auto' } : {}   // for tests, set 'auto' to detect port dynamically
+cds.on('bootstrap', app => app.use(proxy(opts)))  // install proxy
+cds.log('cov2ap','silent') // suppress anoying log outpout, e.g. for `npm run mocha -- --reporter nyan`
+
 module.exports = require('@capire/bookstore/server.js')

gdpr/.cdsrc.json

@@ -1,28 +0,0 @@
-{
-  "build": {
-    "target": "gen",
-    "tasks": [{
-        "for": "hana",
-        "src": "db",
-        "options": {
-          "model": [
-            "db",
-            "srv",
-            "app"
-          ]
-        }
-      },
-      {
-        "for": "node-cf",
-        "src": "srv",
-        "options": {
-          "model": [
-            "db",
-            "srv",
-            "app"
-          ]
-        }
-      }
-    ]
-  }
-}

gdpr/.env

@@ -1 +0,0 @@
-PORT = 4007

gdpr/.etc/deploy.sh

@@ -1,4 +0,0 @@
-npm run build
-cf create-service-push
-cf bind-service gdpr-srv gdpr-pdm -c .pdm/pdm-binding-config.json
-cf restage gdpr-srv

gdpr/.etc/undeploy.sh

@@ -1,7 +0,0 @@
-cf delete gdpr-srv -f
-cf delete gdpr-db-deployer -f
-cf delete-service gdpr-pdm -f
-cf delete-service gdpr-auditlog -f
-cf delete-service gdpr-uaa -f
-cf delete-service gdpr-hdi -f
-cf delete-service gdpr-logs -f

gdpr/.pdm/pdm-binding-config.json

@@ -1,16 +0,0 @@
-{
-  "fullyQualifiedApplicationName": "capire-gdpr",
-  "fullyQualifiedModuleName": "gdpr-srv",
-  "applicationTitle": "Capire GDPR Sample App",
-  "applicationTitleKey": "Capire GDPR Sample App",
-  "applicationURL": "https://capire-gdpr-srv.cfapps.eu10.hana.ondemand.com",
-  "endPoints": [{
-    "type": "odatav4",
-    "serviceName": "PDMService",
-    "serviceURI": "/pdm",
-    "serviceTitle": "Capire GDPR Sample App PDM Service",
-    "serviceTitleKey": "Capire GDPR Sample App PDM Service",
-    "hasGdprV4Annotations": true,
-    "cacheControl": "no-cache"
-  }]
-}

gdpr/.pdm/pdm-instance-config.json

@@ -1,8 +0,0 @@
-{
-  "xs-security": {
-    "xsappname": "capire-gdpr",
-    "authorities": ["$ACCEPT_GRANTED_AUTHORITIES"]
-  },
-  "fullyQualifiedApplicationName": "capire-gdpr",
-  "appConsentServiceEnabled": true
-}

gdpr/app/fiori.cds

@@ -1,317 +0,0 @@
-////////////////////////////////////////////////////////////////////////////
-//
-//	Note: this is designed for the GDPRService being co-located with
-//	orders. It does not work if GDPRService is run as a separate
-// 	process, and is not intended to do so.
-//
-////////////////////////////////////////////////////////////////////////////
-
-
-using {GDPRService} from '../srv/gdpr-service';
-
-annotate cds.UUID with @Core.Computed;
-
-/*
- * Orders
- */
-@odata.draft.enabled
-annotate GDPRService.Orders with @(UI : {
-  SelectionFields      : [
-    createdAt,
-    createdBy
-  ],
-  LineItem             : [
-    {
-      Value : OrderNo,
-      Label : 'Order number'
-    },
-    {
-      Value : customer.firstName,
-      Label : 'First Name'
-    },
-    {
-      Value : customer.lastName,
-      Label : 'Last Name'
-    }
-  ],
-  HeaderInfo           : {
-    TypeName       : 'Order',
-    TypeNamePlural : 'Orders',
-    Title          : {
-      Value : OrderNo,
-      Label : 'Order number'
-    }
-  },
-  Identification       : [
-    {
-      Value : createdBy,
-      Label : 'Created by'
-    },
-    {
-      Value : createdAt,
-      Label : 'Created at'
-    }
-  ],
-  HeaderFacets         : [
-    {
-      $Type  : 'UI.ReferenceFacet',
-      Label  : '{i18n>Created}',
-      Target : '@UI.FieldGroup#Created'
-    },
-    {
-      $Type  : 'UI.ReferenceFacet',
-      Label  : '{i18n>Modified}',
-      Target : '@UI.FieldGroup#Modified'
-    },
-  ],
-  Facets               : [
-    {
-      $Type  : 'UI.ReferenceFacet',
-      Label  : '{i18n>Details}',
-      Target : '@UI.FieldGroup#Details'
-    },
-    {
-      $Type  : 'UI.ReferenceFacet',
-      Label  : '{i18n>OrderItems}',
-      Target : 'Items/@UI.LineItem'
-    },
-  ],
-  FieldGroup #Details  : {Data : [
-    {
-      Value : customer_ID,
-      Label : 'Customer'
-    },
-    {
-      Value : customer.firstName,
-      Label : 'First Name'
-    },
-    {
-      Value : customer.lastName,
-      Label : 'Last Name'
-    },
-    {
-      Value : currency_code,
-      Label : 'Currency'
-    }
-  ]},
-  FieldGroup #Created  : {Data : [
-    {
-      Value : createdBy,
-      Label : 'Created by'
-    },
-    {
-      Value : createdAt,
-      Label : 'Created at'
-    }
-  ]},
-  FieldGroup #Modified : {Data : [
-    {
-      Value : modifiedBy,
-      Label : 'Modified by'
-    },
-    {
-      Value : modifiedAt,
-      Label : 'Modified at'
-    }
-  ]},
-}, ) {
-  createdAt @UI.HiddenFilter  : false;
-  createdBy @UI.HiddenFilter  : false;
-  customer  @ValueList.entity : 'Customers';
-};
-
-/*
- * TODO: Order Items are not really maintainable in Fiori preview app
- */
-annotate GDPRService.Orders.Items with @(UI : {
-  LineItem       : [
-    {
-      Value : product_ID,
-      Label : 'Product ID'
-    },
-    {
-      Value : title,
-      Label : 'Product Name'
-    },
-    {
-      Value : price,
-      Label : 'Price'
-    },
-    {
-      Value : quantity,
-      Label : 'Quantity'
-    },
-  ],
-  Identification : [
-    {
-      Value : product_ID,
-      Label : 'Product ID'
-    },
-    {
-      Value : title,
-      Label : 'Product Name'
-    },
-    {
-      Value : quantity,
-      Label : 'Quantity'
-    },
-    {
-      Value : price,
-      Label : 'Price'
-    },
-  ],
-  Facets         : [{
-    $Type  : 'UI.ReferenceFacet',
-    Label  : 'Order Items',
-    Target : '@UI.Identification'
-  }, ],
-}, ) {
-  ID       @Core.Computed  @UI.Hidden : true;
-  title    @Core.Computed;
-  price    @Core.Computed;
-  quantity @(Common.FieldControl : #Mandatory);
-};
-
-/*
- * Customers
- */
-@odata.draft.enabled
-annotate GDPRService.Customers with @(UI : {
-  SelectionFields      : [
-    firstName,
-    lastName
-  ],
-  LineItem             : [
-    {
-      Value : firstName,
-      Label : 'First Name'
-    },
-    {
-      Value : lastName,
-      Label : 'Last Name'
-    },
-    {
-      Value : dateOfBirth,
-      Label : 'Date of Birth'
-    }
-  ],
-  HeaderInfo           : {
-    TypeName       : 'Customer',
-    TypeNamePlural : 'Customers',
-    Title          : {
-      Value : lastName,
-      Label : 'Last Name'
-    },
-    Description    : {
-      Value : firstName,
-      Label : 'First Name'
-    }
-  },
-  Identification       : [
-    {
-      Value : createdBy,
-      Label : 'Created by'
-    },
-    {
-      Value : createdAt,
-      Label : 'Created at'
-    }
-  ],
-  HeaderFacets         : [
-    {
-      $Type  : 'UI.ReferenceFacet',
-      Label  : '{i18n>Created}',
-      Target : '@UI.FieldGroup#Created'
-    },
-    {
-      $Type  : 'UI.ReferenceFacet',
-      Label  : '{i18n>Modified}',
-      Target : '@UI.FieldGroup#Modified'
-    },
-  ],
-  Facets               : [
-    {
-      $Type  : 'UI.ReferenceFacet',
-      Label  : '{i18n>Details}',
-      Target : '@UI.FieldGroup#Details'
-    },
-    {
-      $Type  : 'UI.ReferenceFacet',
-      Label  : '{i18n>Addresses}',
-      Target : 'addresses/@UI.LineItem'
-    },
-  ],
-  FieldGroup #Details  : {Data : [
-    {
-      Value : dateOfBirth,
-      Label : 'Date of Birth'
-    },
-    {
-      Value : email,
-      Label : 'E-Mail'
-    },
-    {
-      Value : creditCardNo,
-      Label : 'Credit Card Number'
-    }
-  ]},
-  FieldGroup #Created  : {Data : [
-    {
-      Value : createdBy,
-      Label : 'Created by'
-    },
-    {
-      Value : createdAt,
-      Label : 'Created at'
-    }
-  ]},
-  FieldGroup #Modified : {Data : [
-    {
-      Value : modifiedBy,
-      Label : 'Modified by'
-    },
-    {
-      Value : modifiedAt,
-      Label : 'Modified at'
-    }
-  ]},
-}, ) {
-  createdAt @UI.HiddenFilter : false;
-  createdBy @UI.HiddenFilter : false;
-};
-
-annotate GDPRService.CustomerPostalAddresses with @(UI : {
-  LineItem       : [
-    {
-      Value : town,
-      Label : 'Town'
-    },
-    {
-      Value : street,
-      Label : 'Street'
-    },
-    {
-      Value : country.name,
-      Label : 'Country'
-    }
-  ],
-  Identification : [
-    {
-      Value : town,
-      Label : 'Town'
-    },
-    {
-      Value : street,
-      Label : 'Street'
-    },
-    {
-      Value : country_code,
-      Label : 'Country Code'
-    }
-  ],
-  Facets         : [{
-    $Type  : 'UI.ReferenceFacet',
-    Label  : 'Customer Postal Address',
-    Target : '@UI.Identification'
-  }, ],
-}, );

gdpr/db/data-privacy.cds

@@ -1,56 +0,0 @@
-using {sap.capire.orders} from '@capire/orders';
-using {sap.capire.gdpr} from './schema';
-
-/*
- * annotations for Data Privacy (Personal Data Manager and Audit Logging)
- */
-annotate gdpr.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 gdpr.CustomerPostalAddresses with @PersonalData : {
-  DataSubjectRole : 'Customer',
-  EntitySemantics : 'DataSubjectDetails'
-}{
-  customer @PersonalData.FieldSemantics                  : 'DataSubjectID';
-  street   @PersonalData.IsPotentiallyPersonal;
-  town     @PersonalData.IsPotentiallyPersonal;
-  country  @PersonalData.IsPotentiallyPersonal;
-}
-
-/*
- * TODO: Personal Data Manager doesn't know EntitySemantics: 'Other' and FieldSemantics: 'ContractRelatedID'
- *       see: https://help.sap.com/viewer/620a3ea6aaf64610accdd05cca9e3de2/Cloud/en-US/5a55fae1eb7c496c92c56071186d76b3.html
- */
-annotate orders.Orders with @PersonalData : {
-  DataSubjectRole : 'Customer',
-  EntitySemantics : 'LegalGround'
-}{
-  ID       @PersonalData.FieldSemantics   : 'LegalGroundID';
-  customer @PersonalData.FieldSemantics   : 'DataSubjectID';
-}
-
-/*
- * additional annotations for Audit Logging
- */
-annotate gdpr.Customers with @AuditLog.Operation : {
-  Read   : true,
-  Insert : true,
-  Update : true,
-  Delete : true
-};
-
-annotate gdpr.CustomerPostalAddresses with @AuditLog.Operation : {
-  Read   : true,
-  Insert : true,
-  Update : true,
-  Delete : true
-};

gdpr/db/data/sap.capire.gdpr-CustomerPostalAddresses.csv

@@ -1,3 +0,0 @@
-ID;modifiedAt;createdAt;createdBy;modifiedBy;customer_ID;street;town;country_code
-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
-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

gdpr/db/data/sap.capire.gdpr-Customers.csv

@@ -1,3 +0,0 @@
-ID;modifiedAt;createdAt;createdBy;modifiedBy;email;firstName;lastName;creditCardNo;dateOfBirth
-8e2f2640-6866-4dcf-8f4d-3027aa831cad;2019-04-04;2019-01-31;admin@business.com;admin@business.com;john.doe@test.com;John;Doe;9977-6655-4433-2211;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;2211-3344-5566-7788;1980-11-11

gdpr/db/data/sap.capire.orders-Orders.Items.csv

@@ -1,4 +0,0 @@
-ID;up__ID;quantity;product_ID;title;price
-4bd2c9df-c19f-47b8-a921-3cde0d863b52;29f15ef6-4a13-47d4-aef4-329a403b49eb;1;201;Wuthering Heights;11.11
-6c42a40d-5f7c-4c2f-816b-a73c7c28d722;29f15ef6-4a13-47d4-aef4-329a403b49eb;1;271;Catweazle;15
-748555fc-2cb0-42b5-a361-dd19a50bd682;31c2bd15-5146-4418-b574-866a08911de7;2;252;Eleonora;28

gdpr/db/data/sap.capire.orders-Orders.csv

@@ -1,3 +0,0 @@
-ID;createdAt;createdBy;customer_ID;OrderNo;currency_code
-29f15ef6-4a13-47d4-aef4-329a403b49eb;2019-01-31;john.doe@test.com;8e2f2640-6866-4dcf-8f4d-3027aa831cad;1;EUR
-31c2bd15-5146-4418-b574-866a08911de7;2019-01-30;jane.doe@test.com;74e718c9-ff99-47f1-8ca3-950c850777d4;2;EUR

gdpr/db/schema.cds

@@ -1,30 +0,0 @@
-using {
-  Country,
-  managed,
-  cuid
-} from '@sap/cds/common';
-using {sap.capire.orders} from '@capire/orders';
-
-namespace sap.capire.gdpr;
-
-extend orders.Orders with {
-  customer : Association to Customers;
-}
-
-entity Customers : cuid, managed {
-  email        : String;
-  firstName    : String;
-  lastName     : String;
-  creditCardNo : String;
-  dateOfBirth  : Date;
-  addresses    : Composition of many CustomerPostalAddresses
-                   on addresses.customer = $self;
-}
-
-entity CustomerPostalAddresses : cuid, managed {
-  customer : Association to Customers;
-  street   : String(128);
-  town     : String(128);
-  @assert.integrity : false
-  country  : Country;
-};

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

gdpr/manifest.yml

@@ -1,31 +0,0 @@
----
-applications:
-# -----------------------------------------------------------------------------------
-# HANA Database Content Deployer App
-# -----------------------------------------------------------------------------------
-- name: gdpr-db-deployer
-  path: gen/db
-  no-route: true
-  health-check-type: process
-  memory: 256M
-  buildpack: nodejs_buildpack
-  services:
-  - gdpr-logs
-  - gdpr-hdi
-# -----------------------------------------------------------------------------------
-# Backend Service
-# -----------------------------------------------------------------------------------
-- name: gdpr-srv
-  path: gen/srv
-  memory: 256M
-  buildpack: nodejs_buildpack
-  routes:
-  - route: capire-gdpr-srv.cfapps.eu10.hana.ondemand.com
-  services:
-  - gdpr-logs
-  - gdpr-hdi
-  - gdpr-uaa
-  - gdpr-auditlog
-  # binding with parameters not yet supported -> binding done manually in .etc/deploy.sh
-  #- name: gdpr-pdm
-  #  parameters: ./pdm-binding-config.json

gdpr/package.json

@@ -1,49 +0,0 @@
-{
-  "name": "@capire/gdpr",
-  "version": "0.0.1",
-  "dependencies": {
-    "@capire/orders": "../orders",
-    "@sap/audit-logging": "^5.1.0",
-    "@sap/cds": "^5.9",
-    "express": "^4.17.1",
-    "hdb": "^0.19.0"
-  },
-  "scripts": {
-    "build": "rm -rf gen && cds build --production",
-    "deploy": "sh .etc/deploy.sh",
-    "undeploy": "sh .etc/undeploy.sh",
-    "start": "cds run"
-  },
-  "cds": {
-    "requires": {
-      "auth": {
-        "__comment__": "workaround to avoid approuter et al. setup",
-        "impl": "srv/auth.js"
-      },
-      "audit-log": {
-        "[development]": {
-          "kind": "audit-log-to-console"
-        },
-        "[production]": {
-          "kind": "audit-log-service"
-        }
-      },
-      "db": {
-        "kind": "sql"
-      },
-      "uaa": {
-        "kind": "xsuaa"
-      }
-    },
-    "features": {
-      "audit_personal_data": true,
-      "fiori_preview": true,
-      "[production]": {
-        "kibana_formatter": true
-      }
-    },
-    "hana": {
-      "deploy-format": "hdbtable"
-    }
-  }
-}

gdpr/readme.md

@@ -1,35 +0,0 @@
-# how-to
-
-## required services and subscriptions
-
-services:
-- Audit Log Service
-- SAP HANA Cloud
-- SAP HANA Schemas & HDI Containers
-- Application Logging Service
-- Personal Data Manager
-- Authorization and Trust Management Service
-
-subscriptions:
-- Audit Log Viewer Service
-- Personal Data Manager
-
-## deploy
-
-after adding the necessary entitlements, do:
-- `cf l` to log into the respective account
-- `cd gdpr` (if still in root of `cloud-cap-samples`)
-- `npm run deploy`, which executes build and deployment via `.etc/deploy.sh`
-
-## authorization
-
-create roles for Audit Log Viewer Service and Personal Data Manager, and assign the roles to the respective users
-
-# open issues
-
-- deploy via mta, which can bind with parameters, and get rid of scripts in `.etc`
-- use approuter to remove hacky custom auth impl (`srv/auth.js`)
-- clarify annotation `EntitySemantics`, which differs between audit logging (`Other`) and personal data manager (`LegalGround`)
-- annotations for order items Fiori preview app
-  + `Products` has `@cds.persistence.skip:'always'`
-- how to reuse intial data from `common`?

gdpr/services-manifest.yml

@@ -1,20 +0,0 @@
----
-create-services:
-  - name:       gdpr-logs         # > for kibana
-    broker:     application-logs
-    plan:       standard
-  - name:       gdpr-hdi          # > hana
-    broker:     hana
-    plan:       hdi-shared
-  - name:       gdpr-auditlog     # > audit log sink
-    broker:     auditlog
-    plan:       standard
-  # gdpr-pdm needs to exist before creating gdpr-uaa for authorization grant
-  - name:       gdpr-pdm          # > personal data manager
-    broker:     personal-data-manager-service
-    plan:       standard
-    parameters: ./.pdm/pdm-instance-config.json
-  - name:       gdpr-uaa          # > uaa for authentication
-    broker:     xsuaa
-    plan:       application
-    parameters: xs-security.json

gdpr/srv/auth.js

@@ -1,43 +0,0 @@
-/*
- * workaround to avoid approuter et al. setup
- */
-
-const jwt = require('jsonwebtoken')
-const tenant = process.env.VCAP_SERVICES
-  ? JSON.parse(process.env.VCAP_SERVICES).xsuaa[0].credentials.tenantid
-  : 'anonymous'
-
-module.exports = (req, res, next) => {
-  /*
-   * decode JWT coming from Personal Data Manager
-   *
-   * DO NOT USE FOR PRODUCTION!
-   * - no token validation
-   * - no xsappname check
-   */
-  const bearer = req.headers.authorization && req.headers.authorization.split('Bearer ')[1]
-  if (bearer) {
-    const { client_id: id, zid: tenant, scope: roles } = jwt.decode(bearer)
-    req.user = {
-      id,
-      tenant,
-      is: role => roles.some(r => r.endsWith(`.${role}`))
-    }
-    return next()
-  }
-
-  // mock user that has every role EXCEPT PersonalDataManagerUser
-  const basic = req.headers.authorization && req.headers.authorization.split('Basic ')[1]
-  if (basic) {
-    const [id] = Buffer.from(basic, 'base64').toString('utf-8').split(':')
-    req.user = {
-      id,
-      tenant,
-      is: role => role !== 'PersonalDataManagerUser'
-    }
-    return next()
-  }
-
-  // no bearer & no basic -> 401
-  res.set('WWW-Authenticate', 'Basic realm="Users"').status(401).end()
-}

gdpr/srv/gdpr-service.cds

@@ -1,10 +0,0 @@
-using {
-  sap.capire.orders,
-  sap.capire.gdpr
-} from '../db/schema';
-
-@requires : 'admin' // > authorization check
-service GDPRService {
-  entity Customers as projection on gdpr.Customers;
-  entity Orders    as projection on orders.Orders;
-}

gdpr/srv/pdm-service.cds

@@ -1,24 +0,0 @@
-using {
-  sap.capire.gdpr as gdpr,
-  sap.capire.orders as orders
-} from '../db/data-privacy';
-
-@requires : 'PersonalDataManagerUser' // > authorization check
-service PDMService {
-
-  entity Customers               as projection on gdpr.Customers;
-  entity CustomerPostalAddresses as projection on gdpr.CustomerPostalAddresses;
-  entity Orders                  as projection on orders.Orders;
-
-  /*
-   * additional annotations for Personal Data Manager's Search Fields
-   */
-  annotate Customers with @(Communication.Contact : {
-    n    : {
-      surname : lastName,
-      given   : firstName
-    },
-    bday : dateOfBirth
-  });
-
-};

gdpr/srv/server.js

@@ -1,26 +0,0 @@
-const cds = require('@sap/cds')
-
-/*
- * in development, write audit logs to custom sink (i.e., to console in this example)
- */
-cds.on('served', async () => {
-  if (process.env.NODE_ENV === 'production') return
-
-  const auditLogService = await cds.connect.to('audit-log')
-  // use prepend to get called before the generic implementation
-  auditLogService.prepend(function() {
-    const LOG = cds.log('my custom audit logging impl')
-    // triggered when reading sensitive personal data
-    this.on('dataAccessLog', function(req) {
-      const { accesses } = req.data
-      for (const access of accesses) LOG.info(access)
-    })
-    // triggered when modifying personal data
-    this.on('dataModificationLog', function(req) {
-      const { modifications } = req.data
-      for (const modification of modifications) LOG.info(modification)
-    })
-  })
-})
-
-module.exports = cds.server

gdpr/xs-security.json

@@ -1,14 +0,0 @@
-{
-  "xsappname": "capire-gdpr",
-  "tenant-mode": "shared",
-  "scopes": [{
-    "name": "$XSAPPNAME.PersonalDataManagerUser",
-    "description": "Authority for Personal Data Manager",
-    "grant-as-authority-to-apps": [
-      "$XSSERVICENAME(gdpr-pdm)"
-    ]
-  }, {
-    "name": "$XSAPPNAME.admin",
-    "description": "Administrator"
-  }]
-}

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)

hello/package.json

@@ -7,27 +7,12 @@
     "start:ts": "cds-ts serve srv/world.cds"
   },
   "dependencies": {
-    "@sap/cds": "^5.0.4"
+    "@sap/cds": ">=5.0.4"
   },
   "devDependencies": {
-    "@types/jest": "^27.0.2",
-    "@types/node": "^16.11.6",
-    "ts-jest": "^27.0.2",
-    "typescript": "^4.3.5"
-  },
-  "jest": {
-    "testEnvironment": "node",
-    "preset": "ts-jest",
-    "globals": {
-      "ts-jest": {
-        "diagnostics": {
-          "_comment": "see https://githubmemory.com/repo/kulshekhar/ts-jest/issues/2722",
-          "ignoreCodes": [
-            151001
-          ]
-        }
-      }
-    }
+    "@types/jest": "*",
+    "@types/node": "*",
+    "typescript": ">=4.3.5"
   },
   "eslintConfig": {
     "extends": "eslint:recommended",

hello/srv/world.js

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

hello/test/hello-world-test.js

@@ -0,0 +1,13 @@
+const cds = require ('@sap/cds')
+describe('Hello world!', () => {
+
+    beforeAll (()=> process.env.CDS_TYPESCRIPT = true)
+    afterAll (()=> delete process.env.CDS_TYPESCRIPT)
+    const {GET} = cds.test.in(__dirname,'../srv').run('serve', 'world.cds')
+
+    it('should say hello with class impl', async () => {
+        const {data} = await GET`/say/hello(to='world')`
+        expect(data.value).toMatch(/Hello world.*typescript.*/i)
+    })
+
+})

hello/test/hello-world-ts.test.ts

@@ -1,15 +0,0 @@
-process.env.CDS_TYPESCRIPT = 'true';
-import * as cds from '@sap/cds';
-
-//@ts-ignore
-const {GET} = cds.test.in(__dirname,'../srv').run('serve', 'world.cds');
-
-describe('Hello world!', () => {
-    afterAll(() => { delete process.env.CDS_TYPESCRIPT; });
-
-    it('should say hello with class impl from a typescript file', async () => {
-        const {data} = await GET`/say/hello(to='world')`
-        expect(data.value).toMatch(/Hello world.*typescript.*/i)
-    })
-
-})

loggers/app/loggers.html

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

loggers/package.json

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

loggers/readme.md

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

loggers/srv/dummy.cds

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

loggers/srv/loggers.cds

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

loggers/srv/loggers.js

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

loggers/test/requests.http

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

media/srv/media-service.js

@@ -40,7 +40,7 @@ module.exports = srv => {
         req.reject(404, 'Media not found for the ID')
         return
       }
-      const decodedMedia = new Buffer(
+      const decodedMedia = Buffer.from(
         mediaObj.media.split(';base64,').pop(),
         'base64'
       )

orders/app/fiori.cds

@@ -16,23 +16,24 @@ using { OrdersService } from '../srv/orders-service';
 @odata.draft.enabled
 annotate OrdersService.Orders with @(
 	UI: {
-		SelectionFields: [ createdAt, createdBy ],
+		SelectionFields: [ createdBy ],
 		LineItem: [
-			{Value: OrderNo, Label:'OrderNo'},
-			{Value: buyer, Label:'Customer'},
-			{Value: createdAt, Label:'Date'}
+			{Value: OrderNo, Label:'{i18n>OrderNo}'},
+			{Value: buyer, Label:'{i18n>Customer}'},
+			{Value: currency.symbol, Label:'{i18n>Currency}'},
+			{Value: createdAt, Label:'{i18n>Date}'},
 		],
 		HeaderInfo: {
-			TypeName: 'Order', TypeNamePlural: 'Orders',
+			TypeName: '{i18n>Order}', TypeNamePlural: '{i18n>Orders}',
 			Title: {
-				Label: 'Order number ', //A label is possible but it is not considered on the ObjectPage yet
+				Label: '{i18n>OrderNo}', //A label is possible but it is not considered on the ObjectPage yet
 				Value: OrderNo
 			},
 			Description: {Value: createdBy}
 		},
 		Identification: [ //Is the main field group
-			{Value: createdBy, Label:'Customer'},
-			{Value: createdAt, Label:'Date'},
+			{Value: createdBy, Label:'{i18n>Customer}'},
+			{Value: createdAt, Label:'{i18n>Date}'},
 			{Value: OrderNo },
 		],
 		HeaderFacets: [
@@ -45,7 +46,7 @@ annotate OrdersService.Orders with @(
 		],
 		FieldGroup#Details: {
 			Data: [
-				{Value: currency.code, Label:'Currency'}
+				{Value: currency.code, Label:'{i18n>Currency}'}
 			]
 		},
 		FieldGroup#Created: {
@@ -64,6 +65,7 @@ annotate OrdersService.Orders with @(
 ) {
 	createdAt @UI.HiddenFilter:false;
 	createdBy @UI.HiddenFilter:false;
+        ID        @UI.Hidden;
 };
 
 
@@ -71,15 +73,15 @@ annotate OrdersService.Orders with @(
 annotate OrdersService.Orders.Items with @(
 	UI: {
 		LineItem: [
-			{Value: product_ID, Label:'Product ID'},
-			{Value: title, Label:'Product Title'},
-			{Value: price, Label:'Unit Price'},
-			{Value: quantity, Label:'Quantity'},
+			{Value: product_ID, Label:'{i18n>ProductID}'},
+			{Value: title, Label:'{i18n>ProductTitle}'},
+			{Value: price, Label:'{i18n>UnitPrice}'},
+			{Value: quantity, Label:'{i18n>Quantity}'},
 		],
 		Identification: [ //Is the main field group
-			{Value: quantity, Label:'Quantity'},
-			{Value: title, Label:'Product'},
-			{Value: price, Label:'Unit Price'},
+			{Value: quantity, Label:'{i18n>Quantity}'},
+			{Value: title, Label:'{i18n>Product}'},
+			{Value: price, Label:'{i18n>UnitPrice}'},
 		],
 		Facets: [
 			{$Type: 'UI.ReferenceFacet', Label: '{i18n>OrderItems}', Target: '@UI.Identification'},
@@ -89,4 +91,7 @@ annotate OrdersService.Orders.Items with @(
 	quantity @(
 		Common.FieldControl: #Mandatory
 	);
+        ID       @UI.Hidden;
+        up_      @UI.Hidden;
+
 };

orders/app/orders/index.html

@@ -13,7 +13,7 @@
 			applications: {
 				"manage-orders": {
 					title: "Manage Orders",
-					description: "... testing FE v42",
+					description: "CAP Sample App",
 					additionalInformation: "SAPUI5.Component=orders",
 					applicationType : "URL",
 					url: "/orders/webapp",
@@ -25,10 +25,10 @@
 
 	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
 	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
-    	data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
-    	data-sap-ui-compatVersion="edge"
-    	data-sap-ui-theme="sap_fiori_3"
-    	data-sap-ui-frameOptions="allow"
+			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
+			data-sap-ui-compatVersion="edge"
+			data-sap-ui-theme="sap_horizon"
+			data-sap-ui-frameOptions="allow"
 	></script>
 	<script>
 		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))

orders/app/orders/webapp/manifest.json

@@ -3,8 +3,8 @@
 	"sap.app": {
 		"id": "orders",
 		"type": "application",
-		"title": "Order Books",
-		"description": "Sample Application",
+		"title": "Order Management",
+		"description": "CAP Sample Application",
 		"i18n": "i18n/i18n.properties",
 		"dataSources": {
 			"OrdersService": {
@@ -167,4 +167,4 @@
 		"registrationIds": [],
 		"archeType": "transactional"
 	}
-}
+}

orders/db/schema.cds

@@ -2,7 +2,7 @@ using { Currency, User, managed, cuid } from '@sap/cds/common';
 namespace sap.capire.orders;
 
 entity Orders : cuid, managed {
-  OrderNo  : String @title:'Order Number'; //> readable key
+  OrderNo  : String(22) @title:'Order Number'; //> readable key
   Items    : Composition of many {
     key ID    : UUID;
     product   : Association to Products;