@sap/cds 6.4.1 → 6.6.0

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

@@ -11,7 +11,7 @@ const _redirectXpr = (xpr, localize) => {
       }
 
       if (ele.SELECT) {
-        redirect(ele.SELECT, localize)
+        if (!ele._suppressLocalization) redirect(ele.SELECT, localize)
       }
     })
 }

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

@@ -112,9 +112,11 @@ const fioriGenericActivate = async function (req) {
     req.query.SELECT.from.ref.length > 2 ||
     !isDraftRootEntity(this.model.definitions, ensureNoDraftsSuffix(req.target.name))
   ) {
-    req.reject(400)
+    req.reject(400, 'Action "draftActivate" can only be called on the root draft entity')
   }
 
+  if (!cds.db) req.reject('NO_DATABASE_CONNECTION')
+
   const { draftData, activeData, adminData } = await _draftCompositionTree(this, req)
 
   if (!draftData) req.reject(404)
@@ -174,6 +176,10 @@ const fioriGenericActivate = async function (req) {
     })
   ])
 
+  // REVISIT: we need to use okra API here because it must be set in the batched request
+  // status code must be set in handler to allow overriding for FE V2
+  req?._?.odataRes.setStatusCode(201)
+
   return result
 }
 

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

@@ -78,6 +78,7 @@ const _getRoot = req => {
 }
 
 const _getDraftDataFromExistingDraft = async (req, root, isBoundAction) => {
+  if (!cds.db) req.reject('NO_DATABASE_CONNECTION')
   if (!root) return []
   if (root?.IsActiveEntity === false) {
     const query = _getSelectDraftDataCqn(root.entityName, root.where)
@@ -155,6 +156,13 @@ const _validateDraftBoundAction = async function (req) {
   if (result && result.length > 0) _validateDraft(req, result, isBoundAction)
 }
 
+const _allowEntityCollectionOnAction = action => {
+  return (
+    action['@cds.odata.bindingparameter.collection'] ||
+    (action.params && Object.values(action.params).some(e => e?.items?.type === '$self'))
+  )
+}
+
 const _registerBoundActionHandlers = function (entityName, actions) {
   if (!actions) return
 
@@ -164,7 +172,7 @@ const _registerBoundActionHandlers = function (entityName, actions) {
       action.name !== 'draftPrepare' &&
       action.name !== 'draftEdit' &&
       action.name !== 'draftActivate' &&
-      !action['@cds.odata.bindingparameter.collection']
+      !_allowEntityCollectionOnAction(action)
   )
 
   for (const action of boundActions) {

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

@@ -70,9 +70,11 @@ const _select = async (lockRecordCQN, draftExistsCQN, selectCQNs, req, dbtx) =>
  */
 const fioriGenericEdit = async function (req) {
   if (!isActiveEntityRequested(req.query.SELECT.where || [])) {
-    req.reject(400)
+    req.reject(400, 'Action "draftEdit" can only be called on the active entity')
   }
 
+  if (!cds.db) req.reject('NO_DATABASE_CONNECTION')
+
   const { definitions } = this.model
 
   // TODO replace with generic where filter
@@ -156,6 +158,11 @@ const fioriGenericEdit = async function (req) {
   }
 
   await Promise.all(insertCQNs.map(CQN => dbtx.run(CQN)))
+
+  // REVISIT: we need to use okra API here because it must be set in the batched request
+  // status code must be set in handler to allow overriding for FE V2
+  req?._?.odataRes.setStatusCode(201)
+
   return results[0][0]
 }
 

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

@@ -54,6 +54,8 @@ const fioriGenericNew = async function (req, next) {
     return onDraftActivate(req, next)
   }
 
+  if (!cds.db) req.reject('NO_DATABASE_CONNECTION')
+
   const navigationToMany = isNavigationToMany(req)
 
   const adminDataCQN = navigationToMany

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

@@ -61,6 +61,8 @@ const _joinDraftAdministrativeData = (selectResolved, target) => {
 const fioriGenericPatch = async function (req) {
   if (req.data.IsActiveEntity === true) req.reject(400, 'Patch can only be applied to a draft entity')
 
+  if (!cds.db) req.reject('NO_DATABASE_CONNECTION')
+
   const dbtx = cds.tx(req)
 
   const selectResolved = cqn2cqn4sql(_getSelectCQN(req), this.model)

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

@@ -16,6 +16,8 @@ const fioriGenericPrepare = async function (req) {
     req.reject(400, 'Action "draftPrepare" can only be called on a draft entity')
   }
 
+  if (!cds.db) req.reject('NO_DATABASE_CONNECTION')
+
   const target = ensureDraftsSuffix(req.target.name)
   const columns = getColumns(this.model.definitions[ensureNoDraftsSuffix(req.target.name)], {
     keysOnly: true,

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

@@ -18,6 +18,7 @@ const {
 } = require('../utils/handler')
 const { deleteCondition, readAndDeleteKeywords, removeIsActiveEntityRecursively } = require('../utils/where')
 const { adaptStreamCQN } = require('../../cds-services/adapter/odata-v4/utils/stream')
+const getError = require('../../common/error')
 
 const _findSubselect = where => {
   return where.find((e, i) => {
@@ -37,15 +38,16 @@ const _findRootSubSelectFor = query => {
 
 // append where with clauses from @restrict
 const _getWhereWithAppendedDraftRestrictions = (where = [], req) => {
+  const restrictions = []
   if (req.query._draftRestrictions) {
     for (const each of req.query._draftRestrictions) {
       const xpr = each._xpr
       if (each.target.name === ensureUnlocalized(req.target.name)) {
-        if (where.length) where.push('and')
         // restriction might contain or clause -> use xpr for grouping
-        xpr.includes('or') ? where.push({ xpr }) : where.push(...xpr)
+        if (restrictions.length) restrictions.push('or')
+        xpr.includes('or') ? restrictions.push({ xpr }) : restrictions.push(...xpr)
       } else {
-        // > restriction inherited from parent via autoexposure
+        // restriction inherited from parent via autoexposure
         // find inner most sub select if available and append restriction to where clause
         const rootSubSelect = _findRootSubSelectFor({ SELECT: { where } })
         if (rootSubSelect && rootSubSelect.SELECT.from) {
@@ -62,6 +64,10 @@ const _getWhereWithAppendedDraftRestrictions = (where = [], req) => {
     }
   }
 
+  if (restrictions.length) {
+    if (where.length) where.push('and', { xpr: restrictions })
+    else where.push(...restrictions)
+  }
   return where
 }
 
@@ -1177,7 +1183,7 @@ const _getOriginalColumns = req => {
   const originalColumns = {}
   // expanded columns are handled generically in db
   for (const c of req.query.SELECT.columns) {
-    originalColumns[c.ref ? c.ref[c.ref.length - 1] : c.as || c] = true
+    originalColumns[c.as || (c.ref && c.ref[c.ref.length - 1]) || c] = true
   }
 
   return originalColumns
@@ -1221,6 +1227,9 @@ const _postProcess = (result, req, cqnScenario, deleteLastChangeDateTime) => {
     }
   }
 
+  if (result.HasActiveEntity === null) result.HasActiveEntity = false
+  if (result.HasDraftEntity === null) result.HasDraftEntity = false
+  if (result.IsActiveEntity === null) result.IsActiveEntity = false
   return result
 }
 
@@ -1261,6 +1270,8 @@ const _adaptColumns4readAfterWrite = (req, cqnScenario, query4sql) => {
  * @param req
  */
 const fioriGenericRead = async function (req) {
+  if (!cds.db) req.reject('NO_DATABASE_CONNECTION')
+
   const query = req.query
   const originalFrom = _copyCQNPartial(query.SELECT.from)
 
@@ -1293,7 +1304,7 @@ const fioriGenericRead = async function (req) {
     cqnScenario = _generateCQN(reqClone, nonDraftColumns, originalFrom, this.model)
   }
 
-  if (!cqnScenario) req.reject(400)
+  if (!cqnScenario) throw getError(501)
 
   // ensure base columns for calculation are selected in draft admin expand
   _adaptDraftAdminExpand(cqnScenario.cqn)

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

@@ -109,6 +109,8 @@ const _shouldReadOverDraft = (req, definitions) => {
  * @returns {Promise<Array>}
  */
 const _readOverDraftHandler = async function (req, next) {
+  if (!cds.db) req.reject('NO_DATABASE_CONNECTION')
+
   const definitions = this.model.definitions
 
   // determine whether the request is handled here (read over draft handler),