Merge branch 'main' into test-extensibility

fixed windows error
Update to latest UIFlex changes and CDS master
2021-11-03 13:32:34 +01:00 · 2021-11-03 09:30:33 +01:00 · 2021-10-25 14:54:51 +02:00 · 2021-10-01 14:07:22 +02:00 · 2021-10-01 14:07:10 +02:00 · 2021-10-01 10:31:53 +02:00
47 changed files with 2956 additions and 313 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ reviews/msg-box
 reviews/db/test.db

 *.openapi3.json
+sqlite.db
--- a/bookshop/db/schema.cds
+++ b/bookshop/db/schema.cds
@@ -1,7 +1,7 @@
-using { Currency, managed, sap } from '@sap/cds/common';
+using { Currency, managed, sap, extensible } from '@sap/cds/common';
 namespace sap.capire.bookshop;

-entity Books : managed {
+entity Books : managed, extensible {
  key ID : Integer;
  title  : localized String(111);
  descr  : localized String(1111);
@@ -13,7 +13,7 @@ entity Books : managed {
  image : LargeBinary @Core.MediaType : 'image/png';
 }

-entity Authors : managed {
+entity Authors : managed, extensible {
  key ID : Integer;
  name   : String(111);
  dateOfBirth  : Date;
--- a/bookshop/srv/cat-service.js
+++ b/bookshop/srv/cat-service.js
@@ -1,9 +1,8 @@
 const cds = require('@sap/cds')
+const { Books } = cds.entities ('sap.capire.bookshop')

 class CatalogService extends cds.ApplicationService { init(){

-  const { Books } = cds.entities ('sap.capire.bookshop')
-
  // Reduce stock of ordered books if available stock suffices
  this.on ('submitOrder', async req => {
    const {book,quantity} = req.data
--- a/bookstore/package.json
+++ b/bookstore/package.json
@@ -1,39 +0,0 @@
-{
-  "name": "@capire/bookstore",
-  "version": "1.0.0",
-  "dependencies": {
-    "@capire/bookshop": "*",
-    "@capire/reviews": "*",
-    "@capire/orders": "*",
-    "@capire/common": "*",
-    "@sap/cds": "^5",
-    "express": "^4.17.1"
-  },
-  "cds": {
-    "requires": {
-      "ReviewsService": {
-        "kind": "odata",
-        "model": "@capire/reviews"
-      },
-      "OrdersService": {
-        "kind": "odata",
-        "model": "@capire/orders"
-      },
-      "messaging": {
-        "[development]": { "kind": "file-based-messaging" },
-        "[hybrid]": { "kind": "enterprise-messaging-shared" },
-        "[production]": { "kind": "enterprise-messaging" }
-      },
-      "db": {
-        "kind": "sql",
-        "[development]": {
-          "model": "db/sqlite"
-        },
-        "[production]": {
-          "model": "db/hana"
-        }
-      }
-    },
-    "log": { "service": true }
-  }
-}
--- a/bookstore/server.js
+++ b/bookstore/server.js
@@ -1,21 +0,0 @@
-const cds = require ('@sap/cds')
-
-// Add mashup logic
-cds.once('served', require('./srv/mashup'))
-
-// Add routes to UIs from imported packages
-cds.once('bootstrap',(app)=>{
-  app.serve ('/bookshop') .from ('@capire/bookshop','app/vue')
-  app.serve ('/reviews') .from ('@capire/reviews','app/vue')
-  app.serve ('/orders') .from('@capire/orders','app/orders')
-})
-
-// Add Swagger UI
-require('./srv/swagger-ui')
-
-// Returning cds.server
-module.exports = cds.server
-
-// For didactic reasons in capire
-const { ReviewsService, OrdersService } = cds.requires
-if (!ReviewsService.credentials && !OrdersService.credentials) cds.requires.messaging = false
--- a/bookstore/srv/swagger-ui.js
+++ b/bookstore/srv/swagger-ui.js
@@ -1,10 +0,0 @@
-
-// -----------------------------------------------------------------------
-// Adding Swagger UI - see https://cap.cloud.sap/docs/advanced/openapi
-const cds = require ('@sap/cds')
-try {
-  const cds_swagger = require ('cds-swagger-ui-express')
-  cds.once ('bootstrap', app => app.use (cds_swagger()) )
-} catch (err) {
-  if (err.code !== 'MODULE_NOT_FOUND')  throw err
-}
--- a/fiori/.env
+++ b/fiori/.env
@@ -0,0 +1,2 @@
+# cds.requires.messaging.kind = file-based-messaging
+PORT = 4004
--- a/fiori/app/admin-fiori.html
+++ b/fiori/app/admin-fiori.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Bookshop</title>
+
+    <script>
+      window["sap-ushell-config"] = {
+        defaultRenderer: "fiori2",
+        applications: {
+          "browse-books": {
+            title: "Browse Books",
+            description: "w/ SAP Fiori Elements",
+            additionalInformation: "SAPUI5.Component=bookshop",
+            applicationType: "URL",
+            url: "/browse/webapp",
+            navigationMode: "embedded",
+          },
+          "manage-books": {
+            title: "Manage Books",
+            description: "w/ SAP Fiori Elements",
+            additionalInformation: "SAPUI5.Component=admin",
+            applicationType: "URL",
+            url: "/admin/webapp",
+            navigationMode: "embedded",
+          },
+          "manage-orders": {
+            title: "Manage Orders",
+            description: "w/ SAP Fiori Elements",
+            additionalInformation: "SAPUI5.Component=orders",
+            applicationType: "URL",
+            url: "/orders/webapp",
+            navigationMode: "embedded",
+          },
+        },
+        bootstrapPlugins: {
+          RuntimeAuthoringPlugin: {
+            component: "sap.ushell.plugins.rta",
+            config: {
+              validateAppVersion: false,
+            },
+          },
+          PersonalizePlugin: {
+            component: "sap.ushell.plugins.rta-personalize",
+            config: {
+              validateAppVersion: false,
+            },
+          },
+        },
+      };
+    </script>
+
+    <script
+      id="sap-ushell-bootstrap"
+      src="https://sapui5nightly.int.sap.eu2.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"
+    ></script>
+    <script
+      id="sap-ui-bootstrap"
+      src="https://sapui5nightly.int.sap.eu2.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-bindingSyntax="complex"
+    ></script>
+    <script>
+      sap.ui
+        .getCore()
+        .attachInit(() =>
+          sap.ushell.Container.createRenderer().placeAt("content")
+        );
+      sap.ui
+        .getCore()
+        .getConfiguration()
+        .setFlexibilityServices([{ connector: "SessionStorageConnector" }]);
+    </script>
+  </head>
+  <body class="sapUiBody" id="content"></body>
+</html>
--- a/fiori/app/admin/fiori-service.cds
+++ b/fiori/app/admin/fiori-service.cds
@@ -1,4 +1,4 @@
-using { AdminService } from '@capire/bookshop';
+using { AdminService } from '../../db/schema';
 using from '../common'; // to help UI linter get the complete annotations

 ////////////////////////////////////////////////////////////////////////////
--- a/fiori/app/admin/webapp/manifest.json
+++ b/fiori/app/admin/webapp/manifest.json
@@ -22,6 +22,10 @@
        }
    },
    "sap.ui5": {
+        "flexEnabled": true,
+        "config": {   
+            "experimentalCAPScenario": true
+        },
        "dependencies": {
            "libs": {
                "sap.fe.templates": {}
--- a/fiori/app/bookshop.html
+++ b/fiori/app/bookshop.html
@@ -0,0 +1,3 @@
+<head>
+  <meta http-equiv="refresh" content="0;url=bookshop/index.html">
+</head>
--- a/fiori/app/browse/webapp/manifest.json
+++ b/fiori/app/browse/webapp/manifest.json
@@ -22,6 +22,7 @@
    }
  },
  "sap.ui5": {
+    "flexEnabled": true,
    "dependencies": {
      "libs": {
        "sap.fe.templates": {}
--- a/fiori/app/fiori-apps.html
+++ b/fiori/app/fiori-apps.html
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-
-	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-	<title>Bookshop</title>
-
-	<script>
-		window["sap-ushell-config"] = {
-			defaultRenderer: "fiori2",
-			applications: {
-				"browse-books": {
-					title: "Browse Books",
-					description: "w/ SAP Fiori Elements",
-					additionalInformation: "SAPUI5.Component=bookshop",
-					applicationType : "URL",
-					url: "/browse/webapp",
-					navigationMode: "embedded"
-				},
-				"manage-books": {
-					title: "Manage Books",
-					description: "w/ SAP Fiori Elements",
-					additionalInformation: "SAPUI5.Component=admin",
-					applicationType : "URL",
-					url: "/admin/webapp",
-					navigationMode: "embedded"
-				},
-				"manage-orders": {
-					title: "Manage Orders",
-					description: "w/ SAP Fiori Elements",
-					additionalInformation: "SAPUI5.Component=orders",
-					applicationType : "URL",
-					url: "/orders/webapp",
-					navigationMode: "embedded"
-				}
-			}
-		};
-	</script>
-
-	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://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"
-	></script>
-	<script>
-		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))
-	</script>
-
-</head>
-<body class="sapUiBody" id="content"></body>
-</html>
--- a/fiori/app/reviews.html
+++ b/fiori/app/reviews.html
@@ -0,0 +1,3 @@
+<head>
+  <meta http-equiv="refresh" content="0;url=reviews/index.html">
+</head>
--- a/fiori/app/services.cds
+++ b/fiori/app/services.cds
@@ -6,4 +6,7 @@ using from './admin/fiori-service';
 using from './browse/fiori-service';
 using from './common';

-using from '@capire/bookstore/srv/mashup';
+using from '@capire/common';
+
+// only works in case of embedded orders service
+using from '@capire/orders/app/orders/fiori-service';
--- a/bookstore/db/hana/index.cds
+++ b/bookstore/db/hana/index.cds
--- a/bookstore/db/schema.cds
+++ b/bookstore/db/schema.cds
--- a/bookstore/db/sqlite/index.cds
+++ b/bookstore/db/sqlite/index.cds
--- a/fiori/package.json
+++ b/fiori/package.json
@@ -2,7 +2,10 @@
  "name": "@capire/fiori",
  "version": "1.0.0",
  "dependencies": {
-    "@capire/bookstore": "*",
+    "@capire/bookshop": "*",
+    "@capire/reviews": "*",
+    "@capire/orders": "*",
+    "@capire/common": "*",
    "@sap/cds": "^5",
    "express": "^4.17.1",
    "passport": "^0.4.1"
@@ -12,6 +15,9 @@
    "watch": "cds watch"
  },
  "cds": {
+    "hana": {
+      "deploy-format": "hdbtable"
+    },
    "requires": {
      "auth": {
        "strategy": "dummy"
@@ -24,13 +30,19 @@
        "kind": "odata",
        "model": "@capire/orders"
      },
-      "messaging": {
-        "[production]": { "kind": "enterprise-messaging" },
-        "[development]": { "kind": "file-based-messaging" },
-        "[hybrid!]": { "kind": "enterprise-messaging-shared" }
+      "extensibility": {
+        "kind": "uiflex"
      },
-      "hana": {
-        "deploy-format": "hdbtable"
+      "db": {
+        "kind": "sqlite",
+        "credentials": {
+          "database": "sqlite.db"
+        }
+      },
+      "messaging": {
+        "[development]": { "kind": "file-based-messaging" },
+        "[hybrid]": { "kind": "enterprise-messaging-shared" },
+        "kind": "enterprise-messaging"
      }
    }
  }
--- a/fiori/server.js
+++ b/fiori/server.js
@@ -1 +1,25 @@
-module.exports = require('@capire/bookstore/server.js')
+const cds = require ('@sap/cds')
+module.exports = cds.server
+
+cds.once('bootstrap',(app)=>{
+  app.use ('/orders/webapp', _from('@capire/orders/app/orders/webapp/manifest.json'))
+  app.use ('/bookshop', _from('@capire/bookshop/app/vue/index.html'))
+  app.use ('/reviews', _from('@capire/reviews/app/vue/index.html'))
+})
+
+cds.once('served', require('./srv/mashup'))
+
+// Swagger UI - see https://cap.cloud.sap/docs/advanced/openapi
+try {
+  const cds_swagger = require ('cds-swagger-ui-express')
+  cds.once ('bootstrap', app => app.use (cds_swagger()) )
+} catch (err) {
+  if (err.code !== 'MODULE_NOT_FOUND')  throw err
+}
+
+
+// -----------------------------------------------------------------------
+// Helper for serving static content from npm-installed packages
+const {static} = require('express')
+const {dirname} = require('path')
+const _from = target => static (dirname (require.resolve(target)))
--- a/bookstore/srv/mashup.cds
+++ b/bookstore/srv/mashup.cds
@@ -1,7 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 //
-//    Enhancing bookshop with Reviews and Orders provided through
-//    respective reuse packages and services
+//    Mashing up imported models...
 //

 using { sap.capire.bookshop.Books } from '@capire/bookshop';
@@ -9,22 +8,19 @@ using { sap.capire.bookshop.Books } from '@capire/bookshop';
 //
 //  Extend Books with access to Reviews and average ratings
 //
+
 using { ReviewsService.Reviews } from '@capire/reviews';
 extend Books with {
  reviews : Composition of many Reviews on reviews.subject = $self.ID;
-  rating  : Decimal;
  numberOfReviews : Integer;
+  rating  : Decimal;
 }

-
 //
 //  Extend Orders with Books as Products
 //
+
 using { sap.capire.orders.Orders_Items } from '@capire/orders';
 extend Orders_Items with {
  book : Association to Books on product.ID = book.ID
 }
-
-
-// Add orders fiori app (in case of embedded orders service)
-using from '@capire/orders/app/fiori';
--- a/bookstore/srv/mashup.js
+++ b/bookstore/srv/mashup.js
@@ -1,6 +1,6 @@
 ////////////////////////////////////////////////////////////////////////////
 //
-//    Mashing up bookshop services with required services...
+//    Mashing up provided and required services...
 //
 module.exports = async()=>{ // called by server.js

@@ -20,7 +20,7 @@ module.exports = async()=>{ // called by server.js
  CatalogService.prepend (srv => srv.on ('READ', 'Books/reviews', (req) => {
    console.debug ('> delegating request to ReviewsService')
    const [id] = req.params, { columns, limit } = req.query.SELECT
-    return ReviewsService.read ('Reviews',columns).limit(limit).where({subject:String(id)})
+    return ReviewsService.tx(req).read ('Reviews',columns).limit(limit).where({subject:String(id)})
  }))

  //
@@ -37,12 +37,13 @@ module.exports = async()=>{ // called by server.js
  })

  //
-  // Update Books' average ratings when ReviewsService signals updated reviews
+  // Update Books' average ratings when ReviewsService signals updatd reviews
  //
  ReviewsService.on ('reviewed', (msg) => {
    console.debug ('> received:', msg.event, msg.data)
    const { subject, count, rating } = msg.data
    return UPDATE(Books,subject).with({ numberOfReviews:count, rating })
+    // ^ Note: the framework will execute this and take care for db.tx
  })

  //
--- a/fiori/test.http
+++ b/fiori/test.http
@@ -0,0 +1,14 @@
+# Add integer extension field to Books
+POST http://localhost:4004/extensibility/addExtension
+Content-Type: application/json
+
+{
+  "extensions": [
+    "{\"extend\":\"AdminService.Books\",\"elements\":{\"neuesFeld2\":{\"type\":\"cds.String\", \"default\":\"hallo\"}}}"
+  ]
+}
+
+###
+    # { "extend": "AdminService.Books", "elements":{
+    #   "abc":{"type":"cds.Integer"}
+    # }},
--- a/bookstore/test/requests.http
+++ b/bookstore/test/requests.http
@@ -2,7 +2,7 @@
@bookshop = http://localhost:4004
@reviews-service = {{bookshop}}/reviews
 # Uncomment this when running a separate reviews service
-# @reviews-service = http://localhost:4005/reviews
+@reviews-service = http://localhost:4005/reviews



--- a/graphql/.env
+++ b/graphql/.env
@@ -1 +0,0 @@
-PORT = 4007
--- a/graphql/db/data/sap.capire.graphql-Chapters.csv
+++ b/graphql/db/data/sap.capire.graphql-Chapters.csv
@@ -1,4 +0,0 @@
-book_ID;number;title
-201;1;Chapter 1
-201;2;Chapter 2
-201;3;Chapter 3
--- a/graphql/db/schema.cds
+++ b/graphql/db/schema.cds
@@ -1,26 +0,0 @@
-using {
-  cuid,
-  managed
-} from '@sap/cds/common';
-using {sap.capire.bookshop} from '@capire/bookshop';
-
-namespace sap.capire.graphql;
-
-extend bookshop.Books with {
-  chapters : Composition of many Chapters
-               on chapters.book = $self;
-}
-
-entity Chapters : managed {
-  key book   : Association to bookshop.Books;
-  key number : Integer;
-      title  : String;
-}
-
-entity Orders : cuid, managed {
-  @mandatory
-  book     : Association to bookshop.Books;
-  @mandatory
-  @assert.range : [ 1, 5 ]
-  quantity : Integer;
-}
--- a/graphql/examples.http
+++ b/graphql/examples.http
@@ -1,7 +0,0 @@
-# GraphQL
-GET http://localhost:4007/graphql?query={BookshopService{Books{title,author{name},chapters{number,title}}}}
-
-###
-
-# OData
-GET http://localhost:4007/bookshop/Books?$select=title&$expand=author($select=name),chapters($select=number,title)
--- a/graphql/examples.md
+++ b/graphql/examples.md
@@ -1,16 +0,0 @@
-1. open `http://localhost:4007/graphql`
-2. paste into left field:
-    ```graphql
-    {
-      BookshopService {
-        Books {
-          title
-          chapters {
-            number
-            title
-          }
-        }
-      }
-    }
-    ```
-3. press play button
--- a/graphql/package.json
+++ b/graphql/package.json
@@ -1,21 +0,0 @@
-{
-  "name": "@capire/graphql",
-  "version": "1.0.0",
-  "dependencies": {
-    "@capire/bookshop": "*",
-    "@graphql-tools/schema": "^8.3.1",
-    "@sap/cds": "^5.6",
-    "express-graphql": "^0.12.0",
-    "graphql": "^16.0.1"
-  },
-  "cds": {
-    "features": {
-      "graphql": true
-    },
-    "requires": {
-      "auth": {
-        "kind": "dummy-auth"
-      }
-    }
-  }
-}
--- a/graphql/srv/bookshop-service.cds
+++ b/graphql/srv/bookshop-service.cds
@@ -1,11 +0,0 @@
-using {
-  sap.capire.bookshop,
-  sap.capire.graphql
-} from '../db/schema';
-
-service BookshopService {
-  entity Books    as projection on bookshop.Books;
-  entity Authors  as projection on bookshop.Authors;
-  entity Chapters as projection on graphql.Chapters;
-  entity Orders   as projection on graphql.Orders;
-}
--- a/graphql/srv/bookshop-service.js
+++ b/graphql/srv/bookshop-service.js
@@ -1,11 +0,0 @@
-module.exports = function() {
-  const { Orders, Books } = this.entities
-
-  this.before('CREATE', Orders, async function(req) {
-    const { book_ID, quantity } = req.data
-
-    // reduce the stock, if enough are available, else reject the order
-    const applied = await UPDATE(Books, book_ID).set({ stock: { '-=': quantity } }).where({ stock: { '>=': quantity }})
-    if (!applied) req.reject(400, `Sorry, ${quantity} are not in stock`)
-  })
-}
--- a/orders/app/fiori-app.html
+++ b/orders/app/fiori-app.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+<head>
+
+	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+	<title>Bookshop</title>
+
+	<script>
+		window["sap-ushell-config"] = {
+			defaultRenderer: "fiori2",
+			applications: {
+				"manage-orders": {
+					title: "Manage Orders",
+					description: "... testing FE v42",
+					additionalInformation: "SAPUI5.Component=orders",
+					applicationType : "URL",
+					url: "/orders/webapp",
+					navigationMode: "embedded"
+				}
+			},
+			bootstrapPlugins: {
+          RuntimeAuthoringPlugin: {
+            component: "sap.ushell.plugins.rta",
+            config: {
+              validateAppVersion: false,
+            },
+          },
+          PersonalizePlugin: {
+            component: "sap.ushell.plugins.rta-personalize",
+            config: {
+              validateAppVersion: false,
+            },
+          },
+        },
+		};
+	</script>
+
+<script id="sap-ushell-bootstrap" src="https://sapui5nightly.int.sap.eu2.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
+<script id="sap-ui-bootstrap" src="https://sapui5nightly.int.sap.eu2.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-bindingSyntax="complex"
+></script>
+	<script>
+		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"));
+		sap.ui
+        .getCore()
+        .getConfiguration()
+        .setFlexibilityServices([{ connector: "SessionStorageConnector" }]);
+	</script>
+
+</head>
+<body class="sapUiBody" id="content"></body>
+</html>
--- a/orders/app/index.cds
+++ b/orders/app/index.cds
@@ -0,0 +1,5 @@
+/*
+  This model controls what gets served to Fiori frontends...
+*/
+
+using from './orders/fiori-service';
--- a/orders/app/orders/fiori-service.cds
+++ b/orders/app/orders/fiori-service.cds
@@ -10,7 +10,7 @@



-using { OrdersService } from '../srv/orders-service';
+using { OrdersService } from '../../srv/orders-service';


@odata.draft.enabled
--- a/orders/app/orders/index.html
+++ b/orders/app/orders/index.html
@@ -1,39 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-
-	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-	<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-	<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-	<title>Bookshop</title>
-
-	<script>
-		window["sap-ushell-config"] = {
-			defaultRenderer: "fiori2",
-			applications: {
-				"manage-orders": {
-					title: "Manage Orders",
-					description: "... testing FE v42",
-					additionalInformation: "SAPUI5.Component=orders",
-					applicationType : "URL",
-					url: "/orders/webapp",
-					navigationMode: "embedded"
-				}
-			}
-		};
-	</script>
-
-	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://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"
-	></script>
-	<script>
-		sap.ui.getCore().attachInit(()=> sap.ushell.Container.createRenderer().placeAt("content"))
-	</script>
-
-</head>
-<body class="sapUiBody" id="content"></body>
-</html>
--- a/orders/app/orders/webapp/manifest.json
+++ b/orders/app/orders/webapp/manifest.json
@@ -22,6 +22,10 @@
 		}
 	},
 	"sap.ui5": {
+        "flexEnabled": true,
+        "config": {   
+            "experimentalCAPScenario": true
+        },
        "dependencies": {
            "libs": {
                "sap.fe.templates": {}
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -5,16 +5,15 @@
  "repository": "https://github.com/sap-samples/cloud-cap-samples.git",
  "author": "daniel.hutzel@sap.com",
  "dependencies": {
-    "@capire/bookstore": "./bookstore",
    "@capire/bookshop": "./bookshop",
    "@capire/common": "./common",
    "@capire/fiori": "./fiori",
-    "@capire/graphql": "./graphql",
    "@capire/hello": "./hello",
    "@capire/media": "./media",
    "@capire/orders": "./orders",
    "@capire/reviews": "./reviews",
-    "@sap/cds": "^5.6"
+    "@sap/cds": "git+https://github.tools.sap/cap/cds.git",
+    "@sap/cds-dk": "*"
  },
  "devDependencies": {
    "chai": "^4.3.4",
--- a/reviews/.env
+++ b/reviews/.env
@@ -1,2 +1,2 @@
-# cds.requires.messaging.kind = file-based-messaging
+cds.requires.messaging.kind = file-based-messaging
 PORT = 4005
--- a/reviews/package.json
+++ b/reviews/package.json
@@ -10,14 +10,15 @@
    "@sap/cds": "^5",
    "express": "^4.17.1"
  },
+  "scripts": {
+    "reviews-service": "cds watch",
+    "books-reviewed": "cds watch ../reviewed"
+  },
  "cds": {
    "requires": {
-      "messaging": {
-        "[development]": { "kind": "file-based-messaging" },
-        "[hybrid]": { "kind": "enterprise-messaging-shared" },
-        "[production]": { "kind": "enterprise-messaging" }
-      },
-      "db": { "kind": "sql" }
+      "db": {
+        "kind": "sql"
+      }
    }
  }
 }
--- a/reviews/test/app/bookshop.html
+++ b/reviews/test/app/bookshop.html
@@ -0,0 +1,3 @@
+<head>
+  <meta http-equiv="refresh" content="0;url=app/bookshop/index.html">
+</head>
--- a/reviews/test/app/reviews.html
+++ b/reviews/test/app/reviews.html
@@ -0,0 +1,3 @@
+<head>
+  <meta http-equiv="refresh" content="0;url=app/reviews/index.html">
+</head>
--- a/reviews/test/package.json
+++ b/reviews/test/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "@capire/bookshop-with-reviews",
+  "version": "1.0.0",
+  "dependencies": {
+    "@capire/bookshop": "*",
+    "@capire/reviews": "*",
+    "@sap/cds": "^5",
+    "express": "^4.17.1"
+  },
+  "cds": {
+    "requires": {
+      "db": {
+        "kind": "sql"
+      }
+    }
+  }
+}
--- a/reviews/test/srv/bookshop.cds
+++ b/reviews/test/srv/bookshop.cds
@@ -0,0 +1,13 @@
+// Use enhanced implementation for CatalogService
+using { CatalogService } from '@capire/bookshop';
+annotate CatalogService with @impl:'srv/bookshop.js';
+
+
+// Extend Books with access to Reviews and average ratings
+using { sap.capire.bookshop.Books } from '@capire/bookshop';
+using { ReviewsService.Reviews } from '@capire/reviews';
+extend Books with {
+  reviews : Composition of many Reviews on reviews.subject = $self.ID;
+  rating  : Decimal;
+  numberOfReviews : Integer;
+}
--- a/reviews/test/srv/bookshop.js
+++ b/reviews/test/srv/bookshop.js
@@ -0,0 +1,27 @@
+const { CatalogService } = require('@capire/bookshop')
+const cds = require ('@sap/cds')
+
+module.exports = class extends CatalogService {async init(){
+
+  const { Books } = cds.entities('sap.capire.bookshop')
+
+  // Connect to ReviewsService to receive `reviewed` events from it
+  const ReviewsService = await cds.connect.to ('ReviewsService')
+  ReviewsService.on ('reviewed', (msg) => {
+    console.debug ('> received:', msg.event, msg.data)
+    const { subject, count, rating } = msg.data
+    return UPDATE(Books,subject).with({ numberOfReviews:count, rating })
+  })
+
+  return super.init()
+}}
+
+
+// -----------------------------------------------------------------------
+// Helper for serving static content from npm-installed packages
+const {dirname,resolve} = require('path')
+const {static} = require('express')
+cds.once('listening',()=>{
+  cds.app.use ('/app/bookshop', static (dirname (require.resolve('@capire/bookshop'))+'/app/vue'))
+  cds.app.use ('/app/reviews', static (resolve (__dirname, '../../app/vue')))
+})
--- a/samples.md
+++ b/samples.md
@@ -51,27 +51,20 @@ Each sub directory essentially is an individual npm package arranged in an [all-
 - As well as managed data, input validations, and authorization


-## [@capire/bookstore](bookstore)
+## [@capire/fiori](fiori)

 - A [composite app, reusing and combining](https://cap.cloud.sap/docs/guides/verticalize) these packages:
  - [@capire/bookshop](bookshop)
  - [@capire/reviews](reviews)
  - [@capire/orders](orders)
  - [@capire/common](common)
- [The Vue.js app](bookshop/app/vue) imported from bookshop is served as well
- [The Vue.js app](reviews/app/vue) imported from reviews is served as well
- [The Fiori app](orders/app) imported from orders is served as well
- [OpenAPI export + Swagger UI](https://cap.cloud.sap/docs/advanced/openapi)
-
-
-
-## [@capire/fiori](fiori)
-
 - [Adds an SAP Fiori elements application](https://cap.cloud.sap/docs/guides/fiori/) to bookshop, thereby introducing to:
  - [OData Annotations](https://cap.cloud.sap/docs/guides/fiori#adding-odata-annotations) in `.cds` files
  - Support for [Fiori Draft](https://cap.cloud.sap/docs/guides/fiori#draft)
  - Support for [Value Helps](https://cap.cloud.sap/docs/guides/fiori#value-help)
  - Serving SAP Fiori apps locally
+- [The Vue.js app](bookshop/app/vue) imported from bookshop is served as well
+- [OpenAPI export + Swagger UI](https://cap.cloud.sap/docs/advanced/openapi)

 <br>
Author	SHA1	Message	Date
Vitaly Kozyura	d5c45d0326	Merge branch 'main' into test-extensibility	2021-11-03 13:32:34 +01:00
nkaputnik	390bd82502	fixed windows error	2021-11-03 09:30:33 +01:00
nkaputnik	5429617e0b	Update to latest UIFlex changes and CDS master	2021-10-25 14:54:51 +02:00
nkaputnik	211c7e43ae	Merge branch 'test-extensibility' of https://github.com/SAP-samples/cloud-cap-samples into test-extensibility	2021-10-01 14:07:22 +02:00
nkaputnik	08ec0c7d0d	Added fiori configuration for UIFlex enablement	2021-10-01 14:07:10 +02:00
Daniel	0b8e7cece9	.	2021-10-01 10:31:53 +02:00
Daniel	c33613fa57	..	2021-09-30 19:43:52 +02:00
D051920	c841765791	add test	2021-09-30 16:46:59 +02:00
D051920	aeee07cbcd	Test UIFlex	2021-09-30 16:45:44 +02:00