@sapui5/sap.suite.ui.generic.template 1.120.44 → 1.120.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.120.44",
+  "version": "1.120.45",
   "description": "SAPUI5 Library sap.suite.ui.generic.template",
   "keywords": [
     "sapui5",

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

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.120.44</version>
+	<version>1.120.45</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

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

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

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

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.120.44"
+			"version": "1.120.45"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

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

@@ -16,23 +16,23 @@ sap.ui.define([
 	"sap/suite/ui/generic/template/genericUtilities/testableHelper",
 	"sap/suite/ui/generic/template/js/StableIdHelper",
 	"sap/suite/ui/generic/template/genericUtilities/utils"
-	], function(BaseObject, ControllerExtension, NavError, listUtils, SelectionVariant, UIState, FeLogger, deepEqual, extend,
-			isEmptyObject, FeError, Device, semanticDateRangeTypeHelper, LegacyStateHandler, testableHelper, StableIdHelper, Utils) {
+], function (BaseObject, ControllerExtension, NavError, listUtils, SelectionVariant, UIState, FeLogger, deepEqual, extend,
+	isEmptyObject, FeError, Device, semanticDateRangeTypeHelper, LegacyStateHandler, testableHelper, StableIdHelper, Utils) {
 	"use strict";
 
-	var	sClassName = "ListReport.controller.IappStateHandler";
+	var sClassName = "ListReport.controller.IappStateHandler";
 	var oFeLogger = new FeLogger(sClassName);
 	var oLogger = oFeLogger.getLogger();
 	var oLevel = oFeLogger.Level;
 	// Constants which are used as property names for storing custom filter data and generic filter data
 	var dataPropertyNameCustom = "sap.suite.ui.generic.template.customData",
-	dataPropertyNameExtension = "sap.suite.ui.generic.template.extensionData",
-	dataPropertyNameGeneric = "sap.suite.ui.generic.template.genericData";
+		dataPropertyNameExtension = "sap.suite.ui.generic.template.extensionData",
+		dataPropertyNameGeneric = "sap.suite.ui.generic.template.genericData";
 	// Array contains URL parameters that should be ignored and trigger app initialization as only
 	// default parameters were passed
 	var aIgnoreURLParameters = ["save-appvar-id"];
 
-	function fnLogInfo(sMessage, vDetails){
+	function fnLogInfo(sMessage, vDetails) {
 		if (sap.ui.support) { //only if support assistant is loaded
 			var iLevel = oLogger.getLevel();
 			if (iLevel < oLevel.INFO) {
@@ -40,12 +40,12 @@ sap.ui.define([
 			}
 		}
 		var sDetails;
-		if (typeof vDetails === "string"){
+		if (typeof vDetails === "string") {
 			sDetails = vDetails;
 		} else {
 			sDetails = "";
 			var sDelim = "";
-			for (var sKey in vDetails){
+			for (var sKey in vDetails) {
 				sDetails = sDetails + sDelim + sKey + ": " + vDetails[sKey];
 				sDelim = "; ";
 			}
@@ -60,10 +60,15 @@ sap.ui.define([
 		// don't apply any results from appstate analysis to SFB before this event
 		// -> should actually be handled by (wrapper for) SFB
 		var onSmartFilterBarInitialized;
-		var oSmartFilterBarInitializedPromise = new Promise(function(fnResolve){
+		var oSmartFilterBarInitializedPromise = new Promise(function (fnResolve) {
 			onSmartFilterBarInitialized = fnResolve;
 		});
 
+		// Resolve this only after the FE initializes all the filter values from different sources
+		var onFEStartupInitializedResolver;
+		var onFEStartupInitializedPromise = new Promise(function (fnResolve) {
+			onFEStartupInitializedResolver = fnResolve;
+		});
 		// *** setup wrappers for control states (start)
 
 
@@ -83,21 +88,27 @@ sap.ui.define([
 		// 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.
 		// 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
+		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
 			aControlStateWrappers.push(oTemplateUtils.oCommonUtils.getControlStateWrapper(oSmartTable));
 		}
 
 		// SearchField state: Value of searchfield
 		// Exists only in case of worklist. In case of worklist with multiple views with multiple tables, same is true as for SmartTable
-		var oSearchField = oController.byId(StableIdHelper.getStableId({type: "ListReportAction", subType: "SearchField"}));
-		if (oSearchField){
+		var oSearchField = oController.byId(StableIdHelper.getStableId({
+			type: "ListReportAction",
+			subType: "SearchField"
+		}));
+		if (oSearchField) {
 			aControlStateWrappers.push(oTemplateUtils.oCommonUtils.getControlStateWrapper(oSearchField));
 		}
 
 		var oMultipleViewsGeneralContentStateWrapper = oState.oMultipleViewsHandler.getGeneralContentStateWrapper();
-		if (oMultipleViewsGeneralContentStateWrapper){
-			oMultipleViewsGeneralContentStateWrapper.getLocalId = function(){
+		if (oMultipleViewsGeneralContentStateWrapper) {
+			oMultipleViewsGeneralContentStateWrapper.getLocalId = function () {
 				return "$multipleViewsGeneralContent";
 			};
 			aControlStateWrappers.push(oMultipleViewsGeneralContentStateWrapper);
@@ -106,7 +117,7 @@ sap.ui.define([
 		// state information not belonging to the SFB needs to be added to the variant management, if page variant management is used (setting smartVariantManagment) and not
 		// hidden (setting variantManagementHidden) - otherwise, it needs to be stored directly in the appState
 
-		if (oController.getOwnerComponent().getSmartVariantManagement() && !oController.getOwnerComponent().getVariantManagementHidden()){
+		if (oController.getOwnerComponent().getSmartVariantManagement() && !oController.getOwnerComponent().getVariantManagementHidden()) {
 			// if no page variant management or page variant hidden, everything up to here is stored directly in the iAppState (only). In that case, only SFBs state is relevant for
 			// variant managment
 			aPageVariantControlStateWrappers = aControlStateWrappers;
@@ -114,8 +125,8 @@ sap.ui.define([
 		}
 
 		var oMultipleViewsSFBVariantContentStateWrapper = oState.oMultipleViewsHandler.getSFBVariantContentStateWrapper();
-		if (oMultipleViewsSFBVariantContentStateWrapper){
-			oMultipleViewsSFBVariantContentStateWrapper.getLocalId = function(){
+		if (oMultipleViewsSFBVariantContentStateWrapper) {
+			oMultipleViewsSFBVariantContentStateWrapper.getLocalId = function () {
 				return "$multipleViewsSFBVariantContent";
 			};
 			aPageVariantControlStateWrappers.push(oMultipleViewsSFBVariantContentStateWrapper);
@@ -124,83 +135,86 @@ 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 = [];
+
 		function customAppStateChange() {
-			aExtensionStateChangeHandlers.forEach(function(fnHandler) {
+			aExtensionStateChangeHandlers.forEach(function (fnHandler) {
 				fnHandler();
 			});
 		}
 
 		var oCustomFiltersWrapper = {
-				getLocalId: function(){
-					return "$customFilters";
-				},
-				getState: function(){
-					var oState = {
-							appExtension: Object.create(null),
-							adaptationExtensions: Object.create(null) // collects all extension state information (as map extension-namespace -> state). Initialized on demand
-					};
-
-					if (oTemplateUtils.oComponentUtils.isDraftEnabled()){
-						var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
-						oState.editState = oTemplatePrivateModel.getProperty("/listReport/vDraftState");
-					}
-
-					oController.getCustomAppStateDataExtension(oState.appExtension);
+			getLocalId: function () {
+				return "$customFilters";
+			},
+			getState: function () {
+				var oState = {
+					appExtension: Object.create(null),
+					adaptationExtensions: Object.create(null) // collects all extension state information (as map extension-namespace -> state). Initialized on demand
+				};
+
+				if (oTemplateUtils.oComponentUtils.isDraftEnabled()) {
+					var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
+					oState.editState = oTemplatePrivateModel.getProperty("/listReport/vDraftState");
+				}
 
-					var bIsAllowed = true; // check for synchronous calls
-					// the following function will be passed to all extensions. It gives them the possibility to provide their state as oAppState
-					// Therefore, they must identify themselves via their instance of ControllerExtension.
-					var fnSetSingleAdaptationExtensionState = function(oControllerExtension, oSingleAdaptationExtensionState){
-						if (!(oControllerExtension instanceof ControllerExtension)){
-							throw new FeError(sClassName, "State must always be set with respect to a ControllerExtension");
-						}
-						if (!bIsAllowed){
-							throw new FeError(sClassName, "State must always be provided synchronously");
-						}
-						oState.adaptationExtensions[oControllerExtension.getMetadata().getNamespace()] = oSingleAdaptationExtensionState;
-					};
-					oController.templateBaseExtension.provideExtensionAppStateData(fnSetSingleAdaptationExtensionState);
-					bIsAllowed = false;
+				oController.getCustomAppStateDataExtension(oState.appExtension);
 
-					return oState;
-				},
-				setState: function(oState){
-					if (oTemplateUtils.oComponentUtils.isDraftEnabled()){
-						var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
-						oTemplatePrivateModel.setProperty("/listReport/vDraftState", oState.editState);
+				var bIsAllowed = true; // check for synchronous calls
+				// the following function will be passed to all extensions. It gives them the possibility to provide their state as oAppState
+				// Therefore, they must identify themselves via their instance of ControllerExtension.
+				var fnSetSingleAdaptationExtensionState = function (oControllerExtension, oSingleAdaptationExtensionState) {
+					if (!(oControllerExtension instanceof ControllerExtension)) {
+						throw new FeError(sClassName, "State must always be set with respect to a ControllerExtension");
 					}
+					if (!bIsAllowed) {
+						throw new FeError(sClassName, "State must always be provided synchronously");
+					}
+					oState.adaptationExtensions[oControllerExtension.getMetadata().getNamespace()] = oSingleAdaptationExtensionState;
+				};
+				oController.templateBaseExtension.provideExtensionAppStateData(fnSetSingleAdaptationExtensionState);
+				bIsAllowed = false;
+
+				return oState;
+			},
+			setState: function (oState) {
+				if (oTemplateUtils.oComponentUtils.isDraftEnabled()) {
+					var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
+					oTemplatePrivateModel.setProperty("/listReport/vDraftState", oState.editState);
+				}
 
-					oController.restoreCustomAppStateDataExtension(oState.appExtension);
+				oController.restoreCustomAppStateDataExtension(oState.appExtension);
 
-					var bIsAllowed = true; // check for synchronous calls
-					// the following function will be passed to all extensions. It gives them the possibility to retrieve their state.
-					// Therefore, they must identify themselves via their instance of ControllerExtension.
-					var fnGetSingleAdaptationExtensionState = function(oControllerExtension){
-						if (!(oControllerExtension instanceof ControllerExtension)){
-							throw new FeError(sClassName, "State must always be retrieved with respect to a ControllerExtension");
-						}
-						if (!bIsAllowed){
-							throw new FeError(sClassName, "State must always be restored synchronously");
-						}
-						return oState.adaptationExtensions[oControllerExtension.getMetadata().getNamespace()];
-					};
-					oController.templateBaseExtension.restoreExtensionAppStateData(fnGetSingleAdaptationExtensionState);
-					bIsAllowed = false;
-				},
-				attachStateChanged: function(fnHandler){
-					if (oController.byId("editStateFilter")){
-						// Remark:
-						// - checking for isDraftEnabled is not enough - if filtering on draft is not supported, editStateFilter would also not be created
-						// - Cleaner from architectural point of view, but not strictly needed, as SFB registers for the same event and fires filterChanged
-						oController.byId("editStateFilter").attachChange(fnHandler);
+				var bIsAllowed = true; // check for synchronous calls
+				// the following function will be passed to all extensions. It gives them the possibility to retrieve their state.
+				// Therefore, they must identify themselves via their instance of ControllerExtension.
+				var fnGetSingleAdaptationExtensionState = function (oControllerExtension) {
+					if (!(oControllerExtension instanceof ControllerExtension)) {
+						throw new FeError(sClassName, "State must always be retrieved with respect to a ControllerExtension");
 					}
-					// For extensionFilters, registration is needed for extension using controls not known to the SFB implementation (which is a fundamental purpose of extension!)
-					// Same is valid for appExtensions and adaptationExtensions.
-					aExtensionStateChangeHandlers.push(fnHandler);
+					if (!bIsAllowed) {
+						throw new FeError(sClassName, "State must always be restored synchronously");
+					}
+					return oState.adaptationExtensions[oControllerExtension.getMetadata().getNamespace()];
+				};
+				oController.templateBaseExtension.restoreExtensionAppStateData(fnGetSingleAdaptationExtensionState);
+				bIsAllowed = false;
+			},
+			attachStateChanged: function (fnHandler) {
+				if (oController.byId("editStateFilter")) {
+					// Remark:
+					// - checking for isDraftEnabled is not enough - if filtering on draft is not supported, editStateFilter would also not be created
+					// - Cleaner from architectural point of view, but not strictly needed, as SFB registers for the same event and fires filterChanged
+					oController.byId("editStateFilter").attachChange(fnHandler);
 				}
+				// For extensionFilters, registration is needed for extension using controls not known to the SFB implementation (which is a fundamental purpose of extension!)
+				// Same is valid for appExtensions and adaptationExtensions.
+				aExtensionStateChangeHandlers.push(fnHandler);
+			}
 		};
 
-		var oSmartFilterBarWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapper(oState.oSmartFilterbar, {oCustomFiltersWrapper: oCustomFiltersWrapper});
+		var oSmartFilterBarWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapper(oState.oSmartFilterbar, {
+			oCustomFiltersWrapper: oCustomFiltersWrapper
+		});
 
 		// theoretically, SFB's state is part of VM. But due to the direct connection between SFB and SVM, applying a variant would lead to an endless loop (selection variant as
 		// part of UiState object applied to SFB also contains a variant id, which is then applied to SVM). The same connection ensures that the part of SFB's state known to the SFB
@@ -216,7 +230,7 @@ sap.ui.define([
 		//		SVM side (which is cleaner architecture, as the SVM rather manages the SFB)
 		// - Here, only the connection is established. All workarounds needed due to the broken connection should be build into the wrappers
 		var oSmartVariantManagement = oState.oSmartFilterbar.getSmartVariant();
-		if (oSmartVariantManagement){
+		if (oSmartVariantManagement) {
 			var oSmartVariantManagementWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapper(oSmartVariantManagement, {
 				managedControlWrappers: aPageVariantControlStateWrappers.concat([oSmartFilterBarWrapper]),
 				smartFilterBarWrapper: oSmartFilterBarWrapper
@@ -227,7 +241,10 @@ sap.ui.define([
 		}
 
 		// DynamicPage state: header pinned
-		var oDynamicPage = oController.byId(StableIdHelper.getStableId({type: "ListReportPage", subType: "DynamicPage"}));
+		var oDynamicPage = oController.byId(StableIdHelper.getStableId({
+			type: "ListReportPage",
+			subType: "DynamicPage"
+		}));
 		// The DynamicPage state (header pinned) is intentionally stored only in iAppState and not included in any variant (neither page variant nor SFB variant).
 		var oDynamicPageWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapper(oDynamicPage);
 		aControlStateWrappers.push(oDynamicPageWrapper);
@@ -235,7 +252,7 @@ sap.ui.define([
 
 		// Wrapper to control whether data is loaded
 
-		function fnGetDataLoadedWrapper(){
+		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();
 			// initial state:
@@ -243,16 +260,16 @@ sap.ui.define([
 			// - other startup cases: applyInitialLoadBehavior calls setState explicitly
 			// - navigation
 
-			function fnSetState(bState){
+			function fnSetState(bState) {
 				oTemplatePrivateModel.setProperty("/generic/bDataAreShownInTable", bState);
 			}
 
-			function fnGetState(){
+			function fnGetState() {
 				return oTemplatePrivateModel.getProperty("/generic/bDataAreShownInTable");
 			}
 
-			function fnSetDataShown(bDataShown, fnHandler){
-				if (bDataShown === fnGetState()){
+			function fnSetDataShown(bDataShown, fnHandler) {
+				if (bDataShown === fnGetState()) {
 					return;
 				}
 				fnSetState(bDataShown);
@@ -260,12 +277,12 @@ sap.ui.define([
 			}
 
 			return {
-				getLocalId: function(){
+				getLocalId: function () {
 					return "$dataLoaded";
 				},
 				setState: fnSetState,
 				getState: fnGetState,
-				attachStateChanged: function(fnHandler){
+				attachStateChanged: function (fnHandler) {
 					// changing from data not loaded to data loaded:
 					// - when SFB triggers search
 					oState.oSmartFilterbar.attachSearch(fnSetDataShown.bind(null, true, fnHandler));
@@ -277,6 +294,10 @@ sap.ui.define([
 					//			pro: 	- also for custom filters (the SFB does not know about)
 					//					- not when applying state to SFB
 					//			contra: could there be other changes from SFB?
+					// Note: this event also fires during iAppState restore when SVM applies a variant
+					//		asynchronously via setCurrentVariantId, unintentionally resetting $dataLoaded
+					//		to false. Therefore fnAdaptToAppStateIappState explicitly re-applies the saved
+					//		$dataLoaded value after all wrappers have settled via Promise.all.
 					oState.oSmartFilterbar.attachFilterChange(fnSetDataShown.bind(null, false, fnHandler));
 				}
 			};
@@ -284,10 +305,10 @@ sap.ui.define([
 
 		var oDataLoadedWrapper = fnGetDataLoadedWrapper();
 		aControlStateWrappers.push(oDataLoadedWrapper);
-//		oDataLoadedWrapper.attachStateChanged(changeIappState);
+		//		oDataLoadedWrapper.attachStateChanged(changeIappState);
 
 		// attach to change event of all wrappers handled directly - others should be propagated through the managing control wrapper (currently a SmartVariantManagementWrapper)
-		aControlStateWrappers.forEach(function(oWrapper){
+		aControlStateWrappers.forEach(function (oWrapper) {
 			oWrapper.attachStateChanged(changeIappState);
 		});
 
@@ -307,22 +328,22 @@ sap.ui.define([
 			oDataLoadedWrapper.setState(bDataShown);
 		}
 
-		function areDataShownInTable(){
+		function areDataShownInTable() {
 			var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
 			return oTemplatePrivateModel.getProperty("/generic/bDataAreShownInTable");
 		}
 
 		// trigger loading data
 		// This method is NOT intended to do any checks to analyze, whether loading data is actually needed - that should be done before
-		function loadData(){
+		function loadData() {
 			oState.oSmartFilterbar.search();
 		}
 
 		function getCurrentAppState() {
 
 			var mControlStates = {};
-			aControlStateWrappers.forEach(function(oWrapper){
-				if (oWrapper.getLocalId()){
+			aControlStateWrappers.forEach(function (oWrapper) {
+				if (oWrapper.getLocalId()) {
 					mControlStates[oWrapper.getLocalId()] = oWrapper.getState();
 				}
 			});
@@ -352,13 +373,14 @@ sap.ui.define([
 				}
 			} else {
 				var aPageVariantId = oNewUrlParameters['sap-ui-fe-variant-id'],
-				aFilterBarVariantId = oNewUrlParameters['sap-ui-fe-filterbar-variant-id'],
-				aChartVariantId = oNewUrlParameters['sap-ui-fe-chart-variant-id'],
-				aTableVariantId = oNewUrlParameters['sap-ui-fe-table-variant-id'];
+					aFilterBarVariantId = oNewUrlParameters['sap-ui-fe-filterbar-variant-id'],
+					aChartVariantId = oNewUrlParameters['sap-ui-fe-chart-variant-id'],
+					aTableVariantId = oNewUrlParameters['sap-ui-fe-table-variant-id'];
 
 				applyControlVariantId(aFilterBarVariantId && aFilterBarVariantId[0], aChartVariantId && aChartVariantId[0], aTableVariantId && aTableVariantId[0], aPageVariantId && aPageVariantId[0]);
 			}
 		}
+
 		function applyControlVariantId(sFilterBarVariantId, sChartVariantId, sTableVariantId, sPageVariantId) {
 			if (sFilterBarVariantId || sPageVariantId) {
 				oSmartVariantManagement.setCurrentVariantId(sFilterBarVariantId || sPageVariantId);
@@ -382,7 +404,7 @@ sap.ui.define([
 		// - Collapse of filter bar once user press Go (only for phone device)
 		function onSearchPressed() {
 			// if SFB does not allow search, no need to adapt anything
-			if (!oState.oSmartFilterbar.checkSearchAllowed()){
+			if (!oState.oSmartFilterbar.checkSearchAllowed()) {
 				return;
 			}
 			oState.refreshModel();
@@ -402,7 +424,7 @@ sap.ui.define([
 
 		// It is responsible for:
 		// - triggering the creation of a new appState
-		function changeIappState(){
+		function changeIappState() {
 			fnLogInfo("changeIappState called", {
 				bDataAreShownInTable: areDataShownInTable()
 			});
@@ -415,16 +437,16 @@ sap.ui.define([
 
 		/*
 		The function is to add default values in Display Currency parameter if it is not there in the Selection Variant
-        @param {object} Selection Variant
+		@param {object} Selection Variant
 `		@param {object} App data
 		 */
 		function addDisplayCurrency(oAppData) {
 			var aMandatoryFilterItems = oState.oSmartFilterbar.determineMandatoryFilterItems(),
-			sDisplayCurrency;
+				sDisplayCurrency;
 			for (var item = 0; item < aMandatoryFilterItems.length; item++) {
 				if (aMandatoryFilterItems[item].getName().indexOf("P_DisplayCurrency") !== -1) {
-					if (oAppData.oDefaultedSelectionVariant.getSelectOption("DisplayCurrency") && oAppData.oDefaultedSelectionVariant.getSelectOption("DisplayCurrency")[0]
-						&& oAppData.oDefaultedSelectionVariant.getSelectOption("DisplayCurrency")[0].Low) {
+					if (oAppData.oDefaultedSelectionVariant.getSelectOption("DisplayCurrency") && oAppData.oDefaultedSelectionVariant.getSelectOption("DisplayCurrency")[0] &&
+						oAppData.oDefaultedSelectionVariant.getSelectOption("DisplayCurrency")[0].Low) {
 						sDisplayCurrency = oAppData.oDefaultedSelectionVariant.getSelectOption("DisplayCurrency")[0].Low;
 						if (sDisplayCurrency) {
 							oAppData.oSelectionVariant.addParameter("P_DisplayCurrency", sDisplayCurrency);
@@ -449,28 +471,39 @@ sap.ui.define([
 			oState.oPresentationControlHandler.applyNavigationSortOrder(aNavigationSortOrder);
 		}
 
-		function fnAdaptToAppStateIappState(oAppData){
-
+		function fnAdaptToAppStateIappState(oAppData) {
+			// Save $dataLoaded value upfront before any wrappers run.
+			// This is needed because the SVM wrapper applies its variant asynchronously
+			// (via oAllControlsInitializedPromise). When it resolves, fnSetVariant calls
+			// setCurrentVariantId which triggers SFB's filterChange event. oDataLoadedWrapper
+			// is attached to filterChange and resets bDataAreShownInTable to false — overwriting
+			// the value that was correctly restored from iAppState. Re-applying it explicitly
+			// after the microtask ensures the saved value wins after all synchronous activity
+			// settles, without depending on the full SVM async promise chain which may not
+			// resolve in test environments (OPA).
+			var bDataLoaded = oAppData.controlStates && oAppData.controlStates["$dataLoaded"];
 			fnAdaptOtherControlsToAppState(oAppData.controlStates);
-			if (areDataShownInTable() && Object.keys(oState.oSmartFilterbar.verifySearchAllowed()).length === 0){
+			Promise.resolve().then(function() {
+				oDataLoadedWrapper.setState(bDataLoaded);
+				if (areDataShownInTable() && Object.keys(oState.oSmartFilterbar.verifySearchAllowed()).length === 0) {
 				// fnAdaptOtherControlsToAppState only (synchronously) sets the state including the information whether data should be loaded and search is allowed,- if this is the case, the actual loading
 				// (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
-			if (!oState.oSmartFilterbar.checkSearchAllowed()){
-				oTemplateUtils.oComponentUtils.hidePlaceholder();
-			}
+				} 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
+				if (!oState.oSmartFilterbar.checkSearchAllowed()) {
+					oTemplateUtils.oComponentUtils.hidePlaceholder();
+				}
+			});
 		}
 
-		function fnAdaptToAppStateNavigation(oAppData, oURLParameters, sPreferredQuickVariantSelectionKey){
+		function fnAdaptToAppStateNavigation(oAppData, oURLParameters, sPreferredQuickVariantSelectionKey) {
 			handleVariantIdPassedViaURLParams(oURLParameters);
 			handleEditingStatusFilterPassedViaURLParams(oURLParameters);
 			//Apply sort order coming from the XAppState to the smart table.
@@ -481,12 +514,12 @@ sap.ui.define([
 				addDisplayCurrency(oAppData);
 			}
 			var oStartupObject = {
-					viaExternalNavigation: true,
-					selectionVariant: oAppData.oSelectionVariant,
-					urlParameters: oURLParameters,
-					selectedQuickVariantSelectionKey: sPreferredQuickVariantSelectionKey,
-					// incase semantic date field is present, parseNavigation returns semanticDates in stringified format and otherwise an empty object
-					semanticDates: (typeof oAppData.semanticDates === "string" ? JSON.parse(oAppData.semanticDates) : oAppData.semanticDates) || {}
+				viaExternalNavigation: true,
+				selectionVariant: oAppData.oSelectionVariant,
+				urlParameters: oURLParameters,
+				selectedQuickVariantSelectionKey: sPreferredQuickVariantSelectionKey,
+				// incase semantic date field is present, parseNavigation returns semanticDates in stringified format and otherwise an empty object
+				semanticDates: (typeof oAppData.semanticDates === "string" ? JSON.parse(oAppData.semanticDates) : oAppData.semanticDates) || {}
 			};
 			// if there is a navigation from external application to worklist,
 			// the filters from external application should not be applied since the worklist does not show smartfilterbar
@@ -500,7 +533,7 @@ sap.ui.define([
 					oStartupObject.semanticDates = semanticDateRangeTypeHelper.addSemanticDateRangeDefaultValue(oSettings, oState.oSmartFilterbar, oStartupObject.semanticDates, oStartupObject.urlParameters || {}, oStartupObject.selectionVariant, true);
 					// Smart filter bar all the filters will be replaced by the one which are coming from oUiState build base of oSelectionVariant where the Semantic Date Default Values
 					// is missing and because of that the values are replaced. Hence adding the semantic Dates to oSelectionVariant as mentioned by the Smart Control Colleague in the mentioned BCP
-					oStartupObject.semanticDates.Dates.forEach(function(oSelectDateOption){
+					oStartupObject.semanticDates.Dates.forEach(function (oSelectDateOption) {
 						oStartupObject.selectionVariant.addSelectOption(oSelectDateOption.PropertyName, "I", "EQ", "");
 					});
 				}
@@ -514,21 +547,21 @@ sap.ui.define([
 
 			// In navigation case, data should be loaded in general unless variant is provided in navigation parameters - in that case, setting of that variant should win.
 			// Remark: Implemented logic does not fully reflect this: If navigation parameter exists but points to the standard variant, still the initial startup logic applies.
-			applyInitialLoadBehavior(/* bDataLoadCausedByNavigation = */ oState.oSmartFilterbar.isCurrentVariantStandard());
+			applyInitialLoadBehavior( /* bDataLoadCausedByNavigation = */ oState.oSmartFilterbar.isCurrentVariantStandard());
 		}
 
 
-		function fnAdaptToAppStateStartUpInitial(oURLParameters, sPreferredQuickVariantSelectionKey){
+		function fnAdaptToAppStateStartUpInitial(oURLParameters, sPreferredQuickVariantSelectionKey) {
 			handleVariantIdPassedViaURLParams(oURLParameters);
 
 			//oStartupObject to be passed to the extension where urlParameters and selectedQuickVariantSelectionKey are optional
 			var oStartupObject = {
-					viaExternalNavigation: false,
-					selectionVariant: "",
-					urlParameters: oURLParameters, // can only contain "technical" parameters (starting with "sap-")
-					selectedQuickVariantSelectionKey: sPreferredQuickVariantSelectionKey,
-					// in case semantic date field is present, parseNavigation returns semanticDates in stringified format and otherwise an empty object
-					semanticDates:  {}
+				viaExternalNavigation: false,
+				selectionVariant: "",
+				urlParameters: oURLParameters, // can only contain "technical" parameters (starting with "sap-")
+				selectedQuickVariantSelectionKey: sPreferredQuickVariantSelectionKey,
+				// in case semantic date field is present, parseNavigation returns semanticDates in stringified format and otherwise an empty object
+				semanticDates: {}
 			};
 			var oSFBUiState = oState.oSmartFilterbar.getUiState();
 			var oSFBSelectionVariant = new SelectionVariant(JSON.stringify(oSFBUiState.getSelectionVariant()));
@@ -568,7 +601,7 @@ sap.ui.define([
 
 				// Smart filter bar all the filters will be replaced by the one which are coming from oUiState build base of oSelectionVariant where the Semantic Date Default Values
 				// is missing and because of that the values are replaced. Hence adding the semantic Dates to oSelectionVariant as mentioned by the Smart Control Colleague in the mentioned BCP
-				oStartupObject.semanticDates.Dates.forEach(function(oSelectDateOption){
+				oStartupObject.semanticDates.Dates.forEach(function (oSelectDateOption) {
 					oStartupObject.selectionVariant.addSelectOption(oSelectDateOption.PropertyName, "I", "EQ", "");
 				});
 			}
@@ -584,32 +617,32 @@ sap.ui.define([
 		}
 
 		//Startup semantic date will be priortised in case of collision
-		function fnMergeSemanticDates(aSFBSemanticDate, aStartupSemanticDate){
+		function fnMergeSemanticDates(aSFBSemanticDate, aStartupSemanticDate) {
 			var oSemanticDateMap = {};
-			aSFBSemanticDate.forEach(function(oVal) {
+			aSFBSemanticDate.forEach(function (oVal) {
 				oSemanticDateMap[oVal.PropertyName] = oVal;
 			});
-			aStartupSemanticDate.forEach(function(oVal) {
+			aStartupSemanticDate.forEach(function (oVal) {
 				oSemanticDateMap[oVal.PropertyName] = oVal;
 			});
 			return Object.values(oSemanticDateMap);
 		}
 
-		function fnAdaptToAppStateStartUpWithParameters(oAppData, oURLParameters, sPreferredQuickVariantSelectionKey){
+		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
 			var oStartupObject = {
-					viaExternalNavigation: false,
-					selectionVariant: oAppData.oSelectionVariant,
-					urlParameters: oURLParameters,
-					selectedQuickVariantSelectionKey: sPreferredQuickVariantSelectionKey,
-					// In case semantic date field is present, parseNavigation returns semanticDates in stringified format and otherwise an empty object.
-					// Moreover, if there is no semanticDates retrieved from NavigationHandler, then the existing values of semantic
-					// dates properties considered by smartfilterbar (from annotation, change handler etc) should be taken into consideration.
-					semanticDates: (typeof oAppData.semanticDates === "string" ? JSON.parse(oAppData.semanticDates) : oAppData.semanticDates) || {}
+				viaExternalNavigation: false,
+				selectionVariant: oAppData.oSelectionVariant,
+				urlParameters: oURLParameters,
+				selectedQuickVariantSelectionKey: sPreferredQuickVariantSelectionKey,
+				// In case semantic date field is present, parseNavigation returns semanticDates in stringified format and otherwise an empty object.
+				// Moreover, if there is no semanticDates retrieved from NavigationHandler, then the existing values of semantic
+				// dates properties considered by smartfilterbar (from annotation, change handler etc) should be taken into consideration.
+				semanticDates: (typeof oAppData.semanticDates === "string" ? JSON.parse(oAppData.semanticDates) : oAppData.semanticDates) || {}
 			};
 			//Apply sort order coming from the XAppState to the smart table.
 			if (oAppData.presentationVariant !== undefined) {
@@ -642,16 +675,16 @@ sap.ui.define([
 					}
 					// Smart filter bar all the filters will be replaced by the one which are coming from oUiState build base of oSelectionVariant where the Semantic Date Default Values
 					// is missing and because of that the values are replaced. Hence adding the semantic Dates to oSelectionVariant as mentioned by the Smart Control Colleague in the mentioned BCP
-					oStartupObject.semanticDates.Dates.forEach(function(oSelectDateOption) {
+					oStartupObject.semanticDates.Dates.forEach(function (oSelectDateOption) {
 						var oSelectionDateOption = oStartupObject.selectionVariant.getSelectOption(oSelectDateOption.PropertyName);
-						var oSFBSelectionOption =  oSFBSelectionVariant.getSelectOption(oSelectDateOption.PropertyName);
+						var oSFBSelectionOption = oSFBSelectionVariant.getSelectOption(oSelectDateOption.PropertyName);
 						//If startup object contains date range with the oSelectionDateOption PropertyName no need to override
 						if (oSelectionDateOption && oSelectionDateOption.length != 0) {
 							return;
 						}
 						//If SmartFilterBar has the property for that in that case add it to selectOption
 						if (oSFBSelectionOption && oSFBSelectionOption.length != 0) {
-							oStartupObject.selectionVariant.massAddSelectOption(oSelectDateOption.PropertyName,oSFBSelectionOption);
+							oStartupObject.selectionVariant.massAddSelectOption(oSelectDateOption.PropertyName, oSFBSelectionOption);
 							return;
 						}
 						//If none has in that case we will add the selectOption with empty value
@@ -681,9 +714,9 @@ sap.ui.define([
 
 					var oSFBSelectionVariantJSON = oSFBSelectionVariant.toJSONObject();
 					if (
-							!fnArrayContainsSameEnteries(oSFBSelectionVariantJSON.SelectOptions.filter(fnFilterItemExists), aTargetSelectionVariantJSON.SelectOptions.filter(fnFilterItemExists)) ||
-							!fnArrayContainsSameEnteries(oSFBSelectionVariantJSON.Parameters.filter(fnParameterExists), aTargetSelectionVariantJSON.Parameters.filter(fnParameterExists)) ||
-							!bSemanticDateEqual
+						!fnArrayContainsSameEnteries(oSFBSelectionVariantJSON.SelectOptions.filter(fnFilterItemExists), aTargetSelectionVariantJSON.SelectOptions.filter(fnFilterItemExists)) ||
+						!fnArrayContainsSameEnteries(oSFBSelectionVariantJSON.Parameters.filter(fnParameterExists), aTargetSelectionVariantJSON.Parameters.filter(fnParameterExists)) ||
+						!bSemanticDateEqual
 					) {
 						fnApplySelectionVariantToSFB(oTargetSelectionVariant, oAppData.selectionVariant, true, oStartupObject.semanticDates, false);
 						oSmartVariantManagement.currentVariantSetModified(true);
@@ -713,7 +746,7 @@ sap.ui.define([
 		// In case of  restoring from iAppState, it's called by applyState, which is in turn called from statePreserver, that
 		// already takes care of not trying to apply an appstate that is not valid anymore.
 		// task of this method is (now always when it's called!) only to adapt the state of all relevant controls to the provided one
-		function fnAdaptToAppState(oAppData, oURLParameters, sNavType){
+		function fnAdaptToAppState(oAppData, oURLParameters, sNavType) {
 			fnLogInfo("fnAdaptToAppState called", {
 				sNavType: sNavType
 			});
@@ -721,7 +754,7 @@ sap.ui.define([
 			// Remark: within SVM Wrapper, setSuppressSelection is also used - be aware, that this must not be overlapping (as in both cases we set back to fixed-value false)
 			oState.oSmartFilterbar.setSuppressSelection(false);
 			bInitialisation = false;
-			if (sNavType === sap.fe.navigation.NavType.hybrid){ // incase of hybrid -> take everything from IappState
+			if (sNavType === sap.fe.navigation.NavType.hybrid) { // incase of hybrid -> take everything from IappState
 				oAppData = oAppData.iAppState;
 				oAppData.controlStates = oAppData.data.permanentEntries.permanentState.data.controlStates;
 				fnAdaptToAppStateIappState(oAppData);
@@ -731,7 +764,7 @@ sap.ui.define([
 			// - restore from iAppState
 			// - adapt to navigation parameters
 			// - initial startup from scratch (including parameters provided from FLP!)
-			if (sNavType === sap.fe.navigation.NavType.iAppState){ // first case is the simplest -> take everything from IappState
+			if (sNavType === sap.fe.navigation.NavType.iAppState) { // first case is the simplest -> take everything from IappState
 				fnAdaptToAppStateIappState(oAppData);
 				return;
 			}
@@ -741,28 +774,28 @@ sap.ui.define([
 			var sPreferredEntitySet = oSelectionInfo && oSelectionInfo.pageEntitySet;
 			var sPreferredQuickVariantSelectionKey = oState.oMultipleViewsHandler.getPreferredKey(sPreferredEntitySet);
 
-			switch (sNavType){
-			case sap.fe.navigation.NavType.initial:
-				// "technical" URL parameters are possible even in that case. NavigationHandler treats everything starting with "sap-" as technical.
-				// some of them (at least 'sap-ui-fe*variant-id') are relevant
-				fnAdaptToAppStateStartUpInitial(oURLParameters, sPreferredQuickVariantSelectionKey);
-				break;
-			case sap.fe.navigation.NavType.xAppState:
-			case sap.fe.navigation.NavType.URLParams:
-				if (oAppData.bNavSelVarHasDefaultsOnly
-					|| oAppData.oSelectionVariant.getSelectOptionsPropertyNames().length && Utils.isASubsetOfB(oAppData.oSelectionVariant.getSelectOptionsPropertyNames(), aIgnoreURLParameters)
-				){
-					fnAdaptToAppStateStartUpWithParameters(oAppData, oURLParameters, sPreferredQuickVariantSelectionKey);
-				} else {
-					fnAdaptToAppStateNavigation(oAppData, oURLParameters, sPreferredQuickVariantSelectionKey);
-				}
-				break;
-			default:
-				throw new FeError(sClassName, "Invalid navigation type: " + sNavType);
+			switch (sNavType) {
+				case sap.fe.navigation.NavType.initial:
+					// "technical" URL parameters are possible even in that case. NavigationHandler treats everything starting with "sap-" as technical.
+					// some of them (at least 'sap-ui-fe*variant-id') are relevant
+					fnAdaptToAppStateStartUpInitial(oURLParameters, sPreferredQuickVariantSelectionKey);
+					break;
+				case sap.fe.navigation.NavType.xAppState:
+				case sap.fe.navigation.NavType.URLParams:
+					if (oAppData.bNavSelVarHasDefaultsOnly ||
+						oAppData.oSelectionVariant.getSelectOptionsPropertyNames().length && Utils.isASubsetOfB(oAppData.oSelectionVariant.getSelectOptionsPropertyNames(), aIgnoreURLParameters)
+					) {
+						fnAdaptToAppStateStartUpWithParameters(oAppData, oURLParameters, sPreferredQuickVariantSelectionKey);
+					} else {
+						fnAdaptToAppStateNavigation(oAppData, oURLParameters, sPreferredQuickVariantSelectionKey);
+					}
+					break;
+				default:
+					throw new FeError(sClassName, "Invalid navigation type: " + sNavType);
 			}
 
 			// common to all startup cases (except iAppState)
-			if (areDataShownInTable()){
+			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,
@@ -787,7 +820,7 @@ sap.ui.define([
 			// adapt controls according to current implementation
 			// Information in state could actually differ (if state originates from old release, change in FE or app layer). Additional information in state should be ignored,
 			// missing information should lead to set initial state (which wrappers should do if called with undefined)
-			aControlStateWrappers.forEach(function(oWrapper){
+			aControlStateWrappers.forEach(function (oWrapper) {
 				oWrapper.setState(mControlsStates[oWrapper.getLocalId()]);
 			});
 		}
@@ -798,7 +831,7 @@ sap.ui.define([
 		 * 2) State is an empty object: No state should be applied. It offers a flexibility to set the page to an initial state i.e. without any state.
 		 * 3) State is an object: Passed state should be applied and it should be transferred to the most current version, assuming overriding here will not harm.
 		 */
-		function applyState(oState){
+		function applyState(oState) {
 			if (!oState) {
 				// no iAppState key in Url, that means
 				// - we are definitely in startUp case (while navigating inside the app, there's always an appState - even if it cannot be stored)
@@ -806,7 +839,11 @@ sap.ui.define([
 				// Remark: in case of an appState key in the URL, that could not be analyzed, we should NOT call navigationHandler to parse. In this case, we get an empty object
 				// (in contrast to undefined when there's no appstate key)
 
-				return oSmartFilterBarInitializedPromise.then(fnParseUrlAndApplyAppState); // return promise to inform controller, when startup is finished
+				return oSmartFilterBarInitializedPromise.then(function () {
+					var oStartupFinishedPromise = fnParseUrlAndApplyAppState();
+					oStartupFinishedPromise.then(onFEStartupInitializedResolver);
+					return oStartupFinishedPromise; // return promise to inform controller, when startup is finished
+				});
 			}
 
 			var sNavType;
@@ -820,20 +857,22 @@ sap.ui.define([
 			// enhance appData to the format needed by fnAdaptToAppState
 			var oAppData = extend({
 				oDefaultedSelectionVariant: new SelectionVariant(), // only accessed to check for P_DisplayCurrency - can this be relevant?
-				oSelectionVariant: new SelectionVariant(oState && oState.selectionVariant)  // -> oSelectionVariant
+				oSelectionVariant: new SelectionVariant(oState && oState.selectionVariant) // -> oSelectionVariant
 			}, oState);
-			oSmartFilterBarInitializedPromise.then(function(){
+			oSmartFilterBarInitializedPromise.then(function () {
 				// fallback to navType initial, if appState is given in URL, but could not be analyzed => oState is an empty Object
-				fnAdaptToAppState(oAppData, {} /* URLparameter are irrelevant if restoring from iAppState */, sNavType);
+				fnAdaptToAppState(oAppData, {} /* URLparameter are irrelevant if restoring from iAppState */ , sNavType);
+				// Once the FE is initialized, the promise is resolved so that the SFB contains the updated list of filters
+				onFEStartupInitializedResolver();
 			});
 			return oSmartFilterBarInitializedPromise; // to inform controller, when startup is finished
 		}
 
-		function fnParseUrlAndApplyAppState(){
-			var oRet = new Promise(function(fnResolve){
+		function fnParseUrlAndApplyAppState() {
+			var oRet = new Promise(function (fnResolve) {
 				try {
 					var oParseNavigationPromise = oNavigationHandler.parseNavigation();
-					oParseNavigationPromise.done(function(oAppData, oURLParameters, sNavType){
+					oParseNavigationPromise.done(function (oAppData, oURLParameters, sNavType) {
 						if (sNavType !== sap.fe.navigation.NavType.iAppState) { // handled via state preserver
 							// navType initial has also to be handled here, as in that case the call from state preserver happens to early (we don't even know
 							// at that time, whether navtype is initial, URLparams or xAppState when started from FLP with user default values set)
@@ -841,16 +880,16 @@ sap.ui.define([
 						}
 						fnResolve();
 					});
-					oParseNavigationPromise.fail(function(oNavError, oURLParameters, sNavType){
+					oParseNavigationPromise.fail(function (oNavError, oURLParameters, sNavType) {
 						/* Parsing app state has failed, so we cannot set the correct state
 						 * But at least we should get into a consistent state again, so the user can continue using the app
 						 */
 						oLogger.warning(oNavError.getErrorCode() + "app state could not be parsed - continuing with empty state");
-						 // Use NavType initial, as this will enforce selection in case auto-binding is true.
+						// Use NavType initial, as this will enforce selection in case auto-binding is true.
 						fnAdaptToAppState({}, oURLParameters, sap.fe.navigation.NavType.initial);
 						fnResolve();
 					});
-				} catch (oError){
+				} catch (oError) {
 					// method is called only, if no iAppState key in URL
 					// possible error case could be a URL with xAppState key, but no iAppState key (navigation from non FE-app, or very old bookmark), and no ushell-Service available
 					// TODO: verify, whether this can happen and how to deal with it
@@ -861,7 +900,7 @@ sap.ui.define([
 			return oRet;
 		}
 
-		function fnRestoreExtendedFilterDataOnAfterSFBVariantLoad(oEvent){
+		function fnRestoreExtendedFilterDataOnAfterSFBVariantLoad(oEvent) {
 			// Only difference in worklist: any change, i.e. also loading a variant, has to directly trigger a new request.
 			// If we apply variant (as per appState), don't trigger search here, but later from appState restoring itself
 			if (oState.oWorklistData.bWorkListEnabled && oEvent.getParameter("context") !== "SET_VM_ID") {
@@ -888,6 +927,17 @@ sap.ui.define([
 			// regarding a), while SFB takes care to set the data for standard filters (created via annotation), for others (extension filters, edit state filter, anything else that
 			// should be controlled by VM (currently anything else we add to iAppState, but maybe that's only correct in case of page variant management)) we have to set it
 			// (independent of the context).
+			if (sap.ui.getCore().getMessageManager().getMessageModel().oData.length) {
+				var removedMessages = [];
+				for (var i in sap.ui.getCore().getMessageManager().getMessageModel().oData) {
+					var msg = sap.ui.getCore().getMessageManager().getMessageModel().oData[i];
+					if (msg.persistent && oEvent.getParameters().context === undefined) {
+						removedMessages.push(msg);
+					}
+				}
+				sap.ui.getCore().getMessageManager().removeMessages(removedMessages);
+			}
+
 			// Restore header collapse logic (originally removed in change 5641712)
 			// Collapse header when user manually selects a variant (context === undefined) that has executeOnSelect set to true
 			var oContext = oEvent.getParameter("context");
@@ -901,7 +951,7 @@ sap.ui.define([
 		}
 
 		// collapse dynamic header - conditions are checked at calling places
-		function collapseHeader(){
+		function collapseHeader() {
 			var oTemplatePrivateModel = oController.getOwnerComponent().getModel("_templPriv");
 			// Remark: this property is never set to true programmatically - only if user expands the header explicitly via 2-way-binding
 			oTemplatePrivateModel.setProperty("/listReport/isHeaderExpanded", false);
@@ -914,7 +964,7 @@ sap.ui.define([
 		 */
 		function fnSetFiltersUsingUIState(oSelectionVariant, bReplace, bStrictMode, oSemanticDates) {
 			var oUiState = new UIState({
-				selectionVariant : oSelectionVariant,
+				selectionVariant: oSelectionVariant,
 				semanticDates: oSemanticDates
 			});
 			oState.oSmartFilterbar.setUiState(oUiState, {
@@ -939,9 +989,9 @@ sap.ui.define([
 		 */
 		function applySelectionProperties(oSelectionVariant, sSelectionVariant, bNavTypeInitial) {
 			// even when the nav type is initial, due to modifystartup extension,new fields can be added to smartfilterbar
-			if (oSelectionVariant && (sSelectionVariant !== "" || bNavTypeInitial)){
+			if (oSelectionVariant && (sSelectionVariant !== "" || bNavTypeInitial)) {
 				var aSelectionVariantProperties = oSelectionVariant.getParameterNames().concat(
-						oSelectionVariant.getSelectOptionsPropertyNames());
+					oSelectionVariant.getSelectOptionsPropertyNames());
 				for (var i = 0; i < aSelectionVariantProperties.length; i++) {
 					oState.oSmartFilterbar.addFieldToAdvancedArea(aSelectionVariantProperties[i]);
 				}
@@ -949,24 +999,24 @@ sap.ui.define([
 		}
 
 		// map property values for property with name sFirstProperty to values for property with name sSecondProperty in oSelectionVariant
-		function fnAlignSelectOptions(oSelectionVariant, sFirstProperty, sSecondProperty){
-			if (oSelectionVariant.getParameter(sFirstProperty) && !oSelectionVariant.getParameter(sSecondProperty)){
+		function fnAlignSelectOptions(oSelectionVariant, sFirstProperty, sSecondProperty) {
+			if (oSelectionVariant.getParameter(sFirstProperty) && !oSelectionVariant.getParameter(sSecondProperty)) {
 				oSelectionVariant.addParameter(sSecondProperty, oSelectionVariant.getParameter(sFirstProperty));
 			}
-			if (oSelectionVariant.getSelectOption(sFirstProperty) && !oSelectionVariant.getSelectOption(sSecondProperty)){
+			if (oSelectionVariant.getSelectOption(sFirstProperty) && !oSelectionVariant.getSelectOption(sSecondProperty)) {
 				var aSelectOption = oSelectionVariant.getSelectOption(sFirstProperty);
-				aSelectOption.forEach(function(oSelectOption){
+				aSelectOption.forEach(function (oSelectOption) {
 					oSelectionVariant.addSelectOption(sSecondProperty, oSelectOption.Sign, oSelectOption.Option, oSelectOption.Low, oSelectOption.High);
 				});
 			}
 		}
 
-		function fnMapEditableFieldFor(oSelectionVariant){
+		function fnMapEditableFieldFor(oSelectionVariant) {
 			var oMetaModel = oController.getOwnerComponent().getModel().getMetaModel();
 			var sEntitySet = oController.getOwnerComponent().getEntitySet();
 			var oEntityType = oMetaModel.getODataEntityType(oMetaModel.getODataEntitySet(sEntitySet).entityType);
-			oEntityType.property.forEach(function(oProperty){
-				if (oProperty["com.sap.vocabularies.Common.v1.EditableFieldFor"]){
+			oEntityType.property.forEach(function (oProperty) {
+				if (oProperty["com.sap.vocabularies.Common.v1.EditableFieldFor"]) {
 					// annotation property names follow their type, so PropertyPath is the right property to look at - String has to be supported for compatibility reasons
 					var sKeyProperty = oProperty["com.sap.vocabularies.Common.v1.EditableFieldFor"].PropertyPath || oProperty["com.sap.vocabularies.Common.v1.EditableFieldFor"].String;
 					var sForEditProperty = oProperty.name;
@@ -978,7 +1028,7 @@ sap.ui.define([
 			});
 		}
 
-		function fnApplySelectionVariantToSFB(oSelectionVariant, sSelectionVariant, bReplace, oSemanticDates, bNavTypeInitial){
+		function fnApplySelectionVariantToSFB(oSelectionVariant, sSelectionVariant, bReplace, oSemanticDates, bNavTypeInitial) {
 			fnMapEditableFieldFor(oSelectionVariant);
 			if (bReplace) {
 				oState.oSmartFilterbar.clearVariantSelection();
@@ -990,15 +1040,17 @@ 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
 		// manifest (i.e. it should be sufficient to define the default in component - no need to individually implement defaulting!)
-		function getDataLoadSettings(){
+		function getDataLoadSettings() {
 			// general default
-			var oDefaultDataLoadSettings = {loadDataOnAppLaunch: "ifAnyFilterExist"};
+			var oDefaultDataLoadSettings = {
+				loadDataOnAppLaunch: "ifAnyFilterExist"
+			};
 
 			// intension is boolean, but unfortunately faulty values are (historically) not treated consistently
 			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){
+			if (bEnableAutoBindingMultiViews !== undefined && bEnableAutoBindingMultiViews !== null) {
 				// multiple views setting overrules general default
 				oDefaultDataLoadSettings.loadDataOnAppLaunch = bEnableAutoBindingMultiViews ? "always" : "never";
 			}
@@ -1008,7 +1060,7 @@ sap.ui.define([
 			// 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 === ""){
+			if (oManifestDataLoadSettings && oManifestDataLoadSettings.loadDataOnAppLaunch === "") {
 				oManifestDataLoadSettings.loadDataOnAppLaunch = undefined;
 			}
 
@@ -1019,16 +1071,16 @@ sap.ui.define([
 		// analyze all input determining whether data should be loaded initially and accordingly
 		// - sets default value for flag whether standard variant should be execute on select
 		// - determines whether we actually should load data
-		function applyInitialLoadBehavior(bDataLoadCausedByNavigation){
+		function applyInitialLoadBehavior(bDataLoadCausedByNavigation) {
 			// cases definitely determining to load data initially
 			// - worklist
 			// - livemode
 			// - master detail (i.e. bLoadListAndFirstEntryOnStartup is set)
 			var oSmartFilterbar = oState.oSmartFilterbar;
-			var bShouldDataBeLoaded = oState.oWorklistData.bWorkListEnabled || oSmartFilterbar.getLiveMode() || oState.bLoadListAndFirstEntryOnStartup ;
+			var bShouldDataBeLoaded = oState.oWorklistData.bWorkListEnabled || oSmartFilterbar.getLiveMode() || oState.bLoadListAndFirstEntryOnStartup;
 
 			var sLoadBehaviour = getDataLoadSettings().loadDataOnAppLaunch;
-			if (!oSmartVariantManagement || oController.getOwnerComponent().getVariantManagementHidden()){
+			if (!oSmartVariantManagement || oController.getOwnerComponent().getVariantManagementHidden()) {
 				// No VM ->
 				bShouldDataBeLoaded = bShouldDataBeLoaded || sLoadBehaviour === "always";
 				bShouldDataBeLoaded = bShouldDataBeLoaded || (sLoadBehaviour === "ifAnyFilterExist" && oSmartFilterbar.getFiltersWithValues().length > 0);
@@ -1047,9 +1099,9 @@ sap.ui.define([
 				oSmartVariantManagement && oSmartVariantManagement.setExecuteOnStandard(bDefaultExecuteOnStandard);
 
 				// determine final setting according to user's variant settings
-				if (oState.oSmartFilterbar.isCurrentVariantStandard()){
+				if (oState.oSmartFilterbar.isCurrentVariantStandard()) {
 					var bExecuteOnStandard = oSmartVariantManagement.getExecuteOnStandard();
-					if (bDefaultExecuteOnStandard !== bExecuteOnStandard){
+					if (bDefaultExecuteOnStandard !== bExecuteOnStandard) {
 						// user has overruled setting, so user's choice wins
 						bShouldDataBeLoaded = bExecuteOnStandard;
 					} else {
@@ -1075,6 +1127,10 @@ sap.ui.define([
 			oDataLoadedWrapper.setState(!!bShouldDataBeLoaded);
 		}
 
+		function onFEStartupInitialized() {
+			return onFEStartupInitializedPromise;
+		}
+
 		return {
 			areDataShownInTable: areDataShownInTable,
 			setDataShownInTable: fnSetDataShownInTable,
@@ -1085,12 +1141,13 @@ sap.ui.define([
 			onAfterSFBVariantLoad: onAfterSFBVariantLoad,
 			applyState: applyState,
 			getCurrentAppState: getCurrentAppState, // separation of concerns - only provide state, statePreserver responsible for storing it
-			setFiltersUsingUIState : fnSetFiltersUsingUIState
+			setFiltersUsingUIState: fnSetFiltersUsingUIState,
+			onFEStartupInitialized: onFEStartupInitialized
 		};
 	}
 
 	return BaseObject.extend("sap.suite.ui.generic.template.ListReport.controller.IappStateHandler", {
-		constructor: function(oState, oController, oTemplateUtils) {
+		constructor: function (oState, oController, oTemplateUtils) {
 			extend(this, getMethods(oState, oController, oTemplateUtils));
 		}
 	});

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.120.44"
+			"version": "1.120.45"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

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

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

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

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

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

@@ -155,7 +155,7 @@ sap.ui.define([
 			oPreliminaryState = oState;
 
 			// Wait for all managed controls to be initialized before applying state
-			oAllControlsInitializedPromise.then(function() {
+			return oAllControlsInitializedPromise.then(function() {
 				bIsApplyingVariant = true;
 				if (!oPreliminaryState) {
 					// if no state is provided set default variant (not modified)

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

@@ -939,7 +939,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.UIComponent
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.120.44
+	 * @version 1.120.45
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	return UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {

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

@@ -3094,7 +3094,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.120.44
+	 * @version 1.120.45
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

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

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