Compare commits

...

50 Commits

Author SHA1 Message Date
Daniel
518429e2a0 . 2022-05-31 15:38:54 +02:00
Daniel
02000f4a94 Merged from main 2022-05-31 14:54:11 +02:00
dependabot[bot]
8f5c33f4f5 Bump @sap/cds from 5.9.5 to 5.9.6
Bumps [@sap/cds](https://cap.cloud.sap/) from 5.9.5 to 5.9.6.

---
updated-dependencies:
- dependency-name: "@sap/cds"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-25 14:20:28 +02:00
Daniel Hutzel
a893184736 Add login to bookshop Vue.js app (#358) 2022-05-19 12:16:11 +02:00
Daniel
9370d0544e trying esm modules 2022-05-12 01:44:09 +02:00
dependabot[bot]
ee4dcf116c Bump @sap/cds from 5.9.4 to 5.9.5
Bumps [@sap/cds](https://cap.cloud.sap/) from 5.9.4 to 5.9.5.

---
updated-dependencies:
- dependency-name: "@sap/cds"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-10 14:19:55 +02:00
dependabot[bot]
58cef5558d Bump sqlite3 from 5.0.6 to 5.0.8
Bumps [sqlite3](https://github.com/TryGhost/node-sqlite3) from 5.0.6 to 5.0.8.
- [Release notes](https://github.com/TryGhost/node-sqlite3/releases)
- [Changelog](https://github.com/TryGhost/node-sqlite3/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TryGhost/node-sqlite3/compare/v5.0.6...v5.0.8)

---
updated-dependencies:
- dependency-name: sqlite3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-09 18:39:39 +02:00
dependabot[bot]
7753cda65d Bump @sap/cds from 5.9.3 to 5.9.4
Bumps [@sap/cds](https://cap.cloud.sap/) from 5.9.3 to 5.9.4.

---
updated-dependencies:
- dependency-name: "@sap/cds"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-03 17:23:37 +02:00
dependabot[bot]
df57a9d8d0 Bump sqlite3 from 5.0.5 to 5.0.6
Bumps [sqlite3](https://github.com/TryGhost/node-sqlite3) from 5.0.5 to 5.0.6.
- [Release notes](https://github.com/TryGhost/node-sqlite3/releases)
- [Changelog](https://github.com/TryGhost/node-sqlite3/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TryGhost/node-sqlite3/compare/v5.0.5...v5.0.6)

---
updated-dependencies:
- dependency-name: sqlite3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-28 14:19:35 +02:00
dependabot[bot]
2d92b851f1 Bump @sap/cds from 5.9.2 to 5.9.3
Bumps [@sap/cds](https://cap.cloud.sap/) from 5.9.2 to 5.9.3.

---
updated-dependencies:
- dependency-name: "@sap/cds"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-27 15:42:39 +02:00
dependabot[bot]
e157fc8a92 Bump sqlite3 from 5.0.4 to 5.0.5
Bumps [sqlite3](https://github.com/TryGhost/node-sqlite3) from 5.0.4 to 5.0.5.
- [Release notes](https://github.com/TryGhost/node-sqlite3/releases)
- [Changelog](https://github.com/TryGhost/node-sqlite3/blob/master/CHANGELOG.md)
- [Commits](https://github.com/TryGhost/node-sqlite3/compare/v5.0.4...v5.0.5)

---
updated-dependencies:
- dependency-name: sqlite3
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-25 14:37:35 +02:00
Christian Georgi
3b69a80975 Use original sqlite3 again 2022-04-20 09:00:05 +02:00
dependabot[bot]
b80ba7445d Bump semver from 7.3.6 to 7.3.7
Bumps [semver](https://github.com/npm/node-semver) from 7.3.6 to 7.3.7.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v7.3.6...v7.3.7)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-13 14:24:24 +02:00
Daniel
b733643f2a fixed accidential push 2022-04-09 12:38:24 +02:00
Daniel
bf317bc2c9 fixed 2022-04-09 11:54:12 +02:00
Daniel
bbebff4066 . 2022-04-08 19:52:26 +02:00
dependabot[bot]
eb75394044 Bump @sap/cds from 5.9.1 to 5.9.2
Bumps [@sap/cds](https://cap.cloud.sap/) from 5.9.1 to 5.9.2.

---
updated-dependencies:
- dependency-name: "@sap/cds"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-08 12:35:56 +02:00
dependabot[bot]
b8f65b687f Bump semver from 7.3.5 to 7.3.6
Bumps [semver](https://github.com/npm/node-semver) from 7.3.5 to 7.3.6.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md)
- [Commits](https://github.com/npm/node-semver/compare/v7.3.5...v7.3.6)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-08 12:33:12 +02:00
Daniel
c49c9691bd . 2022-04-06 15:29:46 +02:00
Daniel
7e4bc0985e Revert change to npm workspaces
This PARTIALLY reverts commit 912271338d.
2022-04-06 13:17:51 +02:00
Daniel Hutzel
912271338d Prepare for cds6 (#341) 2022-04-05 16:30:04 +02:00
Daniel Hutzel
bbf1194a09 Cosmetics to test outlines (#340) 2022-04-03 12:36:11 +02:00
dependabot[bot]
529c431518 Bump @sap/cds from 5.9.0 to 5.9.1
Bumps [@sap/cds](https://cap.cloud.sap/) from 5.9.0 to 5.9.1.

---
updated-dependencies:
- dependency-name: "@sap/cds"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-01 14:51:22 +02:00
Christian Georgi
3f85676edd Registry to handle packages with dashes
Like `@capire/data-viewer`, resulting in requests like
`GET /capire-data-viewer-0.1.0.tgz`
2022-04-01 11:49:28 +02:00
Daniel
959c07cee3 minor cosmetics for user service 2022-03-31 09:49:47 +02:00
Daniel
8cc09fde38 Fixed SELECT...columns { foo, bar } 2022-03-28 14:44:06 +02:00
Christian Georgi
bb55c432c9 Bookshop showing user info
Show current user name, locale and tenant (if available).
Useful in deployments w/ real auth and tenant contexts.
2022-03-28 14:36:32 +02:00
dependabot[bot]
5fc86d45ad Bump minimist from 1.2.5 to 1.2.6
Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-28 14:31:42 +02:00
Steffen Waldmann
e86d0dc3a2 Use cds.requires.auth.kind instead of cds.requires.auth.strategy
As recently discussed, this is the preferred version as opposed to the legacy `cds.requires.auth.strategy`.
2022-03-28 14:29:58 +02:00
dependabot[bot]
a661fb2d45 Bump @sap/cds from 5.8.4 to 5.9.0
Bumps [@sap/cds](https://cap.cloud.sap/) from 5.8.4 to 5.9.0.

---
updated-dependencies:
- dependency-name: "@sap/cds"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-28 14:26:16 +02:00
Christian Georgi
bfe0c831d6 Relative Fiori dataSource URLs
Since this is what 'real' Fiori apps use as well, to allow serving from
FLP.  CDS's fiori helper takes care that they work w/o FLP as well.
2022-03-28 13:31:58 +02:00
dependabot[bot]
cad615a662 Bump @sap/cds from 5.8.3 to 5.8.4
Bumps [@sap/cds](https://cap.cloud.sap/) from 5.8.3 to 5.8.4.

---
updated-dependencies:
- dependency-name: "@sap/cds"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-17 15:07:20 +01:00
Christian Georgi
7101c58920 Use new horizon theme of Fiori 2022-03-02 15:48:58 +01:00
dependabot[bot]
07dc1e88b3 Bump @sap/cds from 5.8.2 to 5.8.3
Bumps [@sap/cds](https://cap.cloud.sap/) from 5.8.2 to 5.8.3.

---
updated-dependencies:
- dependency-name: "@sap/cds"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-02 11:40:49 +01:00
dependabot[bot]
6f8d74dc9a Bump @sap/cds from 5.8.1 to 5.8.2
Bumps [@sap/cds](https://cap.cloud.sap/) from 5.8.1 to 5.8.2.

---
updated-dependencies:
- dependency-name: "@sap/cds"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-01 14:57:33 +01:00
Christian Georgi
ec57c5ea48 Enable dependency updates 2022-03-01 14:53:44 +01:00
Christian Georgi
c040a47279 Merge pull request #326 from MikhailGoncharov/followup-324
Follow-up #324: better version handling
2022-02-21 09:45:44 +01:00
Christian Georgi
30bfd70c49 Update package-lock 2022-02-21 09:42:12 +01:00
Mikhail Goncharov
6fb9581cf1 Update package.json 2022-02-17 10:39:18 +01:00
Mikhail Goncharov
e87d6cdfc5 Update devDependencies 2022-02-17 10:35:35 +01:00
Mikhail Goncharov
29ea2bc2da Better version handling 2022-02-17 10:09:43 +01:00
Heiko Witteborg
12574271ac Merge pull request #324 from MikhailGoncharov/service-api-read-no-keys-if-not-asked
Fixed eagerly read IDs (CAP !== OData)
2022-02-17 08:53:01 +01:00
Mikhail Goncharov
17b5cc1ad2 Merge branch 'main' into service-api-read-no-keys-if-not-asked 2022-02-15 08:56:08 +01:00
Daniel Hutzel
26ca7f54ad Specified files in package.json (#325) 2022-02-15 01:33:02 +01:00
dependabot[bot]
573e78253d Merge pull request #323 from SAP-samples/dependabot/npm_and_yarn/follow-redirects-1.14.8 2022-02-14 12:02:04 +00:00
Mikhail Goncharov
a7511ed677 Sync with cds runtime for next release 2022-02-14 12:06:22 +01:00
dependabot[bot]
f1289b436b Bump follow-redirects from 1.14.7 to 1.14.8
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-14 10:32:09 +00:00
Dr. David A. Kunz
984ea2133b Merge pull request #322 from SAP-samples/fix-change-to-vue3
Changes in Vue 3 and stable version
2022-02-09 10:23:27 +01:00
D065023
179d301acb Use stable URI 2022-02-09 10:12:41 +01:00
D065023
bbf20b1ca3 Change to Vue 3 2022-02-09 10:10:19 +01:00
36 changed files with 2889 additions and 2643 deletions

8
.github/dependabot.yml vendored Normal file
View File

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

View File

@@ -16,7 +16,8 @@ app.use('/-/:tarball', (req,res,next) => {
console.debug ('GET', req.params)
try {
const { tarball } = req.params
const [, pkg ] = /^\w+-(\w+)/.exec(tarball)
const pkgFull = tarball.substring(0, tarball.lastIndexOf('-'))
const [, pkg ] = /^\w+-(.+)/.exec(pkgFull)
fs.lstat(tarball,(err => {
if (err) console.debug (`npm pack ../${pkg}`)
if (err) exec(`npm pack ../${pkg}`,{cwd},next)
@@ -31,7 +32,7 @@ app.use('/-/:tarball', (req,res,next) => {
app.use('/-', express.static(__dirname))
app.get('/*', (req,res)=>{
const urlRegex = /^\/(@\w+)\/(\w+)/
const urlRegex = /^\/(@[\w-]+)\/(.+)/
const url = decodeURIComponent(req.url)
console.debug ('GET',url)
try {

View File

@@ -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,30 @@ 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")
// initially fill list of books
books.fetch()
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
})

View File

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

View File

@@ -4,7 +4,7 @@
* currencies, if not obtained through @capire/common.
*/
module.exports = async (db)=>{
export default async (db)=>{
const has_common = db.model.definitions['sap.common.Currencies'].elements.numcode
if (has_common) return

View File

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

View File

@@ -2,10 +2,18 @@
"name": "@capire/bookshop",
"version": "1.0.0",
"description": "A simple self-contained bookshop service.",
"type": "module",
"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",

View File

@@ -1,6 +1,6 @@
const cds = require('@sap/cds')
import cds from '@sap/cds'
module.exports = cds.service.impl (function(){
export default cds.service.impl (function(){
this.before ('NEW','Authors', genid)
this.before ('NEW','Books', genid)
})

View File

@@ -1,8 +1,8 @@
const cds = require('@sap/cds')
import cds from '@sap/cds'
class CatalogService extends cds.ApplicationService { init(){
export class CatalogService extends cds.ApplicationService { init(){
const { Books } = cds.entities ('sap.capire.bookshop')
const { Books } = this.entities ('sap.capire.bookshop')
// Reduce stock of ordered books if available stock suffices
this.on ('submitOrder', async req => {
@@ -24,5 +24,3 @@ class CatalogService extends cds.ApplicationService { init(){
return super.init()
}}
module.exports = { CatalogService }

View File

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

View File

@@ -0,0 +1,10 @@
import cds from '@sap/cds'
export default 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')
})
}}

View File

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

View File

@@ -7,7 +7,7 @@
"@capire/orders": "*",
"@capire/common": "*",
"@capire/data-viewer": "*",
"@sap/cds": "^5",
"@sap/cds": ">=5",
"express": "^4.17.1"
},
"cds": {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -3,9 +3,9 @@
"version": "1.0.0",
"dependencies": {
"@capire/bookstore": "*",
"@sap/cds": "^5",
"@sap/cds": ">=5",
"express": "^4.17.1",
"passport": "^0.4.1"
"passport": ">=0.4.1"
},
"scripts": {
"start": "cds run --in-memory?",
@@ -14,7 +14,7 @@
"cds": {
"requires": {
"auth": {
"strategy": "dummy"
"kind": "dummy-auth"
},
"ReviewsService": {
"kind": "odata",
@@ -51,4 +51,4 @@
}
}
}
}
}

View File

@@ -7,11 +7,11 @@
"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",
"@types/jest": "*",
"@types/node": "*",
"ts-jest": "^27.0.2",
"typescript": "^4.3.5"
},

View File

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

View File

@@ -3,6 +3,6 @@
"version": "1.0.0",
"dependencies": {
"@capire/common": "*",
"@sap/cds": "^5"
"@sap/cds": ">=5"
}
}

5187
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -14,13 +14,14 @@
"@capire/media": "./media",
"@capire/orders": "./orders",
"@capire/reviews": "./reviews",
"@sap/cds": "^5.5.3"
"@sap/cds": ">=5.5.3"
},
"devDependencies": {
"chai": "^4.3.4",
"chai-as-promised": "^7.1.1",
"chai-subset": "^1.6.0",
"sqlite3": "npm:@mendix/sqlite3@^5"
"semver": "^7",
"sqlite3": "^5"
},
"scripts": {
"cleanup": "rm -rf node_modules && rm -rf */node_modules && rm -rf */*/node_modules",

View File

@@ -4,21 +4,21 @@ const GET = (url) => axios.get('/reviews'+url)
const PUT = (cmd,data) => axios.patch('/reviews'+cmd,data)
const POST = (cmd,data) => axios.post('/reviews'+cmd,data)
const reviews = new Vue ({
const reviews = Vue.createApp ({
el:'#app',
data: {
list: [],
review: undefined,
message: {},
Ratings: Object.entries({
data() {
return {
list: [],
review: undefined,
message: {},
Ratings: Object.entries({
5 : '★★★★★',
4 : '★★★★',
3 : '★★★',
2 : '★★',
1 : '★',
}).reverse()
}).reverse()
}
},
methods: {
@@ -66,7 +66,7 @@ const reviews = new Vue ({
datetime: (d) => d && new Date(d).toLocaleString(),
},
})
}).mount("#app")
// initially fill list of my reviews
reviews.fetch()

View File

@@ -5,7 +5,7 @@
<title> Capire Reviews </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 }
@@ -18,7 +18,7 @@
<body class="small-container", style="margin-top: 70px;">
<div id='app'>
<h1> {{ document.title }} </h1>
<h1> Capire Reviews </h1>
<input type="text" placeholder="Search..." @input="search">

View File

@@ -7,7 +7,7 @@
"index.cds"
],
"dependencies": {
"@sap/cds": "^5",
"@sap/cds": ">=5",
"express": "^4.17.1"
},
"cds": {

View File

@@ -81,6 +81,8 @@ describe('cds.ql → cqn', () => {
.to.eql(SELECT('Foo','Boo').from('Bar'))
.to.eql(SELECT(['Foo','Boo']).from('Bar'))
.to.eql(SELECT `Bar` .columns `Foo, Boo`)
.to.eql(SELECT `Bar` .columns `{ Foo, Boo }`)
.to.eql(SELECT `Bar` .columns ('{ Foo, Boo }'))
.to.eql(SELECT `Bar` .columns ('Foo','Boo'))
.to.eql(SELECT `Bar` .columns (['Foo','Boo']))
.to.eql(SELECT.from `Bar` .columns ('Foo','Boo'))

View File

@@ -1,7 +1,7 @@
const cds = require('@sap/cds/lib')
const { expect } = cds.test ('@capire/bookshop')
describe('Consuming Services locally', () => {
describe('cap/samples - Consuming Services locally', () => {
//
it('bootstrapped the database successfully', ()=>{
const { AdminService } = cds.services
@@ -32,6 +32,27 @@ describe('Consuming Services locally', () => {
})
})
}).where(`name like`, 'E%')
if (require('semver').gte(cds.version, '5.9.0')) {
expect(authors).to.containSubset([
{
name: 'Emily Brontë',
books: [
{
title: 'Wuthering Heights',
currency: { name: 'British Pound', symbol: '£' },
},
],
},
{
name: 'Edgar Allen Poe',
books: [
{ title: 'The Raven', currency: { name: 'US Dollar', symbol: '$' } },
{ title: 'Eleonora', currency: { name: 'US Dollar', symbol: '$' } },
],
},
])
return
}
expect(authors).to.containSubset([
{
name: 'Emily Brontë',

View File

@@ -3,7 +3,7 @@ const { GET, POST, expect } = cds.test(__dirname+'/../bookshop')
if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
describe('Custom Handlers', () => {
describe('cap/samples - Custom Handlers', () => {
it('should reject out-of-stock orders', async () => {
await POST `/browse/submitOrder ${{ book: 201, quantity: 5 }}`

View File

@@ -1,7 +1,7 @@
const cds = require('@sap/cds/lib')
const { GET, expect } = cds.test (__dirname+'/../hello')
describe('Hello world!', () => {
describe('cap/samples - Hello world!', () => {
it('should say hello with class impl', async () => {
const {data} = await GET `/say/hello(to='world')`

View File

@@ -13,7 +13,7 @@ const model = cds.compile.to.csn (`
const {Categories:Cats} = model.definitions
describe('Hierarchical Data', ()=>{
describe('cap/samples - Hierarchical Data', ()=>{
before ('bootstrap sqlite in-memory db...', async()=>{
await cds.deploy (model) .to ('sqlite::memory:')
@@ -35,6 +35,21 @@ describe('Hierarchical Data', ()=>{
))
it ('supports nested reads', async()=>{
if (require('semver').gte(cds.version, '5.9.0')) {
expect (await
SELECT.one.from (Cats, c=>{
c.ID, c.name.as('parent'), c.children (c=>{
c.name.as('child')
})
}) .where ({name:'Cat'})
) .to.eql (
{ ID:101, parent:'Cat', children:[
{ child:'Kitty' },
{ child:'Catwoman' },
]}
)
return
}
expect (await
SELECT.one.from (Cats, c=>{
c.ID, c.name.as('parent'), c.children (c=>{
@@ -50,6 +65,25 @@ describe('Hierarchical Data', ()=>{
})
it ('supports deeply nested reads', async()=>{
if (require('semver').gte(cds.version, '5.9.0')) {
expect (await SELECT.one.from (Cats, c=>{
c.ID, c.name, c.children (
c => { c.name },
{levels:3}
)
}) .where ({name:'Cat'})
) .to.eql (
{ ID:101, name:'Cat', children:[
{ name:'Kitty', children:[
{ name:'Kitty Cat', children:[
{ name:'Aristocat' }, ]}, // level 3
{ name:'Kitty Bat', children:[] }, ]},
{ name:'Catwoman', children:[
{ name:'Catalina', children:[] } ]},
]}
)
return
}
expect (await SELECT.one.from (Cats, c=>{
c.ID, c.name, c.children (
c => { c.name },

View File

@@ -2,7 +2,7 @@ const { GET, expect, cds } = require('@sap/cds/lib').test (__dirname)
if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
describe('Localized Data', () => {
describe('cap/samples - Localized Data', () => {
it('serves localized $metadata documents', async () => {
const { data } = await GET`/browse/$metadata?sap-language=de`

View File

@@ -4,7 +4,7 @@ const _model = '@capire/reviews'
if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
describe('Messaging', ()=>{
describe('cap/samples - Messaging', ()=>{
it ('should bootstrap sqlite in-memory db', async()=>{
const db = await cds.deploy (_model) .to ('sqlite::memory:')

View File

@@ -1,9 +1,48 @@
const cds = require('@sap/cds/lib')
const { GET, expect } = cds.test ('@capire/bookshop')
if (cds.User.default) cds.User.default = cds.User.Privileged // hard core monkey patch
else cds.User = cds.User.Privileged // hard core monkey patch for older cds releases
const { GET, expect, axios } = cds.test ('@capire/bookshop')
axios.defaults.auth = { username: 'alice', password: 'admin' }
describe('OData Protocol', () => {
describe('cap/samples - Bookshop APIs', () => {
// Genres
const Drama = {
"name": "Drama",
"descr": null,
"ID": 11,
"parent_ID": 10
}
const Mystery = {
"name": "Mystery",
"descr": null,
"ID": 16,
"parent_ID": 10
}
const Fantasy = {
"name": "Fantasy",
"descr": null,
"ID": 13,
"parent_ID": 10
}
// Currencies
const GBP = {
"name": "British Pound",
"descr": null,
"code": "GBP",
"symbol": "£"
}
const USD = {
"name": "US Dollar",
"descr": null,
"code": "USD",
"symbol": "$"
}
const JPY = {
"name": "Yen",
"descr": null,
"code": "JPY",
"symbol": "¥"
}
it('serves $metadata documents in v4', async () => {
@@ -17,6 +56,16 @@ describe('OData Protocol', () => {
expect(data).to.contain('<Annotation Term="Common.Label" String="Currency"/>')
})
it('serves ListOfBooks?$expand=genre,currency', async () => {
const { data } = await GET `/browse/ListOfBooks ${{
params: { $search: 'Po', $select: `title,author`, $expand:`genre,currency` },
}}`
expect(data.value).to.eql([
{ ID: 251, title: 'The Raven', author: 'Edgar Allen Poe', genre:Mystery, currency:USD },
{ ID: 252, title: 'Eleonora', author: 'Edgar Allen Poe', genre:Mystery, currency:USD },
])
})
it('supports $search in multiple fields', async () => {
const { data } = await GET `/browse/Books ${{
params: { $search: 'Po', $select: `title,author` },
@@ -75,4 +124,16 @@ describe('OData Protocol', () => {
{ ID: 271, title: 'Catweazle' },
])
})
it('serves user info', async () => {
{
const { data } = await GET (`/user/me`)
expect(data).to.containSubset({ id: 'alice', locale:'en', tenant: null })
}
{
const { data } = await GET (`/user/me`, {auth: { username: 'joe' }})
expect(data).to.containSubset({ id: 'joe', locale:'en', tenant: null })
}
})
})

View File

@@ -6,7 +6,7 @@ const { resolve } = require('path')
const verbose = process.env.CDS_TEST_VERBOSE
// ||true
describe('Local NPM registry', () => {
describe('cap/samples - Local NPM registry', () => {
let registry
let axios
const cwd = resolve(__dirname, '..')
@@ -20,7 +20,7 @@ describe('Local NPM registry', () => {
after(() => { registry.kill() })
for (const mod of ['bookshop','fiori','orders','reviews']) {
for (const mod of ['bookshop', 'data-viewer', 'fiori','orders','reviews']) {
it(`should serve ${mod}`, async () => {
const resp = await axios.get(`/@capire/${mod}`)
expect(resp.data).to.containSubset({name: `@capire/${mod}`, versions:{}})