@sap/cds-dk 7.0.1 → 7.0.2

package/lib/init/template/multitenancy/index.js

@@ -1,6 +1,7 @@
 const { join } = require('path')
 const cds = require('../../../cds')
-const { exists } = cds.utils
+const { exists, read, write } = cds.utils
+const { APPROUTER, HANA, KIBANA } = require('../../constants').OPTIONS
 const { readProject } = require('../../util/projectReader')
 const { mergeJSON, mergeYAML, sort } = require('../../util/merge')
 const { copyAndTrack, parseMd5File, writeMd5File } = require('../../util/md5')
@@ -22,13 +23,18 @@ module.exports = class MultitenancyTemplate extends require('../templateBase') {
   }
 
   getRelatedFacets() {
-    return ['approuter', 'hana']
+    return [APPROUTER, HANA, KIBANA]
   }
 
   async run() {
     const project = await readProject(this.options)
-    const { isNodejs, configFile } = project
+    const { isNodejs, isJava, configFile } = project
     await mergeJSON(configFile, join(__dirname, 'files', `package.json.hbs`), project)
+    if (isJava) {
+      const packageJson = await read('package.json')
+      packageJson.workspaces = ['mtx/sidecar']
+      await write('package.json', packageJson, { spaces: 2 })
+    }
     if (isNodejs) await sort('package.json', 'dependencies')
     await copyRenderedJSON(join(__dirname, 'files', 'package.sidecar.json.hbs'), join('mtx', 'sidecar', 'package.json'), project)
     await this.runDependentMerging()

package/lib/init/template/nodejs/index.js

@@ -14,10 +14,10 @@ module.exports = class NodejsTemplate extends require('../templateBase') {
 
     async canRun() {
         if (cds.cli.command === COMMAND_ADD) {
-            throw new Error(`You can't change the runtime of an existing project.`)
+            throw `You can't change the runtime of an existing project.`
         }
         if (cds.cli.options.add?.has(JAVA)) {
-            throw new Error(`Only one runtime per project is supported. Specify either ${term.bold(JAVA)} or ${term.bold(NODEJS)}.`)
+            throw `Only one runtime per project is supported. Specify either ${term.bold(JAVA)} or ${term.bold(NODEJS)}.`
         }
         return true
     }

package/lib/init/template/pipeline/index.js

@@ -14,7 +14,7 @@ module.exports = class PipelineTemplate extends require('../templateBase') {
         }
 
         if (exists('Jenkinsfile') || exists(join('.pipeline', 'config.yml'))) {
-            throw new Error(`Pipeline support file exists. Use --force to overwrite.`);
+            throw `Pipeline support file exists. Use --force to overwrite.`
         }
 
         return true;

package/lib/init/template/sample/files/app/_i18n/i18n.properties

@@ -3,41 +3,12 @@ Book = Book
 ID = ID
 Title = Title
 Author = Author
+Authors = Authors
 AuthorID = Author ID
-Stock = Stock
+AuthorName = Author Name
 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
-
+Stock = Stock
 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
-SubGenres = Sub Genres
-
-NumCode = Numeric Code
-MinorUnit = Minor Unit
-Exponent = Exponent

package/lib/init/template/sample/files/app/_i18n/i18n_de.properties

@@ -2,12 +2,12 @@ Books = Bücher
 Book = Buch
 ID = ID
 Title = Titel
-Authors = Autoren
 Author = Autor
+Authors = Autoren
 AuthorID = ID des Autors
 AuthorName = Name des Autors
-Age = Alter
 Name = Name
+Age = Alter
 Stock = Bestand
 Order = Bestellung
 Orders = Bestellungen

package/lib/init/template/sample/files/app/admin-books/fiori-service.cds

@@ -7,7 +7,7 @@ using { sap.capire.bookshop } from '../../db/schema';
 //
 
 annotate AdminService.Books with @(UI: {
-  Facets             : [
+  Facets: [
     {
       $Type : 'UI.ReferenceFacet',
       Label : '{i18n>General}',
@@ -43,7 +43,7 @@ annotate AdminService.Books with @(UI: {
       Label: '{i18n>Currency}'
     },
   ]},
-  FieldGroup #Admin  : {Data: [
+  FieldGroup #Admin: {Data: [
     {Value: createdBy},
     {Value: createdAt},
     {Value: modifiedBy},
@@ -61,12 +61,12 @@ annotate sap.capire.bookshop.Books with @fiori.draft.enabled;
 annotate AdminService.Books with @odata.draft.enabled;
 
 annotate AdminService.Books.texts with @(UI: {
-  Identification : [{Value: title}],
+  Identification: [{Value: title}],
   SelectionFields: [
     locale,
     title
   ],
-  LineItem       : [
+  LineItem: [
     {
       Value: locale,
       Label: 'Locale'
@@ -93,14 +93,13 @@ annotate AdminService.Books.texts {
     ValueList.entity: 'Languages',
     Common.ValueListWithFixedValues, //show as drop down, not a dialog
   )
-}
+};
 
 // In addition we need to expose Languages through AdminService as a target for ValueList
 using {sap} from '@sap/cds/common';
 
 extend service AdminService {
-  @readonly
-  entity Languages as projection on sap.common.Languages;
+  @readonly entity Languages as projection on sap.common.Languages;
 }
 
 // Workaround for Fiori popup for asking user to enter a new UUID on Create

package/lib/init/template/sample/files/app/admin-books/webapp/Component.js

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

package/lib/init/template/sample/files/app/admin-books/webapp/i18n/i18n.properties

@@ -1,11 +1,3 @@
-# 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
+appTitle=Manage Books
+appSubTitle=Manage bookshop inventory
+appDescription=Manage your bookshop inventory with ease.

package/lib/init/template/sample/files/app/admin-books/webapp/manifest.json

@@ -1,129 +1,133 @@
 {
-    "_version": "1.8.0",
+    "_version": "1.49.0",
     "sap.app": {
-        "id": "books",
-        "type": "application",
-        "title": "Manage Books",
-        "description": "Sample Application",
-        "i18n": "i18n/i18n.properties",
-        "dataSources": {
-            "AdminService": {
-                "uri": "/admin/",
-                "type": "OData",
-                "settings": {
-                    "odataVersion": "4.0"
-                }
-            }
-        },
-        "-sourceTemplate": {
-            "id": "ui5template.basicSAPUI5ApplicationProject",
-            "-id": "ui5template.smartTemplate",
-            "-version": "1.40.12"
+      "applicationVersion": {
+        "version": "1.0.0"
+      },
+      "id": "books",
+      "type": "application",
+      "title": "{{appTitle}}",
+      "description": "{{appDescription}}",
+      "i18n": "i18n/i18n.properties",
+      "dataSources": {
+        "AdminService": {
+          "uri": "/admin/",
+          "type": "OData",
+          "settings": {
+            "odataVersion": "4.0"
+          }
         }
+      }
+    },
+    "sap.ui": {
+      "technology": "UI5",
+      "fullWidth": false,
+      "deviceTypes": {
+          "desktop": true,
+          "tablet": true,
+          "phone": true
+      }
     },
     "sap.ui5": {
-        "dependencies": {
-            "libs": {
-                "sap.fe.templates": {}
-            }
+      "dependencies": {
+        "minUI5Version": "1.115.1",
+        "libs": {
+          "sap.fe.templates": {}
+        }
+      },
+      "models": {
+        "i18n": {
+          "type": "sap.ui.model.resource.ResourceModel",
+          "uri": "i18n/i18n.properties"
         },
-        "models": {
-            "i18n": {
-                "type": "sap.ui.model.resource.ResourceModel",
-                "uri": "i18n/i18n.properties"
-            },
-            "": {
-                "dataSource": "AdminService",
-                "settings": {
-                    "synchronizationMode": "None",
-                    "operationMode": "Server",
-                    "autoExpandSelect" : true,
-                    "earlyRequests": true,
-                    "groupProperties": {
-                        "default": {
-                            "submit": "Auto"
-                        }
+        "": {
+          "dataSource": "AdminService",
+          "settings": {
+            "synchronizationMode": "None",
+            "operationMode": "Server",
+            "autoExpandSelect": true,
+            "earlyRequests": true,
+            "groupProperties": {
+              "default": {
+                "submit": "Auto"
+              }
+            }
+          }
+        }
+      },
+      "routing": {
+        "routes": [
+          {
+            "pattern": ":?query:",
+            "name": "BooksList",
+            "target": "BooksList"
+          },
+          {
+            "pattern": "Books({key}):?query:",
+            "name": "BooksDetails",
+            "target": "BooksDetails"
+          },
+          {
+            "pattern": "Books({key}/author({key2}):?query:",
+            "name": "AuthorsDetails",
+            "target": "AuthorsDetails"
+          }
+        ],
+        "targets": {
+          "BooksList": {
+            "type": "Component",
+            "id": "BooksList",
+            "name": "sap.fe.templates.ListReport",
+            "options": {
+              "settings": {
+                "entitySet": "Books",
+                "initialLoad": true,
+                "navigation": {
+                  "Books": {
+                    "detail": {
+                      "route": "BooksDetails"
                     }
+                  }
                 }
+              }
             }
-        },
-        "routing": {
-            "routes": [
-                {
-                    "pattern": ":?query:",
-                    "name": "BooksList",
-                    "target": "BooksList"
-                },
-                {
-                    "pattern": "Books({key}):?query:",
-                    "name": "BooksDetails",
-                    "target": "BooksDetails"
-                },
-                {
-                    "pattern": "Books({key}/author({key2}):?query:",
-                    "name": "AuthorsDetails",
-                    "target": "AuthorsDetails"
-                }
-            ],
-            "targets": {
-                "BooksList": {
-                    "type": "Component",
-                    "id": "BooksList",
-                    "name": "sap.fe.templates.ListReport",
-                    "options": {
-                        "settings" : {
-                            "entitySet" : "Books",
-                            "initialLoad": true,
-                            "navigation" : {
-                                "Books" : {
-                                    "detail" : {
-                                        "route" : "BooksDetails"
-                                    }
-                                }
-                            }
-                        }
-                    }
-                },
-                "BooksDetails": {
-                    "type": "Component",
-                    "id": "BooksDetailsList",
-                    "name": "sap.fe.templates.ObjectPage",
-                    "options": {
-                        "settings" : {
-                            "entitySet" : "Books",
-                            "navigation" : {
-                                "Authors" : {
-                                    "detail" : {
-                                        "route" : "AuthorsDetails"
-                                    }
-                                }
-                            }
-                        }
-                    }
-                },
-                "AuthorsDetails": {
-                    "type": "Component",
-                    "id": "AuthorsDetailsList",
-                    "name": "sap.fe.templates.ObjectPage",
-                    "options": {
-                        "settings" : {
-                            "entitySet" : "Authors"
-                        }
+          },
+          "BooksDetails": {
+            "type": "Component",
+            "id": "BooksDetailsList",
+            "name": "sap.fe.templates.ObjectPage",
+            "options": {
+              "settings": {
+                "entitySet": "Books",
+                "navigation": {
+                  "Authors": {
+                    "detail": {
+                      "route": "AuthorsDetails"
                     }
+                  }
                 }
+              }
             }
-        },
-        "contentDensities": {
-            "compact": true,
-            "cozy": true
+          },
+          "AuthorsDetails": {
+            "type": "Component",
+            "id": "AuthorsDetailsList",
+            "name": "sap.fe.templates.ObjectPage",
+            "options": {
+              "settings": {
+                "entitySet": "Authors"
+              }
+            }
+          }
         }
-    },
-    "sap.ui": {
-        "technology": "UI5",
-        "fullWidth": false
+      },
+      "contentDensities": {
+        "compact": true,
+        "cozy": true
+      }
     },
     "sap.fiori": {
-        "registrationIds": [],
-        "archeType": "transactional"
+      "registrationIds": [],
+      "archeType": "transactional"
     }
-}
+  }

package/lib/init/template/sample/files/app/appconfig/fioriSandboxConfig.json

@@ -5,6 +5,23 @@
         "config": {
           "catalogs": [],
           "groups": [
+            {
+              "id": "Bookshop",
+              "title": "Bookshop",
+              "isPreset": true,
+              "isVisible": true,
+              "isGroupLocked": false,
+              "tiles": [
+                {
+                  "id": "BrowseBooks",
+                  "tileType": "sap.ushell.ui.tile.StaticTile",
+                  "properties": {
+                    "title": "Browse Books",
+                    "targetURL": "#Books-display"
+                  }
+                }
+              ]
+            },
             {
               "id": "Administration",
               "title": "Administration",
@@ -35,6 +52,27 @@
       "adapter": {
         "config": {
           "inbounds": {
+            "BrowseBooks": {
+              "semanticObject": "Books",
+              "action": "display",
+              "title": "Browse Books",
+              "signature": {
+                "parameters": {
+                  "Books.ID": {
+                    "renameTo": "ID"
+                  },
+                  "Authors.books.ID": {
+                    "renameTo": "ID"
+                  }
+                },
+                "additionalParameters": "ignored"
+              },
+              "resolutionResult": {
+                "applicationType": "SAPUI5",
+                "additionalInformation": "SAPUI5.Component=bookshop",
+                "url": "browse/webapp"
+              }
+            },
             "ManageBooks": {
               "semanticObject": "Books",
               "action": "manage",

package/lib/init/template/sample/files/app/browse/fiori-service.cds

@@ -0,0 +1,56 @@
+using { CatalogService } from '../../srv/cat-service.cds';
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Books Object Page
+//
+annotate CatalogService.Books with @(UI : {
+    HeaderInfo: {
+        TypeName      : 'Book',
+        TypeNamePlural: 'Books',
+        Description   : {Value : author}
+    },
+    HeaderFacets: [{
+        $Type : 'UI.ReferenceFacet',
+        Label : '{i18n>Description}',
+        Target: '@UI.FieldGroup#Descr'
+    }, ],
+    Facets: [{
+        $Type : 'UI.ReferenceFacet',
+        Label : '{i18n>Details}',
+        Target: '@UI.FieldGroup#Price'
+    }, ],
+    FieldGroup #Descr: {Data : [{Value : descr}, ]},
+    FieldGroup #Price: {Data : [
+        {Value: price},
+        {
+            Value: currency.symbol,
+            Label: '{i18n>Currency}'
+        },
+    ]},
+});
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Books List Page
+//
+annotate CatalogService.Books with @(UI : {
+    SelectionFields: [
+        ID,
+        price,
+        currency_code
+    ],
+    LineItem: [
+        {
+            Value: ID,
+            Label: '{i18n>Title}'
+        },
+        {
+            Value: author,
+            Label: '{i18n>Author}'
+        },
+        {Value: genre.name},
+        {Value: price},
+        {Value: currency.symbol},
+    ]
+});

package/lib/init/template/sample/files/app/browse/webapp/Component.js

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

package/lib/init/template/sample/files/app/browse/webapp/i18n/i18n.properties

@@ -0,0 +1,4 @@
+appTitle=Browse Books
+appSubTitle=Find all your favorite books
+appDescription=This application lets you find the next books you want to read.
+appInfo=This is an app info field