@sap/cds 9.6.0 → 9.6.1

package/CHANGELOG.md

@@ -4,6 +4,13 @@
 - The format is based on [Keep a Changelog](https://keepachangelog.com/).
 - This project adheres to [Semantic Versioning](https://semver.org/).
 
+## Version 9.6.1 - 2025-12-18
+
+### Fixed
+
+- Status check in case of non-existing subject
+- Gracefully handle bad value when calculating `@Core.OperationAvailable` from `@from`
+
 ## Version 9.6.0 - 2025-12-16
 
 ### Added

package/lib/compile/for/flows.js

@@ -13,12 +13,18 @@ const getFrom = action => {
 }
 
 function addOperationAvailableToActions(actions, statusEnum, statusElementName) {
-  for (const action of Object.values(actions)) {
+  action: for (const action of Object.values(actions)) {
     const fromList = getFrom(action)
-    const conditions = fromList.map(from => {
+    const conditions = []
+    for (const from of fromList) {
       const value = from['#'] ? statusEnum[from['#']]?.val ?? from['#'] : from
-      return `$self.${statusElementName} = ${typeof value === 'string' ? `'${value}'` : value}`
-    })
+      if (typeof value !== 'string') {
+        const msg = `Error while constructing @Core.OperationAvailable for action "${action.name}" of "${action.parent.name}". Value of @from must either be an enum symbol or a raw string.`
+        cds.log('cds|edmx').warn(msg)
+        continue action
+      }
+      conditions.push(`$self.${statusElementName} = '${value}'`)
+    }
     const condition = `(${conditions.join(' OR ')})`
     const parsedXpr = cds.parse.expr(condition)
     action['@Core.OperationAvailable'] ??= {
@@ -74,7 +80,7 @@ function addActionsToTarget(targetAnnotation, entity, actions) {
       identification.push({
         $Type: 'UI.DataFieldForAction',
         Action: `${entity._service.name}.${actionName}`,
-        Label: action["@Common.Label"] ?? action["@title"] ?? `{i18n>${actionName}}`,
+        Label: action['@Common.Label'] ?? action['@title'] ?? `{i18n>${actionName}}`,
         ...(entity['@odata.draft.enabled'] && {
           '@UI.Hidden': {
             '=': true,

package/libx/_runtime/common/generic/flows.js

@@ -9,24 +9,20 @@ const FLOW_PREVIOUS = '$flow.previous'
 
 const $transitions_ = Symbol.for('transitions_')
 
-function buildAllowedCondition(action, statusElementName, statusEnum) {
+function isCurrentStatusInFrom(result, action, statusElementName, statusEnum) {
   const fromList = getFrom(action)
-  const conditions = fromList.map(from => {
+  const allowed = fromList.filter(from => {
     const value = from['#'] ? (statusEnum[from['#']]?.val ?? statusEnum[from['#']]['$path'].at(-1)) : from
-    return `${statusElementName} = ${typeof value === 'string' ? `'${value}'` : value}`
+    return result[statusElementName] === value
   })
-  return `(${conditions.join(' OR ')})`
-}
-
-async function isCurrentStatusInFrom(subject, action, statusElementName, statusEnum) {
-  const cond = buildAllowedCondition(action, statusElementName, statusEnum)
-  const parsedXpr = cds.parse.expr(cond)
-  const dbEntity = await SELECT.one.from(subject).where(parsedXpr)
-  return dbEntity !== undefined
+  return allowed.length
 }
 
 async function checkStatus(subject, action, statusElementName, statusEnum) {
-  const allowed = await isCurrentStatusInFrom(subject, action, statusElementName, statusEnum)
+  const result = await SELECT.one.from(subject)
+  if (!result) cds.error(404)
+
+  const allowed = isCurrentStatusInFrom(result, action, statusElementName, statusEnum)
   if (!allowed) {
     const from = getFrom(action)
     const fromValues = JSON.stringify(from.flatMap(el => Object.values(el)))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/cds",
-  "version": "9.6.0",
+  "version": "9.6.1",
   "description": "SAP Cloud Application Programming Model - CDS for Node.js",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [