@openui5/sap.ui.fl 1.120.6 → 1.121.0

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.120.6
+	 * @version 1.121.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.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.initial._internal, sap.ui.fl.write._internal
 	 */

package/src/sap/ui/fl/apply/_internal/controlVariants/URLHandler.js

@@ -13,7 +13,6 @@ sap.ui.define([
 	"sap/base/util/isEmptyObject",
 	"sap/ui/base/ManagedObjectObserver",
 	"sap/ui/thirdparty/hasher",
-	"sap/base/util/includes",
 	"sap/ui/fl/apply/_internal/controlVariants/Utils"
 ], function(
 	Component,
@@ -24,7 +23,6 @@ sap.ui.define([
 	isEmptyObject,
 	ManagedObjectObserver,
 	hasher,
-	includes,
 	VariantUtil
 ) {
 	"use strict";
@@ -59,7 +57,7 @@ sap.ui.define([
 
 			if (sVariantManagementReference) {
 				// check if a URL parameter for this variant management reference was already added
-				if (includes(aAddedVMReferences, sVariantManagementReference)) {
+				if (aAddedVMReferences.includes(sVariantManagementReference)) {
 					oResultantParameters.updateRequired = true;
 					return oResultantParameters;
 				}
@@ -170,7 +168,7 @@ sap.ui.define([
 	function setTechnicalURLParameterValues(mPropertyBag) {
 		var oModel = mPropertyBag.model;
 		var oURLParsingService = oModel.getUShellService("URLParsing");
-		var oCrossApplicationNavigationService = oModel.getUShellService("CrossApplicationNavigation");
+		var oUshellNavigationService = oModel.getUShellService("Navigation");
 		var oParsedHash = oURLParsingService && oURLParsingService.parseShellHash(hasher.getHash());
 
 		if (oParsedHash && oParsedHash.params) {
@@ -181,14 +179,18 @@ sap.ui.define([
 				&& oModel.oAppComponent.getComponentData().technicalParameters;
 			// if mTechnicalParameters are not available we write a warning and continue updating the hash
 			if (!mTechnicalParameters) {
-				Log.warning("Component instance not provided, so technical parameters in component data and browser history remain unchanged");
+				Log.warning(
+					"Component instance not provided, so technical parameters in component data and browser history remain unchanged"
+				);
 			}
 			if (mPropertyBag.parameters.length === 0) {
 				delete oParsedHash.params[VariantUtil.VARIANT_TECHNICAL_PARAMETER];
-				mTechnicalParameters && delete mTechnicalParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER]; // Case when ControlVariantsAPI.clearVariantParameterInURL is called with a parameter
+				// Case when ControlVariantsAPI.clearVariantParameterInURL is called with a parameter
+				mTechnicalParameters && delete mTechnicalParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER];
 			} else {
 				oParsedHash.params[VariantUtil.VARIANT_TECHNICAL_PARAMETER] = mPropertyBag.parameters;
-				mTechnicalParameters && (mTechnicalParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER] = mPropertyBag.parameters); // Technical parameters need to be in sync with the URL hash
+				// Technical parameters need to be in sync with the URL hash
+				mTechnicalParameters && (mTechnicalParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER] = mPropertyBag.parameters);
 			}
 
 			if (mPropertyBag.silent) {
@@ -196,7 +198,7 @@ sap.ui.define([
 				hasher.replaceHash(oURLParsingService.constructShellHash(oParsedHash));
 				hasher.changed.active = true; // re-enable changed signal
 			} else if (!deepEqual(mOldHashParams, oParsedHash.params)) {
-				oCrossApplicationNavigationService.toExternal({
+				oUshellNavigationService.navigate({
 					target: {
 						semanticObject: oParsedHash.semanticObject,
 						action: oParsedHash.action,
@@ -240,7 +242,8 @@ sap.ui.define([
 			}
 
 			if (Array.isArray(mURLParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER])) {
-				mURLParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER] = mURLParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER].map(decodeURIComponent);
+				mURLParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER] =
+					mURLParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER].map(decodeURIComponent);
 				mURLParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER].some(function(sParamDecoded, iIndex) {
 					if (!isEmptyObject(oModel.getVariant(sParamDecoded, mPropertyBag.vmReference))) {
 						mReturnObject.index = iIndex;
@@ -252,7 +255,9 @@ sap.ui.define([
 		}
 		return merge(
 			mReturnObject,
-			mURLParameters && mURLParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER] && {parameters: mURLParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER]}
+			mURLParameters
+			&& mURLParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER]
+			&& {parameters: mURLParameters[VariantUtil.VARIANT_TECHNICAL_PARAMETER]}
 		);
 	}
 
@@ -341,7 +346,8 @@ sap.ui.define([
 	};
 
 	/**
-	 * Removes the variant URL parameter for the passed variant management and returns the index at which the passed variant management is present.
+	 * Removes the variant URL parameter for the passed variant management
+	 * and returns the index at which the passed variant management is present.
 	 *
 	 * @param {object} mPropertyBag - Property bag
 	 * @param {string} mPropertyBag.vmReference - Variant management reference

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

@@ -7,6 +7,7 @@
 // Provides object sap.ui.fl.apply._internal.extensionPoint.Processor
 sap.ui.define([
 	"sap/ui/fl/apply/_internal/changes/Applier",
+	"sap/ui/fl/apply/_internal/extensionPoint/Registry",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
 	"sap/ui/fl/apply/_internal/flexState/changes/ExtensionPointState",
 	"sap/ui/fl/Utils",
@@ -17,6 +18,7 @@ sap.ui.define([
 ],
 function(
 	Applier,
+	ExtensionPointRegistry,
 	FlexState,
 	ExtensionPointState,
 	Utils,
@@ -28,13 +30,14 @@ function(
 	"use strict";
 
 	/**
-	 * Implements the <code>Extension Points</code> provider by SAPUI5 flexibility that can be hooked in the <code>sap.ui.core.ExtensionPoint</code> life cycle.
+	 * Implements the <code>Extension Points</code> provider by SAPUI5 flexibility that can be hooked
+	 * in the <code>sap.ui.core.ExtensionPoint</code> life cycle.
 	 *
 	 * @name sap.ui.fl.apply._internal.extensionPoint.Processor
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 */
 	var Processor;
 
@@ -77,6 +80,7 @@ function(
 						iControlIndex,
 						iNestedEPAdditionalContentCounter,
 						fnNestedCallback
+					// eslint-disable-next-line max-nested-callbacks
 					).then(function(iNestedCounter) {
 						iNestedEPAdditionalContentCounter += iNestedCounter;
 					});
@@ -120,23 +124,7 @@ function(
 
 		registerExtensionPoint(mExtensionPointInfo) {
 			if (DesignTime.isDesignModeEnabled()) {
-				if (Processor.oExtensionPointRegistry) {
-					Processor.oExtensionPointRegistry.registerExtensionPoint(mExtensionPointInfo);
-					return SyncPromise.resolve();
-				}
-
-				Processor.oRegistryPromise = Processor.oRegistryPromise.then(function() {
-					return new Promise(function(resolve, reject) {
-						sap.ui.require(["sap/ui/fl/write/_internal/extensionPoint/Registry"], function(ExtensionPointRegistry) {
-							Processor.oExtensionPointRegistry = ExtensionPointRegistry;
-							ExtensionPointRegistry.registerExtensionPoint(mExtensionPointInfo);
-							resolve();
-						}, function(oError) {
-							reject(oError);
-						});
-					});
-				});
-				return Processor.oRegistryPromise;
+				ExtensionPointRegistry.registerExtensionPoint(mExtensionPointInfo);
 			}
 			return SyncPromise.resolve();
 		},

package/src/sap/ui/fl/{write → apply}/_internal/extensionPoint/Registry.js

@@ -15,10 +15,10 @@ sap.ui.define([
 	/**
 	 * Object to register extension points to track their locations.
 	 * @constructor
-	 * @alias sap.ui.fl.write._internal.extensionPoint.Registry
+	 * @alias sap.ui.fl.apply._internal.extensionPoint.Registry
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

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.120.6
+	 * @version 1.121.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.120.6
+	 * @version 1.121.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.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -5,11 +5,9 @@
  */
 
 sap.ui.define([
-	"sap/ui/core/Core",
 	"sap/ui/fl/apply/_internal/controlVariants/Utils",
 	"sap/ui/fl/apply/_internal/flexObjects/Variant"
 ], function(
-	Core,
 	ControlVariantUtils,
 	Variant
 ) {
@@ -24,7 +22,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.120.6
+	 * @version 1.121.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.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -6,7 +6,6 @@
 sap.ui.define([
 	"sap/base/util/restricted/_pick",
 	"sap/base/util/ObjectPath",
-	"sap/ui/core/Core",
 	"sap/ui/fl/apply/_internal/flexObjects/AppDescriptorChange",
 	"sap/ui/fl/apply/_internal/flexObjects/CompVariant",
 	"sap/ui/fl/apply/_internal/flexObjects/ControllerExtensionChange",
@@ -14,6 +13,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/_internal/flexObjects/FlVariant",
 	"sap/ui/fl/apply/_internal/flexObjects/States",
 	"sap/ui/fl/apply/_internal/flexObjects/UIChange",
+	"sap/ui/fl/apply/_internal/flexObjects/getVariantAuthor",
 	"sap/ui/fl/registry/Settings",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/LayerUtils",
@@ -21,7 +21,6 @@ sap.ui.define([
 ], function(
 	_pick,
 	ObjectPath,
-	Core,
 	AppDescriptorChange,
 	CompVariant,
 	ControllerExtensionChange,
@@ -29,6 +28,7 @@ sap.ui.define([
 	FlVariant,
 	States,
 	UIChange,
+	getVariantAuthor,
 	Settings,
 	Layer,
 	LayerUtils,
@@ -97,7 +97,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.flexObjects.FlexObjectFactory
 	 * @since 1.100
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -193,6 +193,7 @@ sap.ui.define([
 	 * @param {object} [mPropertyBag.layer] - See {@link sap.ui.fl.apply._internal.flexObjects.FlexObject}
 	 * @param {string} [mPropertyBag.reference] - See {@link sap.ui.fl.apply._internal.flexObjects.FlexObject.FlexObjectMetadata}
 	 * @param {string} [mPropertyBag.generator] - See {@link sap.ui.fl.apply._internal.flexObjects.FlexObject.SupportInformation}
+	 * @param {object} [mPropertyBag.authors] - Map of user IDs to full names
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.FlVariant} Variant instance
 	 */
 	FlexObjectFactory.createFlVariant = function(mPropertyBag) {
@@ -207,7 +208,10 @@ sap.ui.define([
 				type: "XFLD"
 			}
 		};
-		return new FlVariant(mProperties);
+
+		const oFlVariant = new FlVariant(mProperties);
+		oFlVariant.setAuthor(getVariantAuthor(oFlVariant, mPropertyBag.authors));
+		return oFlVariant;
 	};
 
 	/**
@@ -238,10 +242,10 @@ sap.ui.define([
 	 * @param {object} [oFileContent.executeOnSelection] - see above
 	 *
 	 * @param {string} [oFileContent.persistencyKey] - see <code>sap.ui.fl.apply._internal.flexObjects.CompVariant</code>
-	 *
+	 * @param {object} [mAuthors] - Map of user IDs and users' names which is used to determine author of the variant
 	 * @returns {sap.ui.fl.apply._internal.flexObjects.CompVariant} Created comp variant object
 	 */
-	FlexObjectFactory.createCompVariant = function(oFileContent) {
+	FlexObjectFactory.createCompVariant = function(oFileContent, mAuthors) {
 		oFileContent.generator ||= "FlexObjectFactory.createCompVariant";
 		oFileContent.user = ObjectPath.get("support.user", oFileContent);
 		var mCompVariantContent = createBasePropertyBag(oFileContent);
@@ -265,7 +269,9 @@ sap.ui.define([
 			);
 		}
 
-		return new CompVariant(mCompVariantContent);
+		const oCompVariant = new CompVariant(mCompVariantContent);
+		oCompVariant.setAuthor(getVariantAuthor(oCompVariant, mAuthors));
+		return oCompVariant;
 	};
 
 	return FlexObjectFactory;

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.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -239,7 +239,8 @@ sap.ui.define([
 	 * Adds and returns a promise that resolves as soon as
 	 * <code>resolveChangeProcessingPromise</code> or <code>resolveChangeProcessingPromiseWithError</code> is called.
 	 * The promise will always resolve, either without a parameter or with an object and an <code>error</code> parameter inside.
-	 * At any time, there is only one object for 'apply' or 'revert'. If this function is called multiple times for the same key, only the current promise will be returned.
+	 * At any time, there is only one object for 'apply' or 'revert'. If this function is called multiple times for the same key,
+	 * only the current promise will be returned.
 	 *
 	 * 	_oChangeProcessingPromises: {
 	 * 		States.Operations.APPLY: {

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.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */
@@ -64,6 +64,12 @@ sap.ui.define([
 				 */
 				variantId: {
 					type: "string"
+				},
+				/**
+				 * Variant author
+				 */
+				author: {
+					type: "string"
 				}
 			}
 		},
@@ -74,6 +80,7 @@ sap.ui.define([
 			if (!this.getVariantId()) {
 				this.setVariantId(this.getId());
 			}
+			this.setAuthor(this.getSupportInformation().user || "");
 		}
 	});
 

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

@@ -0,0 +1,47 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+sap.ui.define([
+	"sap/ui/core/Lib",
+	"sap/ui/fl/Layer",
+	"sap/ui/fl/registry/Settings"
+], function(
+	Lib,
+	Layer,
+	Settings
+) {
+	"use strict";
+
+	/**
+	 * Retrieves the full username by the ID of a variant author.
+	 * In case the user herself is the author, a translated 'You' will be displayed or in case of developers, no exchange takes place.
+	 *
+	 * @function
+	 * @since 1.121
+	 * @version 1.121.0
+	 * @private
+	 * @ui5-restricted sap.ui.fl
+	 * @alias module:sap/ui/fl/apply/_internal/flexState/compVariants/getVariantAuthor
+	 *
+	 * @param {sap.ui.fl.apply.flexObjects.Variant} oVariant - A variant object for which the Author should be retrieved
+	 * @param {object} mMapIdsNames - Map of user IDs and users' names
+	 * @returns {string} The resolved author of variant
+	 */
+	return (oVariant, mMapIdsNames) => {
+		const sAuthor = oVariant.getSupportInformation().user || "";
+		const oSettings = Settings.getInstanceOrUndef();
+
+		if (oVariant.getLayer() === Layer.USER || sAuthor === oSettings?.getUserId()) {
+			return Lib.getResourceBundleFor("sap.ui.fl").getText("VARIANT_SELF_OWNER_NAME");
+		}
+
+		if (![Layer.PUBLIC, Layer.CUSTOMER].includes(oVariant.getLayer())) {
+			return sAuthor;
+		}
+
+		return mMapIdsNames?.[sAuthor] || sAuthor;
+	};
+});

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

@@ -24,6 +24,7 @@ sap.ui.define([
 	 * @private
 	 * @ui5-restricted
 	 */
+	// eslint-disable-next-line max-len
 	var DataSelector = ManagedObject.extend("sap.ui.fl.apply._internal.flexState.DataSelector", /* @lends sap.ui.fl.apply._internal.flexState.DataSelector.prototype */ {
 		metadata: {
 			properties: {
@@ -39,8 +40,8 @@ sap.ui.define([
 					type: "object"
 				},
 				/**
-				 * Temporary cache to store calculated values or key value pairs
-				 * in case of parameterized selectors
+				 * Temporary cache to store calculated values or, in case of parameterized selectors,
+				 * key value pairs like <code>parentSelectorParameterValue: { parameterValue: { someKey: someValue } }</code>
 				 */
 				cachedResult: {
 					type: "any"
@@ -103,14 +104,34 @@ sap.ui.define([
 
 	const sNoParameter = "DataSelector_no_parameter";
 
-	function getAllParameterValues(oDataSelector, mParameters) {
-		const aReturn = [];
-		let oCurrentDataSelector = oDataSelector;
+	// Returns a list of parameter values for all selectors in the chain
+	// This list can be used to access nested caches in child selectors
+	function getParameterChain(oLowestDataSelector, mParameters) {
+		const aParameterList = [];
+
+		function getParameterValue(oCurrentDataSelector) {
+			const sParameterKey = oCurrentDataSelector.getParameterKey();
+			if (!sParameterKey) {
+				return sNoParameter;
+			}
+			return mParameters?.[sParameterKey];
+		}
+
+		let oCurrentDataSelector = oLowestDataSelector;
 		do {
-			aReturn.unshift(oCurrentDataSelector.getParameterKey() ? mParameters[oCurrentDataSelector.getParameterKey()] : sNoParameter);
+			const sParameterValue = getParameterValue(oCurrentDataSelector);
+			// If no parameter value is provided for the last child selector in the chain
+			// skip it, start with its parent and thus return the whole cache entry
+			if (sParameterValue || oCurrentDataSelector !== oLowestDataSelector) {
+				if (sParameterValue === undefined) {
+					throw new Error(`Parameter '${oCurrentDataSelector.getParameterKey()}' is missing`);
+				}
+				aParameterList.unshift(sParameterValue);
+			}
+
 			oCurrentDataSelector = oCurrentDataSelector.getParentDataSelector();
 		} while (oCurrentDataSelector);
-		return aReturn;
+		return aParameterList;
 	}
 
 	/**
@@ -143,14 +164,21 @@ sap.ui.define([
 	};
 
 	DataSelector.prototype._getParameterizedCachedResult = function(mParameters) {
-		const aParameterValues = getAllParameterValues(this, mParameters);
+		const aParameterValues = getParameterChain(this, mParameters);
+		if (aParameterValues.length === 0) {
+			return this.getCachedResult();
+		}
 		return ObjectPath.get(aParameterValues, this.getCachedResult());
 	};
 
 	DataSelector.prototype._setParameterizedCachedResult = function(mParameters, vValue) {
-		const aParameterValues = getAllParameterValues(this, mParameters);
+		const aParameterValues = getParameterChain(this, mParameters);
 		const mNewData = {};
-		ObjectPath.set(aParameterValues, vValue, mNewData);
+		if (aParameterValues.length === 0) {
+			Object.assign(mNewData, vValue);
+		} else {
+			ObjectPath.set(aParameterValues, vValue, mNewData);
+		}
 		return this.setCachedResult(merge(
 			{},
 			this.getCachedResult(),
@@ -158,14 +186,43 @@ sap.ui.define([
 		));
 	};
 
-	DataSelector.prototype._clearCache = function(mParameters) {
-		if (mParameters) {
-			this._setParameterizedCachedResult(mParameters, null);
+	// Clears the affected cache section and updates
+	// dependent selectors accordingly
+	// It might be required to fully clear all dependent selectors
+	// as well in the future
+	DataSelector.prototype._clearCache = function(mParameters, aUpdateInfo) {
+		const aUpdatedParameterMaps = [];
+
+		const sParameterKey = this.getParameterKey();
+		if (!sParameterKey) {
+			// Cache is not parameterized, clear it completly
+			this.setCachedResult(null);
+			aUpdatedParameterMaps.push(mParameters);
+		} else if (Object.keys(mParameters || {}).includes(sParameterKey)) {
+			// Clear cache for a specific parameter
+			if (this._getParameterizedCachedResult(mParameters) !== undefined) {
+				this._setParameterizedCachedResult(mParameters, null);
+				aUpdatedParameterMaps.push(mParameters);
+			}
 		} else {
-			// Clear full cache
-			var bIsParameterized = !!this.getParameterKey();
-			this.setCachedResult(bIsParameterized ? {} : null);
+			// Fully clear all parameters
+			// Since its own parameter is missing, cached result is the map of all
+			// parameter keys and their cache values
+			const mCurrentCache = this._getParameterizedCachedResult(mParameters);
+			Object.keys(mCurrentCache || {}).forEach((sCacheKey) => {
+				aUpdatedParameterMaps.push({
+					...mParameters,
+					[sParameterKey]: sCacheKey
+				});
+			});
+			this.setCachedResult({});
 		}
+
+		this.getUpdateListeners().forEach(function(fnUpdateFunction) {
+			aUpdatedParameterMaps.forEach((mUpdatedParameters) => {
+				fnUpdateFunction(mUpdatedParameters, aUpdateInfo);
+			});
+		});
 	};
 
 	/**
@@ -176,12 +233,6 @@ sap.ui.define([
 	 */
 	DataSelector.prototype.clearCachedResult = function(mParameters) {
 		this._clearCache(mParameters);
-		// TODO: For now recalculate the dependent selectors,
-		// it might be required to fully clear all dependent selectors
-		// as well in the future
-		this.getUpdateListeners().forEach(function(fnUpdateFunction) {
-			fnUpdateFunction();
-		});
 	};
 
 	/**
@@ -214,26 +265,65 @@ sap.ui.define([
 
 		var vNewResult = this.getExecuteFunction()(
 			oParentData,
-			vParameterValue
+			mParameters
 		);
 		this._setParameterizedCachedResult(mParameters, vNewResult);
-		// FIXME: Might lead to infinite loop if update always invalidates
-		// this.getUpdateListeners().forEach(function(fnUpdateFunction) {
-		// 	fnUpdateFunction();
-		// });
 		return vNewResult;
 	};
 
+	function checkInvalidation(fnCheckInvalidation, mParameters, aUpdateInfo) {
+		if (aUpdateInfo) {
+			return aUpdateInfo.some((oUpdateInfo) => fnCheckInvalidation(mParameters, oUpdateInfo));
+		}
+		return true;
+	}
+
 	/**
-	 * Invokes the cache invalidation check and resets the cache if necessary
-	 * @param {object} mParameters - Map of selector specific parameters
+	 * Update Info Object containing information for the checkInvalidation function.
+	 * @typedef {object} sap.ui.fl.apply._internal.flexState.dataSelector.UpdateInfo
+	 * @property {string} [aUpdateInfo.type] - Type of the update done before
+	 * @property {sap.ui.fl.apply._internal.flexObjects.FlexObject} [aUpdateInfo.updatedObject] - Update relevant object
 	 */
-	DataSelector.prototype.checkUpdate = function(mParameters) {
-		if (this.getCheckInvalidation()(mParameters) === true) {
-			this._clearCache(mParameters);
-			this.getUpdateListeners().forEach(function(fnUpdateFunction) {
-				fnUpdateFunction();
+
+	/**
+	 * Invokes the cache invalidation check and resets the cache if necessary.
+	 * For chained selectors, this function must always be called as low in the chain as possible,
+	 * i.e. on the first selector where the updated data might show side effects.
+	 *
+	 * @param {object} [mParameters] - Map of selector specific parameters
+	 * @param {sap.ui.fl.apply._internal.flexState.dataSelector.UpdateInfo[]} [aUpdateInfo] - List with update info objects
+	 */
+	DataSelector.prototype.checkUpdate = function(mParameters, aUpdateInfo) {
+		const sParameterKey = this.getParameterKey();
+
+		if (
+			// If data selector is parameterized
+			sParameterKey !== undefined
+			// and no valid value for the parameter of the data selector was provided
+			&& !Object.keys(mParameters || {}).includes(sParameterKey)
+		) {
+			const vCachedResult = this._getParameterizedCachedResult(mParameters);
+			const aCacheKeys = Object.keys(vCachedResult && typeof vCachedResult === "object" ? vCachedResult : {});
+			// Check invalidation of children for each possible parameter value
+			aCacheKeys.forEach((sCacheKey) => {
+				// Append the possible cache key part to pass down the selector chain
+				const mInvalidationCheckParameters = {
+					...mParameters,
+					[sParameterKey]: sCacheKey
+				};
+				const bRequiresInvalidation = checkInvalidation(this.getCheckInvalidation(), mInvalidationCheckParameters, aUpdateInfo);
+				if (bRequiresInvalidation) {
+					// Clear the affected cache entry and continue checks in the child selectors
+					this._clearCache(mInvalidationCheckParameters, aUpdateInfo);
+				}
+				return !bRequiresInvalidation;
 			});
+		} else {
+			// Data selector is not parameterized or specific cache entry was selected
+			const bRequiresInvalidation = checkInvalidation(this.getCheckInvalidation(), mParameters, aUpdateInfo);
+			if (bRequiresInvalidation) {
+				this._clearCache(mParameters, aUpdateInfo);
+			}
 		}
 	};