@sapui5/sap.suite.ui.generic.template 1.147.1 → 1.148.0

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

@@ -23,36 +23,59 @@
 
 		<template:if test="{= ${parameter>/isDraftEnabled} &amp;&amp; ${entitySet>com.sap.vocabularies.Common.v1.DraftRoot} }">
 			<template:if test="{= !${device>/system/desktop} &amp;&amp; (${device>/system/tablet} || ${device>/system/phone})}">
-				<MenuButton id="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageAction', subType: 'ActivateMenu'})}"
-					text="{= ${ui>/createMode} ? ${i18n>CREATE} : ${i18n>SAVE}}"
-					buttonMode="Split"
-					defaultAction="._templateEventHandlers.onSave"
-					useDefaultActionOnly="true"
-					enabled="{ui>/enabled}"
-					type="Emphasized"
-					visible="{ui>/editable}">
-					<menu>
-						<Menu>
-							<MenuItem text="{i18n>VALIDATE_DRAFT}" press="._templateEventHandlers.onValidateDraft" />
-						</Menu>
-					</menu>
-				</MenuButton>
-			</template:if>
-
-			<template:with path="parameter>/templateSpecific/pageLevelActions/commandExecution/Save" var="saveAction">
-				<Button id="{saveAction>id}"
-					text="{saveAction>text}"
-					type="{saveAction>type}"
-					enabled="{ui>/enabled}"
-					fesr:press="fe:save"
-					press="{saveAction>press}"
-					visible="{saveAction>visible}" />
-					<template:if test="!${saveAction>isStandardAction}">
-						<layoutData>
-							<OverflowToolbarLayoutData priority="{path: 'saveAction>importance', formatter: 'AH.getToolbarButtonPriorityFromImportance'}"/>
-						</layoutData>
+				<template:then>
+					<template:with path="parameter>/templateSpecific/pageLevelActions/commandExecution/Save" var="saveAction">
+						<MenuButton id="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageAction', subType: 'ActivateMenu'})}"
+							text="{saveAction>text}"
+							buttonMode="Split"
+							defaultAction="._templateEventHandlers.onSave"
+							useDefaultActionOnly="true"
+							enabled="{ui>/enabled}"
+							type="Emphasized"
+							visible="{ui>/editable}">
+						<menu>
+							<Menu>
+								<template:if test="{= ${parameter>/templateSpecific/pageLevelActions/commandExecution/SaveAndBack} }">
+									<template:with path="parameter>/templateSpecific/pageLevelActions/commandExecution/SaveAndBack" var="saveAndBackAction">
+											<MenuItem id="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageAction', subType: 'ActivateAndBackMenu'})}"
+												text="{saveAndBackAction>text}"
+												press="{saveAndBackAction>callbackName}" />
+										</template:with>
+									</template:if>
+									<MenuItem text="{i18n>VALIDATE_DRAFT}" press="._templateEventHandlers.onValidateDraft" />
+								</Menu>
+							</menu>
+						</MenuButton>
+					</template:with>
+				</template:then>
+				<template:else>
+					<template:with path="parameter>/templateSpecific/pageLevelActions/commandExecution/Save" var="saveAction">
+						<Button id="{saveAction>id}"
+							text="{saveAction>text}"
+							type="{saveAction>type}"
+							enabled="{ui>/enabled}"
+							fesr:press="fe:save"
+							press="{saveAction>press}"
+							visible="{saveAction>visible}" />
+							<template:if test="!${saveAction>isStandardAction}">
+								<layoutData>
+									<OverflowToolbarLayoutData priority="{path: 'saveAction>importance', formatter: 'AH.getToolbarButtonPriorityFromImportance'}"/>
+								</layoutData>
+							</template:if>
+					</template:with>
+					<template:if test="{= ${parameter>/templateSpecific/pageLevelActions/commandExecution/SaveAndBack} }">
+						<template:with path="parameter>/templateSpecific/pageLevelActions/commandExecution/SaveAndBack" var="saveAndBackAction">
+							<Button id="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageAction', subType: 'CommonAction', sAction: 'saveAndBack'})}"
+								text="{saveAndBackAction>text}"
+								press="{saveAndBackAction>press}"
+								visible="{saveAndBackAction>visible}"
+								enabled="{ui>/enabled}"
+								fesr:press="fe:saveAndBack"
+								type="Transparent" />
+						</template:with>
 					</template:if>
-			</template:with>
+				</template:else>
+			</template:if>
 
 			<Button id="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageAction', subType: 'CommonAction', sAction: 'discard'})}"
 				text="{i18n>ST_DISCARD_DRAFT_BTN}"
@@ -70,20 +93,58 @@
 		</template:if>
 
 		<template:if test="{= !${parameter>/isDraftEnabled} }">
-			<template:with path="parameter>/templateSpecific/pageLevelActions/commandExecution/Save" var="saveAction">
-				<Button id="{saveAction>id}"
-					text="{saveAction>text}"
-					type="{saveAction>type}"
-					fesr:press="fe:save"
-					press="{saveAction>press}"
-					visible="{saveAction>visible}" />
-				<template:if test="!${saveAction>isStandardAction}">
-					<layoutData>
-						<OverflowToolbarLayoutData priority="{path: 'saveAction>importance', formatter: 'AH.getToolbarButtonPriorityFromImportance'}"/>
-					</layoutData>
-				</template:if>
-			</template:with>
+			<template:if test="{= !${device>/system/desktop} &amp;&amp; (${device>/system/tablet} || ${device>/system/phone}) &amp;&amp; ${parameter>/templateSpecific/pageLevelActions/commandExecution/SaveAndBack}}">
+				<template:then>
+					<template:with path="parameter>/templateSpecific/pageLevelActions/commandExecution/Save" var="saveAction">
+						<MenuButton id="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageAction', subType: 'ActivateMenu'})}"
+							text="{saveAction>text}"
+							buttonMode="Split"
+							defaultAction="{saveAction>callbackName}"
+							useDefaultActionOnly="true"
+							type="Emphasized"
+							visible="{saveAction>visible}">
+						<menu>
+							<Menu>
+								<template:if test="{= ${parameter>/templateSpecific/pageLevelActions/commandExecution/SaveAndBack} }">
+									<template:with path="parameter>/templateSpecific/pageLevelActions/commandExecution/SaveAndBack" var="saveAndBackAction">
+											<MenuItem id="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageAction', subType: 'ActivateAndBackMenu'})}"
+												text="{saveAndBackAction>text}"
+												press="{saveAndBackAction>callbackName}" />
+										</template:with>
+									</template:if>
+								</Menu>
+							</menu>
+						</MenuButton>
+					</template:with>
+				</template:then>
+				<template:else>
+					<template:with path="parameter>/templateSpecific/pageLevelActions/commandExecution/Save" var="saveAction">
+						<Button id="{saveAction>id}"
+							text="{saveAction>text}"
+							type="{saveAction>type}"
+							fesr:press="fe:save"
+							press="{saveAction>press}"
+							visible="{saveAction>visible}" />
+						<template:if test="!${saveAction>isStandardAction}">
+							<layoutData>
+								<OverflowToolbarLayoutData priority="{path: 'saveAction>importance', formatter: 'AH.getToolbarButtonPriorityFromImportance'}"/>
+							</layoutData>
+						</template:if>
+					</template:with>
 
+					<template:if test="{= ${parameter>/templateSpecific/pageLevelActions/commandExecution/SaveAndBack} }">
+						<template:with path="parameter>/templateSpecific/pageLevelActions/commandExecution/SaveAndBack" var="saveAndBackAction">
+							<Button id="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageAction', subType: 'CommonAction', sAction: 'saveAndBack'})}"
+								text="{saveAndBackAction>text}"
+								press="{saveAndBackAction>press}"
+								visible="{saveAndBackAction>visible}"
+								enabled="{ui>/enabled}"
+								fesr:press="fe:saveAndBack"
+								type="Transparent" />
+						</template:with>
+					</template:if>
+				</template:else>
+			</template:if>
 			<template:if test="{= ${parameter>/treeNode/level} === 1}">
 				<Button id="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageAction', subType: 'SaveAndEdit'})}"
 					text="{i18n>SAVE_AND_EDIT}"

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

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.147.1"
+			"version": "1.148.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.147.1"
+		"version": "1.148.0"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

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

@@ -5,6 +5,9 @@
             showValueHelp="._templateEventHandlers.onEasyFilterShowValueHelp"
             queryChanged="._templateEventHandlers.onEasyFilterQueryChanged"
             tokensChanged="._templateEventHandlers.onEasyFilterTokensChanged"
+            tokensChangedByUser="._templateEventHandlers.onEasyFilterTokensChangedByUser"
+            sortersChanged="._templateEventHandlers.onEasyFilterSortersChanged"
+            groupLevelsChanged="._templateEventHandlers.onEasyFilterGroupLevelsChanged"
             beforeQueryProcessing="._templateEventHandlers.onEasyFilterBeforeQueryProcessing"
             afterQueryProcessing="._templateEventHandlers.onEasyFilterAfterQueryProcessing"
             clearFilters="._templateEventHandlers.onEasyFilterClearFilters"

package/src/sap/suite/ui/generic/template/genericUtilities/controlHelper.js

@@ -1,29 +1,29 @@
 sap.ui.define([
-	"sap/ui/dom/getFirstEditableInput", 
+	"sap/ui/dom/getFirstEditableInput",
 	"sap/suite/ui/generic/template/genericUtilities/FeLogger",
 	"sap/ui/core/Element",
 	"sap/ui/table/plugins/MultiSelectionPlugin"
 ], function(getFirstEditableInput, FeLogger, Element, MultiSelectionPlugin) {
 		"use strict";
-		
+
 	var oFeLogger = new FeLogger("genericUtilities.controlHelper");
 	var oLogger = oFeLogger.getLogger();
-	
+
 	var byId = Element.getElementById;
-	
+
 	function isControlOfType(sPathToType, oControl){
 		var FNClass = sap.ui.require(sPathToType);
         return typeof FNClass === "function" && (oControl instanceof FNClass);
 	}
-	
+
 	function getUI5ControlForDomElement(oDom){
 	    for (; oDom; oDom = oDom.parentNode) {
 	        if (oDom.hasAttribute && oDom.hasAttribute("data-sap-ui")) {
 				return byId(oDom.id);
 	        }
-	    }		
+	    }
 	}
-	
+
 	function focusUI5Control(oControl, oFocusInfo){
 		if (oControl && oControl.focus) {
 			oLogger.debug("Set focus on control with id " + oControl.getId());
@@ -52,9 +52,9 @@ sap.ui.define([
 			if (oTest !== oControl){
 				oLogger.warning(oCurrentFocus ? ("Focus is now on control with id " + oCurrentFocus.getId()) : "There is no focus now");
 			}
-		}		
+		}
 	}
-	
+
 	function focusDom(oDom, oFocusInfo){
 		var oUi5Control = getUI5ControlForDomElement(oDom);
 		focusUI5Control(oUi5Control, oFocusInfo);
@@ -66,12 +66,12 @@ sap.ui.define([
 	}
 
 	// returns a Promise that resolves to the boolean information whether the SmartField is a possible focus target for input.
-	function getSmartFieldIsFocussableForInputPromise(oSmartField) {
+	function getSmartFieldIsFocussableForInputPromise(oSmartField, isSmartForm) {
 		return oSmartField._getComputedMetadata().then(function () {
 			return (oSmartField.getMode() === "edit") && (oSmartField._getICRenderedPromise() || Promise.resolve());
 		}).then(function () {
-			var oFirstFocusableInput = !oSmartField._bEdmBoolDetected && getFirstEditableInput(oSmartField.getDomRef());
-			return !(!oFirstFocusableInput || oFirstFocusableInput.type === "checkbox");
+			var oFirstFocusableInput = (!oSmartField._bEdmBoolDetected || isSmartForm) && getFirstEditableInput(oSmartField.getDomRef());
+			return !(!oFirstFocusableInput || (oFirstFocusableInput.type === "checkbox" && !isSmartForm));
 		}).catch(function () {
 			return false;
 		});
@@ -82,12 +82,12 @@ sap.ui.define([
 	function getControlWithFocus(){
 		return getUI5ControlForDomElement(document.activeElement);
 	}
-	
+
 	// Returns the parent of a given sap.ui.core.Element, but considers that for Components the parent is to be found via the oContainer property.
 	function getParent(oElement){
 		return oElement.getParent() || oElement.oContainer;
 	}
-	
+
 	// If oChild is identified to be invisible, null is returned. Otherwise its parent is returned.
 	// If the parent does not exist a faulty value is returned.
 	// This is a heuristic method.
@@ -113,7 +113,7 @@ sap.ui.define([
 		}
 		return vRet;
 	}
-	
+
 // Return a list of all children of the given control (in the 'correct' order). Only implemented for certain control types.
 	// For the other control types it returns null or an empty array depending on bAlwaysReturnAList.
 	function getChildren(oControl, bAlwaysReturnAList){
@@ -127,7 +127,7 @@ sap.ui.define([
 			return oControl.getBlocks().concat(oControl.getMoreBlocks());
 		}
 		if (isControlOfType("sap/ui/comp/smartform/Group", oControl)){
-			return oControl.getFormElements();	
+			return oControl.getFormElements();
 		}
 		if (isControlOfType("sap/ui/table/Column", oControl)){
 			var aRet = oControl.getMultiLabels();
@@ -135,11 +135,11 @@ sap.ui.define([
 			if (oLabel){
 				aRet.push(oLabel);
 			}
-			return aRet;	
-		}				
+			return aRet;
+		}
 		return bAlwaysReturnAList ? [] : null;
 	}
-	
+
 	// Sorter that compares the position of two child controls which have a common parent.
 	// Returns a positive integer when oChild1 is larger, a negative number if oChild2 is larger, and 0 if they are identical.
 	// Depends on getChildren() being implemented for commonParent. If this is not the case, at least a reproducable order is guaranteed.
@@ -160,13 +160,13 @@ sap.ui.define([
 				}
 				if (iPositionCompare & Node.DOCUMENT_POSITION_FOLLOWING){
 					return -1;
-				}				
+				}
 			}
 			return 1 - 2 * (!oDomRef1 === !oDomRef2 ? oChild1.getId() < oChild2.getId() : !oDomRef2); // if we cannot determine a reasonable order we still want to have a reproducable order. Note that elements with DomRef must clearly be separated from those without.
 		}
 		return (iPos1 >= 0 && iPos2 >= 0) ? (iPos1 - iPos2) : (iPos2 - iPos1); // if only one child has been identified in the list of children it takes precedence.
 	}
-	
+
 	// This function defines which instances of sap.ui.core.Element are relevant for investigation (Currently used in fnSearchInTree).
 	// They must posess a property 'visible' (which is guaranteed for all instances of sap.ui.core.Control) which is true.
 	// If they have a property 'enabled' this must be true as well.
@@ -176,7 +176,7 @@ sap.ui.define([
 			return checkForRelevance(oCell);
 		})	: (typeof oElement.getVisible === "function" && oElement.getVisible() && (typeof oElement.getEnabled !== "function" || oElement.getEnabled()));
 	}
-	
+
 	// This function allows a depth-first search in an element tree starting with root oElement
 	// Thereby, the following logic is applied
 	// - Children of an element are determined by function getChildren in this class. If this provides an empty array method findElements of the element is used
@@ -188,14 +188,14 @@ sap.ui.define([
 	// Note that mAlreadyAnalyzed will be updated by this function
 	// fnHandleElement(oElement) is a function that will be called on all relevant elements of the tree.
 	// This function can work asynchronously (i.e. return a Promise) or synchronously (i.e. return something which is not a Promise) on a case-by-case basis.
-	// In the second case the return value will be considered as the result of the function. In the first case the value the Promise resolves to will be considered as the result. 
+	// In the second case the return value will be considered as the result of the function. In the first case the value the Promise resolves to will be considered as the result.
 	// If the result is a truthy value for one element this value is considered as the result of fnSearchInTree and the processing is stopped.
 	// fnSearchInTree returns this result synchronously if all calls of fnHandleElement which have been performed until then have worked synchronously.
 	// If the result of fnHandleElement is faulty the depth-first search of the tree proceeds. Thereby the processing of the subtree of oElement is
 	// skipped if the result was exactly false. For other faulty values the subtree will be processed next.
 	// Note that this process will never work on two elements in parallel. If the processing of one element is asynchronous the process is interrupted until
 	// the result of this step is available. Only then  the next element will be analyzed.
-	// If fnHandleElement never results in a truthy value then fnSearchInTree results in null. 
+	// If fnHandleElement never results in a truthy value then fnSearchInTree results in null.
 	function fnSearchInTree(mAlreadyAnalyzed, oElement, fnHandleElement){
 		mAlreadyAnalyzed = mAlreadyAnalyzed || Object.create(null);
 		var sId = oElement.getId();
@@ -213,7 +213,7 @@ sap.ui.define([
 			if (!aChildren){ // if getChildren does not care for the control type of oElement
 				aChildren = oElement.findElements(false);
 				aChildren.sort(fnSortChildControls.bind(null, oElement));
-			}		
+			}
 			aChildren.some(function(oChild){
 				vResult = fnSearchInTree(mAlreadyAnalyzed, oChild, fnHandleElement);
 				return vResult; // If vResult is truthy it is either a Promise (which makes the processing asynchronous) or the result of fnSearchInTree. In both cases we should stop now.
@@ -233,12 +233,12 @@ sap.ui.define([
 		}
 		// When coming here we have synchronously either found a node with a truthy result or have processed the whole tree without finding any truthy result
 		mAlreadyAnalyzed[sId] = 2;
-		return vResult || null;		
+		return vResult || null;
 	}
 
 	/**
 	 * Returns the selection plugin for the given UI table
-	 * @param {sap.ui.table.Table} oUiTable 
+	 * @param {sap.ui.table.Table} oUiTable
 	 * @returns {sap.ui.table.plugins.MultiSelectionPlugin|undefined}
 	 */
 	function fnGetSelectionPluginForUITable (oUiTable) {
@@ -274,6 +274,7 @@ sap.ui.define([
 		isObjectPageSubSection:		isControlOfType.bind(null, "sap/uxap/ObjectPageSubSection"),
 		isObjectObjectPageLayout:	isControlOfType.bind(null, "sap/uxap/ObjectPageLayout"),
 		isMenuButton:				isControlOfType.bind(null, "sap/m/MenuButton"),
+		isMenuItem:				isControlOfType.bind(null, "sap/m/MenuItem"),
 		isMenu:						isControlOfType.bind(null, "sap/m/Menu"),
 		getUI5ControlForDomElement: getUI5ControlForDomElement,
 		focusControl: focusControl,
@@ -286,10 +287,10 @@ sap.ui.define([
 		searchInTree: fnSearchInTree.bind(null, null),
 		getSelectionPluginForUITable: fnGetSelectionPluginForUITable
 	};
-	
+
 	oControlHelper.isTable = function(oControl){
 		return oControlHelper.isSmartTable(oControl) || oControlHelper.isUiTable(oControl) || oControlHelper.isMTable(oControl);
 	};
-	
+
 	return oControlHelper;
 });

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartFilterBarWrapper.js

@@ -26,6 +26,7 @@ sap.ui.define([
 		var bIsApplying = false;
 		var aBasicFilters = [];
 		var oSmartFilterBar = oControl;
+		var oEasyFilterCallbacks = null;
 
 		var oVariantManagementInitializedPromise;
 
@@ -56,6 +57,11 @@ sap.ui.define([
 				var oCustomData = Object.create(null);
 				oCustomData[dataPropertyNameGeneric] = oSVMWrapperCallbacks.getManagedControlStates();
 				oCustomData[dataPropertyNameGeneric].customFilters = mParams.oCustomFiltersWrapper.getState();
+				if (oEasyFilterCallbacks) {
+					var oEFState = oEasyFilterCallbacks.getState();
+					oCustomData[dataPropertyNameGeneric].filterMode = oEFState.filterMode;
+					oCustomData[dataPropertyNameGeneric].easyFilter = oEFState.easyFilter;
+				}
 				oSmartFilterBar.setCustomFilterData(oCustomData);
 			});
 
@@ -75,6 +81,12 @@ sap.ui.define([
 				aBasicFilters = oSmartFilterBar.getAllFilterItems(true);
 				mParams.oCustomFiltersWrapper.setState(oCustomFiltersState);
 				oSVMWrapperCallbacks.setManagedControlStates(oCustomData[dataPropertyNameGeneric]);
+				if (oEasyFilterCallbacks) {
+					oEasyFilterCallbacks.setState({
+						filterMode: oCustomData[dataPropertyNameGeneric].filterMode,
+						easyFilter: oCustomData[dataPropertyNameGeneric].easyFilter
+					});
+				}
 			});
 
 		}
@@ -236,6 +248,9 @@ sap.ui.define([
 			attachStateChanged: fnAttachStateChanged,
 			// specific properties (needed to workaround direct connection between SFB and SVM)
 			setSVMWrapperCallbacks: setSVMWrapperCallbacks,
+			setEasyFilterCallbacks: function(oCallbacks) {
+				oEasyFilterCallbacks = oCallbacks;
+			},
 			bVMConnection: oSmartFilterBar.getSmartVariant(),
 			suppressSelection: oSmartFilterBar.setSuppressSelection.bind(oSmartFilterBar), // if multiple reasons for suppressing overlap, a counter (to avoid to early resume) could be implemented here
 			oVariantManagementInitializedPromise: oVariantManagementInitializedPromise

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

@@ -959,7 +959,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.147.1
+	 * @version 1.148.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/CRUDHelper.js

@@ -333,67 +333,105 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 		}
 
 		/*
-		Allows direct edit on the entires on the list, unlike the method 'edit'above, this method first edit the entry with preserveChanges as true
-		If the response indicates an unsaved change or locked record, a corresponding dialog is shown to proceed or cancel with the edit.
-		*/
-		function directEdit(oTransactionController, sEntitySet, sBindingPath, oModel, oApplication, oCommonUtils, oViewDependencyHelper, oViewProxy, bOpenInEditMode){
+		 * Initiates editing of a list entry directly (without navigating to the object page first).
+		 * Unlike the 'edit' method above, the first editEntity call uses preserveChanges=true.
+		 * If the backend responds with a 409 (conflict) the DraftAdministrativeData is read to
+		 * distinguish between a locked record and a record with unsaved changes by another user.
+		 * A corresponding dialog is shown to let the user decide how to proceed.
+		 *
+		 * @param {object}  oTransactionController  - transaction controller providing editEntity
+		 * @param {string}  sEntitySet              - name of the entity set
+		 * @param {object}  oBindingContext          - UI5 Context of the row being edited;
+		 *                                            the OData model and binding path are derived
+		 *                                            from it via .getModel() / .getPath()
+		 * @param {object}  oApplication            - application proxy (busy helper, component utils, …)
+		 * @param {string}  sAppId                  - ID of the AppComponent; used as the localStorage cache
+		 *                                            key for the content-id batch optimisation
+		 * @param {object}  oCommonUtils             - common utilities (getText, …)
+		 * @param {object}  oViewDependencyHelper    - used to mark the root page as dirty
+		 * @param {object}  oViewProxy               - used for navigateUp on cancellation
+		 * @param {boolean} bOpenInEditMode          - whether the page was opened directly in edit mode
+		 */
+		function directEdit(oTransactionController, sEntitySet, oBindingContext, oApplication, sAppId, oCommonUtils, oViewDependencyHelper, oViewProxy, bOpenInEditMode){
 			var oDraftContext = oTransactionController.getDraftController().getDraftContext();
-			var oPromise = new Promise(function(resolve,reject) {
-				oModel.createBindingContext(sBindingPath, null, null, function(oBindingContext){
-					if (oDraftContext.isDraftEnabled(sEntitySet)) {
-						oTransactionController.editEntity(oBindingContext, true).then(function(oResponse) {
-							oBindingContext.getModel().invalidateEntry(oBindingContext);
-							oViewDependencyHelper.setRootPageToDirty();
-							resolve({
-								context: oResponse.context
-							});
-						}, function(oResponse) {
-							if (oResponse && oResponse.response && oResponse.response.statusCode === "409") {
-								//remove transient message associated with rc 409 in order to prevent message pop-up
-								oApplication.removeTransientMessages();
-								fnReadDraftAdministrativeData(oModel, sBindingPath, oApplication.getBusyHelper()).then(
-									function(oResponse) {
-										if (oResponse.DraftAdministrativeData.InProcessByUser) {
-											reject({
-												lockedByUser: oResponse.DraftAdministrativeData.InProcessByUserDescription || oResponse.DraftAdministrativeData.InProcessByUser
-											});
-										} else { //unsaved changes
-											var editConfirmation = function(){
-											var oUnsavedChangesEditPromise = oTransactionController.editEntity(oBindingContext, false).then(function(oResponse){
-													oBindingContext.getModel().invalidateEntry(oBindingContext);
-													oViewDependencyHelper.setRootPageToDirty();
-													resolve({
-														context: oResponse.context
-													});
-												});
-												oApplication.getBusyHelper().setBusy(oUnsavedChangesEditPromise, true);
-											};
-											var editRejection = reject({
-												cancelled: true
-											});
-											var unSavedChangesDialogPromise = fnUnsavedChangesDialog(undefined, oResponse.DraftAdministrativeData,oCommonUtils, oViewProxy, bOpenInEditMode);
-											unSavedChangesDialogPromise.then(editConfirmation,editRejection);
-										}
-									},
-									function(oResponse) {
-										// DraftAdminData read failed
+
+			if (!oDraftContext.isDraftEnabled(sEntitySet)) {
+				return Promise.resolve({ context: oBindingContext });
+			}
+
+			var oModel = oBindingContext.getModel();
+			// Fetch sRootExpand for the content-id batch optimisation.
+			// getRootExpand is intentionally not provided: directEdit is always invoked from
+			// the List Report before the Object Page is active, so getRootExpand is not yet
+			// available. CacheHelper falls back to the localStorage cache, which is still
+			// much faster than fetching expands in a separate backend request.
+			var oInfoForContentIdPromise = CacheHelper.getInfoForContentIdPromise(sEntitySet, oModel, sAppId);
+
+			var oRet = oInfoForContentIdPromise.then(function(oInfoObject) {
+				var sRootExpand = oInfoObject.contentIdRequestPossible ? oInfoObject.parametersForContentIdRequest.sRootExpand : null;
+
+				return new Promise(function(resolve, reject) {
+					var oFirstEditPromise = oTransactionController.editEntity(oBindingContext, true, sRootExpand);
+					// Track the busy state against the individual network request so the busy
+					// indicator remains active for exactly as long as the request is in flight.
+					oApplication.getBusyHelper().setBusy(oFirstEditPromise, true);
+					oFirstEditPromise.then(function(oResponse) {
+						oModel.invalidateEntry(oBindingContext);
+						oViewDependencyHelper.setRootPageToDirty();
+						resolve({ context: oResponse.context });
+					}, function(oResponse) {
+						if (oResponse && oResponse.response && oResponse.response.statusCode === "409") {
+							//remove transient message associated with rc 409 in order to prevent message pop-up
+							oApplication.removeTransientMessages();
+							fnReadDraftAdministrativeData(oModel, oBindingContext.getPath(), oApplication.getBusyHelper()).then(
+								function(oResponse) {
+									if (oResponse.DraftAdministrativeData.InProcessByUser) {
 										reject({
-											draftAdminReadResponse: oResponse
+											lockedByUser: oResponse.DraftAdministrativeData.InProcessByUserDescription || oResponse.DraftAdministrativeData.InProcessByUser
 										});
-									});
-									oApplication.getBusyHelper().setBusy(oPromise, true);
-							} else {
-								reject(oResponse);
-							}
-						});
-				} else {
-					return resolve({
-						context: oBindingContext
+									} else { //unsaved changes
+										var editConfirmation = function() {
+											// Re-run editEntity without preserveChanges so the
+											// unsaved changes of another user are overwritten.
+											var oUnsavedChangesEditPromise = oTransactionController.editEntity(oBindingContext, false, sRootExpand).then(function(oResponse) {
+												oModel.invalidateEntry(oBindingContext);
+												oViewDependencyHelper.setRootPageToDirty();
+												resolve({ context: oResponse.context });
+											});
+											oApplication.getBusyHelper().setBusy(oUnsavedChangesEditPromise, true);
+										};
+										// editRejection is passed as the rejection handler of Promise.then(),
+										// so it must be a function reference; calling reject() inline here
+										// would execute it immediately instead of on dialog cancellation.
+										var editRejection = function() { reject({ cancelled: true }); };
+										var unSavedChangesDialogPromise = fnUnsavedChangesDialog(undefined, oResponse.DraftAdministrativeData, oCommonUtils, oViewProxy, bOpenInEditMode);
+										unSavedChangesDialogPromise.then(editConfirmation, editRejection);
+									}
+								},
+								function(oResponse) {
+									// DraftAdminData read failed
+									reject({ draftAdminReadResponse: oResponse });
+								}
+							);
+						} else {
+							reject(oResponse);
+						}
 					});
-				}
 				});
 			});
-			return oPromise;
+
+			// Ensure the active context is registered in ContextBookkeeping before the edit
+			// resolves. This caches the draft sibling path so subsequent navigation can use
+			// the cached value without an additional /SiblingEntity request.
+			// editingStarted() notifies all listeners (e.g. the message button helper) that
+			// the editing phase has begun for this context.
+			var bContextRegistered = oApplication.checkContextData(oBindingContext);
+			if (!bContextRegistered) {
+				oApplication.registerContext(oBindingContext, 1, sEntitySet);
+			}
+			oApplication.editingStarted(oBindingContext, oRet);
+
+			return oRet;
 		}
 
 		function deleteEntity(oDraftController, fnExecuteDelete, oApplicationProxy, oContext, bIsActiveEntity, sActionType){

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

@@ -589,6 +589,13 @@ sap.ui.define(["sap/ui/base/Object",
 								oServices.oTemplateCapabilities.oMessageButtonHelper.showMessagePopover();
 							}
 						}
+						// Reset pending changes to prevent infinite loop when entering edit mode again.
+						// Invalid values cause infinite loop because the pending changes (with invalid values) are resubmitted when the user clicks Edit, triggering the same error.
+						var oContext = oController.getView().getBindingContext();
+						var sContextPath = oContext && oContext.getPath();
+						if (sContextPath && oModel && oModel.hasPendingChanges()) {
+							oModel.resetChanges([sContextPath], undefined, true);
+						}
 						reject();
 					});
 					oBusyHelper.setBusy(oSubmitChange);