@openui5/sap.ui.fl 1.120.6 → 1.121.0

package/src/sap/ui/fl/apply/api/FlexRuntimeInfoAPI.js

@@ -5,27 +5,29 @@
  */
 
 sap.ui.define([
-	"sap/base/util/includes",
 	"sap/base/Log",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/fl/apply/_internal/controlVariants/Utils",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/fl/initial/_internal/FlexConfiguration",
+	"sap/ui/fl/initial/_internal/FlexInfoSession",
 	"sap/ui/fl/ChangePersistenceFactory",
 	"sap/ui/fl/FlexControllerFactory",
 	"sap/ui/fl/Layer",
-	"sap/ui/fl/Utils"
+	"sap/ui/fl/Utils",
+	"sap/ui/VersionInfo"
 ], function(
-	includes,
 	Log,
 	JsControlTreeModifier,
 	VariantUtils,
 	ManifestUtils,
 	FlexConfiguration,
+	FlexInfoSession,
 	ChangePersistenceFactory,
 	FlexControllerFactory,
 	Layer,
-	Utils
+	Utils,
+	VersionInfo
 ) {
 	"use strict";
 
@@ -56,7 +58,7 @@ sap.ui.define([
 				return Promise.reject(sMessage);
 			}
 
-			function ifValidFileType(oChange) {
+			function filterByValidFileType(oChange) {
 				return oChange.getFileType() === "change";
 			}
 
@@ -66,12 +68,12 @@ sap.ui.define([
 				});
 				var oSelector = oChange.getSelector();
 				var sControlId = JsControlTreeModifier.getControlIdBySelector(oSelector, oAppComponent);
-				return includes(aIdsOfPassedControls, sControlId);
+				return aIdsOfPassedControls.includes(sControlId);
 			}
 
 			function filterByChangeType(aChangeTypes, oChange) {
 				return (Array.isArray(aChangeTypes) && aChangeTypes.length > 0)
-					? includes(aChangeTypes, oChange.getChangeType())
+					? aChangeTypes.includes(oChange.getChangeType())
 					: true;
 			}
 
@@ -88,9 +90,10 @@ sap.ui.define([
 			return oChangePersistence.getChangesForComponent({currentLayer: Layer.USER, includeCtrlVariants: true})
 			.then(function(aChanges) {
 				return aChanges
+				.filter(filterByValidFileType)
 				.filter(filterBySelectors.bind(this, oAppComponent, mPropertyBag.selectors))
 				.filter(filterByChangeType.bind(this, mPropertyBag.changeTypes))
-				.some(ifValidFileType);
+				.length > 0;
 			}.bind(this));
 		},
 
@@ -180,6 +183,44 @@ sap.ui.define([
 		 */
 		getConfiguredFlexServices() {
 			return FlexConfiguration.getFlexibilityServices();
+		},
+
+		/**
+		 * Returns the version that is used for Flexibility Services
+		 *
+		 * @param {object} mPropertyBag - Object with parameters as properties
+		 * @param {string} mPropertyBag.reference - Reference of the application
+		 * @returns {string} Version of Flexibility Services
+		 *
+		 * @private
+		 * @ui5-restricted sap.ushell
+		 */
+		getFlexVersion(mPropertyBag) {
+			return FlexInfoSession.getByReference(mPropertyBag.reference)?.version;
+		},
+
+		/**
+		 * Returns the information needed for the rta feedback dialog
+		 *
+		 * @param {object} mPropertyBag - Object with parameters as properties
+		 * @param {sap.ui.base.ManagedObject} mPropertyBag.rootControl - root control of the app
+		 * @returns {object[]} Flexibility services configuration
+		 *
+		 * @private
+		 * @ui5-restricted sap.ui.rta
+		 */
+		async getFeedbackInformation(mPropertyBag) {
+			const sConnector = this.getConfiguredFlexServices()[0].connector;
+			const oManifest = Utils.getAppDescriptor(mPropertyBag.rootControl);
+			const oVersion = await VersionInfo.load();
+			const sAppId = ManifestUtils.getAppIdFromManifest(oManifest);
+			const sAppVersion = ManifestUtils.getAppVersionFromManifest(oManifest);
+			return {
+				appId: sAppId,
+				appVersion: sAppVersion,
+				connector: sConnector,
+				version: oVersion.version
+			};
 		}
 	};
 

package/src/sap/ui/fl/apply/api/SmartVariantManagementApplyAPI.js

@@ -40,7 +40,7 @@ sap.ui.define([
 
 	function getCompEntities(mPropertyBag) {
 		var oControl = mPropertyBag.control;
-		var oVMControl = (oControl.getVariantManagement && oControl.getVariantManagement()) || oControl;
+		var oVMControl = oControl.getVariantManagement?.() || oControl;
 		var sSVMControlId = oVMControl.getId();
 		var sReference = ManifestUtils.getFlexReferenceForControl(oControl);
 

package/src/sap/ui/fl/changeHandler/AddIFrame.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddIFrame
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @since 1.72
 	 * @private
 	 */

package/src/sap/ui/fl/changeHandler/AddXML.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddXML
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @since 1.54
 	 * @private
 	 */

package/src/sap/ui/fl/changeHandler/AddXMLAtExtensionPoint.js

@@ -5,11 +5,11 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/changeHandler/BaseAddXml",
-	"sap/ui/fl/write/api/ExtensionPointRegistryAPI"
+	"sap/ui/fl/apply/api/ExtensionPointRegistryAPI",
+	"sap/ui/fl/changeHandler/BaseAddXml"
 ], function(
-	BaseAddXml,
-	ExtensionPointRegistryAPI
+	ExtensionPointRegistryAPI,
+	BaseAddXml
 ) {
 	"use strict";
 
@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.AddXMLAtExtensionPoint
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @since 1.75
 	 * @private
 	 */
@@ -71,7 +71,8 @@ sap.ui.define([
 					 }'). Multiple Extension-points with the same name in one view are not supported!`);
 			}
 			(mExtensionPointInfo.defaultContent || []).forEach(function(vControl) {
-				// Remove default implementation of extension points in async apply (xml-preprocessing) and create (via action handler) scenarios
+				// Remove default implementation of extension points in async apply (xml-preprocessing)
+				// and create (via action handler) scenarios
 				if (vControl) {
 					oModifier.destroy(vControl);
 				}

package/src/sap/ui/fl/changeHandler/Base.js

@@ -14,7 +14,7 @@ sap.ui.define([
 	/**
 	 * Base functionality for all change handlers, which provides some reuse methods
 	 * @namespace sap.ui.fl.changeHandler.Base
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted change handlers
 	 */

package/src/sap/ui/fl/changeHandler/BaseAddViaDelegate.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.changeHandler.BaseAddViaDelegate
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @private
 	 */
 	const BaseAddViaDelegate = {

package/src/sap/ui/fl/changeHandler/BaseAddXml.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.BaseAddXml
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @since 1.75
 	 * @private
 	 */

package/src/sap/ui/fl/changeHandler/BaseRename.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.changeHandler.BaseRename
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @since 1.46
 	 *
 	 */

package/src/sap/ui/fl/changeHandler/HideControl.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * Change handler for hiding of a control.
 	 * @alias sap.ui.fl.changeHandler.HideControl
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @since 1.27.0
 	 */
 	var HideControl = {};

package/src/sap/ui/fl/changeHandler/MoveControls.js

@@ -19,7 +19,7 @@ function(
 	 *
 	 * @alias sap.ui.fl.changeHandler.MoveControls
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @since 1.46
 	 */
 	var MoveControls = { };

package/src/sap/ui/fl/changeHandler/MoveElements.js

@@ -12,7 +12,7 @@ sap.ui.define([], function() {
 	 *
 	 * @alias sap.ui.fl.changeHandler.MoveElements
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @since 1.34.0
 	 */
 	var MoveElements = { };

package/src/sap/ui/fl/changeHandler/PropertyBindingChange.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.PropertyBindingChange
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @since 1.38
 	 * @private
 	 */

package/src/sap/ui/fl/changeHandler/PropertyChange.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.PropertyChange
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @since 1.36
 	 * @private
 	 */

package/src/sap/ui/fl/changeHandler/StashControl.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * Change handler for stashing of a control.
 	 * @alias sap.ui.fl.changeHandler.StashControl
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @since 1.27.0
 	 */
 	var StashControl = {};
@@ -60,7 +60,7 @@ sap.ui.define([
 		const mRevertData = oChange.getRevertData();
 		const oModifier = mPropertyBag.modifier;
 		if (LayerUtils.isDeveloperLayer(oChange.getLayer())) {
-			const oUnstashedControl = oModifier.setStashed(oControl, mRevertData.originalValue, mPropertyBag.appComponent);
+			const oUnstashedControl = await oModifier.setStashed(oControl, mRevertData.originalValue, mPropertyBag.appComponent);
 			if (oUnstashedControl) {
 				const iUnstashedIndex = await oModifier.findIndexInParentAggregation(oUnstashedControl);
 				if (iUnstashedIndex !== mRevertData.originalIndex) {

package/src/sap/ui/fl/changeHandler/UnhideControl.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * Change handler for unhiding of a control.
 	 * @alias sap.ui.fl.changeHandler.UnhideControl
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @since 1.27.0
 	 */
 	var UnhideControl = {};

package/src/sap/ui/fl/changeHandler/UnstashControl.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * Change handler for unstashing of a control.
 	 * @alias sap.ui.fl.changeHandler.UnstashControl
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @since 1.27.0
 	 */
 	var UnstashControl = {};
@@ -38,7 +38,7 @@ sap.ui.define([
 		oChange.setRevertData({
 			originalValue: bPreviouslyStashed
 		});
-		const oUnstashedControl = oModifier.setStashed(oControl, false, mPropertyBag.appComponent) || oControl;
+		const oUnstashedControl = await oModifier.setStashed(oControl, false, mPropertyBag.appComponent) || oControl;
 		// old way including move, new way will have separate move change
 		// only applicable for XML modifier
 		if (mContent.parentAggregationName) {
@@ -66,9 +66,9 @@ sap.ui.define([
 	 * @param {sap.ui.core.util.reflection.BaseTreeModifier} mPropertyBag.modifier - Modifier for the controls
 	 * @public
 	 */
-	UnstashControl.revertChange = function(oChange, oControl, mPropertyBag) {
+	UnstashControl.revertChange = async function(oChange, oControl, mPropertyBag) {
 		var mRevertData = oChange.getRevertData();
-		mPropertyBag.modifier.setStashed(oControl, mRevertData.originalValue);
+		await mPropertyBag.modifier.setStashed(oControl, mRevertData.originalValue);
 		oChange.resetRevertData();
 	};
 

package/src/sap/ui/fl/changeHandler/UpdateIFrame.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @alias sap.ui.fl.changeHandler.UpdateIFrame
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @since 1.72
 	 * @private
 	 */

package/src/sap/ui/fl/descriptorRelated/api/DescriptorChangeFactory.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.fl.descriptorRelated
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @namespace
 	 * @name sap.ui.fl.descriptorRelated.api
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorChange
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */
@@ -124,7 +124,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorChangeFactory
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted sap.ui.rta, smart business
 	 */

package/src/sap/ui/fl/descriptorRelated/api/DescriptorInlineChangeFactory.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorInlineChangeFactory
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @deprecated Since version 1.76
 	 * @ui5-restricted sap.ui.rta, smart business

package/src/sap/ui/fl/descriptorRelated/api/DescriptorVariantFactory.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.descriptorRelated.api.DescriptorVariantFactory
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @deprecated Since version 1.73
 	 * @ui5-restricted sap.ui.rta, smart business

package/src/sap/ui/fl/designtime/util/IFrame.designtime.js

@@ -5,100 +5,12 @@
  */
 
 sap.ui.define([
-	"sap/ui/core/Element",
-	"sap/ui/rta/plugin/iframe/AddIFrameDialog",
-	"sap/m/library"
+	"sap/ui/fl/designtime/util/editIFrame"
 ], function(
-	Element,
-	AddIFrameDialog
+	editIFrame
 ) {
 	"use strict";
 
-	function editIFrame(oIFrame/* , mPropertyBag */) {
-		var oAddIFrameDialog = new AddIFrameDialog();
-		var oInitialSettings = oIFrame.get_settings();
-		var mRenameInfo = oIFrame.getRenameInfo();
-		var mDialogSettings;
-		var oContainer;
-
-		// The title of the iFrame container could have changed
-		// so we need to retrieve it before opening the dialog
-		if (mRenameInfo) {
-			oContainer = Element.getElementById(mRenameInfo.sourceControlId);
-			oInitialSettings.title = oContainer.getProperty(mRenameInfo.propertyName);
-		}
-
-		return AddIFrameDialog.buildUrlBuilderParametersFor(oIFrame)
-		.then(function(mURLParameters) {
-			mDialogSettings = {
-				parameters: mURLParameters,
-				frameUrl: oInitialSettings.url,
-				frameWidth: oInitialSettings.width,
-				frameHeight: oInitialSettings.height,
-				title: oInitialSettings.title,
-				asContainer: !!oInitialSettings.title,
-				useLegacyNavigation: oInitialSettings.useLegacyNavigation,
-				updateMode: true
-			};
-			return oAddIFrameDialog.open(mDialogSettings);
-		})
-		.then(function(mSettings) {
-			if (!mSettings) {
-				return []; // No change
-			}
-			var aChanges = [];
-			var bContentChanged = false;
-			var oNewContent = {
-				url: oInitialSettings.url,
-				height: oInitialSettings.height,
-				width: oInitialSettings.width,
-				useLegacyNavigation: oInitialSettings.useLegacyNavigation
-			};
-
-			if (mSettings.frameHeight + mSettings.frameHeightUnit !== oInitialSettings.height) {
-				bContentChanged = true;
-				oNewContent.height = mSettings.frameHeight + mSettings.frameHeightUnit;
-			}
-			if (mSettings.frameWidth + mSettings.frameWidthUnit !== oInitialSettings.width) {
-				bContentChanged = true;
-				oNewContent.width = mSettings.frameWidth + mSettings.frameWidthUnit;
-			}
-			if (mSettings.frameUrl !== oInitialSettings.url) {
-				bContentChanged = true;
-				oNewContent.url = mSettings.frameUrl;
-			}
-			if (mSettings.useLegacyNavigation !== !!oInitialSettings.useLegacyNavigation) {
-				bContentChanged = true;
-				oNewContent.useLegacyNavigation = mSettings.useLegacyNavigation;
-			}
-
-			if (bContentChanged) {
-				aChanges.push({
-					selectorControl: oIFrame,
-					changeSpecificData: {
-						changeType: "updateIFrame",
-						content: oNewContent
-					}
-				});
-			}
-
-			// If the title changes a rename change must be created
-			if (mSettings.title !== oInitialSettings.title) {
-				var mRenameChange = {
-					selectorControl: Element.getElementById(mRenameInfo.selectorControlId),
-					changeSpecificData: {
-						changeType: "rename",
-						content: {
-							value: mSettings.title
-						}
-					}
-				};
-				aChanges.push(mRenameChange);
-			}
-			return aChanges;
-		});
-	}
-
 	return {
 		actions: {
 			settings() {
@@ -117,4 +29,4 @@ sap.ui.define([
 			}
 		}
 	};
-});
+});

package/src/sap/ui/fl/designtime/util/editIFrame.js

@@ -0,0 +1,94 @@
+/*!
+ * 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/Element",
+	"sap/ui/rta/plugin/iframe/AddIFrameDialog"
+], function(
+	Element,
+	AddIFrameDialog
+) {
+	"use strict";
+
+	return async function editIFrame(oIFrame) {
+		const oAddIFrameDialog = new AddIFrameDialog();
+		const oInitialSettings = oIFrame.get_settings();
+		const mRenameInfo = oIFrame.getRenameInfo();
+
+		// The title of the iFrame container could have changed
+		// so we need to retrieve it before opening the dialog
+		if (mRenameInfo) {
+			const oContainer = Element.getElementById(mRenameInfo.sourceControlId);
+			oInitialSettings.title = oContainer.getProperty(mRenameInfo.propertyName);
+		}
+
+		const mURLParameters = await AddIFrameDialog.buildUrlBuilderParametersFor(oIFrame);
+		const mDialogSettings = {
+			parameters: mURLParameters,
+			frameUrl: oInitialSettings.url,
+			frameWidth: oInitialSettings.width,
+			frameHeight: oInitialSettings.height,
+			title: oInitialSettings.title,
+			asContainer: !!oInitialSettings.title,
+			useLegacyNavigation: oInitialSettings.useLegacyNavigation,
+			updateMode: true
+		};
+		const mSettings = await oAddIFrameDialog.open(mDialogSettings, oIFrame);
+		if (!mSettings) {
+			return []; // No change
+		}
+		const aChanges = [];
+		let bContentChanged = false;
+		const oNewContent = {
+			url: oInitialSettings.url,
+			height: oInitialSettings.height,
+			width: oInitialSettings.width,
+			useLegacyNavigation: oInitialSettings.useLegacyNavigation
+		};
+
+		if (mSettings.frameHeight + mSettings.frameHeightUnit !== oInitialSettings.height) {
+			bContentChanged = true;
+			oNewContent.height = mSettings.frameHeight + mSettings.frameHeightUnit;
+		}
+		if (mSettings.frameWidth + mSettings.frameWidthUnit !== oInitialSettings.width) {
+			bContentChanged = true;
+			oNewContent.width = mSettings.frameWidth + mSettings.frameWidthUnit;
+		}
+		if (mSettings.frameUrl !== oInitialSettings.url) {
+			bContentChanged = true;
+			oNewContent.url = mSettings.frameUrl;
+		}
+		if (mSettings.useLegacyNavigation !== !!oInitialSettings.useLegacyNavigation) {
+			bContentChanged = true;
+			oNewContent.useLegacyNavigation = mSettings.useLegacyNavigation;
+		}
+
+		if (bContentChanged) {
+			aChanges.push({
+				selectorControl: oIFrame,
+				changeSpecificData: {
+					changeType: "updateIFrame",
+					content: oNewContent
+				}
+			});
+		}
+
+		// If the title changes a rename change must be created
+		if (mSettings.title !== oInitialSettings.title) {
+			const mRenameChange = {
+				selectorControl: Element.getElementById(mRenameInfo.selectorControlId),
+				changeSpecificData: {
+					changeType: "rename",
+					content: {
+						value: mSettings.title
+					}
+				}
+			};
+			aChanges.push(mRenameChange);
+		}
+		return aChanges;
+	};
+});

package/src/sap/ui/fl/initial/_internal/FlexConfiguration.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 * The flexibility Configuration.
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @alias module:sap/ui/fl/initial/_internal/FlexConfiguration
 	 * @namespace

package/src/sap/ui/fl/initial/_internal/FlexInfoSession.js

@@ -4,11 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define([
-	"sap/ui/fl/apply/_internal/flexState/ManifestUtils"
-], function(
-	ManifestUtils
-) {
+sap.ui.define([], () => {
 	"use strict";
 
 	var FlexInfoSession = {};
@@ -19,20 +15,8 @@ sap.ui.define([
 		return PARAMETER_PREFIX + (sReference || "true");
 	}
 
-	FlexInfoSession.get = function(oControl) {
-		var sReference = ManifestUtils.getFlexReferenceForControl(oControl);
-		return FlexInfoSession.getByReference(sReference);
-	};
-
 	FlexInfoSession.getByReference = function(sReference) {
-		return JSON.parse(window.sessionStorage.getItem(getSessionStorageKey(sReference)));
-	};
-
-	FlexInfoSession.set = function(oInfo, oControl) {
-		if (oInfo) {
-			var sReference = ManifestUtils.getFlexReferenceForControl(oControl);
-			FlexInfoSession.setByReference(oInfo, sReference);
-		}
+		return JSON.parse(window.sessionStorage.getItem(getSessionStorageKey(sReference))) || {};
 	};
 
 	FlexInfoSession.setByReference = function(oInfo, sReference) {
@@ -41,11 +25,6 @@ sap.ui.define([
 		}
 	};
 
-	FlexInfoSession.remove = function(oControl) {
-		var sReference = ManifestUtils.getFlexReferenceForControl(oControl);
-		window.sessionStorage.removeItem(getSessionStorageKey(sReference));
-	};
-
 	FlexInfoSession.removeByReference = function(sReference) {
 		window.sessionStorage.removeItem(getSessionStorageKey(sReference));
 	};