ui

fiori/.env

@@ -1,2 +0,0 @@
-# cds.requires.messaging.kind = file-based-messaging
-PORT = 4004

fiori/db/hana/index.cds

@@ -1,10 +0,0 @@
-//
-//  Add Author.age and .lifetime with a DB-specific function
-//
-
-using { AdminService } from '../schema';
-
-extend projection AdminService.Authors with {
-  YEARS_BETWEEN(dateOfBirth, dateOfDeath)         as age: Integer,
-  YEAR(dateOfBirth) || ' – ' || YEAR(dateOfDeath) as lifetime : String
-}

fiori/db/schema.cds

@@ -1,8 +0,0 @@
-using { sap.capire.bookshop } from '@capire/bookshop';
-
-// Forward-declare calculated fields to be filled in database-specific ways
-// TODO find a better way to have 'default' fields that still can be overwritten.
-extend bookshop.Authors with {
-	virtual age: Integer;
-	virtual lifetime: String;
-}

fiori/db/sqlite/index.cds

@@ -1,10 +0,0 @@
-//
-//  Add Author.age and .lifetime with a DB-specific function
-//
-
-using { AdminService } from '../schema';
-
-extend projection AdminService.Authors with {
-  strftime('%Y',dateOfDeath)-strftime('%Y',dateOfBirth)              as age: Integer,
-  strftime('%Y',dateOfBirth) || ' – ' || strftime('%Y',dateOfDeath)  as lifetime : String
-}

fiori/package.json

@@ -1,44 +0,0 @@
-{
-  "name": "@capire/fiori",
-  "version": "1.0.0",
-  "dependencies": {
-    "@capire/bookshop": "*",
-    "@capire/reviews": "*",
-    "@capire/orders": "*",
-    "@capire/common": "*",
-    "@sap/cds": ">=4",
-    "express": "^4.17.1",
-    "passport": "^0.4.1"
-  },
-  "scripts": {
-    "start": "cds run --in-memory?",
-    "watch": "cds watch"
-  },
-  "cds": {
-    "hana": {
-      "deploy-format": "hdbtable"
-    },
-    "requires": {
-      "auth": {
-        "strategy": "dummy"
-      },
-      "ReviewsService": {
-        "kind": "odata",
-        "model": "@capire/reviews"
-      },
-      "OrdersService": {
-        "kind": "odata",
-        "model": "@capire/orders"
-      },
-      "db": {
-        "kind": "sql",
-        "[development]": {
-          "model": "db/sqlite"
-        },
-        "[production]": {
-          "model": "db/hana"
-        }
-      }
-    }
-  }
-}

fiori/server.js

@@ -1,18 +0,0 @@
-const cds = require ('@sap/cds')
-
-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'))
-
-module.exports = cds.server
-
-
-// -----------------------------------------------------------------------
-// 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)))

fiori/test/requests.http

@@ -1,77 +0,0 @@
-
-@bookshop = http://localhost:4004
-@reviews-service = {{bookshop}}/reviews
-# Uncomment this when running a separate reviews service
-@reviews-service = http://localhost:4005/reviews
-
-
-
-#################################################
-#
-#   Reviews Service
-#
-
-GET {{reviews-service}}/Reviews
-
-###
-
-POST {{reviews-service}}/Reviews
-Authorization: Basic {{$processEnv USER}}:
-Content-Type: application/json
-
-{"subject":"201", "title":"boo", "rating":3 }
-
-
-
-#################################################
-#
-#   Bookshop Services
-#
-
-GET {{bookshop}}/browse/Books/201/reviews?
-&$select=rating,date,title
-&$top=3
-
-###
-
-GET {{bookshop}}/browse/Books(201)?
-&$select=ID,title,rating
-&$expand=reviews
-
-
-
-#################################################
-#
-#   Orders Service, incl. draft choreography
-#
-@newOrderID = e939604c-ab83-4d4f-bdb6-95fe30b3773e
-
-GET {{bookshop}}/orders/Orders
-
-### Create order, still inactive
-POST {{bookshop}}/orders/Orders
-Content-Type: application/json
-
-{"ID": "{{newOrderID}}"}
-
-### Get inactive order.  We have to specify `IsActiveEntity`.
-GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)
-
-### Activate order using `.../<servicename>.draftActivate`
-POST {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=false)/OrdersService.draftActivate
-Content-Type: application/json
-
-### Get active order
-GET {{bookshop}}/orders/Orders(ID={{newOrderID}},IsActiveEntity=true)
-
-### Create author
-POST {{bookshop}}/admin/Authors
-Content-Type: application/json
-Authorization: Basic alice:
-
-{
-  "ID": 200,
-  "name": "William Shakespeare",
-  "dateOfBirth": "1564-04-26",
-  "dateOfDeath": "1616-04-23"
-}

multitenancy/app/browse/fiori-service.cds

@@ -1,4 +1,4 @@
-using CatalogService from '@capire/bookshop';
+using CatalogService from '../../srv/cat-service';
 
 ////////////////////////////////////////////////////////////////////////////
 //

multitenancy/app/common.cds

@@ -2,8 +2,8 @@
 	Common Annotations shared by all apps
 */
 
-using { sap.capire.bookshop as my } from '@capire/bookshop';
+using { sap.capire.bookshop as my } from '../db/schema';
-using { sap.common } from '@capire/common';
+using { sap.common } from '../db/capire_common';
 
 ////////////////////////////////////////////////////////////////////////////
 //

multitenancy/app/orders/fiori-service.cds

@@ -0,0 +1,92 @@
+
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Note: this is designed for the OrdersService being co-located with
+//	bookshop. It does not work if OrdersService is run as a separate
+// 	process, and is not intended to do so.
+//
+////////////////////////////////////////////////////////////////////////////
+
+
+
+using { OrdersService } from '../../srv/orders-service';
+
+
+@odata.draft.enabled
+annotate OrdersService.Orders with @(
+	UI: {
+		SelectionFields: [ createdAt, createdBy ],
+		LineItem: [
+			{Value: OrderNo, Label:'OrderNo'},
+			{Value: buyer, Label:'Customer'},
+			{Value: createdAt, Label:'Date'}
+		],
+		HeaderInfo: {
+			TypeName: 'Order', TypeNamePlural: 'Orders',
+			Title: {
+				Label: 'Order number ', //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: OrderNo },
+		],
+		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: currency.code, Label:'Currency'}
+			]
+		},
+		FieldGroup#Created: {
+			Data: [
+				{Value: createdBy},
+				{Value: createdAt},
+			]
+		},
+		FieldGroup#Modified: {
+			Data: [
+				{Value: modifiedBy},
+				{Value: modifiedAt},
+			]
+		},
+	},
+) {
+	createdAt @UI.HiddenFilter:false;
+	createdBy @UI.HiddenFilter:false;
+};
+
+
+
+annotate OrdersService.Orders_Items with @(
+	UI: {
+		LineItem: [
+			{Value: product_ID, Label:'Product ID'},
+			{Value: title, Label:'Product Title'},
+			{Value: price, Label:'Unit Price'},
+			{Value: amount, Label:'Quantity'},
+		],
+		Identification: [ //Is the main field group
+			{Value: amount, Label:'Amount'},
+			{Value: title, Label:'Product'},
+			{Value: price, Label:'Unit Price'},
+		],
+		Facets: [
+			{$Type: 'UI.ReferenceFacet', Label: '{i18n>OrderItems}', Target: '@UI.Identification'},
+		],
+	},
+) {
+	amount @(
+		Common.FieldControl: #Mandatory
+	);
+};

multitenancy/app/orders/webapp/Component.js

@@ -0,0 +1,8 @@
+sap.ui.define(["sap/fe/core/AppComponent"], function(AppComponent) {
+	"use strict";
+	return AppComponent.extend("orders.Component", {
+		metadata: { manifest: "json" }
+	});
+});
+
+/* eslint no-undef:0 */

multitenancy/app/orders/webapp/i18n/i18n.properties

@@ -0,0 +1,11 @@
+# This is the resource bundle of itelo
+# __ldi.translation.uuid=c3431418-9caf-11e8-98d0-529269fb1459
+
+# JCI app descriptor contains lower case TITLE
+appTitle=Bookshop Sample
+
+# JCI app descriptor contains lower case DESCRIPTION
+appSubTitle=CAP Sample Application
+
+# JCI app descriptor contains lower case DESCRIPTION
+appDescription=CDS Sample Service

multitenancy/app/orders/webapp/manifest.json

@@ -0,0 +1,170 @@
+{
+	"_version": "1.8.0",
+	"sap.app": {
+		"id": "orders",
+		"type": "application",
+		"title": "Order Books",
+		"description": "Sample Application",
+		"i18n": "i18n/i18n.properties",
+		"dataSources": {
+			"OrdersService": {
+				"uri": "/orders/",
+				"type": "OData",
+				"settings": {
+					"odataVersion": "4.0"
+				}
+			}
+		},
+        "-sourceTemplate": {
+            "id": "ui5template.basicSAPUI5ApplicationProject",
+			"-id": "ui5template.smartTemplate",
+			"-version": "1.40.12"
+		}
+	},
+	"sap.ui5": {
+        "dependencies": {
+            "libs": {
+                "sap.fe.templates": {}
+            }
+        },
+		"models": {
+			"i18n": {
+				"type": "sap.ui.model.resource.ResourceModel",
+				"uri": "i18n/i18n.properties"
+			},
+			"": {
+				"dataSource": "OrdersService",
+				"settings": {
+                    "synchronizationMode": "None",
+                    "operationMode": "Server",
+                    "autoExpandSelect" : true,
+                    "earlyRequests": true,
+                    "groupProperties": {
+                        "default": {
+                          "submit": "Auto"
+                        }
+                    }
+				}
+			}
+		},
+        "routing": {
+            "routes": [
+                {
+                    "pattern": ":?query:",
+                    "name": "OrdersList",
+                    "target": "OrdersList"
+                },
+                {
+                    "pattern": "Orders({key}):?query:",
+                    "name": "OrdersDetails",
+                    "target": "OrdersDetails"
+                },
+                {
+                    "pattern": "Orders({boo})/Items({boo2}):?query:",
+                    "name": "OrderItemsDetails",
+                    "target": "OrderItemsDetails"
+                },
+                {
+                    "pattern": "Books({key}):?query:",
+                    "name": "BooksDetails",
+                    "target": "BooksDetails"
+                }
+            ],
+            "targets": {
+                "OrdersList": {
+                    "type": "Component",
+                    "id": "OrdersList",
+                    "name": "sap.fe.templates.ListReport",
+                    "options": {
+						"settings" : {
+							"entitySet" : "Orders",
+							"navigation" : {
+								"Orders" : {
+									"detail" : {
+										"route" : "OrdersDetails"
+										}
+								}
+							}
+						}
+					}
+                },
+                "OrdersDetails": {
+                    "type": "Component",
+                    "id": "OrdersDetails",
+                    "name": "sap.fe.templates.ObjectPage",
+                    "options": {
+                        "settings" : {
+                            "entitySet": "Orders",
+							"navigation" : {
+								"Items": {
+                                    "detail": {
+                                        "route": "OrderItemsDetails"
+                                    }
+                                },
+                                "book": {
+                                    "detail": {
+                                        "route": "BooksDetails"
+                                    }
+                                },
+                                "dummy": {
+                                    "detail": {
+                                        "route": "BooksDetails"
+                                    }
+                                }
+							}
+						}
+					}
+                },
+                "OrderItemsDetails": {
+                    "type": "Component",
+                    "id": "OrderItemsDetails",
+                    "name": "sap.fe.templates.ObjectPage",
+                    "options": {
+                        "settings" : {
+                            "entitySet": "Orders_Items"
+                        }
+                    }
+                },
+                "BooksDetails": {
+                    "type": "Component",
+                    "id": "BooksDetails",
+                    "name": "sap.fe.templates.ObjectPage",
+                    "options": {
+                        "settings" : {
+                            "entitySet": "Books",
+                            "navigation": {
+                                "author": {
+                                    "detail": {
+                                        "route": "AuthorsDetails"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                "AuthorsDetails": {
+                    "type": "Component",
+                    "id": "AuthorsDetails",
+                    "name": "sap.fe.templates.ObjectPage",
+                    "options": {
+                        "settings" : {
+                            "entitySet": "Authors"
+                        }
+                    }
+                }
+            }
+        },
+		"contentDensities": {
+			"compact": true,
+			"cozy": true
+		}
+	},
+	"sap.ui": {
+		"technology": "UI5",
+		"fullWidth": false
+	},
+	"sap.fiori": {
+		"registrationIds": [],
+		"archeType": "transactional"
+	}
+}

multitenancy/app/services.cds

@@ -6,7 +6,7 @@ using from './admin/fiori-service';
 using from './browse/fiori-service';
 using from './common';
 
-using from '@capire/common';
+using from '../db/capire_common';
 
 // only works in case of embedded orders service
-using from '@capire/orders/app/orders/fiori-service';
+// using from './orders/app/orders/fiori-service';

multitenancy/db/capire_common.cds

@@ -0,0 +1,45 @@
+using { sap } from '@sap/cds/common';
+
+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
+  // See also:
+  // [1] https://www.iso.org/iso-4217-currency-codes.html
+  // [2] https://www.currency-iso.org/en/home/tables/table-a1.html
+  // [3] https://www.ibm.com/support/knowledgecenter/en/SSZLC2_7.0.0/com.ibm.commerce.payments.developer.doc/refs/rpylerl2mst97.htm
+  numcode  : Integer;
+  exponent : Integer; //> e.g. 2 --> 1 Dollar = 10^2 Cent
+  minor    : String; //> e.g. 'Cent'
+}
+
+
+/**
+ * The Code Lists below are designed as optional extensions to
+ * the base schema. Switch them on by adding an Association to
+ * one of the code list entities in your models or by:
+ * annotate sap.common.Countries with @cds.persistence.skip:false;
+ */
+
+context sap.common_countries {
+
+  extend sap.common.Countries {
+    regions   : Composition of many Regions on regions._parent = $self.code;
+  }
+
+  entity Regions : sap.common.CodeList {
+    key code : String(5); // ISO 3166-2 alpha5 codes, e.g. DE-BW
+    children  : Composition of many Regions on children._parent = $self.code;
+    cities    : Composition of many Cities on cities.region = $self;
+    _parent   : String(11);
+  }
+  entity Cities : sap.common.CodeList {
+    key code  : String(11);
+    region    : Association to Regions;
+    districts : Composition of many Districts on districts.city = $self;
+  }
+  entity Districts : sap.common.CodeList {
+    key code  : String(11);
+    city      : Association to Cities;
+  }
+
+}

multitenancy/db/data/sap.common-Countries.csv

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

multitenancy/db/data/sap.common-Countries_texts.csv

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

multitenancy/db/data/sap.common-Currencies.csv

@@ -0,0 +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

multitenancy/db/data/sap.common-Currencies_texts.csv

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

multitenancy/db/data/sap.common-Languages.csv

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

multitenancy/db/data/sap.common-Languages_texts.csv

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

multitenancy/server.js

@@ -1,9 +1,18 @@
-const cds = require ('@sap/cds');
+const cds = require ('@sap/cds')
+
+cds.once('bootstrap',(app)=>{
+  //app.use ('/orders/webapp', _from('./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'))
+
+module.exports = cds.server
 
 
-cds.on('bootstrap', async app => {
+// -----------------------------------------------------------------------
-    await cds.mtx.in(app);
+// 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)))
-module.exports = cds.server;

multitenancy/server_old.js

@@ -0,0 +1,9 @@
+const cds = require ('@sap/cds');
+
+
+cds.on('bootstrap', async app => {
+    await cds.mtx.in(app);
+});
+
+
+module.exports = cds.server;

multitenancy/srv/mashup.cds

@@ -3,23 +3,25 @@
 //    Mashing up imported models...
 //
 
-using { sap.capire.bookshop.Books } from '@capire/bookshop';
+using { sap.capire.bookshop.Books } from '../db/schema';
 
 //
 //  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;
 }
+*/
 
 //
 //  Extend Orders with Books as Products
 //
 
-using { sap.capire.orders.Orders_Items } from '@capire/orders';
+using { sap.capire.orders.Orders_Items } from '../db/schema';
 extend Orders_Items with {
   book : Association to Books on product.ID = book.ID
 }

multitenancy/srv/mashup.js

@@ -6,7 +6,7 @@ module.exports = async()=>{ // called by server.js
 
   const cds = require('@sap/cds')
   const CatalogService = await cds.connect.to ('CatalogService')
-  const ReviewsService = await cds.connect.to ('ReviewsService')
+  //const ReviewsService = await cds.connect.to ('ReviewsService')
   const OrdersService = await cds.connect.to ('OrdersService')
   const db = await cds.connect.to ('db')
 
@@ -39,12 +39,14 @@ module.exports = async()=>{ // called by server.js
   //
   // Update Books' average ratings when ReviewsService signals updatd reviews
   //
+  /*
   ReviewsService.on ('reviewed', (msg) => {
     console.debug ('> received:', msg.event, msg.data)
     const { subject, rating } = msg.data
     return UPDATE(Books,subject).with({rating})
     // ^ Note: the framework will execute this and take care for db.tx
   })
+  */
 
   //
   // Reduce stock of ordered books for orders are created from Orders admin UI