@sap/cds-dk 8.0.3 → 8.1.1

package/lib/import/odata/v2parser.js

@@ -355,7 +355,7 @@ function _extractAllFunctionImports(functionImports, parserContext) {
 }
 
 function _replaceSpecialCharacters(text) {
-	return text.replace(/(?:\\[rn]|[\r\n]+)+/gm, "\\n").replace(/\s+/g, ' ').replace(/"/g, """).trim();
+	return text.replace(/\\/g, "\\\\").replace(/(?:\\[rn]|[\r\n]+)+/gm, "\\n").replace(/\s+/g, ' ').replace(/"/g, """).trim();
 }
 
 // to parse the documentation tag
@@ -972,7 +972,7 @@ function _parseEntityProperty(properties, parserContext) {
 		// Has more than one entities
 		for (let i = 0; i < properties.length; i++) {
 			propAttributes = properties[i]._attributes;
-			// if the property contains documentatin tag
+			// if the property contains documentation tag
 			if (properties[i] && properties[i].Documentation)
 				propAttributes.doc = _parseDocumentationTag(properties[i].Documentation);
 			retProperties[propAttributes.Name] = _getPropertyAttributes(propAttributes, parserContext);

package/lib/init/bas.js

@@ -5,8 +5,10 @@ const { bold } = require('../util/term')
 const { OPTIONS } = require('./constants')
 const {
   NODEJS, JAVA,
-  HANA, APPROUTER, XSUAA, APPLICATION_LOGGING, ENTERPRISE_MESSAGING,
-  MTA, MULTITENANCY, PIPELINE,
+  XSUAA, APPROUTER, CONNECTIVITY, DESTINATION, HTML5_REPO, PORTAL, APPLICATION_LOGGING, AUDIT_LOGGING, NOTIFICATIONS,
+  ENTERPRISE_MESSAGING, KAFKA, REDIS_MESSAGING,
+  HANA, POSTGRES,
+  MTA, HELM, CONTAINERIZE, MULTITENANCY, PIPELINE,
   TINY_SAMPLE, SAMPLE
 } = OPTIONS
 const cwd = process.cwd()
@@ -17,75 +19,114 @@ module.exports = [{
   default: '',
   target: 'projectName',
   validate: async projectName => {
-      try {
-          cds.root = path.resolve(cwd, projectName || '.')
-          validate.projectName(projectName)
-          validate.projectFolder(path.join(cwd, projectName), cwd)
-      } catch (e) {
-          return e //  BAS Yeoman generator requires error to be returned
-      }
-      return true
+    try {
+      cds.root = path.resolve(cwd, projectName || '.')
+      validate.projectName(projectName)
+      validate.projectFolder(path.join(cwd, projectName), cwd)
+    } catch (e) {
+      return e //  BAS Yeoman generator requires error to be returned
+    }
+    return true
   },
   guiOptions: {
-      hint: 'This name is restricted to certain characters. A valid project name is compatible across platforms.',
-      mandatory: true
+    breadcrumb: 'Project Name',
+    hint: 'This name is restricted to certain characters. A valid project name is compatible across platforms.',
+    mandatory: true
   }
 }, {
   title: 'Type',
   description: `Select your runtime.`,
   default: NODEJS,
   choices: [
-      { name: 'Node.js', value: NODEJS },
-      { name: 'Java', value: JAVA }
+    { name: 'Node.js', value: NODEJS },
+    { name: 'Java', value: JAVA }
   ],
   multiple: false,
   target: 'add',
   guiOptions: {
-      hint: `The preferred runtime can't be changed afterwards. To use a different runtime, create a new project.`,
-      mandatory: true
+    breadcrumb: 'Runtime',
+    hint: `The preferred runtime can't be changed afterwards. To use a different runtime, create a new project.`,
+    mandatory: true
   }
 }, {
-  title: 'Features',
-  description: 'Choose productive runtime capabilities for your application.',
+  title: 'Databases',
+  description: 'Choose a database for your application.',
   default: '',
   choices: [
-      { name: 'SAP HANA Cloud', value: HANA },
-      { name: 'SAP Application Router', value: APPROUTER },
-      { name: 'User Authentication via XSUAA', value: XSUAA },
-      { name: 'Application Logging', value: APPLICATION_LOGGING },
-      { name: 'SAP BTP Event Mesh', value: ENTERPRISE_MESSAGING }
+    { name: 'SAP HANA Cloud', value: HANA },
+    { name: 'PostgreSQL', value: POSTGRES }
   ],
   multiple: true,
   target: 'add',
   guiOptions: {
-      hint: `Choose any combination of features enriching the capabilities of your project. You can also add features later with ${bold('cds add')}`
+    breadcrumb: 'Databases',
+    hint: `Choose any combination of features enriching the capabilities of your project. You can also add features later with ${bold('cds add')}`
   }
 }, {
   title: 'Deployment',
   description: 'Choose which way to deploy your project.',
   default: '',
   choices: [
-      { name: 'Cloud Foundry: MTA Deployment', value: MTA },
-      // { name: 'Kyma: Helm Deployment', value: HELM },
-      { name: 'Multitenancy', value: MULTITENANCY },
-      { name: 'CI/CD Pipeline Integration', value: PIPELINE },
+    { name: 'Cloud Foundry: MTA Deployment', value: MTA },
+    { name: 'Kyma: Helm Deployment', value: HELM },
+    { name: 'Kyma: Containerization using ctz CLI', value: CONTAINERIZE },
+    { name: 'Multitenancy', value: MULTITENANCY },
+    { name: 'CI/CD Pipeline Integration', value: PIPELINE }
+  ],
+  multiple: true,
+  target: 'add',
+  guiOptions: {
+    breadcrumb: 'Deployment',
+    hint: `Choose any combination of features enriching the capabilities of your project. You can also add features later with ${bold('cds add')}`
+  }
+}, {
+  title: 'Runtime Features',
+  description: 'Choose productive runtime capabilities for your application.',
+  default: '',
+  choices: [
+    { name: 'SAP BTP Authorization and Trust Management Service (XSUAA)', value: XSUAA },
+    { name: 'SAP BTP Application Router', value: APPROUTER },
+    { name: 'SAP BTP Connectivity Service', value: CONNECTIVITY },
+    { name: 'SAP BTP Destination Service', value: DESTINATION },
+    { name: 'SAP BTP HTML5 Application Repository', value: HTML5_REPO },
+    { name: 'SAP BTP Portal Service', value: PORTAL },
+    { name: 'SAP BTP Application Logging Service', value: APPLICATION_LOGGING },
+    { name: 'SAP BTP Audit Logging Service', value: AUDIT_LOGGING },
+    { name: 'SAP BTP Notification Service', value: NOTIFICATIONS }
+  ],
+  multiple: true,
+  target: 'add',
+  guiOptions: {
+    breadcrumb: 'Runtime Features',
+    hint: `Choose any combination of features enriching the capabilities of your project. You can also add features later with ${bold('cds add')}`
+  }
+}, {
+  title: 'Messaging',
+  description: 'Choose messaging capabilities for your application.',
+  default: '',
+  choices: [
+    { name: 'SAP BTP Event Mesh', value: ENTERPRISE_MESSAGING },
+    { name: 'Apache Kafka', value: KAFKA },
+    { name: 'Redis', value: REDIS_MESSAGING }
   ],
   multiple: true,
   target: 'add',
   guiOptions: {
-      hint: `Choose any combination of features enriching the capabilities of your project. You can also add features later with ${bold('cds add')}`
+    breadcrumb: 'Messaging',
+    hint: `Choose any combination of features enriching the capabilities of your project. You can also add features later with ${bold('cds add')}`
   }
 }, {
   title: 'Samples',
   description: `Add sample content to your project.`,
   default: '',
   choices: [
-      { name: 'Minimal Sample', value: TINY_SAMPLE },
-      { name: 'Extended Sample with UI', value: SAMPLE }
+    { name: 'Minimal Sample', value: TINY_SAMPLE },
+    { name: 'Extended Sample with UI', value: SAMPLE }
   ],
   multiple: true,
   target: 'add',
   guiOptions: {
-      hint: 'Speed up your ramp-up phase with sample files in your project.'
+    breadcrumb: 'Samples',
+    hint: 'Speed up your ramp-up phase with sample files in your project.'
   }
 }]

package/lib/init/constants.js

@@ -5,7 +5,7 @@ module.exports = {
     COMMAND_ADD: 'add',
 
     JAVA_LTS_VERSIONS: [17, 21],
-    MAVEN_ARCHETYPE_VERSION: '3.0.0',
+    MAVEN_ARCHETYPE_VERSION: '3.1.1',
 
     OPTIONS: Object.freeze({
         COMPLETION: 'completion',
@@ -69,7 +69,10 @@ module.exports = {
         SAMPLES: 'https://github.com/SAP-samples/cloud-cap-samples',
         CAPIRE: 'https://cap.cloud.sap',
         MAVEN_ARCHETYPE_HELP: `https://cap.cloud.sap/docs/java/developing-applications/building#the-maven-archetype`,
-        MAVEN_INSTALL_HELP: `https://maven.apache.org/install.html`
+        MAVEN_INSTALL_HELP: `https://maven.apache.org/install.html`,
+        CAP_JS_COMMUNITY_ODATA_V2: 'https://github.com/cap-js-community/odata-v2-adapter',
+        CAP_JS_COMMUNITY_EVENT_QUEUE: 'https://github.com/cap-js-community/event-queue',
+        CAP_JS_COMMUNITY_WEBSOCKET: 'https://github.com/cap-js-community/websocket'
     }),
 
     PROJECT_FILES: ['package.json', 'pom.xml', '.cdsrc.json']

package/lib/init/index.js

@@ -22,14 +22,16 @@ module.exports = class CDSGenerator {
     }
 
     static help({ exclude = [] } = {}) {
+        if (!cds.add) return // use case shell completion: cds.add is undefined and not needed
+
         const plugins = this.readPlugins(exclude)
         const nameFixedLength = Math.max(...plugins.map(plugin => plugin.name.length))
         return plugins
+            .filter(({module}) => module.help())
             .map(({name, module}) => {
-                const help = module.help?.() ?? ''
-                return `      *${name}*${' '.repeat(nameFixedLength - name.length)}  - ${help}`
+                return `      *${name}*${' '.repeat(nameFixedLength - name.length)}  - ${module.help()}`
             })
-            .join('\n\n')
+            .join('\n')
     }
 
     /**
@@ -176,7 +178,7 @@ module.exports = class CDSGenerator {
                 const fuzzySearch = require('../../bin/util/fuzzySearch')
                 const [bestMatch] = fuzzySearch(plugin, entries.map(e => e.name))
                 const max = entries.reduce((max, {name}) => Math.max(max, name.length), 0)
-                const allFacetsText = entries.map(({name, module}) => {
+                const allFacetsText = entries.filter(({module})=> module.help()).map(({name, module}) => {
                     const help = module.help?.() ?? ''
                     return `${term.bold(name) + ' '.repeat(max - name.length)}  ${term.dim(help)}`
                 }).join('\n')

package/lib/init/merge.js

@@ -70,7 +70,8 @@ module.exports.mergeGitignore = async function(into, from) {
 /**
  * @typedef {Object} Deletion
  * @property {MatchedNode} item - matched node to delete
- * @property {Object[]} relationships - list of relationships to delete
+ * @property {MatchedNode} [key] - key path to property to delete in node (optional)
+ * @property {Object[]} [relationships] - list of relationships to delete
  * @property {string} relationships[].removeProperty - key path to to-be-removed property
  * @property {string[]} relationships[].allWithin - key path to relationship
  */
@@ -285,10 +286,11 @@ async function _mergeYAML(into, from, project, semantics = {}) {
     })
 
     // 4. Delete entries from the project (e.g. separate deployer module when adding mtx)
-    deletions?.forEach(({ item, relationships }) => {
+    deletions?.forEach(({ item, relationships, key }) => {
         const entry = entryMap.get(item)
         if (!entry) return
-        entry.collection.delete(entry.index)
+        if (key) entry.collection.deleteIn([entry.index, ...key.split('.')])
+        else entry.collection.delete(entry.index)
 
         relationships?.forEach(relationship => {
             const [allWithinKeyPath, inKeyPath, into] = relationship.allWithin

package/lib/init/projectReader.js

@@ -3,7 +3,7 @@ const { join, resolve, basename } = require('path')
 const { fs, exists, isdir, path } = cds.utils
 const { parseXml } = require('./xml')
 const { REGEX_JAVA_VERSION, JAVA_LTS_VERSIONS } = require('./constants')
-const DEBUG = cds.debug('cli')
+const TRACE = cds.debug('trace')
 
 module.exports = new class ProjectReader {
 
@@ -88,7 +88,7 @@ module.exports = new class ProjectReader {
      * @property {boolean} hasAttachments Indicates if the project uses SAP BTP Object Store Service.
      * @property {boolean} hasApprouter Indicates if the project uses the SAP Application Router.
      * @property {boolean} hasHtml5Repo Indicates if the project uses the SAP BTP HTML5 Application Repository.
-     * @property {boolean} hasPortal Indicates if the project uses the SAP Cloud Portal serivce.
+     * @property {boolean} hasPortal Indicates if the project uses the SAP Cloud Portal service.
      * @property {boolean} hasDestination Indicates if the project uses the SAP BTP Destination service.
      * @property {boolean} hasMTXRoute Indicates if the approuter should have a multitenant route.
      * @property {boolean} hasMTXRouteJava Indicates if the approuter should have a multitenant subscription route (java).
@@ -106,7 +106,7 @@ module.exports = new class ProjectReader {
         if (!this.appName) this.#setPackageInfo()
         const env = this.env4('production')
         const { appVersion, appName, appId, appDescription, jdkVersion } = this
-        DEBUG?.({ env })
+        TRACE?.({ env })
 
         const _inProd = plugin => require(`./template/${plugin}`).hasInProduction(env)
         const _ui5 = () => exists('package.json') && !!JSON.parse(fs.readFileSync(path.resolve(cds.root, 'package.json'))).sapux
@@ -187,7 +187,6 @@ module.exports = new class ProjectReader {
             })
         })()
 
-        DEBUG?.({ project })
         return project
     }
 }

package/lib/init/template/audit-logging/files/package.sidecar.json

@@ -0,0 +1,7 @@
+{
+  "cds": {
+    "requires": {
+      "audit-log": true
+    }
+  }
+}

package/lib/init/template/audit-logging/index.js

@@ -36,7 +36,7 @@ module.exports = class AuditLoggingTemplate extends require('../../plugin') {
     const { hasMta, hasHelm, hasMultitenancy, srvPath } = project
     const { plan = 'premium' } = cds.cli.options
     project.servicePlan = plan
-    
+
     if (hasMultitenancy) {
       await merge(__dirname, 'files/package.sidecar.json').into('mtx/sidecar/package.json')
     }

package/lib/init/template/cf-manifest/index.js

@@ -12,6 +12,10 @@ module.exports = class CfManifestTemplate extends require('../../plugin') {
         return 'Cloud Foundry deployment using manifest files'
     }
 
+    static hasInProduction() {
+        return exists(MANIFEST_FILE)
+    }
+
     async canRun() {
         if (cds.cli.options.force) {
             return true

package/lib/init/template/data/as-json.js

@@ -15,7 +15,7 @@ const MAX_ASSOC_DEPTH = 5
  * @returns {Record<string, object[]>} the filled data
  */
 const asJson = module.exports = async (data, csn, numRecords=1, options={}) => {
-  let { referenceData } = options
+  let { referenceData, contentType } = options
 
   // if no entity restrictions are given, use all entities
   if (!data)  data = csn.all('entity').reduce((all, e) => { all[e.name] = []; return all }, {})
@@ -63,6 +63,14 @@ const asJson = module.exports = async (data, csn, numRecords=1, options={}) => {
     // remove records w/ duplicate keys. This can happen if the key is an enum (and we have less enum values than requested records).
     data[name] = uniqRecords(data[name], entity)
   }
+  for (let [key, d] of Object.entries(data)) {
+    if (contentType === 'json' && d.deleteReference && !d.keepReferece) {
+      delete data[key]
+    } 
+    delete d.keepReferece
+    delete d.deleteReference
+    uniqRecords(d, csn.definitions[key])
+  }
   return data
 }
 
@@ -222,17 +230,16 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
     }
     case 'cds.Composition': {
       const target = csn.definitions[element.target]
-      if (!target)
-        return
-      delete data[target.name] // as data for the target is created inline below, no need to have it separately
-      if (target === parentEntity || depth > MAX_ASSOC_DEPTH)
-        return
-
-      const targetRecords = []
+      if (!target || entity.name === target.name || depth > MAX_ASSOC_DEPTH) return
+      
+      let targetRecords = [] // in findKeysInOnCondition target records are linked to the entity, we don't want to overwrite any existing data
+      if (data[target.name]) data[target.name].deleteReference = true // for json composites references are nested and will be deleted when writing to file
+    
       const targetRecordCount = element.is2many ? 2 : 1 // TODO: make this configurable
       const targetRecordID = randomNumber()
       for (let i = 0; i < targetRecordCount; i++) {
-        targetRecords.push(fillRecord({}, targetRecordID+i, target, csn, data, entity, depth+1, referenceData))
+        const newRecord = fillRecord({}, targetRecordID+i, target, csn, data, entity, depth+1, referenceData)
+        if (newRecord) targetRecords.push(newRecord)
       }
 
       const [ownKey, ownKeyStructured, targetKey] = findKeysInOnCondition(element, target)
@@ -268,11 +275,14 @@ function dataForField(element, entity, csn, record, data, parentEntity, depth, r
           return
         
         if (targetRecords.length > 0) { // use record generated by following asociation
-          targetRecord = targetRecords[0]
+          targetRecord = targetRecords.at(-1)  // make sure the localized record references the newly generated texts
         } else {
           targetRecord = fillRecord({}, randomNumber(), target, csn, data, entity, depth+1, referenceData)
-          targetRecords.push(targetRecord)
-          uniqRecords(targetRecords, target)
+          if (targetRecord) {
+            targetRecords.push(targetRecord)
+            uniqRecords(targetRecords, target)
+          }
+          if (parentEntity && (parentEntity.name != entity.name)) data[target.name].keepReferece = true
         }
       }
 

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

@@ -77,7 +77,7 @@ module.exports = class DataTemplate extends require('../../plugin') {
       .filter (e => queries || !e.query) // remove all projection-like entities unless specified differently
       .reduce((all, e) => { all[e.name] = []; return all }, {})
 
-    await asJson(data, csn, records)
+    await asJson(data, csn, records, {contentType})
 
     if (contentType === 'csv') {
       const headerOnly = !cds.cli.options['records'] // compat to old behavior which only creates headers

package/lib/init/template/helm-unified-runtime/index.js

@@ -1,7 +1,9 @@
 const cds = require('../../..')
 const { rimraf, exists, readFileSync, yaml } = cds.utils
 const { join } = require('path')
-const { merge, readProject } = cds.add ?? {}
+
+const { readProject } = require('../../projectReader')
+const { merge } = require('../../merge')
 
 module.exports = class HelmUnifiedRuntimeTemplate extends require('../helm') {
 

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

@@ -149,6 +149,7 @@ module.exports = class HttpTemplate extends require('../../plugin') {
       }
       varsDefined = true
       const headers = auth ? `Content-Type: application/json\n{{auth}}` : `Content-Type: application/json`
+      const headerAuth = auth ? '{{auth}}' : ''
 
       service.urlPaths.forEach((urlPath) => {
         if (service.urlPaths.length > 1) {
@@ -156,36 +157,41 @@ module.exports = class HttpTemplate extends require('../../plugin') {
         }
 
         service.entities.forEach((e) => {
-          const entityNameSimple = e.name.slice(e.name.lastIndexOf('.') + 1)
+          const entityNameSimple = e.name.slice(serviceName.length + 1)
+          const nameSlug = slug(entityNameSimple)
           const url = `{{server}}/${urlPath}${entityNameSimple}`
-          const requestTitle = `\n### ${e.name}`
-          requests.push(`${requestTitle}\nGET ${url}\n${headers}\n`)
+          const requestTitle = `\n### ${entityNameSimple}`
+          requests.push(`${requestTitle}\n# @name ${nameSlug}_GET\nGET ${url}\n${headerAuth}\n`)
           if (e.readOnly) return
 
           const entityData = payload[`${e.name}`] ? payload[`${e.name}`][0] : null
           if (!entityData) return
-          const postBody = JSON.stringify(entityData, null, 2)
-
-          let id
-          const compositeKey = Object.keys(e.keys).length > 1
-          if (compositeKey) {
-            id = e.keys.map(k => k.type === 'cds.String' ? `${k.name}='${entityData[k.name]}'` : `${k.name}=${entityData[k.name]}`).join(',')
-            } else {
-            id = entityData[Object.keys(e.keys)[0]]
-          }
 
           if (e.isDraft) {
-            generateDraftRequests(requests, requestTitle, url, headers, postBody, id)
-          } else {
+            const key = Object.keys(e.keys)[0] // draft keys are always single
+            delete entityData[key] // draft keys should always by auto generated (either UUID or through custom logic), so remove them from the payload
+            const postBody = JSON.stringify(entityData, null, 2)
+            generateDraftRequests(requests, requestTitle, url, headers, headerAuth, postBody, key)
+          }
+          else {
+            const postBody = JSON.stringify(entityData, null, 2)
+            let id
+            const compositeKey = Object.keys(e.keys).length > 1
+            if (compositeKey) {
+              id = e.keys.map(k => k.type === 'cds.String' ? `${k.name}='${entityData[k.name]}'` : `${k.name}=${entityData[k.name]}`).join(',')
+            } else {
+              id = entityData[Object.keys(e.keys)[0]]
+            }
             compositeKey ? id = `(${id})` : id = `/${id}`
-            requests.push(`${requestTitle}\nPOST ${url}\n${headers}\n\n${postBody}\n`)
-            requests.push(`${requestTitle}\nPATCH ${url}${id}\n${headers}\n\n${postBody}\n`)
-            requests.push(`${requestTitle}\nDELETE ${url}${id}\n${headers}\n`)
+            requests.push(`${requestTitle}\n# @name ${nameSlug}_POST\nPOST ${url}\n${headers}\n\n${postBody}\n`)
+            requests.push(`${requestTitle}\n# @name ${nameSlug}_PATCH\nPATCH ${url}${id}\n${headers}\n\n${postBody}\n`)
+            requests.push(`${requestTitle}\n# @name ${nameSlug}_DELETE\nDELETE ${url}${id}\n${headers}\n`)
           }
         })
 
         service.actions.forEach((a) => {
-          const url = `{{server}}/${urlPath}${a.name.split(".")[1]}`
+          const simpleNameAction = a.name.slice(serviceName.length + 1)
+          const url = `{{server}}/${urlPath}${simpleNameAction}`
 
           let actionPayload = {}
           if (a.params) {
@@ -197,20 +203,25 @@ module.exports = class HttpTemplate extends require('../../plugin') {
                     : null
             }
           }
-          requests.push(`\n### ${a.name}\nPOST ${url}\n${headers}\n\n${JSON.stringify(actionPayload, null, 2)}\n`)
+          requests.push(`\n### ${simpleNameAction}\n# @name ${simpleNameAction}_POST\nPOST ${url}\n${headers}\n\n${JSON.stringify(actionPayload, null, 2)}\n`)
         })
 
       })
       this.#write(requests, serviceName)
     }
 
-    function generateDraftRequests(requests, requestTitle, url, headers, postBody, id) {
-      requests.push(`${requestTitle} Drafts \nGET ${url}?$filter=(IsActiveEntity eq false)\n${headers}\n`) // unencoded URL for better readability (client can handle this)
-      requests.push(`${requestTitle} Drafts \nPOST ${url}\n${headers}\n\n${postBody}\n`)
-      requests.push(`\n### Please paste the server-generated draft id here e.g. ID=101 or ID=101,secodKey='stringValue' \n@draftID = ${id}\n`)
-      requests.push(`${requestTitle} Patch Draft \nPATCH ${url}({{draftID}},IsActiveEntity=false)\n${headers}\n\n${postBody}\n`)
-      requests.push(`${requestTitle} Prepare Draft \nPOST ${url}({{draftID}},IsActiveEntity=false)/AdminService.draftPrepare\n${headers}\n\n{}\n`)
-      requests.push(`${requestTitle} Activate Draft \nPOST ${url}({{draftID}},IsActiveEntity=false)/AdminService.draftActivate\n${headers}\n\n{}\n`)
+    function generateDraftRequests(requests, title, url, headers, headerAuth, postBody, key) {
+      const nameDraftsCreate = slug(title+'_Draft_POST')
+      requests.push(`${title} Drafts GET\n# @name ${slug(title+'_Drafts_GET')}\nGET ${url}?$filter=(IsActiveEntity eq false)\n${headerAuth}\n`) // unencoded URL for better readability (client can handle this)
+      requests.push(`${title} Draft POST\n# @name ${nameDraftsCreate}\nPOST ${url}\n${headers}\n\n${postBody}\n`)
+      requests.push(`\n### Result from POST request above\n@draftID = {{${nameDraftsCreate}.response.body.$.${key}}}\n`)
+      requests.push(`${title} Draft PATCH\n# @name ${slug(title+'_Draft_Patch')}\nPATCH ${url}(${key}={{draftID}},IsActiveEntity=false)\n${headers}\n\n${postBody}\n`)
+      requests.push(`${title} Draft Prepare\n# @name ${slug(title+'_Draft_Prepare')}\nPOST ${url}(${key}={{draftID}},IsActiveEntity=false)/AdminService.draftPrepare\n${headers}\n\n{}\n`)
+      requests.push(`${title} Draft Activate\n# @name ${slug(title+'_Draft_Activate')}\nPOST ${url}(${key}={{draftID}},IsActiveEntity=false)/AdminService.draftActivate\n${headers}\n\n{}\n`)
+    }
+
+    function slug(str) {
+      return str.trim().replace(/[#\\. ]/g, '')
     }
   }
 
@@ -248,5 +259,3 @@ module.exports = class HttpTemplate extends require('../../plugin') {
     return `${outputDir}/${serviceName}.http`
   }
 }
-
-

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

@@ -8,7 +8,7 @@ const { copyRenderedJSON } = require('../../../util/fs')
 const {
   srv4, // Server
   mtxSidecar4, // Additional Modules
-  saasRegistry, serviceManager, xsuaa, // BTP Services
+  saasRegistry, // BTP Services
   srvApi4, providedMtxApiSidecar4, requiredMtxSidecarApi4 // APIs
 } = require('../../registries/mta')
 
@@ -47,13 +47,9 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
       const mtxSidecar = mtxSidecar4(isJava ? 'mtx/sidecar' : 'gen/mtx/sidecar')
       const modules = [srv, mtxSidecar]
       const services = [saasRegistry]
-      if (hasXsuaa) services.push(xsuaa)
       const apis = [srvApi4(srv), providedMtxApiSidecar4(mtxSidecar)]
       if (isJava) apis.push(requiredMtxSidecarApi4(srv))
       const additions = [...modules, ...services, ...apis]
-
-      const overwrites = hasXsuaa ? [{ item: [xsuaa, 'parameters.config.tenant-mode'], withValue: 'shared' }] : []
-
       const relationships =  [{
         insert: [saasRegistry, 'name'],
         into: [isJava ? srv : mtxSidecar, 'requires', 'name']
@@ -64,34 +60,16 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
           into: [mtxSidecar, 'build-parameters.requires', 'name']
         })
       }
-      if (hasXsuaa) {
-        relationships.push({
-          insert: [xsuaa, 'name'],
-          into: [mtxSidecar, 'requires', 'name']
-        })
-      }
-      if (hasHana) {
-        relationships.push({
-          insert: [serviceManager, 'name'],
-          into: [mtxSidecar, 'requires', 'name'],
-        })
-      }
 
-      const templateMtaPath = join(__dirname, 'files', 'mta.yaml.hbs')
-      await merge(templateMtaPath).into('mta.yaml', { with: project, additions, overwrites, relationships })
+      const templateMtaPath = join(__dirname, 'files/mta.yaml.hbs')
+      await merge(templateMtaPath).into('mta.yaml', { with: project, additions, relationships })
     }
 
     if (hasHelm || hasHelmUnifiedRuntime) {
-      const overwrites = hasXsuaa ? [{
-        item: [{
-          in: 'xsuaa',
-          where: { serviceOfferingName: 'xsuaa' }
-        }, 'parameters.tenant-mode'], withValue: 'shared'
-      }] : []
 
-      await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project, overwrites })
+      await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
 
-      const domain = hasApprouter ? 'svc.cluster.local:8080' : '{{ .Values.global.domain }}' 
+      const domain = hasApprouter ? 'svc.cluster.local:8080' : '{{ .Values.global.domain }}'
       const applicationWorkload = hasApprouter ? 'approuter' : 'srv'
       const serviceCommunicatingWithSaasReg = hasApprouter ? 'approuter' : isNodejs ? 'sidecar' : 'srv';
       await merge({
@@ -102,7 +80,7 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
             appUrls: {
               getDependencies: `https://{{ .Release.Name }}-${serviceCommunicatingWithSaasReg}-{{ .Release.Namespace }}.{{ .Values.global.domain }}${isNodejs ? '/-/cds/saas-provisioning' : '/mt/v1.0/subscriptions'}/dependencies`,
               onSubscription: `https://{{ .Release.Name }}-${serviceCommunicatingWithSaasReg}-{{ .Release.Namespace }}.{{ .Values.global.domain }}${isNodejs ? '/-/cds/saas-provisioning/tenant/{tenantId}' : '/mt/v1.0/subscriptions/tenants/{tenantId}'}`,
-            } 
+            }
           }
         },
         ...(isNodejs) && { sidecar: {
@@ -110,12 +88,12 @@ module.exports = class MultitenancyTemplate extends require('../../plugin') {
             SUBSCRIPTION_URL: `https://\${tenant_subdomain}-{{ .Release.Name }}-${applicationWorkload}-{{ .Release.Namespace }}.{{ .Values.global.domain }}`
           }
         }},
-        ...(isJava) && { srv: { 
+        ...(isJava) && { srv: {
           env: {
             CDS_MULTITENANCY_APPUI_URL: `https://{{ .Release.Name }}-${applicationWorkload}-{{ .Release.Namespace }}.{{ .Values.global.domain }}`,
             CDS_MULTITENANCY_SIDECAR_URL: `http${hasApprouter ? '' : 's'}://{{ .Release.Name }}-sidecar${hasApprouter ? '.' : '-'}{{ .Release.Namespace }}.${domain}`
-          }          
-        }}       
+          }
+        }}
       }).into('chart/values.yaml',{ forceOverwrite: true })
     }
 

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

@@ -55,7 +55,6 @@
         "": {
           "dataSource": "AdminService",
           "settings": {
-            "synchronizationMode": "None",
             "operationMode": "Server",
             "autoExpandSelect": true,
             "earlyRequests": true,

package/lib/init/template/sample/files/app/browse/webapp/manifest.json

@@ -71,7 +71,6 @@
       "": {
         "dataSource": "CatalogService",
         "settings": {
-          "synchronizationMode": "None",
           "operationMode": "Server",
           "autoExpandSelect": true,
           "earlyRequests": true,