@openui5/sap.ui.fl 1.99.1 → 1.102.0

package/THIRDPARTY.txt

@@ -400,7 +400,7 @@ Contained in: src/sap.ui.mdc/test/sap/ui/mdc/sample/field/filterfieldwithoperato
 
 Library: sap.ui.webc.common:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -411,7 +411,7 @@ Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
 
-Component: lit-html, version: 1.4.1
+Component: lit-html, version: 2.0.1
 Copyright: Google LLC
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -420,7 +420,7 @@ Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/lit-html/
 
 Library: sap.ui.webc.fiori:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -429,7 +429,7 @@ Contained in: src/sap.ui.webc.fiori/src/sap/ui/webc/fiori/thirdparty/*.*
 
 Library: sap.ui.webc.main:
 
-Component: UI5 Web Components, version: 1.0.0-rc.12
+Component: UI5 Web Components, version: 1.1.2
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -450,7 +450,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
-Component: SAP Theming Base Content, version: 11.1.34
+Component: SAP Theming Base Content, version: 11.1.39
 Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.fl",
-  "version": "1.99.1",
+  "version": "1.102.0",
   "description": "OpenUI5 UI Library sap.ui.fl",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,7 +14,7 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.m": "1.99.1",
-    "@openui5/sap.ui.core": "1.99.1"
+    "@openui5/sap.m": "1.102.0",
+    "@openui5/sap.ui.core": "1.102.0"
   }
 }

package/src/sap/ui/fl/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.99.1</version>
+  <version>1.102.0</version>
 
   <documentation>SAPUI5 library with sap.ui.fl controls.</documentation>
 

package/src/sap/ui/fl/Cache.js

@@ -24,7 +24,7 @@ function(
 	 * @alias sap.ui.fl.Cache
 	 * @experimental Since 1.25.0
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

package/src/sap/ui/fl/Change.js

@@ -87,9 +87,11 @@ sap.ui.define([
 	Change.applyState = {
 		INITIAL: 0,
 		APPLYING: 1,
-		APPLY_FINISHED: 2,
+		APPLY_FINISHED: 2, // Deprecated
 		REVERTING: 3,
-		REVERT_FINISHED: 4
+		REVERT_FINISHED: 4,
+		APPLY_SUCCESSFUL: 5,
+		APPLY_FAILED: 6
 	};
 
 	Change.operations = {
@@ -154,10 +156,22 @@ sap.ui.define([
 		this.setApplyState(Change.applyState.APPLYING);
 	};
 
-	Change.prototype.markFinished = function(oResult) {
+	// Deprecated, use markSuccessful or markFailed instead
+	Change.prototype.markFinished = function(oResult, bApplySuccessful) {
 		this._aQueuedProcesses.pop();
 		this._resolveChangeProcessingPromiseWithError(Change.operations.APPLY, oResult);
-		this.setApplyState(Change.applyState.APPLY_FINISHED);
+		var sNewApplyState = bApplySuccessful !== false
+			? Change.applyState.APPLY_SUCCESSFUL
+			: Change.applyState.APPLY_FAILED;
+		this.setApplyState(sNewApplyState);
+	};
+
+	Change.prototype.markSuccessful = function(oResult) {
+		this.markFinished(oResult, true);
+	};
+
+	Change.prototype.markFailed = function(oResult) {
+		this.markFinished(oResult, false);
 	};
 
 	Change.prototype.startReverting = function() {
@@ -174,8 +188,16 @@ sap.ui.define([
 		return this.getApplyState() === Change.applyState.APPLYING;
 	};
 
+	Change.prototype.isSuccessfullyApplied = function() {
+		return this.getApplyState() === Change.applyState.APPLY_SUCCESSFUL;
+	};
+
+	Change.prototype.hasApplyProcessFailed = function() {
+		return this.getApplyState() === Change.applyState.APPLY_FAILED;
+	};
+
 	Change.prototype.isApplyProcessFinished = function() {
-		return this.getApplyState() === Change.applyState.APPLY_FINISHED;
+		return this.isSuccessfullyApplied() || this.hasApplyProcessFailed();
 	};
 
 	Change.prototype.hasRevertProcessStarted = function() {

package/src/sap/ui/fl/ChangePersistence.js

@@ -5,53 +5,57 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler",
-	"sap/ui/fl/initial/_internal/StorageUtils",
-	"sap/ui/fl/Change",
-	"sap/ui/fl/Layer",
-	"sap/ui/fl/Variant",
-	"sap/ui/fl/Utils",
-	"sap/ui/fl/LayerUtils",
-	"sap/ui/fl/Cache",
-	"sap/ui/fl/registry/Settings",
-	"sap/ui/fl/apply/_internal/changes/Applier",
-	"sap/ui/fl/write/_internal/Storage",
-	"sap/ui/core/util/reflection/JsControlTreeModifier",
-	"sap/ui/core/Component",
-	"sap/ui/model/json/JSONModel",
-	"sap/ui/performance/Measurement",
+	"sap/base/util/restricted/_union",
 	"sap/base/util/includes",
 	"sap/base/util/merge",
-	"sap/base/util/restricted/_union",
 	"sap/base/util/UriParameters",
 	"sap/base/Log",
+	"sap/ui/core/util/reflection/JsControlTreeModifier",
+	"sap/ui/core/Component",
+	"sap/ui/fl/apply/_internal/changes/Applier",
+	"sap/ui/fl/apply/_internal/changes/Utils",
+	"sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler",
 	"sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState",
 	"sap/ui/fl/apply/_internal/flexState/FlexState",
-	"sap/ui/fl/write/_internal/condenser/Condenser"
+	"sap/ui/fl/initial/_internal/StorageUtils",
+	"sap/ui/fl/registry/Settings",
+	"sap/ui/fl/write/_internal/condenser/Condenser",
+	"sap/ui/fl/write/_internal/Storage",
+	"sap/ui/fl/write/api/Version",
+	"sap/ui/fl/Cache",
+	"sap/ui/fl/Change",
+	"sap/ui/fl/LayerUtils",
+	"sap/ui/fl/Layer",
+	"sap/ui/fl/Utils",
+	"sap/ui/fl/Variant",
+	"sap/ui/model/json/JSONModel",
+	"sap/ui/performance/Measurement"
 ], function(
-	DependencyHandler,
-	StorageUtils,
-	Change,
-	Layer,
-	Variant,
-	Utils,
-	LayerUtils,
-	Cache,
-	Settings,
-	Applier,
-	Storage,
-	JsControlTreeModifier,
-	Component,
-	JSONModel,
-	Measurement,
+	union,
 	includes,
 	merge,
-	union,
 	UriParameters,
 	Log,
+	JsControlTreeModifier,
+	Component,
+	Applier,
+	ChangesUtils,
+	DependencyHandler,
 	VariantManagementState,
 	FlexState,
-	Condenser
+	StorageUtils,
+	Settings,
+	Condenser,
+	Storage,
+	Version,
+	Cache,
+	Change,
+	LayerUtils,
+	Layer,
+	Utils,
+	Variant,
+	JSONModel,
+	Measurement
 ) {
 	"use strict";
 
@@ -60,10 +64,10 @@ sap.ui.define([
 	 *
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.37.0-SNAPSHOT
+	 * @version 1.102.0
 	 * @experimental Since 1.25.0
-	 * @param {object} mComponent Component data to initiate <code>ChangePersistence</code> instance
-	 * @param {string} mComponent.name Name of the component this instance is responsible for
+	 * @param {object} mComponent - Component data to initiate <code>ChangePersistence</code> instance
+	 * @param {string} mComponent.name - Name of the component this instance is responsible for
 	 */
 	var ChangePersistence = function(mComponent) {
 		this._mComponent = mComponent;
@@ -133,19 +137,17 @@ sap.ui.define([
 	 * @param {object} oChangeOrChangeContent Change instance or content of the change
 	 *
 	 * @returns {boolean} <code>true</code> if all the preconditions are fulfilled
-	 * @public
 	 */
-	ChangePersistence.prototype._preconditionsFulfilled = function(oChangeOrChangeContent) {
+	function preconditionsFulfilled(oChangeOrChangeContent) {
 		var oChangeContent = oChangeOrChangeContent instanceof Change ? oChangeOrChangeContent.getDefinition() : oChangeOrChangeContent;
 
-		function isControlVariantChange() {
-			if ((oChangeContent.fileType === "ctrl_variant") || (oChangeContent.fileType === "ctrl_variant_change") || (oChangeContent.fileType === "ctrl_variant_management_change")) {
-				return oChangeContent.variantManagementReference || oChangeContent.variantReference || (oChangeContent.selector && oChangeContent.selector.id);
-			}
+		var bControlVariantChange = false;
+		if ((oChangeContent.fileType === "ctrl_variant") || (oChangeContent.fileType === "ctrl_variant_change") || (oChangeContent.fileType === "ctrl_variant_management_change")) {
+			bControlVariantChange = oChangeContent.variantManagementReference || oChangeContent.variantReference || (oChangeContent.selector && oChangeContent.selector.id);
 		}
 
-		return oChangeContent.fileType === "change" || isControlVariantChange();
-	};
+		return oChangeContent.fileType === "change" || bControlVariantChange;
+	}
 
 	/**
 	 * Calls the back end asynchronously and fetches all changes for the component
@@ -201,7 +203,7 @@ sap.ui.define([
 				if (sCurrentLayer) {
 					aChanges = LayerUtils.filterChangeOrChangeDefinitionsByCurrentLayer(aChanges, sCurrentLayer);
 				} else if (LayerUtils.isLayerFilteringRequired(this._oUShellURLParsingService) && bFilterMaxLayer) {
-					fnFilter = this._filterChangeForMaxLayer.bind(this);
+					fnFilter = filterChangeForMaxLayer.bind(this);
 					//If layer filtering required, excludes changes in higher layer than the max layer
 					aChanges = aChanges.filter(fnFilter);
 				} else if (this._bHasChangesOverMaxLayer && !bFilterMaxLayer) {
@@ -222,21 +224,21 @@ sap.ui.define([
 
 	ChangePersistence.prototype._checkAndGetChangeInstances = function(aChanges, oChangeFileContent) {
 		return aChanges
-			.filter(this._preconditionsFulfilled)
+			.filter(preconditionsFulfilled)
 			.map(getChangeInstance.bind(this, oChangeFileContent));
 	};
 
-	ChangePersistence.prototype._filterChangeForMaxLayer = function(oChangeOrChangeContent) {
-		if (LayerUtils.isOverMaxLayer(this._getLayerFromChangeOrChangeContent(oChangeOrChangeContent), this._oUShellURLParsingService)) {
+	function filterChangeForMaxLayer(oChangeOrChangeContent) {
+		if (LayerUtils.isOverMaxLayer(getLayerFromChangeOrChangeContent(oChangeOrChangeContent), this._oUShellURLParsingService)) {
 			if (!this._bHasChangesOverMaxLayer) {
 				this._bHasChangesOverMaxLayer = true;
 			}
 			return false;
 		}
 		return true;
-	};
+	}
 
-	ChangePersistence.prototype._getLayerFromChangeOrChangeContent = function(oChangeOrChangeContent) {
+	function getLayerFromChangeOrChangeContent(oChangeOrChangeContent) {
 		var sChangeLayer;
 		if (oChangeOrChangeContent instanceof Variant || oChangeOrChangeContent instanceof Change) {
 			sChangeLayer = oChangeOrChangeContent.getLayer();
@@ -244,7 +246,7 @@ sap.ui.define([
 			sChangeLayer = oChangeOrChangeContent.layer;
 		}
 		return sChangeLayer;
-	};
+	}
 
 	ChangePersistence.prototype._getAllCtrlVariantChanges = function(oChangeFileContent, bIncludeCtrlVariants, fnFilter) {
 		if (!bIncludeCtrlVariants) {
@@ -445,40 +447,6 @@ sap.ui.define([
 		return this._bChangesMapCreated;
 	};
 
-	ChangePersistence.prototype.changesHavingCorrectViewPrefix = function(mPropertyBag, oChange) {
-		var oModifier = mPropertyBag.modifier;
-		var oAppComponent = mPropertyBag.appComponent;
-		var oSelector = oChange.getSelector();
-		if (!oSelector || !mPropertyBag) {
-			return false;
-		}
-		if (oSelector.viewSelector) {
-			var sSelectorViewId = oModifier.getControlIdBySelector(oSelector.viewSelector, oAppComponent);
-			return sSelectorViewId === mPropertyBag.viewId;
-		}
-		var sSelectorId = oSelector.id;
-		if (sSelectorId) {
-			var sViewId;
-			if (oChange.getSelector().idIsLocal) {
-				if (oAppComponent) {
-					sViewId = oAppComponent.getLocalId(mPropertyBag.viewId);
-				}
-			} else {
-				sViewId = mPropertyBag.viewId;
-			}
-			var iIndex = 0;
-			var sSelectorIdViewPrefix;
-			do {
-				iIndex = sSelectorId.indexOf("--", iIndex);
-				sSelectorIdViewPrefix = sSelectorId.slice(0, iIndex);
-				iIndex++;
-			} while (sSelectorIdViewPrefix !== sViewId && iIndex > 0);
-
-			return sSelectorIdViewPrefix === sViewId;
-		}
-		return false;
-	};
-
 	/**
 	 * Gets the changes for the given view id. The complete view prefix has to match.
 	 *
@@ -504,8 +472,8 @@ sap.ui.define([
 	 */
 	ChangePersistence.prototype.getChangesForView = function(mPropertyBag) {
 		return this.getChangesForComponent(mPropertyBag).then(function(aChanges) {
-			return aChanges.filter(this.changesHavingCorrectViewPrefix.bind(this, mPropertyBag));
-		}.bind(this));
+			return aChanges.filter(ChangesUtils.filterChangeByView.bind(undefined, mPropertyBag));
+		});
 	};
 
 	/**
@@ -672,8 +640,8 @@ sap.ui.define([
 		var aAllChanges = bIsCondensingEnabled ? aRelevantChangesForCondensing : aDirtyChanges;
 		var aChangesClone = aAllChanges.slice(0);
 		var aDirtyChangesClone = aDirtyChanges.slice(0);
-		var aRequests = this._getRequests(aDirtyChanges);
-		var aStates = this._getStates(aDirtyChanges);
+		var aRequests = getRequests(aDirtyChanges);
+		var aStates = getStates(aDirtyChanges);
 
 		if (aStates.length === 1 && aRequests.length === 1 && aStates[0] === Change.states.NEW) {
 			var oCondensedChangesPromise = Promise.resolve(aChangesClone);
@@ -699,7 +667,7 @@ sap.ui.define([
 				if (aCondensedChanges.length) {
 					return Storage.write({
 						layer: sLayer,
-						flexObjects: this._prepareDirtyChanges(aCondensedChanges),
+						flexObjects: prepareDirtyChanges(aCondensedChanges),
 						transport: sRequest,
 						isLegacyVariant: false,
 						parentVersion: sParentVersion
@@ -739,33 +707,33 @@ sap.ui.define([
 
 		return aDirtyChanges.reduce(function(oPreviousPromise, oDirtyChange) {
 			return oPreviousPromise
-				.then(this._performSingleSaveAction(oDirtyChange, oFirstNewChange, sParentVersion))
+				.then(performSingleSaveAction.bind(undefined, oDirtyChange, oFirstNewChange, sParentVersion))
 				.then(this._updateCacheAndDirtyState.bind(this, oDirtyChange, bSkipUpdateCache));
 		}.bind(this), Promise.resolve());
 	};
 
-	ChangePersistence.prototype._performSingleSaveAction = function(oDirtyChange, oFirstChange, sParentVersion) {
-		return function() {
-			switch (oDirtyChange.getState()) {
-				case Change.states.NEW:
-					if (sParentVersion !== undefined) {
-						sParentVersion = oDirtyChange === oFirstChange ? sParentVersion : sap.ui.fl.Versions.Draft;
-					}
-					return Storage.write({
-						layer: oDirtyChange.getLayer(),
-						flexObjects: [oDirtyChange.getDefinition()],
-						transport: oDirtyChange.getRequest(),
-						parentVersion: sParentVersion
-					});
-				case Change.states.DELETED:
-					return Storage.remove({
-						flexObject: oDirtyChange.getDefinition(),
-						layer: oDirtyChange.getLayer(),
-						transport: oDirtyChange.getRequest()
-					});
-			}
-		};
-	};
+	function performSingleSaveAction(oDirtyChange, oFirstChange, sParentVersion) {
+		switch (oDirtyChange.getState()) {
+			case Change.states.NEW:
+				if (sParentVersion !== undefined) {
+					sParentVersion = oDirtyChange === oFirstChange ? sParentVersion : Version.Number.Draft;
+				}
+				return Storage.write({
+					layer: oDirtyChange.getLayer(),
+					flexObjects: [oDirtyChange.getDefinition()],
+					transport: oDirtyChange.getRequest(),
+					parentVersion: sParentVersion
+				});
+			case Change.states.DELETED:
+				return Storage.remove({
+					flexObject: oDirtyChange.getDefinition(),
+					layer: oDirtyChange.getLayer(),
+					transport: oDirtyChange.getRequest(),
+					parentVersion: sParentVersion
+				});
+			default:
+		}
+	}
 
 	/**
 	 * Updates the cache with the dirty change passed and removes it from the array of dirty changes if present.
@@ -774,6 +742,10 @@ sap.ui.define([
 	 * therefore, the cache update of the current app is skipped
 	 */
 	ChangePersistence.prototype._updateCacheAndDirtyState = function(oDirtyChange, bSkipUpdateCache) {
+		this._aDirtyChanges = this._aDirtyChanges.filter(function(oExistingDirtyChange) {
+			return oDirtyChange.getId() !== oExistingDirtyChange.getId();
+		});
+
 		if (!bSkipUpdateCache) {
 			if (Utils.isChangeRelatedToVariants(oDirtyChange)) {
 				VariantManagementState.updateVariantsState({
@@ -796,10 +768,6 @@ sap.ui.define([
 				}
 			}
 		}
-
-		this._aDirtyChanges = this._aDirtyChanges.filter(function(oExistingDirtyChange) {
-			return oDirtyChange.getId() !== oExistingDirtyChange.getId();
-		});
 	};
 
 	/**
@@ -813,7 +781,7 @@ sap.ui.define([
 		}, this);
 	};
 
-	ChangePersistence.prototype._getRequests = function(aDirtyChanges) {
+	function getRequests(aDirtyChanges) {
 		var aRequests = [];
 
 		aDirtyChanges.forEach(function(oChange) {
@@ -824,9 +792,9 @@ sap.ui.define([
 		});
 
 		return aRequests;
-	};
+	}
 
-	ChangePersistence.prototype._getStates = function(aDirtyChanges) {
+	function getStates(aDirtyChanges) {
 		var aStates = [];
 
 		aDirtyChanges.forEach(function(oChange) {
@@ -837,9 +805,9 @@ sap.ui.define([
 		});
 
 		return aStates;
-	};
+	}
 
-	ChangePersistence.prototype._prepareDirtyChanges = function(aDirtyChanges) {
+	function prepareDirtyChanges(aDirtyChanges) {
 		var aChanges = [];
 
 		aDirtyChanges.forEach(function(oChange) {
@@ -847,7 +815,7 @@ sap.ui.define([
 		});
 
 		return aChanges;
-	};
+	}
 
 	ChangePersistence.prototype.getDirtyChanges = function() {
 		return this._aDirtyChanges;
@@ -909,6 +877,20 @@ sap.ui.define([
 		return (oObject.getRequest() === "$TMP" || oObject.getRequest() === "") && oObject.getLayer() === sLayer;
 	}
 
+	function isPersistedAndInLayer(sLayer, oObject) {
+		return oObject.getState() === Change.states.PERSISTED && oObject.getLayer() === sLayer;
+	}
+
+	function getAllCompVariantsEntities() {
+		var aCompVariantEntities = [];
+		var mCompVariantsMap = FlexState.getCompVariantsMap(this.getComponentName());
+		for (var sPersistencyKey in mCompVariantsMap) {
+			for (var sId in mCompVariantsMap[sPersistencyKey].byId) {
+				aCompVariantEntities.push(mCompVariantsMap[sPersistencyKey].byId[sId]);
+			}
+		}
+		return aCompVariantEntities;
+	}
 	/**
 	 * Transports all the UI changes and app variant descriptor (if exists) to the target system
 	 *
@@ -919,18 +901,8 @@ sap.ui.define([
 	 * @returns {Promise} promise that resolves when all the artifacts are successfully transported
 	 */
 	ChangePersistence.prototype.transportAllUIChanges = function(oRootControl, sStyleClass, sLayer, aAppVariantDescriptors) {
-		return Promise.all([
-			this.getChangesForComponent({currentLayer: sLayer, includeCtrlVariants: true}),
-			FlexState.getCompVariantsMap(this.getComponentName())// FIXME: also transport comp changes via compState
-		]).then(function(aResponses) {
-			var aLocalChanges = aResponses[0];
-			var mCompVariantsMap = aResponses[1];
-			var aCompVariantEntities = [];
-			for (var sPersistencyKey in mCompVariantsMap) {
-				for (var sId in mCompVariantsMap[sPersistencyKey].byId) {
-					aCompVariantEntities.push(mCompVariantsMap[sPersistencyKey].byId[sId]);
-				}
-			}
+		return this.getChangesForComponent({currentLayer: sLayer, includeCtrlVariants: true}).then(function(aLocalChanges) {
+			var aCompVariantEntities = getAllCompVariantsEntities.call(this);
 
 			aLocalChanges = aLocalChanges.concat(
 				aCompVariantEntities.filter(isLocalAndInLayer.bind(this, sLayer)));
@@ -1024,10 +996,16 @@ sap.ui.define([
 		var bSelectorIdsProvided = aSelectorIds && aSelectorIds.length > 0;
 		var bChangeTypesProvided = aChangeTypes && aChangeTypes.length > 0;
 
-		return this.getChangesForComponent({
-			currentLayer: sLayer,
-			includeCtrlVariants: true
-		}).then(function(aChanges) {
+		//In case of application reset and PUBLIC layer available, also includes comp variant entities
+		var isPublicLayerAvailable = Settings.getInstanceOrUndef() && Settings.getInstanceOrUndef().isPublicLayerAvailable();
+		var isApplicationReset = sGenerator === undefined && aSelectorIds === undefined && aChangeTypes === undefined;
+		var aCompVariantsEntries = [];
+		if (isPublicLayerAvailable && isApplicationReset) {
+			aCompVariantsEntries = getAllCompVariantsEntities.call(this).filter(isPersistedAndInLayer.bind(this, sLayer));
+		}
+
+		return this.getChangesForComponent({ currentLayer: sLayer, includeCtrlVariants: true}).then(function(aChanges) {
+			aChanges = aChanges.concat(aCompVariantsEntries);
 			var mParams = {
 				reference: this.getComponentName(),
 				layer: sLayer,
@@ -1062,18 +1040,5 @@ sap.ui.define([
 		}.bind(this));
 	};
 
-	/**
-	 * Send a flex/info request to the backend.
-	 *
-	 * @param {object} mPropertyBag Contains additional data needed for checking flex/info
-	 * @param {sap.ui.fl.Selector} mPropertyBag.selector Selector
-	 * @param {string} mPropertyBag.layer Layer on which the request is sent to the backend
-	 *
-	 * @returns {Promise<boolean>} Resolves the information if the application has content that can be reset and/or published
-	 */
-	ChangePersistence.prototype.getResetAndPublishInfo = function(mPropertyBag) {
-		return Storage.getFlexInfo(mPropertyBag);
-	};
-
 	return ChangePersistence;
 });

package/src/sap/ui/fl/ChangePersistenceFactory.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.ChangePersistenceFactory
 	 * @experimental Since 1.27.0
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/FakeLrepConnectorLocalStorage.js

@@ -15,15 +15,14 @@ function(
 	"use strict";
 
 	/**
-	 * Class for storing changes in local storage
+	 * Utility for storing changes in local storage.
 	 *
-	 * @class
+	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @private
-	 * @static
 	 * @since 1.48
 	 * @alias sap.ui.fl.FakeLrepConnectorLocalStorage
 	 */

package/src/sap/ui/fl/FakeLrepConnectorSessionStorage.js

@@ -15,15 +15,14 @@ function(
 	"use strict";
 
 	/**
-	 * Class for storing changes in session storage
+	 * Utility for storing changes in session storage.
 	 *
-	 * @class
+	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @private
-	 * @static
 	 * @since 1.58
 	 * @alias sap.ui.fl.FakeLrepConnectorSessionStorage
 	 */

package/src/sap/ui/fl/FakeLrepLocalStorage.js

@@ -10,16 +10,16 @@ sap.ui.define([
 	FakeLrepConnectorLocalStorage
 ) {
 	/**
-	 * Class handling the Fake Lrep storage for local storage;
+	 * Utility handling the Fake Lrep storage for local storage;
+	 *
 	 * This class stays since some tests are still using this internal; We will remove this in the near future.
 	 *
-	 * @class
+	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.99.1
+	 * @version 1.102.0
 	 *
 	 * @private
-	 * @static
 	 * @since 1.48
 	 * @alias sap.ui.fl.FakeLrepLocalStorage
 	 */