@sap/cds 6.7.2 → 6.8.2

package/libx/_runtime/db/expand/expandCQNToJoin.js

@@ -66,7 +66,6 @@ class JoinCQNFromExpanded {
 
     // Get first level of expanding regarding to many and all to one if not part of a nested to many expand.
     this._createJoinCQNFromExpanded(this._SELECT, [])
-
     return this
   }
 
@@ -117,12 +116,10 @@ class JoinCQNFromExpanded {
    */
   _createJoinCQNFromExpanded(SELECT, toManyTree, defaultLanguage) {
     const joinArgs = SELECT.from.args
-    const isJoinOfTwoSelects = joinArgs && joinArgs.every(a => a.SELECT)
-
+    const isJoinOfTwoSelects = joinArgs?.every(a => a.SELECT)
     const unionTableRef = this._getUnionTable(SELECT)
-    const unionTable = unionTableRef && unionTableRef.table
+    const unionTable = unionTableRef?.table
     const tableAlias = this._getTableAlias(SELECT, toManyTree)
-
     const readToOneCQN = this._getReadToOneCQN(SELECT, isJoinOfTwoSelects ? 'filterExpand' : tableAlias)
 
     if (isJoinOfTwoSelects) {
@@ -134,6 +131,7 @@ class JoinCQNFromExpanded {
         .forEach(c => {
           mappings[c.as.replace(prefix, '')] = c.as
         })
+
       // expand to one
       const entity = this._csn.definitions[joinArgs[0].SELECT.from.SET.args[1].SELECT.from.ref[0]]
       this._addImplicitOrderBy(readToOneCQN, entity, tableAlias)
@@ -147,9 +145,7 @@ class JoinCQNFromExpanded {
       const entity = this._getEntityForTable(table)
       this._addImplicitOrderBy(readToOneCQN, entity, tableAlias)
       if (unionTable) readToOneCQN[IS_UNION_DRAFT] = true
-
       readToOneCQN[IS_ACTIVE] = isDraftTree ? this._isDraftTargetActive(table) : true
-
       const givenColumns = readToOneCQN.columns
       readToOneCQN.columns = []
       if (entity['@cds.localized'] === false) defaultLanguage = true
@@ -178,7 +174,8 @@ class JoinCQNFromExpanded {
    * @private
    */
   _getTableAlias(SELECT, toManyTree) {
-    return this._createAlias(toManyTree.length === 0 ? this._getRef(SELECT).table : toManyTree.join(':'))
+    const ref = this._getRef(SELECT)
+    return this._createAlias(toManyTree.length === 0 ? ref.table : toManyTree.join(':'), ref.as)
   }
 
   _getRef(SELECT) {
@@ -212,15 +209,21 @@ class JoinCQNFromExpanded {
    * Create an alias from value.
    *
    * @param {string} value
+   * @param {string} [alias]
    * @returns {string}
    * @private
    */
-  _createAlias(value) {
+  _createAlias(value, alias) {
     if (!this._aliases) {
       this._aliases = {}
     }
 
     if (!this._aliases[value]) {
+      if (alias) {
+        this._aliases[value] = alias
+        return alias
+      }
+
       const aliasNum = Object.keys(this._aliases).length
 
       if (aliasNum < 26) {
@@ -319,6 +322,7 @@ class JoinCQNFromExpanded {
         list: element.list.map(element => this._checkOrderByWhereElementRecursive(cqn, element, tableAlias))
       })
     }
+
     return this._checkOrderByWhereElementRecursive(cqn, element, tableAlias)
   }
 
@@ -333,9 +337,7 @@ class JoinCQNFromExpanded {
    */
   _adaptWhereOrderBy(cqn, tableAlias) {
     if (cqn.where) {
-      cqn.where = cqn.where.map(element => {
-        return this._adaptWhereElement(element, cqn, tableAlias)
-      })
+      cqn.where = cqn.where.map(element => this._adaptWhereElement(element, cqn, tableAlias))
     }
 
     if (cqn.having) {
@@ -343,15 +345,11 @@ class JoinCQNFromExpanded {
     }
 
     if (cqn.orderBy) {
-      cqn.orderBy = cqn.orderBy.map(element => {
-        return this._checkOrderByWhereElementRecursive(cqn, element, tableAlias)
-      })
+      cqn.orderBy = cqn.orderBy.map(element => this._checkOrderByWhereElementRecursive(cqn, element, tableAlias))
     }
 
     if (cqn.groupBy) {
-      cqn.groupBy = cqn.groupBy.map(element => {
-        return this._checkOrderByWhereElementRecursive(cqn, element, tableAlias)
-      })
+      cqn.groupBy = cqn.groupBy.map(element => this._checkOrderByWhereElementRecursive(cqn, element, tableAlias))
     }
 
     return cqn
@@ -393,7 +391,7 @@ class JoinCQNFromExpanded {
       element.xpr = element.xpr.map(nestedElement => {
         return this._checkOrderByWhereElementRecursive(cqn, nestedElement, tableAlias)
       })
-    } else if (element.SELECT && element.SELECT.where) {
+    } else if (element.SELECT?.where) {
       element = {
         SELECT: Object.assign({}, element.SELECT, {
           where: this._adaptWhereSELECT(this._getRef(cqn), element.SELECT.where, tableAlias)
@@ -416,6 +414,7 @@ class JoinCQNFromExpanded {
       if (element.xpr) {
         return { xpr: this._adaptWhereSELECT(aliasedTable, element.xpr, tableAlias) }
       }
+
       return this._elementAliasNeedsReplacement(element, aliasedTable)
         ? Object.assign({}, element, { ref: [tableAlias, element.ref[1]] })
         : element
@@ -498,11 +497,11 @@ class JoinCQNFromExpanded {
   _expandedToFlat({ entity, givenColumns, readToOneCQN, tableAlias, toManyTree, defaultLanguage }) {
     const toManyColumns = []
     const mappings = this._getMappingObject(toManyTree)
-
     const readToOneCQNCopy = getCqnCopy(readToOneCQN)
 
     for (const column of givenColumns) {
       let navigation
+
       if (column.expand) {
         navigation = getNavigationIfStruct(entity, tableAlias === column.ref[0] ? column.ref.slice(1) : column.ref)
         if (this._skip(navigation && navigation._target)) continue
@@ -518,6 +517,7 @@ class JoinCQNFromExpanded {
         // Expands with to one target can be processed directly
         const navProp = column.ref[column.ref.length - 1]
         const navTarget = entity.elements[navProp]
+
         if (
           entity._isDraftEnabled &&
           navTarget._isAssociationStrict &&
@@ -527,6 +527,7 @@ class JoinCQNFromExpanded {
         ) {
           mappings[navProp] = { [TO_ACTIVE]: true }
         }
+
         this._addJoinAndElements({
           column,
           entity,
@@ -537,7 +538,8 @@ class JoinCQNFromExpanded {
         })
       } else {
         // No expand, directly add the column and its mapping.
-        readToOneCQN.columns.push(this._addAliasToColumn(column, entity, tableAlias, mappings))
+        const columnAliased = this._addAliasToColumn(column, entity, tableAlias, mappings)
+        readToOneCQN.columns.push(columnAliased)
 
         // REVISIT required for other cqn properties as well?
         this.adjustOrderBy(readToOneCQN.orderBy, mappings, column, tableAlias)
@@ -554,6 +556,7 @@ class JoinCQNFromExpanded {
         }
       }
     }
+
     // only as second step handle expand to many, or else keys might still be unknown
     this._toMany({
       entity,
@@ -656,7 +659,6 @@ class JoinCQNFromExpanded {
     const extendedToManyTree = toManyTree.concat(column.ref[0] === parentAlias ? column.ref.slice(1) : column.ref)
     const tableAlias = this._createAlias(extendedToManyTree.join(':'))
     const target = this._getTarget(entity, column, parentAlias)
-
     const name = column.ref[column.ref.length - 1]
     const element = name && entity.elements[name]
 
@@ -763,8 +765,7 @@ class JoinCQNFromExpanded {
     const givenColumns = column.expand.map(col => {
       if (
         activeTableRequired &&
-        col.ref &&
-        col.ref.length &&
+        col.ref?.length &&
         (col.ref[0] === 'IsActiveEntity' || col.ref[0] === 'HasActiveEntity')
       ) {
         return {
@@ -847,7 +848,7 @@ class JoinCQNFromExpanded {
           continue
         }
 
-        if (arg.SELECT && arg.SELECT.columns.some(column => column[IDENTIFIER])) {
+        if (arg.SELECT?.columns.some(column => column[IDENTIFIER])) {
           return arg.SELECT.columns
         }
 
@@ -972,9 +973,7 @@ class JoinCQNFromExpanded {
    */
   _addAliasToColumn(column, entity, tableAlias, mappings) {
     // No identifier for this row entry or technical column
-    if (this._isAliasNotNeeded(column)) {
-      return column
-    }
+    if (this._isAliasNotNeeded(column)) return column
 
     if (Array.isArray(column.xpr)) {
       return this._buildNewAliasColumn(
@@ -993,6 +992,7 @@ class JoinCQNFromExpanded {
         mappings
       )
     }
+
     return this._buildNewAliasColumn(column, entity, tableAlias, mappings)
   }
 
@@ -1073,10 +1073,7 @@ class JoinCQNFromExpanded {
     defaultLanguage,
     readToOneCQNCopy
   }) {
-    if (toManyColumns.length === 0) {
-      return
-    }
-
+    if (toManyColumns.length === 0) return
     this._addKeysIfNeeded({ entity, readToOneCQN, tableAlias })
 
     for (const { column, parentAlias } of toManyColumns) {
@@ -1089,6 +1086,7 @@ class JoinCQNFromExpanded {
         parentAlias,
         defaultLanguage
       })
+
       this._createJoinCQNFromExpanded(select, toManyTree.concat([column.ref[column.ref.length - 1]]), defaultLanguage)
     }
   }
@@ -1160,7 +1158,6 @@ class JoinCQNFromExpanded {
   // eslint-disable-next-line complexity
   _buildExpandedCQN({ column, entity, readToOneCQN, toManyTree, mappings, parentAlias, defaultLanguage }) {
     const isUnion = !!readToOneCQN.from.SET
-
     const colRef = parentAlias === column.ref[0] ? column.ref.slice(1) : column.ref.slice(0)
     const element = entity.elements[colRef[0]]
     const colTarget = ensureUnlocalized(element.target)
@@ -1168,24 +1165,21 @@ class JoinCQNFromExpanded {
       defaultLanguage ||
       entity['@cds.localized'] === false ||
       this._csn.definitions[colTarget]['@cds.localized'] === false
-
     const expandActive =
       readToOneCQN[IS_ACTIVE] ||
       (element._isAssociationStrict && !element['@odata.draft.enclosed']) ||
       !this._csn.definitions[colTarget]._isDraftEnabled
-
     const ref = this._refFromRefByExpand(column.ref[0], colTarget, defaultLanguageThis, expandActive)
     const tableAlias = this._createAlias(toManyTree.concat(colRef).join(':'))
     const on = entity._relations[colRef[0]].join(tableAlias, 'filterExpand')
     const filterExpand = this._getFilterExpandCQN(readToOneCQN, on, parentAlias, entity.keys)
     const expandedEntity = this._csn.definitions[colTarget]
     const joinColumns = this._getJoinColumnsFromOnAddToMapping(mappings[colRef[0]], parentAlias, on, entity)
-
     let cqn = {
       from: {
         join: 'inner',
         args: [{ ref: [ref], as: tableAlias }, filterExpand],
-        on: on
+        on
       }
     }
 
@@ -1211,16 +1205,17 @@ class JoinCQNFromExpanded {
     }
 
     if (column.limit) throw getError(501, 'Pagination is not supported in expand')
-
     cqn = this._adaptWhereOrderBy(cqn, tableAlias)
 
     if (isUnion) {
       const cols = column.expand.filter(c => !c.expand && !(c.ref[0] in DRAFT_COLUMNS_MAP)).map(c => c.ref[0])
+
       // ensure the join columns are selected
       for (const each of joinColumns) {
         const col = each.ref[each.ref.length - 1]
         if (!cols.includes(col)) cols.push(col)
       }
+
       // ensure the foreign keys are selected in case of expand to one
       for (const each of cqn.columns) {
         if (each.expand) {
@@ -1238,14 +1233,17 @@ class JoinCQNFromExpanded {
         )
         const user = (cds.context && cds.context.user && cds.context.user.id) || 'anonymous'
         const unionFrom = getCQNUnionFrom(cols, ref.replace(/_drafts$/, ''), ref, ks, user)
+
         for (const each of cqn.columns) {
           if (!each.as) continue
+
           // replace val with ref
           if (each.as === 'IsActiveEntity' || each.as === 'HasActiveEntity') {
             delete each.val
             each.ref = [tableAlias, each.as]
             each.as = tableAlias + '_' + each.as
           }
+
           // ensure the cast
           if (
             each.as.match(/IsActiveEntity$/) ||
@@ -1255,6 +1253,7 @@ class JoinCQNFromExpanded {
             each.cast = { type: 'cds.Boolean' }
           }
         }
+
         const cs = cqn.columns
           .filter(c => !c.expand && c.ref && c.ref[0] === tableAlias)
           .map(c => ({ ref: [c.ref[1]] }))
@@ -1278,6 +1277,7 @@ class JoinCQNFromExpanded {
       const sort = element.sort
       if (element.args)
         return { func: element.func, args: this._copyOrderBy(element.args, alias, expandedEntity), sort }
+
       const ref =
         element.ref[0] === alias
           ? [...element.ref]
@@ -1286,6 +1286,7 @@ class JoinCQNFromExpanded {
           : this._isPathExpressionToOne(element.ref, expandedEntity)
           ? [alias, ...element.ref]
           : [alias, element.ref[1]]
+
       return (sort && { ref, sort }) || { ref }
     })
   }
@@ -1304,6 +1305,7 @@ class JoinCQNFromExpanded {
         where: where
       }
     }
+
     return {
       xpr: ['case', 'when', hasDraftQuery, 'IS NOT NULL', 'then', 'true', 'else', 'false', 'end'],
       as: 'HasDraftEntity',
@@ -1368,6 +1370,7 @@ class JoinCQNFromExpanded {
         outerColumns.push(...outerCols)
         continue
       }
+
       if (typeof entry === 'object' && entry.ref && entry.ref[0] === 'filterExpand') {
         columns.push(this._getColumnObjectForFilterExpand(readToOneCQN, parentAlias, entry.ref[1]))
         outerColumns.push({ ref: [entry.ref[1]] })
@@ -1434,7 +1437,7 @@ class JoinCQNFromExpanded {
   }
 
   _getValueFromEntry(entry, parentAlias, key, struct) {
-    let value = entry[key] || entry[key.toUpperCase()]
+    let value = entry[key] ?? entry[key.toUpperCase()]
     if (value === undefined) {
       value = entry[`${parentAlias}_${key}`] || entry[`${parentAlias}_${key}`.toUpperCase()]
     }
@@ -1464,6 +1467,7 @@ class JoinCQNFromExpanded {
           }
           struct = current.elements[key.replace(parentAlias + '_', '')]
         }
+
         // build value for spreading (cf. mapping[GET_KEY_VALUE])
         value = []
         for (const k in struct.elements) {
@@ -1480,7 +1484,8 @@ class JoinCQNFromExpanded {
 
   _addColumNames(entity, parentAlias, columnNames) {
     for (const keyName in entity.keys) {
-      if (entity.keys[keyName].is2one || entity.keys[keyName].is2many) continue
+      const key = entity.keys[keyName]
+      if (key.is2one || key.is2many) continue
       const columnNameAlt = keyName === 'IsActiveEntity' ? 'IsActiveEntity' : `${parentAlias}_${keyName}`
       if (!columnNames.includes(columnNameAlt)) {
         columnNames.push(columnNameAlt)
@@ -1509,6 +1514,7 @@ class JoinCQNFromExpanded {
         columns.push(...this._getJoinColumnsFromOnAddToMapping(mapping, parentAlias, entry.xpr, entity))
         continue
       }
+
       if (typeof entry === 'object' && entry.ref && entry.ref[0] !== 'filterExpand') {
         const as = entry.ref.join('_')
         columns.push({
@@ -1528,6 +1534,7 @@ class JoinCQNFromExpanded {
 
       for (const key of keyList) {
         const parts = key.split('_')
+
         // For draft-enabled entities, associations may not take over 'IsActiveEntity', e.g.
         // when a draft points to an active entity
         if (parts[parts.length - 1] !== 'IsActiveEntity') {
@@ -1575,7 +1582,6 @@ class JoinCQNFromExpanded {
     this._addMissingJoinElements(columns, joinColumns)
     this._addMissingKeyColumns(columns, tableAlias, keys, isActive, entity)
     this._addMissingParentKeyColumns(columns, 'filterExpand', parentKeys, isActive)
-
     return columns
   }
 
@@ -1604,11 +1610,13 @@ class JoinCQNFromExpanded {
         columns.push(this._createCalculatedBooleanColumn('IsActiveEntity', isActive))
         return
       }
+
       if (isActive) {
         if (columnName === 'HasActiveEntity') {
           columns.push(this._createCalculatedBooleanColumn('HasActiveEntity', false))
           return
         }
+
         if (columnName === 'HasDraftEntity') {
           columns.push(this._getHasDraftEntityXpr(entity, tableAlias))
           return

package/libx/_runtime/db/expand/rawToExpanded.js

@@ -158,9 +158,7 @@ class RawToExpanded {
     }
 
     // No property holds any value. A to null must have failed.
-    if (isEntityNull) {
-      return
-    }
+    if (isEntityNull) return
 
     return row
   }
@@ -175,10 +173,10 @@ class RawToExpanded {
    */
   _isNull(isEntityNull, value, key) {
     if (isEntityNull === undefined) {
-      return value === null || value === undefined || key === 'IsActiveEntity'
+      return value == null || key === 'IsActiveEntity'
     }
 
-    return isEntityNull === true && (value === null || value === undefined || key === 'IsActiveEntity')
+    return isEntityNull === true && (value == null || key === 'IsActiveEntity')
   }
 
   /**

package/libx/_runtime/db/generic/rewrite.js

@@ -14,6 +14,9 @@ const _isLinked = req => {
 function handler(req) {
   if (typeof req.query === 'string') return
 
+  // invoke req.subject before it gets modified
+  req.subject
+
   if (!this.model) {
     // best-effort rewrite of path in from
     req.query = cqn2cqn4sql(req.query, { definitions: {} }, { service: this })

package/libx/_runtime/db/utils/generateAliases.js

@@ -120,7 +120,7 @@ const _addAliasToElement = (expr, alias) => {
       alias = alias(expr.ref)
     }
 
-    return { ref: [alias, ...expr.ref] }
+    return { ...expr, ref: [alias, ...expr.ref] }
   }
 
   if (expr.list) {

package/libx/_runtime/fiori/generic/activate.js

@@ -122,7 +122,7 @@ const fioriGenericActivate = async function (req) {
   if (!draftData) req.reject(404)
   if (adminData.InProcessByUser !== req.user.id) {
     // REVISIT: security log?
-    req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER')
+    req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [adminData.InProcessByUser])
   }
 
   /*

package/libx/_runtime/fiori/generic/before.js

@@ -4,7 +4,7 @@ const { SELECT } = cds.ql
 
 const { isNavigationToMany } = require('../utils/req')
 const { getKeysCondition, removeIsActiveEntityRecursively } = require('../utils/where')
-const { isDraftActivateAction, ensureNoDraftsSuffix, ensureDraftsSuffix, draftIsLocked } = require('../utils/handler')
+const { ensureNoDraftsSuffix, ensureDraftsSuffix, draftIsLocked } = require('../utils/handler')
 
 const { DRAFT_COLUMNS_ADMIN_MAP } = require('../../common/constants/draft')
 const { deepCopyArray } = require('../../common/utils/copy')
@@ -32,7 +32,7 @@ const _validateDraft = (req, draftResult, isBoundAction) => {
   // user than the one who locked the entity and the configured drafts cancellation
   // timeout timer has expired
   if (draftIsLocked(draftAdminData.LastChangeDateTime)) {
-    req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER')
+    req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [draftAdminData.CreatedByUser])
   }
 
   // At this point, the request user ID isn't the owner of the draft.
@@ -60,16 +60,19 @@ const _getSelectDraftDataCqn = (entityName, where) => {
 
 const _getRoot = req => {
   if (!req.query) return
+
   const refObj = req.query.SELECT?.from || req.query.UPDATE?.entity || req.query.INSERT?.into || req.query.DELETE?.from
+  const ref0 = refObj.ref[0]
+
   const root = {
-    entityName: ensureDraftsSuffix(refObj.ref[0].id),
-    where: removeIsActiveEntityRecursively(deepCopyArray(refObj.ref[0].where))
+    entityName: ensureDraftsSuffix(ref0.id),
+    where: removeIsActiveEntityRecursively(deepCopyArray(ref0.where))
   }
 
-  for (const item of refObj.ref[0].where) {
+  for (const item of ref0.where) {
     if (item.ref && item.ref[item.ref.length - 1] === 'IsActiveEntity') {
-      const index = refObj.ref[0].where.indexOf(item)
-      root.IsActiveEntity = refObj.ref[0].where[index + 2].val
+      const index = ref0.where.indexOf(item)
+      root.IsActiveEntity = ref0.where[index + 2].val
       break
     }
   }
@@ -115,14 +118,12 @@ const _addDraftDataFromExistingDraft = async req => {
  * Generic Handler for before NEW requests.
  */
 const _new = async function (req) {
-  if (isDraftActivateAction(req)) return // REVISIT: How can NEW be draftActivate???
-
   if (isNavigationToMany(req)) {
-    // REVISIT: How can NEW be a navigation to many?
     const result = await _addDraftDataFromExistingDraft(req)
 
     // in order to fix corner case where active subitems are created in draft case
     if (result.length === 0) req.reject(404)
+
     return
   }
 
@@ -134,19 +135,17 @@ const _new = async function (req) {
 /**
  * Generic Handler for before PATCH and UPDATE requests.
  */
-const _patchUpdate = async function (req) {
-  if (isDraftActivateAction(req)) return
-
+const _patch = async function (req) {
   const result = await _addDraftDataFromExistingDraft(req)
 
-  // means that the draft does not exists
+  // no result means that the draft does not exist
   if (result.length === 0) req.reject(404)
 }
 
 /**
  * Generic Handler for before DELETE and CANCEL requests.
  */
-const _deleteCancel = async function (req) {
+const _cancel = async function (req) {
   await _addDraftDataFromExistingDraft(req)
 }
 
@@ -181,12 +180,12 @@ const _registerBoundActionHandlers = function (entityName, actions) {
 }
 
 _new._initial = true
-_patchUpdate._initial = true
-_deleteCancel._initial = true
+_patch._initial = true
+_cancel._initial = true
 
 module.exports = cds.service.impl((srv, entity) => {
   srv.before('NEW', entity, _new)
-  srv.before(['PATCH', 'UPDATE'], entity, _patchUpdate)
-  srv.before(['DELETE', 'CANCEL'], entity, _deleteCancel)
+  srv.before('PATCH', entity, _patch)
+  srv.before('CANCEL', entity, _cancel)
   _registerBoundActionHandlers.call(srv, entity.name, entity.actions)
 })

package/libx/_runtime/fiori/generic/prepare.js

@@ -39,7 +39,7 @@ const fioriGenericPrepare = async function (req) {
   if (!result) req.reject(404)
   if (result.draftAdmin_inProcessByUser !== req.user.id) {
     // REVISIT: security log?
-    req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER')
+    req.reject(403, 'DRAFT_LOCKED_BY_ANOTHER_USER', [result.draftAdmin_inProcessByUser])
   }
   delete result.draftAdmin_inProcessByUser
   return result

package/libx/_runtime/fiori/generic/read.js

@@ -787,7 +787,7 @@ const _getOrderByEnrichedColumns = (orderBy, columns, entity) => {
   const enrichedCol = []
 
   if (orderBy && orderBy.length > 1) {
-    const colNames = columns.map(el => el.ref[el.ref.length - 1])
+    const colNames = columns.filter(el => el.ref).map(el => el.ref[el.ref.length - 1])
 
     // REVISIT: GET Books?$select=title&$expand=NotBooks($select=pages)&$orderby=NotBooks/title - what's then?
     for (const el of orderBy) {