@openui5/sap.ui.fl 1.118.0 → 1.119.0

package/src/sap/ui/fl/apply/_internal/DelegateMediator.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 *
 	 * @private
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 *
 	 */
 	var DelegateMediator = {};

package/src/sap/ui/fl/apply/_internal/changes/Applier.js

@@ -81,10 +81,14 @@ sap.ui.define([
 	}
 
 	function checkAndAdjustChangeStatus(oControl, oChange, mChangesMap, oFlexController, mPropertyBag) {
-		var mControl = Utils.getControlIfTemplateAffected(oChange, oControl, mPropertyBag);
+		// in case of changes in templates, the original control is not always available at this point
+		// example: rename on a control created by a change inside a template
+		var oOriginalControl = Utils.getControlIfTemplateAffected(oChange, oControl, mPropertyBag).control;
 		var oModifier = mPropertyBag.modifier;
-		var bHasAppliedCustomData = !!FlexCustomData.getAppliedCustomDataValue(mControl.control, oChange, oModifier);
-		var bIsCurrentlyAppliedOnControl = FlexCustomData.hasChangeApplyFinishedCustomData(mControl.control, oChange, oModifier);
+		var bHasAppliedCustomData = oOriginalControl
+			&& !!FlexCustomData.getAppliedCustomDataValue(oOriginalControl, oChange, oModifier);
+		var bIsCurrentlyAppliedOnControl = oOriginalControl
+			&& FlexCustomData.hasChangeApplyFinishedCustomData(oOriginalControl, oChange, oModifier);
 		var bChangeStatusAppliedFinished = oChange.isApplyProcessFinished();
 		var oAppComponent = mPropertyBag.appComponent;
 		if (bChangeStatusAppliedFinished && !bIsCurrentlyAppliedOnControl) {
@@ -100,7 +104,7 @@ sap.ui.define([
 			// scenario: viewCache
 			if (bHasAppliedCustomData) {
 				// if the change was applied, set the revert data fetched from the custom data
-				oChange.setRevertData(FlexCustomData.getParsedRevertDataFromCustomData(mControl.control, oChange, oModifier));
+				oChange.setRevertData(FlexCustomData.getParsedRevertDataFromCustomData(oOriginalControl, oChange, oModifier));
 				oChange.markSuccessful();
 			} else {
 				oChange.markFailed();

package/src/sap/ui/fl/apply/_internal/changes/FlexCustomData.js

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @since 1.61.0
 	 * @private
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 */
 	var FlexCustomData = {};
 

package/src/sap/ui/fl/apply/_internal/changes/Utils.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.Utils
 	 * @since 1.70
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal, sap.ui.fl.write._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ApplyStrategyFactory.js

@@ -14,6 +14,26 @@ sap.ui.define([
 ) {
 	"use strict";
 
+	function processManifestPart(vManifestPart, oChangeTexts) {
+		// Recursively search the manifest for localization bindings and replace them with default texts
+		const vNewManifestPart = Array.isArray(vManifestPart)
+			? [...vManifestPart]
+			: { ...vManifestPart };
+		Object.entries(vNewManifestPart).forEach(([sKey, vValue]) => {
+			if (typeof vValue === "object" && vValue !== null) {
+				vNewManifestPart[sKey] = processManifestPart(vValue, oChangeTexts);
+			} else if (typeof vValue === "string") {
+				vNewManifestPart[sKey] = vValue.replaceAll(/{{.*?}}/g, (sMatch) => {
+					// Extract the key and replace it if there is a value for it
+					const sTextKey = sMatch.slice(2, -2);
+					const sResolvedValue = oChangeTexts[sTextKey];
+					return sResolvedValue || sMatch;
+				});
+			}
+		});
+		return vNewManifestPart;
+	}
+
 	var RuntimeStrategy = {
 		registry() {
 			return requireAsync("sap/ui/fl/apply/_internal/changes/descriptor/Registration");
@@ -22,16 +42,16 @@ sap.ui.define([
 			Log.error(oError);
 		},
 		processTexts(oManifest, oChangeTexts) {
-			// TODO: optimize performance by creating map not using JSON.stringify/parse
-			var sManifest = JSON.stringify(oManifest);
-			Object.keys(oChangeTexts).forEach(function(sTextKey) {
-				if (oChangeTexts[sTextKey].value[""]) {
-					 sManifest = sManifest.replace(`{{${sTextKey}}}`, oChangeTexts[sTextKey].value[""]);
-				} else {
-					Log.error("Text change has to contain default language");
+			const oValidChangeTexts = {};
+			Object.entries(oChangeTexts).forEach(([sTextKey, { value: mChangeTextValue }]) => {
+				// Always use the default language (key = "")
+				if (mChangeTextValue[""]) {
+					oValidChangeTexts[sTextKey] = mChangeTextValue[""];
+					return;
 				}
+				Log.error("Text change has to contain default language");
 			});
-			return JSON.parse(sManifest);
+			return processManifestPart(oManifest, oValidChangeTexts);
 		}
 	};
 

package/src/sap/ui/fl/apply/_internal/changes/descriptor/Preprocessor.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Preprocessor
 	 * @since 1.74
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/Registration.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Registration
 	 * @since 1.74
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/RegistrationBuild.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild
 	 * @since 1.77
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddAnnotationsToOData.js

@@ -135,7 +135,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.app.AddAnnotationsToOData
 	 * @since 1.87
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddNewInbound.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	*
 	* @namespace
 	* @alias sap.ui.fl.apply._internal.changes.descriptor.app.AddNewInbound
-	* @version 1.118.0
+	* @version 1.119.0
 	* @private
 	* @ui5-restricted sap.ui.fl.apply._internal
 	*/

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeDataSource.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 *
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.app.ChangeDataSource
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeInbound.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	*
 	* @namespace
 	* @alias sap.ui.fl.apply._internal.changes.descriptor.app.ChangeInbound
-	* @version 1.118.0
+	* @version 1.119.0
 	* @private
 	* @ui5-restricted sap.ui.fl.apply._internal
 	*/

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/RemoveAllInboundsExceptOne.js

@@ -44,7 +44,7 @@ sap.ui.define([
      *
      * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.app.RemoveAllInboundsExceptOne
-     * @version 1.118.0
+     * @version 1.119.0
      * @private
      * @ui5-restricted sap.ui.fl.apply._internal
      */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/SetTitle.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * Available for both runtime and build {@link sap.ui.fl.apply._internal.changes.descriptor.Registration}.
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.app.SetTitle
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetAbstract.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.fiori.SetAbstract
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetRegistrationIds.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.fiori.SetRegistrationIds
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/AddNewCard.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ovp.AddNewCard
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/ChangeCard.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ovp.ChangeCard
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/DeleteCard.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * Available for both runtime and build {@link sap.ui.fl.apply._internal.changes.descriptor.Registration}.
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ovp.DeleteCard
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddComponentUsages.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddComponentUsages
 	 * @since 1.86
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddLibrary.js

@@ -48,7 +48,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ui5.AddLibrary
 	 * @since 1.74
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModel.js

@@ -95,7 +95,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ui5.AddNewModel
 	 * @since 1.87
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModelEnhanceWith.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ui5.AddNewModelEnhanceWith
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetFlexExtensionPointEnabled.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ui5.SetFlexExtensionPointEnabled
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetMinUI5Version.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 *
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.ui5.SetMinUI5Version
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/connectors/ObjectStorageUtils.js

@@ -12,7 +12,7 @@ sap.ui.define([], function() {
 	 *
 	 * @namespace sap.ui.fl.initial._internal.connectors.Utils
 	 * @since 1.70
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal, sap.ui.fl.write._internal
 	 */

package/src/sap/ui/fl/apply/_internal/extensionPoint/Processor.js

@@ -34,7 +34,7 @@ function(
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 */
 	var Processor;
 

package/src/sap/ui/fl/apply/_internal/flexObjects/AppDescriptorChange.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.AppDescriptorChange
 	 * @since 1.105
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/CompVariant.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.Variant
 	 * @alias sap.ui.fl.apply._internal.flexObjects.CompVariant
 	 * @since 1.103
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.comp
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/ControllerExtensionChange.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.ControllerExtensionChange
 	 * @since 1.105
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/FlVariant.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.Variant
 	 * @alias sap.ui.fl.apply._internal.flexObjects.FlVariant
 	 * @since 1.104
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/FlexObject.js

@@ -69,7 +69,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @since 1.100
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -144,6 +144,10 @@ sap.ui.define([
 			var oFlexObjectMetadata = this.getFlexObjectMetadata();
 			var sReference = oFlexObjectMetadata.reference;
 			if (sReference) {
+				// old changes have an unnecessary '.Component' in the reference, that is not actually part of the reference
+				oFlexObjectMetadata.reference = sReference.endsWith(".Component")
+					? sReference.replace(/\.Component(?!.*\.Component)/, "")
+					: sReference;
 				oFlexObjectMetadata.namespace ||= Utils.createNamespace({ reference: sReference }, this.getFileType());
 				oFlexObjectMetadata.projectId ||= sReference;
 			}

package/src/sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory.js

@@ -98,7 +98,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexObjects.FlexObjectFactory
 	 * @since 1.100
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/UIChange.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.UIChange
 	 * @since 1.109
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/apply/_internal/flexObjects/Variant.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
 	 * @alias sap.ui.fl.apply._internal.flexObjects.Variant
 	 * @since 1.103
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/apply/_internal/flexState/FlexState.js

@@ -20,10 +20,9 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexState/InitialPrepareFunctions",
 	"sap/ui/fl/apply/_internal/flexState/Loader",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
-	"sap/ui/fl/write/_internal/FlexInfoSession",
+	"sap/ui/fl/initial/_internal/FlexInfoSession",
 	"sap/ui/fl/LayerUtils",
-	"sap/ui/fl/requireAsync",
-	"sap/ui/fl/Utils"
+	"sap/ui/fl/requireAsync"
 ], function(
 	_omit,
 	each,
@@ -42,8 +41,7 @@ sap.ui.define([
 	ManifestUtils,
 	FlexInfoSession,
 	LayerUtils,
-	requireAsync,
-	Utils
+	requireAsync
 ) {
 	"use strict";
 
@@ -87,17 +85,14 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.FlexState
 	 * @since 1.73
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
 	var FlexState = {};
 
 	var _mInstances = {};
-	var _mNavigationHandlers = {};
 	var _mInitPromises = {};
-	var _oShellNavigationService;
-	var _oURLParsingService;
 	var _oChangePersistenceFactory;
 	var _mFlexObjectInfo = {
 		appDescriptorChanges: {
@@ -318,7 +313,7 @@ sap.ui.define([
 			bDataUpdated = true;
 		}
 		if (!_mInstances[sReference].storageResponse) {
-			_mInstances[sReference].storageResponse = filterByMaxLayer(_mInstances[sReference].unfilteredStorageResponse);
+			_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mInstances[sReference].unfilteredStorageResponse);
 			// Flex objects need to be recreated
 			delete _mInstances[sReference].runtimePersistence;
 			bDataUpdated = true;
@@ -341,15 +336,17 @@ sap.ui.define([
 		}
 	}
 
-	// TODO turn into utility or put it somewhere central
-	function filterByMaxLayer(mResponse) {
-		var mFilteredReturn = merge({}, mResponse);
-		var mFlexObjects = mFilteredReturn.changes;
-		var oURLParsingService = getUShellService("URLParsing");
-		if (LayerUtils.isLayerFilteringRequired(oURLParsingService)) {
+	function filterByMaxLayer(sReference, mResponse) {
+		const mFilteredReturn = merge({}, mResponse);
+		const mFlexObjects = mFilteredReturn.changes;
+		if (LayerUtils.isLayerFilteringRequired(sReference)) {
+			const oFlexInfoSession = FlexInfoSession.getByReference(sReference);
 			each(_mFlexObjectInfo, function(iIndex, mFlexObjectInfo) {
 				mFlexObjectInfo.pathInResponse.forEach(function(sPath) {
-					ObjectPath.set(sPath, LayerUtils.filterChangeDefinitionsByMaxLayer(ObjectPath.get(sPath, mFlexObjects), oURLParsingService), mFlexObjects);
+					const aFilterByMaxLayer = ObjectPath.get(sPath, mFlexObjects).filter(function(oChangeDefinition) {
+						return !oChangeDefinition.layer || !LayerUtils.isOverLayer(oChangeDefinition.layer, oFlexInfoSession.maxLayer);
+					});
+					ObjectPath.set(sPath, aFilterByMaxLayer, mFlexObjects);
 				});
 			});
 		}
@@ -359,6 +356,7 @@ sap.ui.define([
 	function loadFlexData(mPropertyBag) {
 		_mInitPromises[mPropertyBag.reference] = Loader.loadFlexData(mPropertyBag)
 		.then(function(mResponse) {
+			// The following line is used by the Flex Support Tool to set breakpoints - please adjust the tool if you change it!
 			_mInstances[mPropertyBag.reference] = merge({}, {
 				unfilteredStorageResponse: mResponse,
 				preparedMaps: {},
@@ -367,7 +365,6 @@ sap.ui.define([
 				partialFlexState: mPropertyBag.partialFlexState
 			});
 
-			registerMaxLayerHandler(mPropertyBag.reference);
 			storeInfoInSession(mPropertyBag.reference, mResponse);
 
 			// no further changes to storageResponse properties allowed
@@ -391,42 +388,6 @@ sap.ui.define([
 		FlexInfoSession.setByReference(oFlexInfoSession, sReference);
 	}
 
-	function registerMaxLayerHandler(sReference) {
-		var oShellNavigationService = getUShellService("ShellNavigation");
-		if (oShellNavigationService && !_mNavigationHandlers[sReference]) {
-			_mNavigationHandlers[sReference] = handleMaxLayerChange.bind(null, sReference);
-			oShellNavigationService.registerNavigationFilter(_mNavigationHandlers[sReference]);
-		}
-	}
-
-	function deRegisterMaxLayerHandler(sReference) {
-		var oShellNavigationService = getUShellService("ShellNavigation");
-		if (oShellNavigationService) {
-			if (_mNavigationHandlers[sReference]) {
-				oShellNavigationService.unregisterNavigationFilter(_mNavigationHandlers[sReference]);
-				delete _mNavigationHandlers[sReference];
-			}
-		}
-	}
-
-	function handleMaxLayerChange(sReference, sNewHash, sOldHash) {
-		var oShellNavigationService = getUShellService("ShellNavigation");
-		if (oShellNavigationService) {
-			try {
-				var sCurrentMaxLayer = LayerUtils.getMaxLayerTechnicalParameter(sNewHash, getUShellService("URLParsing"));
-				var sPreviousMaxLayer = LayerUtils.getMaxLayerTechnicalParameter(sOldHash, getUShellService("URLParsing"));
-				if (sCurrentMaxLayer !== sPreviousMaxLayer) {
-					FlexState.rebuildFilteredResponse(sReference);
-				}
-			} catch (oError) {
-				// required to hinder any errors - can break FLP navigation
-				Log.error(oError.message);
-			}
-			return oShellNavigationService.NavigationFilterStatus.Continue;
-		}
-		return undefined;
-	}
-
 	function checkPartialFlexState(mInitProperties) {
 		var oFlexInstance = _mInstances[mInitProperties.reference];
 		if (oFlexInstance.partialFlexState === true && mInitProperties.partialFlexState !== true) {
@@ -446,30 +407,6 @@ sap.ui.define([
 		return mInitProperties;
 	}
 
-	function loadUShellServices() {
-		return Promise.all([
-			Utils.getUShellService("ShellNavigation"),
-			Utils.getUShellService("URLParsing")
-		])
-		.then(function(aServices) {
-			[_oShellNavigationService, _oURLParsingService] = aServices;
-		})
-		.catch(function(oError) {
-			Log.error(`Error getting service from Unified Shell: ${oError.message}`);
-		});
-	}
-
-	function getUShellService(sServiceName) {
-		if (Utils.getUshellContainer()) {
-			if (sServiceName === "ShellNavigation") {
-				return _oShellNavigationService;
-			} else if (sServiceName === "URLParsing") {
-				return _oURLParsingService;
-			}
-		}
-		return undefined;
-	}
-
 	// TODO: get rid of the following module dependencies as soon as the change state
 	// is migrated from changePersistenceFactory to the FlexState
 	function lazyLoadModules() {
@@ -499,7 +436,6 @@ sap.ui.define([
 	 */
 	FlexState.initialize = function(mPropertyBag) {
 		return Promise.all([
-			loadUShellServices(),
 			lazyLoadModules()
 		])
 		.then(function() {
@@ -570,9 +506,6 @@ sap.ui.define([
 	FlexState.update = function(mPropertyBag) {
 		enhancePropertyBag(mPropertyBag);
 		var sReference = mPropertyBag.reference;
-
-		deRegisterMaxLayerHandler(sReference);
-
 		var oCurrentRuntimePersistence = _mInstances[sReference].runtimePersistence;
 
 		// TODO: get rid of the following persistence operations as soon as the change state
@@ -587,7 +520,7 @@ sap.ui.define([
 		return (_mInitPromises[sReference] || Promise.resolve())
 		.then(loadFlexData.bind(this, mPropertyBag))
 		.then(function() {
-			_mInstances[sReference].storageResponse = filterByMaxLayer(_mInstances[sReference].unfilteredStorageResponse);
+			_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mInstances[sReference].unfilteredStorageResponse);
 			var bUpdated = updateRuntimePersistence(
 				sReference,
 				_mInstances[sReference].storageResponse,
@@ -659,7 +592,6 @@ sap.ui.define([
 
 	FlexState.clearState = function(sReference) {
 		if (sReference) {
-			deRegisterMaxLayerHandler(sReference);
 			delete _mInstances[sReference];
 			delete _mInitPromises[sReference];
 			oFlexObjectsDataSelector.clearCachedResult({ reference: sReference });
@@ -672,9 +604,6 @@ sap.ui.define([
 				_oChangePersistenceFactory._instanceCache[sReference].removeDirtyChanges();
 			}
 		} else {
-			Object.keys(_mInstances).forEach(function(sReference) {
-				deRegisterMaxLayerHandler(sReference);
-			});
 			_mInstances = {};
 			_mInitPromises = {};
 			oFlexObjectsDataSelector.clearCachedResult();
@@ -739,7 +668,7 @@ sap.ui.define([
 	FlexState.rebuildFilteredResponse = function(sReference) {
 		if (_mInstances[sReference]) {
 			_mInstances[sReference].preparedMaps = {};
-			_mInstances[sReference].storageResponse = filterByMaxLayer(_mInstances[sReference].unfilteredStorageResponse);
+			_mInstances[sReference].storageResponse = filterByMaxLayer(sReference, _mInstances[sReference].unfilteredStorageResponse);
 			// Storage response has changed, recreate the flex objects
 			_mInstances[sReference].runtimePersistence = buildRuntimePersistence(
 				_mInstances[sReference].storageResponse,

package/src/sap/ui/fl/apply/_internal/flexState/Loader.js

@@ -100,7 +100,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexState.Loader
 	 * @since 1.74
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal.flexState
 	 */