@sap/cds-dk 9.4.3 → 9.5.0

package/lib/init/template/multitenancy/files/mta.yaml.hbs

@@ -8,7 +8,7 @@ modules:
         {{#isJava}}
       - name: mtx-api
         properties:
-          CDS_MULTITENANCY_SIDECAR_URL: ~{mtx-url}
+          CDS_MULTITENANCY_SIDECAR_URL: {{^hasIas}}~{mtx-url}{{/hasIas}}{{#hasIas}}~{mtx-cert-url}{{/hasIas}}
         {{/isJava}}
     provides:
       - name: srv-api # required by consumers of CAP services (e.g. approuter)
@@ -93,7 +93,6 @@ resources:
           onUpdateDependenciesAsync: true
           callbackTimeoutMillis: 300000 # Increase if your deployments are taking longer than that
 
-  {{#hasIas}}
   - name: {{appName}}-sms
     type: org.cloudfoundry.managed-service
     parameters:
@@ -119,4 +118,3 @@ resources:
     requires:
       - name: {{#isJava}}srv-api{{/isJava}}{{^isJava}}mtx-api{{/isJava}}
     processed-after: [{{#hasXsuaa}}{{appName}}-registry, {{/hasXsuaa}}{{appName}}-ias]
-  {{/hasIas}}

package/lib/init/template/multitenancy/files/values.yaml.hbs

@@ -49,10 +49,18 @@ subscription-manager:
   servicePlanName: provider
   parameters:
     appCallbacks:
+      {{#isNodejs}}
       dependenciesCallbacks:
         {{#literal}}url: https://{{ .Release.Name }}-sidecar-{{ .Release.Namespace }}.cert.{{ .Values.global.domain }}/-/cds/sms-provisioning/dependencies/{app_tid}{{/literal}}
       subscriptionCallbacks:
         {{#literal}}url: https://{{ .Release.Name }}-sidecar-{{ .Release.Namespace }}.cert.{{ .Values.global.domain }}/-/cds/sms-provisioning/tenant/{app_tid}{{/literal}}
+      {{/isNodejs}}
+      {{#isJava}}
+      dependenciesCallbacks:
+        {{#literal}}url: https://{{ .Release.Name }}-srv-{{ .Release.Namespace }}.cert.{{ .Values.global.domain }}/mt/sms/subscriptions/tenants/{app_tid}/dependencies{{/literal}}
+      subscriptionCallbacks:
+        {{#literal}}url: https://{{ .Release.Name }}-srv-{{ .Release.Namespace }}.cert.{{ .Values.global.domain }}/mt/sms/subscriptions/tenants/{app_tid}{{/literal}}
+      {{/isJava}}
     appName: {{appName}}
     applicationType: application
     category: "CAP Application"

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

@@ -55,10 +55,13 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
       if (hasIas) services.push(subscriptionManager)
       if (!hasIas || hasXsuaa) services.push(saasRegistry)
       const apis = [srvApi4(srv), providedMtxApiSidecar4(mtxSidecar)]
-      if (isJava) apis.push(requiredMtxSidecarApi4(srv))
+      if (isJava) {
+        const name = hasIas ? '~{mtx-cert-url}' : '~{mtx-url}'
+        apis.push(requiredMtxSidecarApi4(srv, name))
+      }
       const additions = [...modules, ...services, ...apis]
       const relationships = []
-      if (addXsuaa) {
+      if (hasXsuaa) {
         relationships.push({
           insert: [saasRegistry, 'name'],
           into: [isJava ? srv : mtxSidecar, 'requires', 'name']
@@ -89,7 +92,9 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
         }}},
         ...(isJava) && { srv: { env: {
           CDS_MULTITENANCY_APPUI_URL: `https://{{ .Release.Name }}-${applicationWorkload}-{{ .Release.Namespace }}.{{ .Values.global.domain }}`,
-          CDS_MULTITENANCY_SIDECAR_URL: `https://{{ .Release.Name }}-sidecar-{{ .Release.Namespace }}.{{ .Values.global.domain }}`
+          CDS_MULTITENANCY_SIDECAR_URL: hasIas ?
+            `https://{{ .Release.Name }}-sidecar-{{ .Release.Namespace }}.cert.{{ .Values.global.domain }}` :
+            `https://{{ .Release.Name }}-sidecar-{{ .Release.Namespace }}.{{ .Values.global.domain }}`
         }}}
       }).into('chart/values.yaml',{ forceOverwrite: true })
     }

package/lib/init/template/nodejs/files/package.json.hbs

@@ -13,4 +13,4 @@
     "start": "cds-serve"
   },
   "private": true
-}
+}

package/lib/init/template/pipeline/files/app-package.json.hbs

@@ -3,18 +3,12 @@
   "version": "1.0.0",
   "main": "webapp/index.html",
   "scripts": {
-    "build": "ui5 build preload --clean-dest --config ui5-deploy.yaml",
-    "build-local": "ui5 build preload --clean-dest",
+    "build": "ui5 build preload --clean-dest",
     "start": "ui5 serve"
   },
   "devDependencies": {
     "@ui5/cli": "^4",
     "ui5-task-zipper": "^3"
-  },
-  "ui5": {
-    "dependencies": [
-      "ui5-task-zipper"
-    ]
   }
   {{/hasUI5}}
 }

package/lib/init/template/pipeline/files/ui5.yaml.hbs

@@ -1,6 +1,25 @@
 ---
 # yaml-language-server: $schema=https://sap.github.io/ui5-tooling/schema/ui5.yaml.json
-specVersion: '3.1'
+specVersion: '4.0'
 metadata:
   name: {{app}}
 type: application
+resources:
+  configuration:
+    propertiesFileSourceEncoding: UTF-8
+builder:
+  resources:
+    excludes:
+      - "/test/**"
+      - "/localService/**"
+  customTasks:
+    - name: ui5-task-zipper
+      afterTask: generateVersionInfo
+      configuration:
+        archiveName: {{app}}
+        additionalFiles:
+          - xs-app.json
+    {{#isTypescript}}
+    - name: ui5-tooling-transpile-task
+      afterTask: replaceVersion
+    {{/isTypescript}}

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

@@ -38,8 +38,7 @@ module.exports = class PipelineTemplate extends require('../../plugin') {
                 project.app = app
                 await Promise.all([
                     merge(__dirname, 'files/app-package.json.hbs').into(join(appPath, app, 'package.json'), { project }),
-                    merge(__dirname, 'files/ui5.yaml.hbs').into(join(appPath, app, 'ui5.yaml'), { project }),
-                    merge(__dirname, 'files/ui5-deploy.yaml.hbs').into(join(appPath, app, 'ui5-deploy.yaml'), { project })
+                    merge(__dirname, 'files/ui5.yaml.hbs').into(join(appPath, app, 'ui5.yaml'), { project })
                 ])
             }
         }

package/lib/init/template/portal/files/mta.yaml.hbs

@@ -43,9 +43,11 @@ modules:
       {{#hasIas}}
       - name: {{appName}}-ias
         parameters:
-          config:
-            credential-type: X509_GENERATED
-            app-identifier: portal-deployer
+           service-key:
+             config:
+               credential-type: X509_GENERATED
+               app-identifier: portal-deployer
+             name: {{appName}}-portal-deployer-ias-key
       {{/hasIas}}
       - name: {{appName}}-html5-repo-host
       - name: {{appName}}-app-deployer

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

@@ -28,7 +28,7 @@ module.exports = class PortalTemplate extends require('../../plugin') {
 
   async combine() {
     const project = readProject()
-    const { appName, isJava, addMta, hasMta, srvPath, addHtml5Repo, addXsuaa, addApprouter, addMultitenancy, addHelm, addHelmUnifiedRuntime, addContainerize, hasApprouter, hasHtml5Repo } = project
+    const { appName, isJava, addMta, hasMta, srvPath, addHtml5Repo, addXsuaa, addApprouter, addMultitenancy, addHelm, addHelmUnifiedRuntime, addContainerize, hasApprouter, hasHtml5Repo, hasMultitenancy, hasXsuaa } = project
 
     if (addMultitenancy) {
       await merge(__dirname, 'files/package.sidecar.json').into('mtx/sidecar/package.json')
@@ -45,15 +45,13 @@ module.exports = class PortalTemplate extends require('../../plugin') {
         into: [portalDeployer, 'requires', 'name']
       }]
 
-      if (addXsuaa) {
-        additions.push(xsuaa)
+      if (hasXsuaa) {
         relationships.push({
           insert: [xsuaa, 'name'],
           into: [portalDeployer, 'requires', 'name']
         })
       }
       if (hasHtml5Repo) {
-        additions.push(html5RepoHost)
         relationships.push({
           insert: [html5RepoHost, 'name'],
           into: [portalDeployer, 'requires', 'name']
@@ -61,14 +59,13 @@ module.exports = class PortalTemplate extends require('../../plugin') {
       }
 
       if (hasApprouter) {
-        additions.push(approuter)
         relationships.push({
             insert: [portal, 'name'],
             into: [approuter, 'requires', 'name']
         })
       }
 
-      if (addMultitenancy) {
+      if (hasMultitenancy) {
         relationships.push({
           insert: [portal, 'name'],
           into: [isJava ? srv : mtxSidecar4('gen/mtx/sidecar'), 'requires', 'name']

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

@@ -0,0 +1,12 @@
+Books = Bücher
+Book = Buch
+Title = Titel
+Description = Beschreibung
+Stock = Bestand
+Image = Bild
+Price = Preis
+Currency = Währung
+
+Authors = Autoren
+Author = Autor
+AuthorID = ID des Autors

package/lib/init/template/sample/files/_i18n/i18n_en.properties

@@ -0,0 +1,21 @@
+Books = Books
+Book = Book
+ID = ID
+Title = Title
+Description = Description
+Stock = Stock
+Image = Image
+Price = Price
+Currency = Currency
+
+Authors = Authors
+Author = Author
+AuthorID = Author''s ID
+Name = Name
+DateOfBirth = Date of Birth
+DateOfDeath = Date of Death
+PlaceOfBirth = Place of Birth
+PlaceOfDeath = Place of Death
+
+Genres = Genres
+Genre = Genre

package/lib/init/template/sample/files/_i18n/i18n_fr.properties

@@ -0,0 +1,20 @@
+Books = Livres
+Book = Livre
+Title = Titre
+Description = Description
+Stock = Action
+Image = Image
+Price = Prix
+Currency = Devise
+
+Authors = Auteurs
+Author = Auteur
+AuthorID = ID de l''auteur
+Name = Nom
+DateOfBirth = Date de naissance
+DateOfDeath = Date de décès
+PlaceOfBirth = Lieu de naissance
+PlaceOfDeath = Lieu de décès
+
+Genres = Genre
+Genre = Genre

package/lib/init/template/sample/files/_i18n/messages_de.properties

@@ -0,0 +1,34 @@
+400 = Ungültige Anfrage
+401 = Nicht autorisiert
+403 = Verboten
+404 = Nicht gefunden
+405 = Methode nicht zulässig
+406 = Nicht akzeptabel
+407 = Proxy-Authentifizierung erforderlich
+408 = Anfrage-Timeout
+409 = Konflikt
+410 = Weg
+411 = Erforderliche Länge
+412 = Vorbedingung fehlgeschlagen
+413 = Nutzlast zu groß
+414 = URI zu lang
+415 = Nicht unterstützter Medientyp
+416 = Bereich nicht erfüllbar
+417 = Erwartung fehlgeschlagen
+422 = Nicht verarbeitbarer Inhalt
+424 = Fehlgeschlagene Abhängigkeit
+428 = Vorbedingung erforderlich
+429 = Zu viele Anfragen
+431 = Anfrage-Headerfelder zu groß
+451 = Aus rechtlichen Gründen nicht verfügbar
+500 = Interner Serverfehler
+501 = Der Server unterstützt die zur Erfüllung der Anfrage erforderliche Funktionalität nicht
+502 = Ungültiges Gateway
+503 = Dienst nicht verfügbar
+504 = Gateway-Timeout
+
+ASSERT_RANGE = Wert {0} liegt nicht im angegebenen Bereich [{1}, {2}]
+ASSERT_FORMAT = Wert "{0}" liegt nicht im angegebenen Format "{1}"
+ASSERT_ARRAY = Wert muss ein Array sein
+ASSERT_ENUM = Wert {0} ist gemäß Enumerationsdeklaration {{1}} ungültig
+ASSERT_NOT_NULL = Wert ist erforderlich

package/lib/init/template/sample/files/_i18n/messages_en.properties

@@ -0,0 +1,34 @@
+400 = Bad Request
+401 = Unauthorized
+403 = Forbidden
+404 = Not Found
+405 = Method Not Allowed
+406 = Not Acceptable
+407 = Proxy Authentication Required
+408 = Request Timeout
+409 = Conflict
+410 = Gone
+411 = Length Required
+412 = Precondition Failed
+413 = Payload Too Large
+414 = URI Too Long
+415 = Unsupported Media Type
+416 = Range Not Satisfiable
+417 = Expectation Failed
+422 = Unprocessable Content
+424 = Failed Dependency
+428 = Precondition Required
+429 = Too Many Requests
+431 = Request Header Fields Too Large
+451 = Unavailable For Legal Reasons
+500 = Internal Server Error
+501 = The server does not support the functionality required to fulfill the request
+502 = Bad Gateway
+503 = Service Unavailable
+504 = Gateway Timeout
+
+ASSERT_RANGE = Value {0} is not in specified range [{1}, {2}]
+ASSERT_FORMAT = Value "{0}" is not in specified format "{1}"
+ASSERT_ARRAY = Value must be an array
+ASSERT_ENUM = Value {0} is invalid according to enum declaration {{1}}
+ASSERT_NOT_NULL = Value is required

package/lib/init/template/sample/files/_i18n/messages_fr.properties

@@ -0,0 +1,34 @@
+400 = Requête incorrecte
+401 = Non autorisée
+403 = Interdite
+404 = Introuvable
+405 = Méthode non autorisée
+406 = Non acceptable
+407 = Authentification proxy requise
+408 = Délai d''expiration de la requête
+409 = Conflit
+410 = Disparu
+411 = Longueur requise
+412 = Échec de la condition préalable
+413 = Charge utile trop importante
+414 = URI trop longue
+415 = Type de média non pris en charge
+416 = Plage non satisfaisante
+417 = Échec de l''attente
+422 = Contenu non traitable
+424 = Dépendance échouée
+428 = Condition préalable requise
+429 = Trop de requêtes
+431 = Champs d''en-tête de requête trop importants
+451 = Indisponible pour des raisons juridiques
+500 = Erreur interne du serveur
+501 = Le serveur ne prend pas en charge la fonctionnalité requise pour répondre à la requête
+502 = Passerelle incorrecte
+503 = Service indisponible
+504 = Délai d''attente de la passerelle
+
+ASSERT_RANGE = La valeur {0} n''est pas dans la plage spécifiée [{1}, {2}]
+ASSERT_FORMAT = La valeur "{0}" n''est pas au format spécifié "{1}"
+ASSERT_ARRAY = La valeur doit être un tableau
+ASSERT_ENUM = La valeur {0} n''est pas valide selon la déclaration d''énumération {{1}}
+ASSERT_NOT_NULL = La valeur est obligatoire

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

@@ -1,29 +1,3 @@
-Books = Bücher
-Book = Buch
-ID = ID
-Title = Titel
-Author = Autor
-Authors = Autoren
-AuthorID = ID des Autors
 AuthorName = Name des Autors
-Name = Name
 Age = Alter
-Stock = Bestand
-Order = Bestellung
-Orders = Bestellungen
 Price = Preis
-Genre = Genre
-Genres = Genres
-DateOfBirth = Geburtsdatum
-DateOfDeath = Todesdatum
-PlaceOfBirth = Geburtsort
-PlaceOfDeath = Todesort
-Details = Details
-Languages = Sprachen
-Currencies = Währungen
-MainGenre = Hauptgenre
-SubGenres = Subgenres
-Admin = Admin
-Translations = Übersetzungen
-General = Allgemein
-Locale = Gebietsschema

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

@@ -0,0 +1,8 @@
+Age = Age
+Lifetime = Lifetime
+
+SubGenres = Subgenre
+
+NumCode = Numeric Code
+MinorUnit = Minor Unit
+Exponent = Exponent

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

@@ -0,0 +1,52 @@
+using {AdminService} from '../../srv/admin-service';
+
+annotate AdminService.Authors with @odata.draft.enabled;
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Authors Object Page
+//
+annotate AdminService.Authors with @(UI : {
+  HeaderInfo : {
+    TypeName : 'Author',
+    TypeNamePlural : 'Authors',
+    Description : {Value : lifetime}
+  },
+  Facets : [
+    {
+      $Type : 'UI.ReferenceFacet',
+      Label : '{i18n>Details}',
+      Target : '@UI.FieldGroup#Details'
+    },
+    {
+      $Type : 'UI.ReferenceFacet',
+      Label : '{i18n>Books}',
+      Target : 'books/@UI.LineItem'
+    },
+  ],
+  FieldGroup #Details : {Data : [
+    {Value : placeOfBirth},
+    {Value : placeOfDeath},
+    {Value : dateOfBirth},
+    {Value : dateOfDeath},
+    {
+      Value : age,
+      Label : '{i18n>Age}'
+    },
+  ]},
+});
+
+
+// Workaround to avoid errors for unknown db-specific calculated fields above
+extend sap.capire.bookshop.Authors with {
+  virtual age      : Integer;
+  virtual lifetime : String;
+}
+
+annotate AdminService.Authors with {
+  age      @Common.Label : '{i18n>Age}';
+  lifetime @Common.Label : '{i18n>Lifetime}'
+}
+
+// Workaround for Fiori popup for asking user to enter a new UUID on Create
+annotate AdminService.Authors with { ID @Core.Computed; }

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

@@ -0,0 +1,3 @@
+sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("{{appName}}.{{app}}.Component", {
+  metadata:{ manifest: 'json' }
+}))

package/lib/init/template/sample/files/app/admin-authors/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=Manage Authors
+
+# JCI app descriptor contains lower case DESCRIPTION
+appSubTitle=CAP Sample Application
+
+# JCI app descriptor contains lower case DESCRIPTION
+appDescription=Bookshop Authors

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

@@ -0,0 +1,130 @@
+{
+  "_version": "1.28.0",
+  "sap.app": {
+    "id": "authors",
+    "type": "application",
+    "title": "{{appTitle}}",
+    "description": "{{appDescription}}",
+    "i18n": "i18n/i18n.properties",
+    "applicationVersion": {
+      "version": "1.0.0"
+    },
+    "dataSources": {
+      "AdminService": {
+        "uri": "odata/v4/admin/",
+        "type": "OData",
+        "settings": {
+          "odataVersion": "4.0"
+        }
+      }
+    },
+    "crossNavigation": {
+      "inbounds": {
+        "Authors-manage": {
+          "signature": {
+            "parameters": {
+              "Books.author.ID": {
+                "renameTo": "ID"
+              }
+            },
+            "additionalParameters": "ignored"
+          },
+          "semanticObject": "Authors",
+          "action": "manage",
+          "title": "{{appTitle}}",
+          "info": "{{appInfo}}",
+          "subTitle": "{{appSubTitle}}",
+          "icon": "sap-icon://SAP-icons-TNT/user",
+          "indicatorDataSource": {
+            "dataSource": "AdminService",
+            "path": "Authors/$count",
+            "refresh": 1800
+          }
+        }
+      }
+    }
+  },
+  "sap.ui5": {
+    "dependencies": {
+      "minUI5Version": "1.136.0",
+      "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
+        }
+      }
+    },
+    "routing": {
+      "routes": [
+        {
+          "pattern": ":?query:",
+          "name": "AuthorsList",
+          "target": "AuthorsList"
+        },
+        {
+          "pattern": "Authors({key}):?query:",
+          "name": "AuthorsDetails",
+          "target": "AuthorsDetails"
+        }
+      ],
+      "targets": {
+        "AuthorsList": {
+          "type": "Component",
+          "id": "AuthorsList",
+          "name": "sap.fe.templates.ListReport",
+          "options": {
+            "settings": {
+              "entitySet": "Authors",
+              "liveMode": true,
+              "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",
+    "deviceTypes": {
+      "desktop": true,
+      "tablet": true,
+      "phone": true
+    }
+  },
+  "sap.fiori": {
+    "registrationIds": [],
+    "archeType": "transactional"
+  }
+}