merged from master

This commit is contained in:
Daniel
2021-07-16 06:20:48 +02:00
13 changed files with 29897 additions and 320 deletions

View File

@@ -1,4 +1,5 @@
using { AdminService } from '../../db/schema';
using { AdminService, sap.capire.bookshop } from '../../db/schema';
using from '../common'; // to help UI linter get the complete annotations
////////////////////////////////////////////////////////////////////////////
//
@@ -86,8 +87,9 @@ annotate AdminService.Books.texts with @(
annotate AdminService.Books.texts {
locale @ValueList:{entity:'Languages',type:#fixed}
}
// In addition we need to expose Languages through AdminService
// In addition we need to expose Languages and Books.texts through AdminService
using { sap } from '@sap/cds/common';
extend service AdminService {
entity Languages as projection on sap.common.Languages;
entity Books.texts as projection on bookshop.Books.texts;
}

View File

@@ -1,4 +1,5 @@
const cds = require ('@sap/cds')
module.exports = cds.server
cds.once('bootstrap',(app)=>{
app.serve ('/orders/webapp').from('@capire/orders','app/orders/webapp')
@@ -9,4 +10,7 @@ cds.once('bootstrap',(app)=>{
cds.once('served', require('./srv/mashup'))
cds.once('served', require('@capire/suppliers/srv/mashup'))
module.exports = cds.server
// Swagger UI - see https://cap.cloud.sap/docs/advanced/openapi
if (process.env.NODE_ENV !== 'production') {
cds.once ('bootstrap', app => app.use (require ('cds-swagger-ui-express')()) )
}