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

package/src/sap/suite/ui/generic/template/ListReport/controller/IappStateHandler.js

@@ -84,12 +84,12 @@ sap.ui.define([
 		var aPageVariantControlStateWrappers = []; // controls handled from page variant management if used: smartTable, searchfield, partly multiple views
 
 		// SmartTable state: Table Settings and (in case of control level variant management) selected variant and whether it's dirty
-		// In case of multipleViews with multiple tables (mode "multi"), each tab has an own table or chart, which has an own state, so multipleViewsHandler has to take care of 
+		// In case of multipleViews with multiple tables (mode "multi"), each tab has an own table or chart, which has an own state, so multipleViewsHandler has to take care of
 		// storing/restoring their states (in its part of the appState stored in genericData.tableTabData)
-		// In this case, mutliViewsHandler exchanges oState.oPresentationControlHandler (setting it always to the current visible one), so don't rely on that to get the wrapper. 
+		// In this case, mutliViewsHandler exchanges oState.oPresentationControlHandler (setting it always to the current visible one), so don't rely on that to get the wrapper.
 		// Using the id (without providing optional parameter sQuickVariantKey) returns the smartTable only in single table case.
 		var oSmartTable = oController.byId(StableIdHelper.getStableId({type: "ListReportTable", subType: "SmartTable"}));
-		if (oSmartTable){ // in multipleViews case (with multiple tables) currently multipleViews handler handles complete state information 
+		if (oSmartTable){ // in multipleViews case (with multiple tables) currently multipleViews handler handles complete state information
 			aControlStateWrappers.push(oTemplateUtils.oCommonUtils.getControlStateWrapper(oSmartTable));
 		}
 
@@ -128,7 +128,7 @@ sap.ui.define([
 
 		// List of handlers to react on (app or adaptation) extension state changes. Only one entry expected (handler in  SFB wrapper). Currently, extensions are only possible in
 		// SFB - if extensions at other places are needed, the similar handler might differ depending on whether page variant management is used.
-		var aExtensionStateChangeHandlers = []; 
+		var aExtensionStateChangeHandlers = [];
 		function customAppStateChange() {
 			aExtensionStateChangeHandlers.forEach(function(fnHandler) {
 				fnHandler();
@@ -239,7 +239,7 @@ sap.ui.define([
 
 
 		// Wrapper to control whether data is loaded
-		
+
 		function fnGetDataLoadedWrapper(){
 			// Wrapper to control whether data is expected to be loaded - controls the state, but does not trigger loading data on restore!
 			var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
@@ -247,15 +247,15 @@ sap.ui.define([
 			// - startup with iAppState: anyway setState will be called
 			// - other startup cases: applyInitialLoadBehavior calls setState explicitly
 			// - navigation
-			
+
 			function fnSetState(bState){
 				oTemplatePrivateModel.setProperty("/generic/bDataAreShownInTable", bState);
 			}
-			
+
 			function fnGetState(){
 				return oTemplatePrivateModel.getProperty("/generic/bDataAreShownInTable");
 			}
-			
+
 			function fnSetDataShown(bDataShown, fnHandler){
 				if (bDataShown === fnGetState()){
 					return;
@@ -263,7 +263,7 @@ sap.ui.define([
 				fnSetState(bDataShown);
 				fnHandler();
 			}
-			
+
 			return {
 				getLocalId: function(){
 					return "$dataLoaded";
@@ -271,7 +271,7 @@ sap.ui.define([
 				setState: fnSetState,
 				getState: fnGetState,
 				attachStateChanged: function(fnHandler){
-					// changing from data not loaded to data loaded: 
+					// changing from data not loaded to data loaded:
 					// - when SFB triggers search
 					oState.oSmartFilterbar.attachSearch(fnSetDataShown.bind(null, true, fnHandler));
 
@@ -286,7 +286,7 @@ sap.ui.define([
 				}
 			};
 		}
-		
+
 		var oDataLoadedWrapper = fnGetDataLoadedWrapper();
 		aControlStateWrappers.push(oDataLoadedWrapper);
 //		oDataLoadedWrapper.attachStateChanged(changeIappState);
@@ -396,7 +396,7 @@ sap.ui.define([
 			if (Device.system.phone) {
 				collapseHeader();
 			}
-			// Ideally, oDataLoadedWrapper should ensure to keep its state correct. However, currently we have no means to attach to the command - i.e. oDataLoadedWrapper only 
+			// Ideally, oDataLoadedWrapper should ensure to keep its state correct. However, currently we have no means to attach to the command - i.e. oDataLoadedWrapper only
 			// attaches to SFB's search event, which is only triggered when user presses the go button. When keyboard shortcut is used instead, this handler would be called (as it
 			// is attached to the command), but SFB's search event would not be triggered. As workaround, we additionally set data loaded state to true here and inform explicitly
 			// the the state has changed.
@@ -440,7 +440,7 @@ sap.ui.define([
 				}
 			}
 		}
-		
+
 		/*
 			This method is called when an LR app is the target of an external navigation and the XAppState data contains a presentationVariant.
 			The sorting from this presentationVariant is then applied to the table.
@@ -460,13 +460,13 @@ sap.ui.define([
 			fnAdaptOtherControlsToAppState(oAppData.controlStates);
 			if (areDataShownInTable()){
 				// fnAdaptOtherControlsToAppState only (synchronously) sets the state including the information whether data should be loaded - if this is the case, the actual loading
-				// (which happens asynchronous of course) still needs to be triggered 
+				// (which happens asynchronous of course) still needs to be triggered
 				loadData();
 			} else {
 				// hide placeholder already here, if no data is to be loaded - in case data is loaded, it will be hidden in data received event
 				oTemplateUtils.oComponentUtils.hidePlaceholder();
-			} 
-			
+			}
+
 			// special case: when restoring an old app state with data loaded, but in the meantime a filter not set in that state has been changed to mandatory, SFB.search would not
 			// trigger a request (but instead only mark that filter) - thus hiding placeholder now to avoid it to stay forever
 			// TODO: refactor: Still in that case our internal data shows data are loaded - ideally, that should not be the case
@@ -603,7 +603,7 @@ sap.ui.define([
 
 		function fnAdaptToAppStateStartUpWithParameters(oAppData, oURLParameters, sPreferredQuickVariantSelectionKey){
 			handleVariantIdPassedViaURLParams(oURLParameters);
-			
+
 			var oSFBUiState = oState.oSmartFilterbar.getUiState();
 			var oSFBSemanticDates = oSFBUiState.getSemanticDates();
 			//oStartupObject to be passed to the extension where urlParameters and selectedQuickVariantSelectionKey are optional
@@ -766,23 +766,24 @@ sap.ui.define([
 			default:
 				throw new FeError(sClassName, "Invalid navigation type: " + sNavType);
 			}
-			
+
 			// common to all startup cases (except iAppState)
 			if (areDataShownInTable()){
 				// trigger search if needed
 				oState.oSmartFilterbar.search();
-				// For desktop devices, expand the header for Standard and Custom variants and for tablet and mobile devices, 
+				// For desktop devices, expand the header for Standard and Custom variants and for tablet and mobile devices,
 				// collapse the header only if search is triggered.
 				if (Device.system.desktop) {
 					oTemplateUtils.oCommonUtils.getControlStateWrapper(oController.byId(StableIdHelper.getStableId({type: "ListReportPage", subType: "DynamicPage"}))).setHeaderState(oController, true);
 				} else {
 					collapseHeader();
 				}
-			} else {
-				// if no data are loaded, place holder has to be hidden now - otherwise it will be hidden when data is received 
+			}
+			if (!areDataShownInTable() || Object.keys(oState.oSmartFilterbar.verifySearchAllowed()).length > 0) {
+				// if no data are loaded or search is not allowed, place holder has to be hidden now - otherwise it will be hidden when data is received
 				oTemplateUtils.oComponentUtils.hidePlaceholder();
 			}
-			
+
 			// ensure first iAppState is created
 			changeIappState();
 		}
@@ -999,14 +1000,14 @@ sap.ui.define([
 		}
 
 		// provide data load settings including defaulting
-		// ideally, this should be implemented in a generic way in template assembler, so that generated getters also return default values for objects if not explicitely set in 
+		// ideally, this should be implemented in a generic way in template assembler, so that generated getters also return default values for objects if not explicitely set in
 		// manifest (i.e. it should be sufficient to define the default in component - no need to individually implement defaulting!)
 		function getDataLoadSettings(){
 			// general default
 			var oDefaultDataLoadSettings = {loadDataOnAppLaunch: "ifAnyFilterExist"};
 
 			// intension is boolean, but unfortunately faulty values are (historically) not treated consistently
-			var bEnableAutoBindingMultiViews = oState.oMultipleViewsHandler.getOriginalEnableAutoBinding(); 
+			var bEnableAutoBindingMultiViews = oState.oMultipleViewsHandler.getOriginalEnableAutoBinding();
 
 			// if multiple views settings is not defined (also the case in single views case), general default is taken. Unlike other faulty values, null is treated like undefined
 			if (bEnableAutoBindingMultiViews !== undefined && bEnableAutoBindingMultiViews !== null){
@@ -1016,13 +1017,13 @@ sap.ui.define([
 
 			var oManifestDataLoadSettings = oController.getOwnerComponent().getDataLoadSettings();
 			// (historically) explicit setting empty string (not an allowed value according to definition in component!) is treated like undefined (including adopting multiple views
-			// settings. Other not allowed values (any other sting) were ignored, i.e. returning undefined from getInitialLoadBehaviourSettings, thus setting undefined to 
-			// oSmartVariantManagement.setExecuteOnStandard (which actually only sets the default) and finally using the value returned from 
+			// settings. Other not allowed values (any other sting) were ignored, i.e. returning undefined from getInitialLoadBehaviourSettings, thus setting undefined to
+			// oSmartVariantManagement.setExecuteOnStandard (which actually only sets the default) and finally using the value returned from
 			// oSmartVariantManagement.getExecuteOnStandard (only different from overall default (false), if user has explicitly set it)
 			if (oManifestDataLoadSettings && oManifestDataLoadSettings.loadDataOnAppLaunch === ""){
 				oManifestDataLoadSettings.loadDataOnAppLaunch = undefined;
 			}
-			
+
 			// explicit setting has highest priority
 			return extend(oDefaultDataLoadSettings, oManifestDataLoadSettings);
 		}
@@ -1031,7 +1032,7 @@ sap.ui.define([
 		// - sets default value for flag whether standard variant should be execute on select
 		// - determines whether we actually should load data
 		function applyInitialLoadBehavior(bDataLoadCausedByNavigation){
-			// cases definitely determining to load data initially 
+			// cases definitely determining to load data initially
 			// - worklist
 			// - livemode
 			// - master detail (i.e. bLoadListAndFirstEntryOnStartup is set)
@@ -1040,17 +1041,17 @@ sap.ui.define([
 
 			var sLoadBehaviour = getDataLoadSettings().loadDataOnAppLaunch;
 			if (!oSmartVariantManagement || oController.getOwnerComponent().getVariantManagementHidden()){
-				// No VM -> 
+				// No VM ->
 				bShouldDataBeLoaded = bShouldDataBeLoaded || sLoadBehaviour === "always";
 				bShouldDataBeLoaded = bShouldDataBeLoaded || (sLoadBehaviour === "ifAnyFilterExist" && oSmartFilterbar.getFiltersWithValues().length > 0);
 				// behavior of last patch set would translate to the following - seems not to be correct (in case of setting ifAnyFilterExist but no filters provided)
 				//				bShouldDataBeLoaded = bShouldDataBeLoaded || sLoadBehaviour !== "never";
 			} else {
-				// in case of a (visible) SVM, we need to set the default value 
-				// default value for standard variant 
+				// in case of a (visible) SVM, we need to set the default value
+				// default value for standard variant
 				// - true if one of the conditions above is fulfilled
-				// - or for any manifest setting but "never" 
-				//		(Remark: "ifAnyFilterExist" leads to mark the standard variant true, even if no filter is provided - this looks ok for startup, as the text shown to the user 
+				// - or for any manifest setting but "never"
+				//		(Remark: "ifAnyFilterExist" leads to mark the standard variant true, even if no filter is provided - this looks ok for startup, as the text shown to the user
 				//		contains the condition, but if reselecting the standard variant, it  will also select without filters!
 				//		TODO: check, how to solve that inconsistency)
 				// - but in both cases not, if a mandatory filter is missing

package/src/sap/suite/ui/generic/template/ListReport/extensionAPI/ExtensionAPI.js

@@ -95,8 +95,11 @@ sap.ui.define(["sap/ui/base/Object",
 				 * @param {map} [mUrlParameters] The URL parameters (name-value pairs) for the function or action. Only needed in special cases.
 				 * @param {object} [oSettings] Additional settings
 				 * @param {boolean} [oSettings.bInvocationGroupingChangeSet=false] 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#invokeActions}
 				 * @throws {Error} Throws an error if the OData function import does not exist or the action input parameters are invalid
 				 * @public
 				 */

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

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.139.0"
+			"version": "1.141.0"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ListReport/view/fragments/SmartTable.fragment.xml

@@ -51,6 +51,7 @@
 							<core:CustomData key="headerInfo" value="{path: 'header>', formatter: 'AH.buildHeaderInfoCustomData'}"/>
 							<core:CustomData key="dateFormatSettings" value='\{"UTC":true,"style":"medium"\}' />
 							<core:CustomData key="useUTCDateTime" value="true" />
+							<core:CustomData key="defaultTextInEditModeSource" value="ValueList" />
 							 <template:if test="{parts: [{path: 'entityType>'}, {path: 'tabItem>annotationPath'}], formatter: 'AH.tabItemHasPresentationVariant'}">
 								<template:then>
 									<core:CustomData key="lineItemQualifier"

package/src/sap/suite/ui/generic/template/ObjectPage/annotationHelpers/AnnotationHelperActionButtons.js

@@ -105,9 +105,8 @@ sap.ui.define([
 	isEditButtonRequired.requiresIContext = true;
 
 	// Returns the visibility for the EDIT button on the object page
-	function getEditActionButtonVisibility(oInterface, mRestrictions, oEntitySet, oAppComponent, oTreeNode, aAncestortreeNodes) {
-		var sGeneralExpression = "!${ui>/editable}";  // logical condition for the edit button
-		
+	function getEditActionButtonVisibility(oInterface, mRestrictions, oEntitySet, oAppComponent, oTreeNode, aAncestortreeNodes,sEasyFillButton) {
+		var sGeneralExpression = (sEasyFillButton === "true") ? "{_templPrivGlobal>/generic/fioriAI/isEasyFillEnabled}" : "!${ui>/editable}"; // logical condition for the edit button
 		//oTreeNode.isDraft is use to show "Hide Draft Values" or "Show Draft Values" button in List Report table toolbar and "Display Saved version/Return to Draft" button in Object page header for a draft application.
 		var sToggleExpression = "";
 		if (oTreeNode.isDraft && oTreeNode.level === 1){ // Exclude the situation that there is already a draft for this user (in this case the CONTINUE_EDITING-button would be shown).
@@ -135,8 +134,52 @@ sap.ui.define([
 	}
 	getEditActionButtonVisibility.requiresIContext = true;
 
+	// Returns the visibility for the EasyFill button
+	function getEasyFillButtonVisibility(oInterface, mRestrictions, oEntitySet, oAppComponent, oTreeNode, aAncestortreeNodes) {
+		var sGeneralExpression = "{_templPrivGlobal>/generic/fioriAI/isEasyFillEnabled}"; // Ensure whether AI resource has been loaded for the EasyFill functionality
+		
+		//oTreeNode.isDraft is use to show "Hide Draft Values" or "Show Draft Values" button in List Report table toolbar and "Display Saved version/Return to Draft" button in Object page header for a draft application.
+		var sFCLExpression = getFCLPathExpression(oAppComponent, oTreeNode, "Edit");
+		var sPathExpression = getPathExpression(oInterface, oEntitySet, mRestrictions, "Updatable"); // if there is an updatable path, add it to the condition
+		var aParentPath = [], sParentPath = "";
+		// for Draft enabled application, check if any parent entity set has update restriction
+		if (oTreeNode.isDraft) {
+			aAncestortreeNodes.forEach( function (oAncestorNode) {
+				if (oAncestorNode.level > 0) {
+					var oParentEntitySet = oAncestorNode.entitySetDefinition;
+					var mParentUpdateRestriction = oParentEntitySet && oParentEntitySet["Org.OData.Capabilities.V1.UpdateRestrictions"];
+					aParentPath.push(getParentPathExpression(oInterface, oParentEntitySet, mParentUpdateRestriction, "Updatable", oAncestorNode));
+				}
+			});
+			sParentPath = fnCombineByAnd.apply(null, aParentPath);
+		}
+		return fnCombineByAnd(sGeneralExpression, sFCLExpression, sPathExpression, sParentPath);
+	}
+	getEasyFillButtonVisibility.requiresIContext = true;
+
 	// Returns the visibility for the DELETE button on main object page
 	function getDeleteActionButtonVisibility(oInterface, mRestrictions, oEntitySet, oAppComponent, oTreeNode){
+		var sNavigationPath = "";
+		if (oTreeNode.level > 1) {
+			var oModel = oInterface.getInterface(0).getModel();
+			var oParentEntitySet = oModel.getODataEntitySet(oTreeNode.parent);
+			var oNavigationRestrictions = oParentEntitySet["Org.OData.Capabilities.V1.NavigationRestrictions"];
+			if (oNavigationRestrictions && oNavigationRestrictions.RestrictedProperties) {
+				var aRestrictedProperties = oNavigationRestrictions.RestrictedProperties;
+				for (var i in aRestrictedProperties) {
+					var oNavigationProperty = aRestrictedProperties[i];
+					var sNavigationPropertyPath = oNavigationProperty.NavigationProperty.NavigationPropertyPath;
+					if (sNavigationPropertyPath === oTreeNode.navigationProperty) {
+						if (oNavigationProperty?.DeleteRestrictions?.Deletable?.Bool === "false") {
+							return false;
+						}
+						if (oNavigationProperty?.DeleteRestrictions?.Deletable?.Path) {
+							sNavigationPath = "${" + oNavigationProperty?.DeleteRestrictions?.Deletable?.Path + "}";
+						}
+					}
+				}
+			}
+		}
 		var sGeneralExpression; // logical condition for the delete button
 		if (oTreeNode.isDraft){ // on main object page the delete button is shown in display mode on subobject pages in edit mode
 			sGeneralExpression = oTreeNode.level === 1 ? "!${ui>/editable}" : "{ui>/editable}";
@@ -145,7 +188,7 @@ sap.ui.define([
 		}
 		var sFCLExpression = getFCLPathExpression(oAppComponent, oTreeNode, "Delete");
 		var sPathExpression = getPathExpression(oInterface, oEntitySet, mRestrictions, "Deletable"); // if there is a deletable path, add it to the condition
-		return fnCombineByAnd(sGeneralExpression, sFCLExpression, sPathExpression);
+		return fnCombineByAnd(sGeneralExpression, sFCLExpression, sPathExpression, sNavigationPath);
 	}
 	getDeleteActionButtonVisibility.requiresIContext = true;
 
@@ -204,6 +247,7 @@ sap.ui.define([
 		getActionControlBreakoutVisibility: getActionControlBreakoutVisibility,
 		getCallAction: getCallAction,
 		getDatafieldForActionVisibility: getDatafieldForActionVisibility,
-		getDraftAdminDataAccess: getDraftAdminDataAccess
+		getDraftAdminDataAccess: getDraftAdminDataAccess,
+		getEasyFillButtonVisibility
 	};
 }, /* bExport= */ true);

package/src/sap/suite/ui/generic/template/ObjectPage/annotationHelpers/AnnotationHelperActionButtons.qunit.js

@@ -0,0 +1,27 @@
+/* QUnit tests for getDeleteActionButtonVisibility */
+
+sap.ui.define([
+    "sap/suite/ui/generic/template/ObjectPage/annotationHelpers/AnnotationHelperActionButtons"
+], function(AnnotationHelperActionButtons) {
+    "use strict";
+
+    QUnit.module("getDeleteActionButtonVisibility");
+
+    QUnit.test("should return true when delete action is visible", function(assert) {
+        var oContext = {/* mock context for visible case */};
+        var result = AnnotationHelperActionButtons.getDeleteActionButtonVisibility(oContext);
+        assert.strictEqual(result, true, "Delete button should be visible");
+    });
+
+    QUnit.test("should return false when delete action is not visible", function(assert) {
+        var oContext = {/* mock context for not visible case */};
+        var result = AnnotationHelperActionButtons.getDeleteActionButtonVisibility(oContext);
+        assert.strictEqual(result, false, "Delete button should not be visible");
+    });
+
+    QUnit.test("should handle edge cases gracefully", function(assert) {
+        var oContext = null;
+        var result = AnnotationHelperActionButtons.getDeleteActionButtonVisibility(oContext);
+        assert.strictEqual(result, false, "Delete button should not be visible for null context");
+    });
+});

package/src/sap/suite/ui/generic/template/ObjectPage/controller/ControllerImplementation.js

@@ -35,6 +35,7 @@ sap.ui.define([
 	"sap/suite/ui/generic/template/ObjectPage/controller/PasteHandler",
 	"sap/suite/ui/generic/template/lib/insights/InsightsHandler",
 	"sap/suite/ui/generic/template/lib/cards/DTCardHelper",
+	"sap/suite/ui/generic/template/lib/ai/EasyFill/EasyFillHandler",
 	"sap/ui/core/Element"
 ], function (
 	ControllerExtension,
@@ -73,6 +74,7 @@ sap.ui.define([
 	PasteHandler,
 	InsightsHandler,
 	DTCardHelper,
+	EasyFillHandler,
 	Element
 ) {
 	"use strict";
@@ -794,38 +796,47 @@ sap.ui.define([
 				var oEditPromises = oTemplateUtils.oServices.oCRUDManager.editEntity(bUnconditional);
 				oEditPromises.then(function (oEditAndSiblingInfo) {
 					if (oEditAndSiblingInfo.draftAdministrativeData) {
-						fnExpiredLockDialog(oEditAndSiblingInfo.draftAdministrativeData.CreatedByUserDescription || oEditAndSiblingInfo.draftAdministrativeData.CreatedByUser);
+						fnExpiredLockDialog(oEditAndSiblingInfo.draftAdministrativeData.CreatedByUserDescription || oEditAndSiblingInfo.draftAdministrativeData.CreatedByUser).catch(Function.prototype);
 					} else {
 						fnStartEditing(oEditAndSiblingInfo);
 					}
 				});
+				return oEditPromises;
 			}
 
 			// This method is called when the user wants to edit an entity, for which a non-locking draft of another user exists.
 			// The method asks the user, whether he wants to continue editing anyway. If this is the case editing is triggered.
 			// sCreatedByUser is the name of the user possessing the non-locking draft
 			fnExpiredLockDialog = function (sCreatedByUser) {
-				var oUnsavedChangesDialog;
-				oTemplateUtils.oCommonUtils.getDialogFragmentAsync(
-					"sap.suite.ui.generic.template.ObjectPage.view.fragments.UnsavedChangesDialog", {
-						onEdit: function () {
-							oUnsavedChangesDialog.close();
-							fnEditEntity(true);
-						},
-						onCancel: function () {
-							oUnsavedChangesDialog.close();
-						}
-					}, "Dialog").then(function (oFragment) {
-					oUnsavedChangesDialog = oFragment;
-					// always access i18n text from the Main Object page level
-					var oDraftLockTextPromise = oTemplateUtils.oComponentUtils.getMainComponentUtils();
-					var oBusyHelper = oTemplateUtils.oServices.oApplication.getBusyHelper();
-					oBusyHelper.setBusy(oDraftLockTextPromise);
-					oDraftLockTextPromise.then(function (oMainUtils) {
-						var sDialogContentText = oMainUtils.getText("DRAFT_LOCK_EXPIRED", [sCreatedByUser]);
-						var oDialogModel = oUnsavedChangesDialog.getModel("Dialog");
-						oDialogModel.setProperty("/unsavedChangesQuestion", sDialogContentText);
-						oUnsavedChangesDialog.open();
+				return new Promise((resolve,reject)=>{
+					var oUnsavedChangesDialog;
+					oTemplateUtils.oCommonUtils.getDialogFragmentAsync(
+						"sap.suite.ui.generic.template.ObjectPage.view.fragments.UnsavedChangesDialog", {
+							onEdit: async function () {
+								oUnsavedChangesDialog.close();
+								try {
+									const oResponse = await fnEditEntity(true);
+									resolve(oResponse.context);
+								} catch (error) {
+									reject(error);
+								}
+							},
+							onCancel: function () {
+								oUnsavedChangesDialog.close();
+								reject();
+							}
+						}, "Dialog",undefined,true).then(function (oFragment) {
+						oUnsavedChangesDialog = oFragment;
+						// always access i18n text from the Main Object page level
+						var oDraftLockTextPromise = oTemplateUtils.oComponentUtils.getMainComponentUtils();
+						var oBusyHelper = oTemplateUtils.oServices.oApplication.getBusyHelper();
+						oBusyHelper.setBusy(oDraftLockTextPromise);
+						oDraftLockTextPromise.then(function (oMainUtils) {
+							var sDialogContentText = oMainUtils.getText("DRAFT_LOCK_EXPIRED", [sCreatedByUser]);
+							var oDialogModel = oUnsavedChangesDialog.getModel("Dialog");
+							oDialogModel.setProperty("/unsavedChangesQuestion", sDialogContentText);
+							oUnsavedChangesDialog.open();
+						});
 					});
 				});
 			};
@@ -1938,6 +1949,7 @@ sap.ui.define([
 							oState.oSectionTitleHandler.adjustSubSectionTitle(oSubSection);
 							// Add accessible name to the SmartForm in the first subsection if all titles are hidden, because accessible name will not propogate to the form control
 							oState.oSectionTitleHandler.addAccessibleName(oSubSection);
+							oState.oSectionTitleHandler.setHeaderSmartFormAriaLabelBy(oSubSection);
 						}
 					}
 
@@ -2363,7 +2375,7 @@ sap.ui.define([
 					oState.oMessageStripHelper = new MessageStripHelper(oMultipleViewsHandler, oController, oTemplateUtils, oBase.state.messageButtonHelper);
 					oState.oInlineCreationRowsHelper = new InlineCreationRowsHelper(oObjectPage, oTemplateUtils, fnGetSmartTableCreationMode, oController, oState.oMessageStripHelper);
 					oState.oSectionTitleHandler = new SectionTitleHandler(oController, oObjectPage, oTemplateUtils);
-
+					oState.oEasyFillHandler = new EasyFillHandler(oState, oController, oTemplateUtils, oObjectPage);
 					var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
 
 
@@ -2529,6 +2541,9 @@ sap.ui.define([
 					onSummarize: function () {
 						oTemplateUtils.oServices.oFioriAIHandler.fioriaiLib.summarize.summarize({view: oController.getView()});
 					},
+					onEasyFillEdit: function (oEvent) {
+						oState.oEasyFillHandler.onEasyFillButtonClick(oEvent);
+					},
 
 					onEdit: function (oEvent) {
 						var oEditButton = oController.byId("edit");
@@ -2539,6 +2554,33 @@ sap.ui.define([
 						}
 						oTemplateUtils.oCommonUtils.executeIfControlReady(fnEditEntity, "edit");
 					},
+					onEditByEasyFill: function() {
+						return new Promise((resolve, reject) => {
+							try {
+								oTemplateUtils.oServices.oApplication.performAfterSideEffectExecution(async function () {
+									try {
+										const oEditAndSiblingInfo = await oTemplateUtils.oServices.oCRUDManager.editEntity(false);
+										if (oEditAndSiblingInfo.draftAdministrativeData) {
+											const user = oEditAndSiblingInfo.draftAdministrativeData.CreatedByUserDescription || oEditAndSiblingInfo.draftAdministrativeData.CreatedByUser;
+											try {
+												const oContext = await fnExpiredLockDialog(user);
+												resolve(oContext);
+											} catch (error) {
+												reject(error);
+											}
+										} else {
+											fnStartEditing(oEditAndSiblingInfo);
+											resolve(oEditAndSiblingInfo.context);
+										}
+									} catch (e) {
+										reject(e);
+									}
+								});
+							} catch (e) {
+								reject(e);
+							}
+						});
+					},
 					onValidateDraft: onValidateDraft,
 					onSave: onSave,
 					onSaveAndContinueEdit: onSaveAndContinueEdit,

package/src/sap/suite/ui/generic/template/ObjectPage/controller/RelatedAppsHandler.js

@@ -100,12 +100,14 @@ sap.ui.define([
 						//Get all semantic object from manifest setting
 						var oSettings = oTemplateUtils.oComponentUtils.getSettings();
 						var oRelatedAppsSettings = oSettings.relatedAppsSettings;
+						// Extension to modify the related app settings.
+                        oRelatedAppsSettings = oController.modifyRelatedAppsSettings(oRelatedAppsSettings, sCurrentSemObj);
 						var bHasRelatedAppSettings = oRelatedAppsSettings && Object.keys(oRelatedAppsSettings).length > 0;
 
 						if (bHasRelatedAppSettings) {
 							// Iterate through oRelatedAppSettings and add all related apps into the set
 							for (const sKey in oRelatedAppsSettings) {
-								if (oRelatedAppsSettings.hasOwnProperty(sKey)) {
+								if (sKey && oRelatedAppsSettings.hasOwnProperty(sKey)) {
 									const sSemanticObject = oRelatedAppsSettings[sKey].semanticObject;
 									aSemanticObjects.push(sSemanticObject);
 								}

package/src/sap/suite/ui/generic/template/ObjectPage/controller/SectionTitleHandler.js

@@ -1,6 +1,6 @@
 sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/generic/template/genericUtilities/controlHelper", "sap/ui/core/library",
-		"sap/suite/ui/generic/template/genericUtilities/FeLogger"
-	], function(BaseObject, extend, controlHelper, SapCoreLibrary, FeLogger) {
+		"sap/suite/ui/generic/template/genericUtilities/FeLogger", "sap/ui/core/Element", "sap/ui/core/InvisibleText"
+	], function(BaseObject, extend, controlHelper, SapCoreLibrary, FeLogger, Element, InvisibleText) {
 		"use strict";
 
 		var STYLE_CLASS_FOR_ADJUSTMENT = "sapUiTableOnObjectPageAdjustmentsForSection";
@@ -174,9 +174,8 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/gener
 				oSmartForm.addAriaLabelledBy(sAnchorBarSectionHeaderId);
 			}
 
-			function fnManageAccessability(oFirstSubSection) {
-				var oSubSectionInfoObject = oTemplateUtils.oInfoObjectHandler.getControlInformation(oFirstSubSection.getId()),
-					oSection = oFirstSubSection.getParent();
+			function fnSetHeaderSmartFormAriaLabelBy(oFirstSubSection) {
+				var oSubSectionInfoObject = oTemplateUtils.oInfoObjectHandler.getControlInformation(oFirstSubSection.getId());
 				oFirstSubSection.getBlocks().concat(oFirstSubSection.getMoreBlocks())
 					.reduce(function(accBlock, currentBlock) {
 						if (!currentBlock.getContent || !currentBlock.getContent() || !currentBlock.getContent().length) {
@@ -191,14 +190,19 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/gener
 						return accBlock;
 					}, [])
 					.forEach(function(entry) {
-						if (!oSubSectionInfoObject) {
+						if (!oSubSectionInfoObject || (entry.getGroups().length === 1 && entry.getGroups()[0].getTitle && !entry.getGroups()[0].getTitle())) {
 							// Case: header is editable. manifest.json, editableHeaderContent=true
-							entry._suggestTitleId(`${oSection.getId()}-title`); // set Section title id that will be used for aria
-							return;
-						}
-						if (entry.getGroups().length === 1 && entry.getGroups()[0].getTitle && !entry.getGroups()[0].getTitle()) {
-							// Case: Section -> one SubSection -> one SmartForm -> one Group. Title is not displayed in this case
-							entry._suggestTitleId(`${oFirstSubSection.getId()}-headerTitle`); // set title to SubSection title id that will be used for aria
+							var sInvisibleTextID = `${entry.getId()}-ariaLabelBy-InvisibleText`,
+								oInvisibleText = Element.getElementById(sInvisibleTextID);
+							if (!oInvisibleText) {
+								var customData = !entry.getCustomData() ? [] : entry.getCustomData().filter(function(entry) {return entry.getKey() === "smartFormAriaLabel";});
+								if (customData.length && customData[0].getValue()) {
+									oInvisibleText = new InvisibleText({id : sInvisibleTextID, text: customData[0].getValue()}).toStatic();
+								}
+							}
+							if (oInvisibleText) {
+								entry._suggestTitleId(oInvisibleText.getId()); // set Section title id that will be used for aria
+							}
 							return;
 						}
 					});
@@ -209,7 +213,7 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/gener
 				setAsTitleOwner: fnSetAsTitleOwner,
 				adjustSubSectionTitle: fnAdjustSubSectionTitle,
 				addAccessibleName: fnAddAccessibleName,
-				manageAccessability: fnManageAccessability
+				setHeaderSmartFormAriaLabelBy: fnSetHeaderSmartFormAriaLabelBy //
 			};
 		}