@sap/cds-dk 6.8.3 → 7.0.0

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

@@ -1,7 +1,7 @@
 const { join, relative } = require('path');
 const cds = require('../../../cds')
 const { mkdirp } = cds.utils
-const { COMMAND_ADD, OPTION_JAVA, OPTION_NODEJS, URLS } = require('../../constants')
+const { COMMAND_ADD, OPTIONS: { JAVA, NODEJS }, URLS } = require('../../constants')
 const { copyFiles } = require('../../util/template')
 const LOG = console
 
@@ -17,21 +17,18 @@ module.exports = class NodejsTemplate extends require('../templateBase') {
             throw new Error(`You can't change the type of an existing project.`);
         }
 
-        if (this.options.add.has(OPTION_JAVA)) {
-            throw new Error(`Only one runtime per project is supported. Specify either ${OPTION_JAVA} or ${OPTION_NODEJS}.`);
+        if (this.options.add.has(JAVA)) {
+            throw new Error(`Only one runtime per project is supported. Specify either ${JAVA} or ${NODEJS}.`);
         }
 
         return true;
     }
 
     async run() {
-        const env = await this.getEnv();
+        const { db, srv, app } = (await this.getEnv()).folders
         const { projectPath, projectName } = this
         await copyFiles(join(__dirname, 'files'), projectPath, { projectName }, this.options.force)
-
-        await mkdirp(env.folders.db);
-        await mkdirp(env.folders.srv);
-        await mkdirp(env.folders.app);
+        await Promise.all([db, srv, app].map(p => mkdirp(p)))
     }
 
     async finalize() {

package/lib/init/template/redis-messaging/files/mta.yaml.hbs

@@ -1,13 +1,13 @@
 ---
 modules:
- - name: {{cap.appName}}-srv
-   type: {{cap.language}}
-   path: {{& cap.srvPath}}
+ - name: {{appName}}-srv
+   type: {{language}}
+   path: {{& srvPath}}
    requires:
-    - name: {{cap.appName}}-redis
+    - name: {{appName}}-redis
 
 resources:
-  - name: {{cap.appName}}-redis
+  - name: {{appName}}-redis
     type: org.cloudfoundry.managed-service
     parameters:
       service: redis-cache

package/lib/init/template/redis-messaging/files/package.json.hbs

@@ -1,22 +1,22 @@
 {
-  {{#cap.isNodejs}}
+  {{#isNodejs}}
   "dependencies": {
     "redis": "^4"
   },
   "cds": {
-  {{/cap.isNodejs}}
+  {{/isNodejs}}
     "requires": {
-      {{#cap.for}}
-      "[{{cap.for}}]": {
-      {{/cap.for}}
+      {{#profile}}
+      "[{{profile}}]": {
+      {{/profile}}
         "messaging": {
           "kind": "redis-messaging"
         }
-      {{#cap.for}}
+      {{#profile}}
       }
-      {{/cap.for}}
+      {{/profile}}
     }
-  {{#cap.isNodejs}}
+  {{#isNodejs}}
   }
-  {{/cap.isNodejs}}
+  {{/isNodejs}}
 }

package/lib/init/template/redis-messaging/index.js

@@ -8,8 +8,7 @@ const { srvNode4, srvJava4, redis } = require('../_merging/registry-mta')
 module.exports = class RedisMessagingTemplate extends require('../templateBase') {
 
   async canRun() {
-    const projectDescriptor = await readProject(this.options)
-    const { hasMta, hasHelm, isJava } = projectDescriptor.cap
+    const { hasMta, hasHelm, isJava } = await readProject(this.options)
     if (isJava)             throw `'cds add redis-messaging' is not available for Java yet`
     if (hasHelm && !hasMta) throw `'cds add redis-messaging' is not available for Kyma yet`
     return true
@@ -21,15 +20,15 @@ module.exports = class RedisMessagingTemplate extends require('../templateBase')
 
   async run() {
     const projectDescriptor = await readProject(this.options)
-    const { configFile } = projectDescriptor.cap
-    projectDescriptor.cap.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
+    const { configFile } = projectDescriptor
+    projectDescriptor.shortcut = !(await read(configFile)).cds?.requires?.messaging?.kind
     await mergeJSON(configFile, join(__dirname, 'files', 'package.json.hbs'), projectDescriptor)
     await this.runDependentMerging()
   }
 
   async runDependentMerging() {
     const projectDescriptor = await readProject(this.options)
-    const { hasMta, isNodejs, srvPath } = projectDescriptor.cap
+    const { hasMta, isNodejs, srvPath } = projectDescriptor
 
     if (hasMta) {
       const srv = (isNodejs ? srvNode4 : srvJava4)(srvPath)

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

@@ -0,0 +1,43 @@
+Books = Books
+Book = Book
+ID = ID
+Title = Title
+Author = Author
+AuthorID = Author ID
+Stock = Stock
+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
+
+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

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

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

@@ -0,0 +1,114 @@
+using { AdminService } from '../../srv/admin-service.cds';
+using { sap.capire.bookshop } from '../../db/schema';
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Books Object Page
+//
+
+annotate AdminService.Books with @(UI: {
+  Facets             : [
+    {
+      $Type : 'UI.ReferenceFacet',
+      Label : '{i18n>General}',
+      Target: '@UI.FieldGroup#General'
+    },
+    {
+      $Type : 'UI.ReferenceFacet',
+      Label : '{i18n>Translations}',
+      Target: 'texts/@UI.LineItem'
+    },
+    {
+      $Type : 'UI.ReferenceFacet',
+      Label : '{i18n>Details}',
+      Target: '@UI.FieldGroup#Details'
+    },
+    {
+      $Type : 'UI.ReferenceFacet',
+      Label : '{i18n>Admin}',
+      Target: '@UI.FieldGroup#Admin'
+    },
+  ],
+  FieldGroup #General: {Data: [
+    {Value: title},
+    {Value: author_ID},
+    {Value: genre_ID},
+    {Value: descr},
+  ]},
+  FieldGroup #Details: {Data: [
+    {Value: stock},
+    {Value: price},
+    {
+      Value: currency_code,
+      Label: '{i18n>Currency}'
+    },
+  ]},
+  FieldGroup #Admin  : {Data: [
+    {Value: createdBy},
+    {Value: createdAt},
+    {Value: modifiedBy},
+    {Value: modifiedAt}
+  ]}
+});
+
+
+////////////////////////////////////////////////////////////
+//
+//  Draft for Localized Data
+//
+
+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}],
+  SelectionFields: [
+    locale,
+    title
+  ],
+  LineItem       : [
+    {
+      Value: locale,
+      Label: 'Locale'
+    },
+    {
+      Value: title,
+      Label: 'Title'
+    },
+    {
+      Value: descr,
+      Label: 'Description'
+    },
+  ]
+});
+
+annotate AdminService.Books.texts with {
+  ID       @UI.Hidden;
+  ID_texts @UI.Hidden;
+};
+
+// Add Value Help for Locales
+annotate AdminService.Books.texts {
+  locale @(
+    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;
+}
+
+// Workaround for Fiori popup for asking user to enter a new UUID on Create
+annotate AdminService.Books with {
+  ID @Core.Computed;
+}
+
+// Show Genre as drop down, not a dialog
+annotate AdminService.Books with {
+  genre @Common.ValueListWithFixedValues;
+}

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

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

package/lib/init/template/sample/files/app/admin-books/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

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

@@ -0,0 +1,129 @@
+{
+    "_version": "1.8.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"
+        }
+    },
+    "sap.ui5": {
+        "dependencies": {
+            "libs": {
+                "sap.fe.templates": {}
+            }
+        },
+        "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"
+                        }
+                    }
+                }
+            }
+        },
+        "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"
+                        }
+                    }
+                }
+            }
+        },
+        "contentDensities": {
+            "compact": true,
+            "cozy": true
+        }
+    },
+    "sap.ui": {
+        "technology": "UI5",
+        "fullWidth": false
+    },
+    "sap.fiori": {
+        "registrationIds": [],
+        "archeType": "transactional"
+    }
+}

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

@@ -0,0 +1,57 @@
+{
+  "services": {
+    "LaunchPage": {
+      "adapter": {
+        "config": {
+          "catalogs": [],
+          "groups": [
+            {
+              "id": "Administration",
+              "title": "Administration",
+              "isPreset": true,
+              "isVisible": true,
+              "isGroupLocked": false,
+              "tiles": [
+                {
+                  "id": "ManageBooks",
+                  "tileType": "sap.ushell.ui.tile.StaticTile",
+                  "properties": {
+                    "title": "Manage Books",
+                    "targetURL": "#Books-manage"
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      }
+    },
+    "NavTargetResolution": {
+      "config": {
+        "enableClientSideTargetResolution": true
+      }
+    },
+    "ClientSideTargetResolution": {
+      "adapter": {
+        "config": {
+          "inbounds": {
+            "ManageBooks": {
+              "semanticObject": "Books",
+              "action": "manage",
+              "title": "Manage Books",
+              "signature": {
+                "parameters": {},
+                "additionalParameters": "allowed"
+              },
+              "resolutionResult": {
+                "applicationType": "SAPUI5",
+                "additionalInformation": "SAPUI5.Component=books",
+                "url": "admin-books/webapp"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}