@sapui5/sap.fe.templates 1.111.1 → 1.113.0

package/src/sap/fe/templates/ObjectPage/ObjectPageController.controller.ts

@@ -1,4 +1,3 @@
-import type ResourceBundle from "sap/base/i18n/ResourceBundle";
 import Log from "sap/base/Log";
 import merge from "sap/base/util/merge";
 import ActionRuntime from "sap/fe/core/ActionRuntime";
@@ -20,11 +19,15 @@ import ViewState from "sap/fe/core/controllerextensions/ViewState";
 import { defineUI5Class, extensible, finalExtension, publicExtension, usingExtension } from "sap/fe/core/helpers/ClassSupport";
 import type { InternalModelContext } from "sap/fe/core/helpers/ModelHelper";
 import ModelHelper from "sap/fe/core/helpers/ModelHelper";
+import { getResourceModel } from "sap/fe/core/helpers/ResourceModelHelper";
 import PageController from "sap/fe/core/PageController";
 import CommonHelper from "sap/fe/macros/CommonHelper";
 import DelegateUtil from "sap/fe/macros/DelegateUtil";
+import type TableAPI from "sap/fe/macros/table/TableAPI";
+import TableHelper from "sap/fe/macros/table/TableHelper";
 import TableUtils from "sap/fe/macros/table/Utils";
 import SelectionVariant from "sap/fe/navigation/SelectionVariant";
+import type SubSectionBlock from "sap/fe/templates/ObjectPage/controls/SubSectionBlock";
 import type { default as ObjectPageExtensionAPI } from "sap/fe/templates/ObjectPage/ExtensionAPI";
 import { default as ExtensionAPI } from "sap/fe/templates/ObjectPage/ExtensionAPI";
 import TableScroller from "sap/fe/templates/TableScroller";
@@ -36,13 +39,13 @@ import Core from "sap/ui/core/Core";
 import type Message from "sap/ui/core/message/Message";
 import OverrideExecution from "sap/ui/core/mvc/OverrideExecution";
 import type View from "sap/ui/core/mvc/View";
+import type Table from "sap/ui/mdc/Table";
 import type Binding from "sap/ui/model/Binding";
 import type JSONModel from "sap/ui/model/json/JSONModel";
 import type Context from "sap/ui/model/odata/v4/Context";
 import ODataContextBinding from "sap/ui/model/odata/v4/ODataContextBinding";
 import ODataListBinding from "sap/ui/model/odata/v4/ODataListBinding";
 import type ODataModel from "sap/ui/model/odata/v4/ODataModel";
-import type ResourceModel from "sap/ui/model/resource/ResourceModel";
 import type BreadCrumbs from "sap/uxap/BreadCrumbs";
 import type ObjectPageDynamicHeaderTitle from "sap/uxap/ObjectPageDynamicHeaderTitle";
 import type ObjectPageLayout from "sap/uxap/ObjectPageLayout";
@@ -58,18 +61,25 @@ import ViewStateOverrides from "./overrides/ViewState";
 @defineUI5Class("sap.fe.templates.ObjectPage.ObjectPageController")
 class ObjectPageController extends PageController {
 	oView!: any;
+
 	@usingExtension(Placeholder)
 	placeholder!: Placeholder;
+
 	@usingExtension(Share.override(ShareOverrides))
 	share!: Share;
+
 	@usingExtension(InternalRouting.override(InternalRoutingOverride))
 	_routing!: InternalRouting;
+
 	@usingExtension(Paginator.override(PaginatorOverride))
 	paginator!: Paginator;
+
 	@usingExtension(MessageHandler.override(MessageHandlerOverride))
 	messageHandler!: MessageHandler;
+
 	@usingExtension(IntentBasedNavigation.override(IntentBasedNavigationOverride))
 	intentBasedNavigation!: IntentBasedNavigation;
+
 	@usingExtension(
 		InternalIntentBasedNavigation.override({
 			getNavigationMode: function (this: InternalIntentBasedNavigation) {
@@ -81,8 +91,10 @@ class ObjectPageController extends PageController {
 		})
 	)
 	_intentBasedNavigation!: InternalIntentBasedNavigation;
+
 	@usingExtension(ViewState.override(ViewStateOverrides))
 	viewState!: ViewState;
+
 	@usingExtension(
 		PageReady.override({
 			isContextExpected: function () {
@@ -91,14 +103,20 @@ class ObjectPageController extends PageController {
 		})
 	)
 	pageReady!: PageReady;
+
 	@usingExtension(MassEdit)
 	massEdit!: MassEdit;
+
 	private mCustomSectionExtensionAPIs?: Record<string, ObjectPageExtensionAPI>;
+
 	protected extensionAPI?: ObjectPageExtensionAPI;
-	private oResourceBundle?: ResourceBundle;
+
 	private bSectionNavigated?: boolean;
+
 	private switchDraftAndActivePopOver?: Popover;
+
 	private currentBinding?: Binding;
+
 	private messageButton: any;
 
 	@publicExtension()
@@ -133,7 +151,7 @@ class ObjectPageController extends PageController {
 		});
 		oInternalModelContext?.setProperty("batchGroups", this._getBatchGroupsForView());
 		oInternalModelContext?.setProperty("errorNavigationSectionFlag", false);
-		if (!(this.getView().getViewData() as any).useNewLazyLoading && (oObjectPage as any).getEnableLazyLoading()) {
+		if (oObjectPage.getEnableLazyLoading()) {
 			//Attaching the event to make the subsection context binding active when it is visible.
 			oObjectPage.attachEvent("subSectionEnteredViewPort", this._handleSubSectionEnteredViewPort.bind(this));
 		}
@@ -195,6 +213,59 @@ class ObjectPageController extends PageController {
 		return oTable && oTable.getRowBinding();
 	}
 
+	/**
+	 * Find the last visible subsection and add the sapUxAPObjectPageSubSectionFitContainer CSS class if it contains only a gridTable.
+	 *
+	 * @param subSections The sub sections to look for
+	 * @private
+	 */
+	private checkSectionsForGridTable(subSections: ObjectPageSubSection[]) {
+		const changeClassForTables = (event: Event, lastVisibleSubSection: ObjectPageSubSection) => {
+			const blocks = [...lastVisibleSubSection.getBlocks(), ...lastVisibleSubSection.getMoreBlocks()];
+			if (
+				blocks.length === 1 &&
+				this.searchTableInBlock(blocks[0] as SubSectionBlock)
+					?.getType()
+					?.isA("sap.ui.mdc.table.GridTableType")
+			) {
+				//In case there is only a single table in a subSection we fit that to the whole page so that the scrollbar comes only on table and not on page
+				lastVisibleSubSection.addStyleClass("sapUxAPObjectPageSubSectionFitContainer");
+				lastVisibleSubSection.detachEvent("modelContextChange", changeClassForTables, this);
+			}
+		};
+		for (let subSectionIndex = subSections.length - 1; subSectionIndex >= 0; subSectionIndex--) {
+			if (subSections[subSectionIndex].getVisible()) {
+				const lastVisibleSubSection = subSections[subSectionIndex];
+				// We need to attach this event in order to manage the Object Page Lazy Loading mechanism
+				lastVisibleSubSection.attachEvent("modelContextChange", lastVisibleSubSection, changeClassForTables, this);
+				break;
+			}
+		}
+	}
+
+	/**
+	 * Find a table in blocks of section.
+	 *
+	 * @param block One sub section block
+	 * @returns Table if exists
+	 */
+	private searchTableInBlock(block: SubSectionBlock) {
+		const control = block.content;
+		let tableAPI: TableAPI | undefined;
+		if (block.isA("sap.fe.templates.ObjectPage.controls.SubSectionBlock")) {
+			// The table may currently be shown in a full screen dialog, we can then get the reference to the TableAPI
+			// control from the custom data of the place holder panel
+			if (control.isA("sap.m.Panel") && control.data("FullScreenTablePlaceHolder")) {
+				tableAPI = control.data("tableAPIreference");
+			} else if (control.isA("sap.fe.macros.table.TableAPI")) {
+				tableAPI = control as TableAPI;
+			}
+			if (tableAPI) {
+				return tableAPI.content as Table;
+			}
+		}
+		return undefined;
+	}
 	onBeforeRendering() {
 		PageController.prototype.onBeforeRendering.apply(this);
 		// In the retrieveTextFromValueList scenario we need to ensure in case of reload/refresh that the meta model in the methode retrieveTextFromValueList of the FieldRuntime is available
@@ -204,13 +275,17 @@ class ObjectPageController extends PageController {
 	}
 
 	onAfterRendering() {
-		((this.getView().getModel("sap.fe.i18n") as ResourceModel).getResourceBundle() as Promise<ResourceBundle>)
-			.then((response: any) => {
-				this.oResourceBundle = response;
-			})
-			.catch(function (oError: any) {
-				Log.error("Error while retrieving the resource bundle", oError);
-			});
+		let subSections: ObjectPageSubSection[];
+		if (this._getObjectPageLayoutControl().getUseIconTabBar()) {
+			const sections = this._getObjectPageLayoutControl().getSections();
+			for (const section of sections) {
+				subSections = section.getSubSections();
+				this.checkSectionsForGridTable(subSections);
+			}
+		} else {
+			subSections = this._getAllSubSections();
+			this.checkSectionsForGridTable(subSections);
+		}
 	}
 
 	_onBeforeBinding(oContext: any, mParameters: any) {
@@ -233,8 +308,8 @@ class ObjectPageController extends PageController {
 			!aBatchGroups.some(opContext.getModel().hasPendingChanges.bind(opContext.getModel()))
 		) {
 			/* 	In case there are pending changes for the creation row and no others we need to reset the changes
-    						TODO: this is just a quick solution, this needs to be reworked
-    				 	*/
+								TODO: this is just a quick solution, this needs to be reworked
+								*/
 
 			opContext.getBinding().resetChanges();
 		}
@@ -281,9 +356,9 @@ class ObjectPageController extends PageController {
 					// if the binding type is not ODataListBinding because of a deeplink navigation or a refresh of the page
 					// we need to create it
 					const sBindingPath = oBinding.getPath();
-					if (/\([^\)]*\)$/.test(sBindingPath)) {
+					if (/\([^)]*\)$/.test(sBindingPath)) {
 						// The current binding path ends with (xxx), so we create the listBinding by removing (xxx)
-						const sListBindingPath = sBindingPath.replace(/\([^\)]*\)$/, "");
+						const sListBindingPath = sBindingPath.replace(/\([^)]*\)$/, "");
 						oBinding = new (ODataListBinding as any)(oBinding.oModel, sListBindingPath);
 						const _setListBindingAsync = () => {
 							if (oBinding.getContexts().length > 0) {
@@ -301,7 +376,8 @@ class ObjectPageController extends PageController {
 				}
 			}
 		}
-		if (!(this.getView().getViewData() as any).useNewLazyLoading && oObjectPage.getEnableLazyLoading()) {
+
+		if (oObjectPage.getEnableLazyLoading()) {
 			const aSections = oObjectPage.getSections();
 			const bUseIconTabBar = oObjectPage.getUseIconTabBar();
 			let iSkip = 2;
@@ -339,7 +415,7 @@ class ObjectPageController extends PageController {
 				// Due to the left alignment of the Draft switch and the collaborative draft avatar controls
 				// there is a ToolbarSpacer in the actions aggregation which we need to exclude here!
 				// Due to the ACC report, we also need not to check for the InvisibleText elements
-				if (oAction.isA("sap.fe.macros.ShareAPI")) {
+				if (oAction.isA("sap.fe.macros.share.ShareAPI")) {
 					// since ShareAPI does not have a disable property
 					// hence there is no need to check if it is disbaled or not
 					return oAction.getVisible();
@@ -466,33 +542,36 @@ class ObjectPageController extends PageController {
 
 		aTables.forEach(function (oTable: any) {
 			const oInternalModelContext = oTable.getBindingContext("internal");
-			oInternalModelContext.setProperty("creationRowFieldValidity", {});
-			oInternalModelContext.setProperty("creationRowCustomValidity", {});
-
-			aIBNActions = CommonUtils.getIBNActions(oTable, aIBNActions);
-			// temporary workaround for BCP: 2080218004
-			// Need to fix with BLI: FIORITECHP1-15274
-			// only for edit mode, we clear the table cache
-			// Workaround starts here!!
-			const oTableRowBinding = oTable.getRowBinding();
-			if (oTableRowBinding) {
-				if (ModelHelper.isStickySessionSupported(oTableRowBinding.getModel().getMetaModel())) {
-					// apply for both edit and display mode in sticky
-					oTableRowBinding.removeCachesAndMessages("");
+			if (oInternalModelContext) {
+				oInternalModelContext.setProperty("creationRowFieldValidity", {});
+				oInternalModelContext.setProperty("creationRowCustomValidity", {});
+
+				aIBNActions = CommonUtils.getIBNActions(oTable, aIBNActions);
+
+				// temporary workaround for BCP: 2080218004
+				// Need to fix with BLI: FIORITECHP1-15274
+				// only for edit mode, we clear the table cache
+				// Workaround starts here!!
+				const oTableRowBinding = oTable.getRowBinding();
+				if (oTableRowBinding) {
+					if (ModelHelper.isStickySessionSupported(oTableRowBinding.getModel().getMetaModel())) {
+						// apply for both edit and display mode in sticky
+						oTableRowBinding.removeCachesAndMessages("");
+					}
 				}
+				// Workaround ends here!!
+
+				// Update 'enabled' property of DataFieldForAction buttons on table toolbar
+				// The same is also performed on Table selectionChange event
+				const oActionOperationAvailableMap = JSON.parse(
+						CommonHelper.parseCustomData(DelegateUtil.getCustomData(oTable, "operationAvailableMap"))
+					),
+					aSelectedContexts = oTable.getSelectedContexts();
+
+				ActionRuntime.setActionEnablement(oInternalModelContext, oActionOperationAvailableMap, aSelectedContexts, "table");
+				// Clear the selection in the table, need to be fixed and review with BLI: FIORITECHP1-24318
+				oTable.clearSelection();
 			}
-			// Workaround ends here!!
-
-			// Update 'enabled' property of DataFieldForAction buttons on table toolbar
-			// The same is also performed on Table selectionChange event
-			const oActionOperationAvailableMap = JSON.parse(
-					CommonHelper.parseCustomData(DelegateUtil.getCustomData(oTable, "operationAvailableMap"))
-				),
-				aSelectedContexts = oTable.getSelectedContexts();
-
-			ActionRuntime.setActionEnablement(oInternalModelContext, oActionOperationAvailableMap, aSelectedContexts, "table");
-			// Clear the selection in the table, need to be fixed and review with BLI: FIORITECHP1-24318
-			oTable.clearSelection();
 		});
 		CommonUtils.getSemanticTargetsFromPageModel(this, "_pageModel");
 		//Retrieve Object Page header actions from Object Page title control
@@ -504,44 +583,6 @@ class ObjectPageController extends PageController {
 
 		let oModel: any, oFinalUIState: any;
 
-		// TODO: this should be moved into an init event of the MDC tables (not yet existing) and should be part
-		// of any controller extension
-		/**
-		 * @param oTable
-		 * @param oListBinding
-		 */
-		async function enableFastCreationRow(oTable: any, oListBinding: any) {
-			const oFastCreationRow = oTable.getCreationRow();
-			let oFastCreationListBinding, oFastCreationContext;
-
-			if (oFastCreationRow) {
-				try {
-					await oFinalUIState;
-					if (oFastCreationRow.getModel("ui").getProperty("/isEditable")) {
-						oFastCreationListBinding = oModel.bindList(oListBinding.getPath(), oListBinding.getContext(), [], [], {
-							$$updateGroupId: "doNotSubmit",
-							$$groupId: "doNotSubmit"
-						});
-						// Workaround suggested by OData model v4 colleagues
-						oFastCreationListBinding.refreshInternal = function () {
-							/* do nothing */
-						};
-						oFastCreationContext = oFastCreationListBinding.create();
-						oFastCreationRow.setBindingContext(oFastCreationContext);
-
-						// this is needed to avoid console error
-						try {
-							await oFastCreationContext.created();
-						} catch (e) {
-							Log.trace("transient fast creation context deleted");
-						}
-					}
-				} catch (oError: any) {
-					Log.error("Error while computing the final UI state", oError);
-				}
-			}
-		}
-
 		// this should not be needed at the all
 		/**
 		 * @param oTable
@@ -549,7 +590,13 @@ class ObjectPageController extends PageController {
 		const handleTableModifications = (oTable: any) => {
 			const oBinding = this._getTableBinding(oTable),
 				fnHandleTablePatchEvents = function () {
-					enableFastCreationRow(oTable, oBinding);
+					TableHelper.enableFastCreationRow(
+						oTable.getCreationRow(),
+						oBinding.getPath(),
+						oBinding.getContext(),
+						oModel,
+						oFinalUIState
+					);
 				};
 
 			if (!oBinding) {
@@ -574,7 +621,7 @@ class ObjectPageController extends PageController {
 			oModel = oBindingContext.getModel();
 
 			// Compute Edit Mode
-			oFinalUIState = this._editFlow.computeEditMode(oBindingContext);
+			oFinalUIState = this.editFlow.computeEditMode(oBindingContext);
 
 			if (ModelHelper.isCollaborationDraftSupported(oModel.getMetaModel())) {
 				oFinalUIState
@@ -589,17 +636,8 @@ class ObjectPageController extends PageController {
 						Log.error("Error while waiting for the final UI State", oError);
 					});
 			}
-			// update related apps once Data is received in case of binding cache is not available
-			// TODO: this is only a temp solution since we need to call _updateRelatedApps method only after data for Object Page is received (if there is no binding)
-			if (oBindingContext.getBinding().oCache) {
-				this._updateRelatedApps();
-			} else {
-				const fnUpdateRelatedApps = () => {
-					this._updateRelatedApps();
-					oBindingContext.getBinding().detachDataReceived(fnUpdateRelatedApps);
-				};
-				oBindingContext.getBinding().attachDataReceived(fnUpdateRelatedApps);
-			}
+			// update related apps
+			this._updateRelatedApps();
 
 			//Attach the patch sent and patch completed event to the object page binding so that we can react
 			const oBinding = (oBindingContext.getBinding && oBindingContext.getBinding()) || oBindingContext;
@@ -619,10 +657,8 @@ class ObjectPageController extends PageController {
 					});
 			});
 
-			if (!(this.getView().getViewData() as any).useNewLazyLoading) {
-				// should be called only after binding is ready hence calling it in onAfterBinding
-				(oObjectPage as any)._triggerVisibleSubSectionsEvents();
-			}
+			// should be called only after binding is ready hence calling it in onAfterBinding
+			(oObjectPage as any)._triggerVisibleSubSectionsEvents();
 
 			//To Compute the Edit Binding of the subObject page using root object page, create a context for draft root and update the edit button in sub OP using the context
 			ActionRuntime.updateEditButtonVisibilityAndEnablement(this.getView());
@@ -848,24 +884,23 @@ class ObjectPageController extends PageController {
 	}
 
 	async _validateDocument(): Promise<void | any[] | ODataContextBinding> {
+		const appComponent = this.getAppComponent();
 		const control = Core.byId(Core.getCurrentFocusedControlId());
-		const context = control?.getBindingContext() as Context;
+		const context = control?.getBindingContext() as Context | undefined;
 		if (context && !context.isTransient()) {
-			// Wait for the pending changes before starting this validation
-			await this._editFlow.syncTask();
-			const appComponent = this.getAppComponent();
 			const sideEffectsService = appComponent.getSideEffectsService();
 			const entityType = sideEffectsService.getEntityTypeFromContext(context);
 			const globalSideEffects = entityType ? sideEffectsService.getGlobalODataEntitySideEffects(entityType) : [];
 			// If there is at least one global SideEffects for the related entity, execute it/them
 			if (globalSideEffects.length) {
+				await this.editFlow.syncTask();
 				return Promise.all(globalSideEffects.map((sideEffects) => this._sideEffects.requestSideEffects(sideEffects, context)));
-			} else {
-				const draftRootContext = await this.getDraftRootContext();
-				//Execute the draftValidation if there is no globalSideEffects (ignore ETags in collaboration draft)
-				if (draftRootContext) {
-					return draft.executeDraftValidation(draftRootContext, appComponent, isConnected(this.getView()));
-				}
+			}
+			const draftRootContext = await this.getDraftRootContext();
+			//Execute the draftValidation if there is no globalSideEffects (ignore ETags in collaboration draft)
+			if (draftRootContext) {
+				await this.editFlow.syncTask();
+				return draft.executeDraftValidation(draftRootContext, appComponent, isConnected(this.getView()));
 			}
 		}
 		return undefined;
@@ -948,13 +983,14 @@ class ObjectPageController extends PageController {
 
 	_updateRelatedApps() {
 		const oObjectPage = this._getObjectPageLayoutControl();
-		if (CommonUtils.resolveStringtoBoolean(oObjectPage.data("showRelatedApps"))) {
-			CommonUtils.updateRelatedAppsDetails(oObjectPage);
+		const showRelatedApps = oObjectPage.data("showRelatedApps");
+		if (showRelatedApps === "true" || showRelatedApps === true) {
+			const appComponent = CommonUtils.getAppComponent(this.getView());
+			CommonUtils.updateRelatedAppsDetails(oObjectPage, appComponent);
 		}
 	}
 
 	_findControlInSubSection(aParentElement: any, aSubsection: any, aControls: any, bIsChart?: boolean) {
-		const aSubSectionTables = [];
 		for (let element = 0; element < aParentElement.length; element++) {
 			let oElement = aParentElement[element].getContent instanceof Function && aParentElement[element].getContent();
 			if (bIsChart) {
@@ -973,6 +1009,11 @@ class ObjectPageController extends PageController {
 					oElement = oElement[0];
 				}
 			}
+			// The table may currently be shown in a full screen dialog, we can then get the reference to the TableAPI
+			// control from the custom data of the place holder panel
+			if (oElement && oElement.isA && oElement.isA("sap.m.Panel") && oElement.data("FullScreenTablePlaceHolder")) {
+				oElement = oElement.data("tableAPIreference");
+			}
 			if (oElement && oElement.isA && oElement.isA("sap.fe.macros.table.TableAPI")) {
 				oElement = oElement.getContent instanceof Function && oElement.getContent();
 				if (oElement && oElement.length > 0) {
@@ -981,12 +1022,7 @@ class ObjectPageController extends PageController {
 			}
 			if (oElement && oElement.isA && oElement.isA("sap.ui.mdc.Table")) {
 				aControls.push(oElement);
-				aSubSectionTables.push({
-					table: oElement,
-					gridTable: oElement.getType().isA("sap.ui.mdc.table.GridTableType")
-				});
 			}
-
 			if (oElement && oElement.isA && oElement.isA("sap.fe.macros.chart.ChartAPI")) {
 				oElement = oElement.getContent instanceof Function && oElement.getContent();
 				if (oElement && oElement.length > 0) {
@@ -997,15 +1033,6 @@ class ObjectPageController extends PageController {
 				aControls.push(oElement);
 			}
 		}
-		if (
-			aSubSectionTables.length === 1 &&
-			aParentElement.length === 1 &&
-			aSubSectionTables[0].gridTable &&
-			!aSubsection.hasStyleClass("sapUxAPObjectPageSubSectionFitContainer")
-		) {
-			//In case there is only a single table in a section we fit that to the whole page so that the scrollbar comes only on table and not on page
-			aSubsection.addStyleClass("sapUxAPObjectPageSubSectionFitContainer");
-		}
 	}
 
 	_getAllSubSections() {
@@ -1144,9 +1171,9 @@ class ObjectPageController extends PageController {
 			entitySet: sMetaPathPage
 		});
 		// Adding Page Context to selection variant
-		aPageAttributes = CommonUtils.removeSensitiveData(aPageAttributes, oMetaModel);
+		aPageAttributes = this._intentBasedNavigation.removeSensitiveData(aPageAttributes, sMetaPathPage);
 		const oPageLevelSV = CommonUtils.addPageContextToSelectionVariant(new SelectionVariant(), aPageAttributes, this.getView());
-		aAttributes = CommonUtils.removeSensitiveData(aAttributes, oMetaModel);
+		aAttributes = this._intentBasedNavigation.removeSensitiveData(aAttributes, sMetaPathPage);
 		return {
 			selectionVariant: oPageLevelSV,
 			attributes: aAttributes
@@ -1384,7 +1411,34 @@ class ObjectPageController extends PageController {
 				return false;
 			});
 
-			const oCurrentActionPromise = this._editFlow.getCurrentActionPromise();
+			// set correct binding context for fast creation row
+			const fastCreationRow = oTable.getCreationRow();
+
+			if (fastCreationRow && !fastCreationRow._oInnerCreationRow?.getBindingContext()) {
+				const tableBinding = this._getTableBinding(oTable);
+
+				if (!tableBinding) {
+					Log.error(`Expected binding missing for table: ${oTable.getId()}`);
+					return;
+				}
+
+				if (tableBinding.getContext()) {
+					const objectPage = this._getObjectPageLayoutControl();
+					const bindingContext = objectPage.getBindingContext() as Context;
+					const model = bindingContext.getModel();
+
+					TableHelper.enableFastCreationRow(
+						fastCreationRow,
+						tableBinding.getPath(),
+						tableBinding.getContext(),
+						model,
+						oTable.getModel("ui").getProperty("/isEditable")
+					);
+				}
+			}
+
+			const oCurrentActionPromise = this.editFlow.getCurrentActionPromise();
+
 			if (oCurrentActionPromise) {
 				let aTableContexts: any;
 				if (oTable.getType().getMetadata().isA("sap.ui.mdc.table.GridTableType")) {
@@ -1427,7 +1481,7 @@ class ObjectPageController extends PageController {
 							} else {
 								oTable.focusRow(iNewItemp, true);
 							}
-							this._editFlow.deleteCurrentActionPromise();
+							this.editFlow.deleteCurrentActionPromise();
 						}
 					})
 					.catch(function (err: any) {
@@ -1527,7 +1581,7 @@ class ObjectPageController extends PageController {
 			//TODO: Should remove this setTimeOut once Variant Management provides an api to fetch the current variant key on save
 			setTimeout(() => {
 				this.getExtensionAPI().updateAppState();
-			}, 500);
+			}, 2000);
 		},
 		navigateToSubSection: function (oController: ObjectPageController, vDetailConfig: any) {
 			const oDetailConfig = typeof vDetailConfig === "string" ? JSON.parse(vDetailConfig) : vDetailConfig;
@@ -1546,20 +1600,13 @@ class ObjectPageController extends PageController {
 				oSection = oSubSection && (oSubSection.getParent() as ObjectPageSection);
 			}
 			if (!oSection || !oSubSection || !oSection.getVisible() || !oSubSection.getVisible()) {
-				((oController.getView().getModel("sap.fe.i18n") as ResourceModel).getResourceBundle() as Promise<ResourceBundle>)
-					.then(function (oResourceBundle) {
-						const sTitle = CommonUtils.getTranslatedText(
-							"C_ROUTING_NAVIGATION_DISABLED_TITLE",
-							oResourceBundle,
-							undefined,
-							(oController.getView().getViewData() as any).entitySet
-						);
-						Log.error(sTitle);
-						MessageBox.error(sTitle);
-					})
-					.catch(function (error) {
-						Log.error(error);
-					});
+				const sTitle = getResourceModel(oController).getText(
+					"C_ROUTING_NAVIGATION_DISABLED_TITLE",
+					undefined,
+					(oController.getView().getViewData() as any).entitySet
+				);
+				Log.error(sTitle);
+				MessageBox.error(sTitle);
 			} else {
 				oObjectPage.scrollToSection(oSubSection.getId());
 				// trigger iapp state change