@sapui5/sap.suite.ui.generic.template 1.140.0 → 1.141.0

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/CRUDActionButtons.fragment.xml

@@ -28,30 +28,37 @@
 					<core:CustomData key="deleteButtonId" value="{deleteAction>id}"/>
 				</customData>
 			</template:if>
-			<Button id="{deleteAction>id}"
-				text="{deleteAction>text}"
-				press="{deleteAction>press}"
-				fesr:press="fe:deleteItem"
-				type="Transparent"
-				ariaHasPopup="{deleteAction>ariaHasPopup}"
-				enabled="{deleteAction>enabled}"
-				visible="{= ${path: 'objectPageTableSettings>value/inlineDelete'} ? 'false' : ${parameter>/isDraftEnabled} ? '{= ${ui>/editable} }' : '{= !${ui>/editable} }'}">
-				<template:if test="${deleteAction>isStandardAction}">
-					<template:then>
-						<customData>
-							<core:CustomData key="Type" value="CRUDActionDelete"/>
-						</customData>
-					</template:then>
-					<template:else>
-						<template:if test="!${deleteAction>enabled}">
-							<core:CustomData key="Type" value="CRUDActionDelete"/>
-						</template:if>
-						<layoutData>
-							<OverflowToolbarLayoutData priority="{path: 'deleteAction>importance', formatter: 'AH.getToolbarButtonPriorityFromImportance'}"/>
-						</layoutData>
-					</template:else>
-				</template:if>
-			</Button>
+				<Button id="{deleteAction>id}"
+					text="{deleteAction>text}"
+					press="{deleteAction>press}"
+					fesr:press="fe:deleteItem"
+					type="Transparent"
+					ariaHasPopup="{deleteAction>ariaHasPopup}"
+					enabled="{deleteAction>enabled}"
+					visible="{parts: [
+									{path: 'listEntitySet>'},
+									{path: 'entitySet>'},
+									{path: 'objectPageTableSettings>value/inlineDelete'},
+									{path:'parameter>/isDraftEnabled'}
+									], formatter: 'AH.checkForDeleteRetriction'}">
+					<template:if test="${deleteAction>isStandardAction}">
+						<template:then>
+							<customData>
+								<core:CustomData key="Type" value="CRUDActionDelete"/>
+							</customData>
+						</template:then>
+						<template:else>
+							<template:if test="!${deleteAction>enabled}">
+								<core:CustomData key="Type" value="CRUDActionDelete"/>
+							</template:if>
+							<layoutData>
+								<OverflowToolbarLayoutData priority="{path: 'deleteAction>importance', formatter: 'AH.getToolbarButtonPriorityFromImportance'}"/>
+							</layoutData>
+						</template:else>
+					</template:if>
+				</Button>
 		</template:with>
 	</template:if>
 </core:FragmentDefinition>
+
+<!-- visible="{= ${path: 'objectPageTableSettings>value/inlineDelete'} ? 'false' : ${parameter>/isDraftEnabled} ? '{= ${ui>/editable} }' : '{= !${ui>/editable} }'}" -->

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/SmartForm.fragment.xml

@@ -21,7 +21,7 @@
 			<core:CustomData key="defaultDropDownDisplayBehaviour" value="descriptionOnly" />
 			<core:CustomData key="defaultTextInEditModeSource" value="ValueListNoValidation" />
 			<core:CustomData key="dateFormatSettings" value='\{"UTC":true,"style":"medium"\}' />
-			<core:CustomData key="smartFormAriaLabel" value="{parts: [{path: 'facet>'}, {path: 'entitySet>name'}], formatter: 'AH.getSmartFormTitle'}" />
+			<core:CustomData key="smartFormAriaLabel" value="{parts: [{path: 'facet>'}, {path: 'entitySet>name'},  {path: 'block>'}, {path: 'subSectionData>'}], formatter: 'AH.getSmartFormTitle'}" />
 		</sfo:customData>
 		<sfo:layout>
 			<template:if test="{= ${appSettings>/useColumnLayoutForSmartForm} !== false}">

package/src/sap/suite/ui/generic/template/QuickCreate/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.140.0"
+			"version": "1.141.0"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickView/manifest.json

@@ -6,7 +6,7 @@
 	"type": "component",
 	"i18n": "i18n/i18n.properties",
 	"applicationVersion": {
-		"version": "1.140.0"
+		"version": "1.141.0"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/fragments/ToolbarButton.fragment.xml

@@ -22,6 +22,7 @@
                         <core:CustomData key="InvocationGrouping" value="{= ${dataField>InvocationGrouping/EnumMember}}"/>
                         <template:with path="dataField>Action" helper="AHModel.gotoFunctionImport" var="action">
                             <core:CustomData key="ActionFor" value="{action>sap:action-for}" />
+                             <core:CustomData key="IsNavigateToInstance" value="{parts: [{path: 'parameter>/settings/sections/'}, {path: 'dataField>'}], formatter: 'AH.getNavigateToInstanceForDataFieldForAction'}" />
                         </template:with>
                     </customData>
                 </Button>

package/src/sap/suite/ui/generic/template/js/AnnotationHelper.js

@@ -2862,6 +2862,25 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			return sNavigationPropertyPath;
 		},
 
+		checkForDeleteRetriction: function(oInterface, oRelatedEntitySet, oSourceEntitySet, isInline, isDraftEnabled) {
+			var oModel = oInterface.getInterface(0).getModel();
+			// The delete button in the table header is not required, as deletions will be handled via the inline delete button.
+			if (isInline) {
+				return false;
+			}
+			var sPath = isDraftEnabled ? "{= ${ui>/editable}" : "{= !${ui>/editable}";
+			var oRestrictionSetViaNavRestrictions = oAnnotationHelper.handleNavigationRestrictions(oModel, oSourceEntitySet, oRelatedEntitySet, "Deletable");
+			if (oRestrictionSetViaNavRestrictions?.Deletable) {
+				if (oRestrictionSetViaNavRestrictions?.Deletable?.Bool === "false") {
+					return false;
+				}
+				if (oRestrictionSetViaNavRestrictions?.Deletable?.Path) {
+					sPath = sPath + " && ${" + oRestrictionSetViaNavRestrictions?.Deletable?.Path + "}";
+				}
+			}
+			return sPath + "}";
+		},
+
 		areBooleanRestrictionsValidAndPossible: function (oInterface, mRestrictions, oRelatedEntitySet, sRestrictionType, sSourceEntitySet, bOnlyValidityCheck) {
 			var oSourceEntitySet;
 			var oModel = oInterface.getInterface(0).getModel();
@@ -4415,6 +4434,24 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			return sActionPress;
 		},
 
+		getNavigateToInstanceForDataFieldForAction: function (oSections, oDataField) {
+			if (!oSections || !oDataField || !oDataField.Action || !oDataField.Action.String) {
+				return undefined;
+			}
+			var actionKey = oDataField.Action.String.split("/")[1];
+			for (var sectionKey in oSections) {
+				var actions = oSections[sectionKey]?.annotatedActions;
+				if (!actions) {
+					continue;
+				}
+				var action = actions[actionKey];
+				if (action && action.afterExecution && typeof action.afterExecution.navigateToInstance !== "undefined") {
+					return action.afterExecution.navigateToInstance;
+				}
+			}
+			return undefined;
+		},
+
 		/**
 		 * A side effect should get triggered directly if a value is selected for a field like value help/combo box, checkbox, date picker, datetime picker
 		 * provided a side effect is defined on this field. However this should be only done if the side effect has only one source property (the source property must
@@ -4543,10 +4580,31 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			};
 		},
 
-		getSmartFormTitle: function(oInterface, oFacet, sEntitySetName) {
+		getSmartFormTitle: function(oInterface, oFacet, sEntitySetName, oBlock, oSubSectionData) {
 			if (!oFacet) {
+				return oAnnotationHelper.getTitleForSectionsForms(oBlock, oSubSectionData);
+			}
+			return oAnnotationHelper.getTitleForHeaderForm(oInterface, oFacet, sEntitySetName);
+		},
+
+		getTitleForSectionsForms: function(oBlock, oSubSectionData) {
+			if (oSubSectionData?.annotations?.Facet?.annotation?.Facets?.length > 1
+				|| oSubSectionData?.annotations?.Facet?.annotation?.Label?.String !== oBlock?.aggregations?.groups[0]?.annotations?.Facet?.annotation?.Label?.String
+			) {
+				// In case Section -> SubSection have more than one form, SmartForm will have it's titles visible
+				// or
+				// SubSectin title !== SmartForm title, SmartForm title will also be visible
 				return;
 			}
+			if (oBlock?.aggregations?.groups[0]?.annotations?.Facet?.annotation?.Label?.String !==  oBlock?.aggregations?.groups[0]?.targetAnnotation?.Label?.String) {
+				// Compare SmartForm title !== FiledGroup title
+				// if they differs -> use FiledGoup title
+				return oBlock?.aggregations?.groups[0]?.targetAnnotation?.Label?.String;
+			}
+			return;
+		},
+
+		getTitleForHeaderForm: function(oInterface, oFacet, sEntitySetName) {
 			if (oFacet.Target && oFacet.Target.AnnotationPath && oFacet.Target.AnnotationPath.indexOf("com.sap.vocabularies.UI.v1.DataPoint") > -1) {
 				// Process DataPoint case
 				var { sAnnotationPath, oEntityType } = oAnnotationHelper.getModelData(oInterface, oFacet.Target.AnnotationPath, sEntitySetName);
@@ -4612,6 +4670,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 	oAnnotationHelper.getProgressIndicatorTooltip.requiresIContext = true;
 	oAnnotationHelper.buildExpressionForProgressIndicatorCriticality.requiresIContext = true;
 	oAnnotationHelper.areBooleanRestrictionsValidAndPossible.requiresIContext = true;
+	oAnnotationHelper.checkForDeleteRetriction.requiresIContext = true;
 	oAnnotationHelper.isRelatedEntityCreatable.requiresIContext = true;
 	oAnnotationHelper.isCreationAllowedByBoolAndPathRestrictions.requiresIContext = true;
 	oAnnotationHelper.buildBreadCrumbExpression.requiresIContext = true;

package/src/sap/suite/ui/generic/template/lib/AppComponent.js

@@ -945,7 +945,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.140.0
+	 * @version 1.141.0
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {

package/src/sap/suite/ui/generic/template/lib/CRUDManager.js

@@ -643,8 +643,10 @@ sap.ui.define(["sap/ui/base/Object",
 				}
 			}
 
-			function callActionImpl(mParameters, oState, fnResolve, fnReject){
-				if (oBusyHelper.isBusy()){
+			async function callActionImpl(mParameters, oState, fnResolve, fnReject){
+				// Standardize the extension API flag access
+				const bInvokedByExtensionApi = mParameters.bInvokedByExtensionApi || false;
+				if (oBusyHelper.isBusy() && !bInvokedByExtensionApi) {
 					fnReject();
 					return;
 				}
@@ -656,6 +658,7 @@ sap.ui.define(["sap/ui/base/Object",
 				var aWarningIndex = [];
 				var aCurrentContexts = mParameters.contexts || [];
 				var oSourceControlHandler = mParameters.sourceControlHandler;
+				let bCallerSuppliedContexts = aCurrentContexts.length > 0;
 				// Code to support context Independent actions with parameter
 				// If the context is not present then a new context will be created.
 				if (aCurrentContexts.length === 0 && oSourceControlHandler) {
@@ -670,10 +673,12 @@ sap.ui.define(["sap/ui/base/Object",
 				var fnCleanUpContext =  function(){
 					// remove pending request from the last change of the model
 					// actually, this should rather be done by ActionUtil itself
-					if (aCurrentContexts[0]){
-						var oModel = aCurrentContexts[0].oModel;
-						if (oModel && oModel.hasPendingChanges()){
-							oModel.resetChanges();
+					if (!bInvokedByExtensionApi){
+						if (aCurrentContexts[0]){
+							var oModel = aCurrentContexts[0].oModel;
+							if (oModel && oModel.hasPendingChanges()){
+								oModel.resetChanges();
+							}
 						}
 					}
 				};
@@ -730,14 +735,32 @@ sap.ui.define(["sap/ui/base/Object",
 						operationGrouping: sOperationGrouping,
 						handleFocus: oServices.controllerServices && oServices.controllerServices.getRestoreFocusHelper
 								? oServices.controllerServices.getRestoreFocusHelper().rememberFocus
-								: null
+								: null,
+						actionParameters: mParameters.urlParameters,
+						invokedByExtensionApi: bInvokedByExtensionApi
 					});
 					oActionProcessor.call(bIsStrict).then(function(oResult){
 						var oSessionParams = {};
 						oSessionParams.actionLabel = sFunctionImportLabel;
 						oServices.oApplication.setNextFocus(Function.prototype);
-						oBusyHelper.setBusy(oResult.executionPromise, null, oSessionParams);
-						oResult.executionPromise.then(fnHandleResponse,fnHandleResponse);
+						// Skip busy state management for extension API-invoked actions.
+						// This allows extension consumers to handle their own loading states and transient message processing,
+						// preventing conflicts with the framework's automatic message handling.
+						const bShouldManageBusyState = !bInvokedByExtensionApi;
+						if (bShouldManageBusyState) {
+							oBusyHelper.setBusy(oResult.executionPromise, null, oSessionParams);
+						}
+						// Handle the result of the action execution promise:
+						// On success, process the response with fnHandleResponse.
+						// On error, also process the response, then reject the outer promise if the UI is still busy (prevents unresolved busy states).
+						oResult.executionPromise.then((vResponse) => {
+							fnHandleResponse(vResponse);
+						}).catch((vResponse) => {
+							fnHandleResponse(vResponse);
+							if (oBusyHelper.isBusy() && bInvokedByExtensionApi) {
+								fnReject();
+							}
+						});
 					}, fnActionPopUpReject);
 
 					var fnHandleResponse = function(vResponse) {
@@ -767,11 +790,59 @@ sap.ui.define(["sap/ui/base/Object",
 								// Cache the error message to avoid duplicate display later
 								MessageUtils.cacheWarningMessage(oErrorReponse.error);
 							}
-						});
+						});						
 						fnShowWarningPopupIfRequired(oParsedResult.aMessagesForUserDecision, fnDone.bind(null, aResponse));
 					};
 					var fnDone = function(aResponses){
 						var aTotalResp = aFailed.concat(aSuccess.concat(aWarning));
+						if (bInvokedByExtensionApi) {
+							// If the action is triggered via the extension API, format the response(s) in a way expected by extension consumers.
+							// Helper to build the response object for each action result.
+							const buildResponse = (oResponse) => {
+								// Check if the action was executed successfully using the action processor's status
+								if (oActionProcessor.getExecutedSuccessfully()) {
+									// Create a standardized success response object containing the essential data
+									const oBaseResponse = {
+										context: oResponse.context,
+										response: oResponse.response,
+										data: oResponse.data
+									};
+									// If the caller provided specific contexts, include the actionContext in the response.
+									if (bCallerSuppliedContexts) {
+										return {
+											actionContext: oResponse.actionContext,
+											response: oBaseResponse
+										};
+									}
+									return { response: oBaseResponse };
+								} else {
+									// Handle error scenarios, create error response structure
+									const oErrorResponse = {
+										error: {
+											response: oResponse.response
+										}
+									};
+									// If the caller provided specific contexts, include the actionContext in the response.
+									if (bCallerSuppliedContexts) {
+										return {
+											actionContext: oResponse.actionContext,
+											...oErrorResponse
+										};
+									}
+									return oErrorResponse;
+								}
+							};
+							let aFinalResponses = aTotalResp.map(buildResponse);
+							oServices.oApplication.setNextFocus(() => {
+								MessageUtils.clearWarningCache();
+							});
+							if (oActionProcessor.getExecutedSuccessfully()) {
+								fnResolve(aFinalResponses);
+							} else {
+								fnReject(aFinalResponses);
+							}
+							return;
+						}
 						if (aTotalResp.length > 1){
 							// case for multiple selection. Some of them may fail or throw warning, so show a hint if any warning occurs.
 							var bWarningOccured = aWarning.length > 0;
@@ -817,7 +888,7 @@ sap.ui.define(["sap/ui/base/Object",
 								oContextInfo = oServices.oApplication.registerContext(oResponseContext);
 							}
 
-							if (oResponseContext && oResponseContext !== oActionContext && oResponseContext.getPath() !== "/undefined"){
+							if (oResponseContext && oResponseContext !== oActionContext && oResponseContext.getPath() !== "/undefined" && mParameters.navigateToInstance !== "false"){
 								oServices.oApplication.setNextFocus(function(oBeforeData, fnFallback){
 									// Clear any cached error messages since the action has completed
 									MessageUtils.clearWarningCache();
@@ -825,7 +896,8 @@ sap.ui.define(["sap/ui/base/Object",
 										ignorePersistence: true
 									});
 								});
-								oServices.oApplication.navigateToDetailContextIfPossible(oResponseContext, false, oContextInfo.bIsDraft ? 2 * (1 + oContextInfo.bIsCreate) : 1, oContextInfo);
+								var bIsDeterminingAction = mParameters.actionType === "determining";
+								oServices.oApplication.navigateToDetailContextIfPossible(oResponseContext, bIsDeterminingAction, oContextInfo.bIsDraft ? 2 * (1 + oContextInfo.bIsCreate) : 1, oContextInfo);
 							}	else {
 								// Restore focus, because we don't navigate out
 								oServices.oApplication.setNextFocus(function(oBeforeData, fnFallback){
@@ -852,7 +924,15 @@ sap.ui.define(["sap/ui/base/Object",
 						}
 					};
 				};
-				fnInvokeAction(true, bWithWarningDialog, aCurrentContexts);
+				// Determine whether to invoke the action with strict handling (412 support)
+				// If `mParameters.bStrict` is `undefined`, assume it's an annotation-based action and enable strict mode by default (`true`). This ensures standard behaviour.
+				// If `mParameters.bStrict` is explicitly defined (e.g., via extension API or other sources),
+				// use its value to determine whether strict mode (and thus 412 support) should be enabled.
+				if (mParameters.bStrict === undefined){
+					fnInvokeAction(true, bWithWarningDialog, aCurrentContexts);
+				} else {
+					fnInvokeAction(mParameters.bStrict, bWithWarningDialog, aCurrentContexts);
+				}
 			}
 
 			/*
@@ -871,7 +951,7 @@ sap.ui.define(["sap/ui/base/Object",
 			 * @public
 			 */
 			function callAction(mParameters, oState) {
-				var oModel = oController.getView().getModel();
+				var oModel = oController.getView().getModel() || mParameters.oModelFromExtensionApi;
 				var oMetaModel = oModel.getMetaModel();
 				var oComponent = oController.getOwnerComponent();
 				var sEntitySet = oComponent.getEntitySet();
@@ -882,6 +962,9 @@ sap.ui.define(["sap/ui/base/Object",
 				var oEntityType = oMetaModel.getODataEntityType(sEntityType);
 				mParameters.functionImport = oFunctionImport;
 				mParameters.entityType = oEntityType;
+				if (!mParameters?.label && oFunctionImport?.["name"]) {
+					mParameters.label = oFunctionImport["name"];
+				}
 				if (sFunctionImportReturnType === sEntityType) {
 					var oAppComponent = oComponent.getAppComponent();
 					var oOPComponentUtils = oServices.oApplication.getComponentUtilsIfLoaded(sEntitySet); // oOPComponentUtils would differ from oComponentUtils if this instance belongs to the root page

package/src/sap/suite/ui/generic/template/lib/CommonEventHandlers.js

@@ -2177,7 +2177,8 @@ sap.ui.define(["sap/ui/base/Object",
 					sourceControl: oSourceControl,
 					label: oCustomData.Label,
 					operationGrouping: oCustomData.InvocationGrouping,
-					skipProperties: oSkipProperties
+					skipProperties: oSkipProperties,
+					navigateToInstance: oCustomData.IsNavigateToInstance
 				}, oState, sEntitySet);
 			}
 		}
@@ -2303,7 +2304,8 @@ sap.ui.define(["sap/ui/base/Object",
 					sourceControlHandler: oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oCommonUtils.getOwnerPresentationControl(oControl)),
 					label: mParams.label,
 					operationGrouping: mParams.operationGrouping,
-					skipProperties: mParams.skipProperties
+					skipProperties: mParams.skipProperties,
+					navigateToInstance: mParams.navigateToInstance
 				}, oState).then(function(aResponses) {
 					if (aResponses) {
 						aResponses.some(function(oResponse){

package/src/sap/suite/ui/generic/template/lib/CommonUtils.js

@@ -1511,13 +1511,19 @@ sap.ui.define(["sap/ui/base/Object",
 		 * @param {map} [mUrlParameters] The URL parameters (name-value pairs) for the function or action. This is not in oSettings for backward compatibility
 		 * @param {object} oSettings Parameters that are set for invoking Application controller's invokeActions method
 		 * @param {boolean} oSettings.bInvocationGroupingChangeSet Determines whether the common or unique changeset gets sent in batch
+ 		 * @param {string} [oSettings.sLabel=""] Optional label for the Function Import.
+		 * * This label is only used when action is invoked in strict mode and HTTP 412 (Precondition Failed) handling is required.
+ 		 * * If not provided, the Function Import name is used as the default label.
+ 		 * @param {boolean} [oSettings.bStrict=false] Optional flag to indicate whether the action should be invoked in strict mode. Defaults to <code>false</code>.
 		 * @returns {Promise} A <code>Promise</code> for asynchronous execution of the action, resolving to the same result as the <code>Promise</code>
-		 * returned from {@link sap.ui.generic.app.ApplicationController}
 		 * @throws {Error} Throws an error if the OData function import does not exist or the action input parameters are invalid
 		 * @public
 		 */
 		function fnInvokeActionsForExtensionAPI (sFunctionName, vContext, mUrlParameters, oSettings, oState) {
-			var aContext, mParameters = {};
+			var aContext;
+			let sOperationGrouping = oSettings?.bInvocationGroupingChangeSet ? "com.sap.vocabularies.UI.v1.OperationGroupingType/ChangeSet" : "";
+			let sLabel = oSettings?.sLabel ?? "";
+			let bStrict = oSettings?.bStrict ?? false;
 			if (!vContext) {
 				aContext = [];
 			} else if (Array.isArray(vContext)) {
@@ -1525,17 +1531,19 @@ sap.ui.define(["sap/ui/base/Object",
 			} else {
 				aContext = [ vContext ];
 			}
-			if (mUrlParameters) {
-				mParameters.urlParameters = mUrlParameters;
-			}
-			if (oSettings && oSettings.bInvocationGroupingChangeSet) {
-				mParameters.operationGrouping = "com.sap.vocabularies.UI.v1.OperationGroupingType/ChangeSet";
-			}
-			mParameters.triggerChanges = oComponentUtils.isDraftEnabled();
 			//Execute floorplan specific logic before invokeaction is executed
 			oComponentUtils.executeBeforeInvokeActionFromExtensionAPI(oState);
-			//call invokeActions method
-			var oPromise = oServices.oApplicationController.invokeActions(sFunctionName, aContext, mParameters);
+			const oPromise = oServices.oCRUDManager.callAction({
+				"contexts": aContext,
+				"functionImportPath": sFunctionName,
+				"label": sLabel,
+				"operationGrouping": sOperationGrouping,
+				"skipProperties": {},
+				"urlParameters": mUrlParameters,
+				"bStrict": bStrict,
+				"bInvokedByExtensionApi": true,
+				"oModelFromExtensionApi": oController.getOwnerComponent()?.getModel()
+			}, oState);
 			if (oSettings && oSettings.bSetBusy) {
 				oComponentUtils.getBusyHelper().setBusy(oPromise);
 			}
@@ -1999,7 +2007,8 @@ sap.ui.define(["sap/ui/base/Object",
 						contexts: aContexts,
 						sourceControlHandler: oPresentationControlHandler,
 						label: oCustomData.Label,
-						operationGrouping: ""
+						operationGrouping: "",
+						actionType: oCustomData.ActionType
 					}).then(function(aResponses) {
 						if (aResponses && aResponses.length > 0) {
 							var oResponse = aResponses[0];

package/src/sap/suite/ui/generic/template/lib/i18n/i18n.properties

@@ -713,7 +713,7 @@ EASY_FILL_SECOND_LABEL_TEXT = Use data sources like spreadsheets, notes, and ema
 EASY_FILL_TEXTAREA_PLACEHOLDER = Provide the required information using data sources or by typing
 
 # XTXT: EasyFill initial Illustration title
-EASY_FILL_ILLUSTRATION_TITLE_INITIAL = Let's fill in some fields
+EASY_FILL_ILLUSTRATION_TITLE_INITIAL = Let\u2019s fill in some fields
 
 # XTXT: EasyFill initial Illustration description 
 EASY_FILL_ILLUSTRATION_DESCRIPTION_INITIAL = Start by providing the required information to see the proposed results.
@@ -722,13 +722,13 @@ EASY_FILL_ILLUSTRATION_DESCRIPTION_INITIAL = Start by providing the required inf
 EASY_FILL_ILLUSTRATION_TITLE_NO_ENTRIES = No fields filled in
 
 # XTXT: EasyFill no entries Illustration description
-EASY_FILL_ILLUSTRATION_DESCRIPTION_NO_ENTRIES = We couldn''t match your query to any of the existing fields.
+EASY_FILL_ILLUSTRATION_DESCRIPTION_NO_ENTRIES = We couldn\u2019t match your query to any of the existing fields.
 
 # XTXT: EasyFill error Illustration title
 EASY_FILL_ILLUSTRATION_TITLE_ERROR = Unable to fill in the fields
 
 # XTXT: EasyFill error Illustration description
-EASY_FILL_ILLUSTRATION_DESCRIPTION_ERROR =It looks like an error occurred. Try again and if that doesn''t help, check with your administrator.
+EASY_FILL_ILLUSTRATION_DESCRIPTION_ERROR =It looks like an error occurred. Try again and if that doesn\u2019t help, check with your administrator.
 
 # XTXT: EasyFill save
 EASY_FILL_SAVE = Save
@@ -746,7 +746,7 @@ EASY_FILL_FILLED_FIELDS = Filled Fields
 EASY_FILL_UNABLE_FILL = Unable to Fill
 
 # XTXT: EasyFill warning message
-EASY_FILL_WARNING_MESSAGE = The fields couldn’t be filled in, for example because they are read-only fields or because you’re not authorized to change them.
+EASY_FILL_WARNING_MESSAGE = The fields couldn\u2019t be filled in, for example because they are read-only fields or because you\u2019re not authorized to change them.
 
 # XTXT: EasyFill proposed values
 EASY_FILL_PROPOSED_VALUES = Proposed Values
@@ -758,7 +758,7 @@ EASY_FILL_PREVIOUS_VALUES = Previous Values
 EASY_FILL_POPOVER_AI_TEXT_1=The content was partially or fully generated by artificial intelligence(AI) technologies.
 
 # XTXT: EasyFill AINotice link popover text
-EASY_FILL_POPOVER_AI_TEXT_2=The AI-generated content may contain inaccuracies due to using multiple information sources.Verify results before use.
+EASY_FILL_POPOVER_AI_TEXT_2=The AI-generated content may contain inaccuracies due to using multiple information sources. Verify results before use.
 
 # XTXT: EasyFill Popover title
 EASY_FILL_POPOVER_AI_TITLE=Created with AI

package/src/sap/suite/ui/generic/template/lib/navigation/NavigationController.js

@@ -3223,7 +3223,7 @@ sap.ui.define(["sap/ui/base/Object",
 	 * @param {sap.suite.ui.generic.template.lib.AppComponent} oAppComponent The AppComponent instance
 	 * @public
 	 * @extends sap.ui.base.Object
-	 * @version 1.140.0
+	 * @version 1.141.0
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

package/src/sap/suite/ui/generic/template/lib/presentationControl/SmartTableHandler.js

@@ -582,7 +582,7 @@ sap.ui.define([
 			const getFieldProps = function (sField) {
 				return {
 					"sProperty": sField,
-					"sLabel": mPropertyByFieldName[sField]["sap:label"],
+					"sLabel": (mPropertyByFieldName[sField]["com.sap.vocabularies.Common.v1.Label"] || "").String || mPropertyByFieldName[sField]["sap:label"] || "",
 					"sValue": oItemContext.getProperty(sField),
 					"bHidden": !aVisibleColumns.has(sField)
 				};

package/src/sap/suite/ui/generic/template/library.js

@@ -66,7 +66,7 @@ sap.ui.define([
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.140.0",
+		version: "1.141.0",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {

package/src/sap/suite/ui/generic/template/listTemplates/controller/SmartChartController.js

@@ -3,8 +3,9 @@ sap.ui.define(["sap/ui/core/mvc/Controller",
 	"sap/suite/ui/generic/template/genericUtilities/FeLogger",
 	"sap/base/util/merge",
 	"sap/base/util/deepExtend",
-	"sap/ui/Device"
-], function(Controller, listUtils, FeLogger, merge, deepExtend, Device) {
+	"sap/ui/Device",
+	"sap/ui/core/theming/Parameters"
+], function(Controller, listUtils, FeLogger, merge, deepExtend, Device, ThemingParameters) {
 		"use strict";
 	    var oLogger = new FeLogger("listTemplates.controller.SmartChartController").getLogger();
 		var oVizProperties = {};
@@ -99,6 +100,7 @@ sap.ui.define(["sap/ui/core/mvc/Controller",
 					var oComponent = this.oState.oController.getOwnerComponent();
 					var bShowDatalabel = oComponent && oComponent.getChartSettings() && oComponent.getChartSettings().showDataLabel;
 					bEnableStableColors = oComponent && oComponent.getChartSettings() && oComponent.getChartSettings().enableStableColors;
+					var sColor = ThemingParameters.get("sapTextColor");
 					oVizProperties = {
 							"legendGroup":{
 								"layout":{
@@ -111,7 +113,7 @@ sap.ui.define(["sap/ui/core/mvc/Controller",
 								},
 								"title": {
 									"style": {
-										"color": "@sapTextColor"
+										"color": sColor
 									}
 								}
 							}