@openui5/sap.ui.fl 1.119.0 → 1.120.0

package/src/sap/ui/fl/registry/Settings.js

@@ -7,13 +7,11 @@
 sap.ui.define([
 	"sap/ui/fl/write/_internal/Storage",
 	"sap/ui/fl/Utils",
-	"sap/base/Log",
-	"sap/base/util/UriParameters"
+	"sap/base/Log"
 ], function(
 	Storage,
 	Utils,
-	Log,
-	UriParameters
+	Log
 ) {
 	"use strict";
 
@@ -241,7 +239,7 @@ sap.ui.define([
 	 * @returns {boolean} <code>true</code> if the underlying ABAP system allows save as adaptation, <code>false</code> if not supported
 	 */
 	Settings.prototype.isContextBasedAdaptationEnabled = function() {
-		var oUriParameters = UriParameters.fromQuery(window.location.search);
+		var oUriParameters = new URLSearchParams(window.location.search);
 		var bIsContextBasedAdaptationEnabled = oUriParameters.get("sap-ui-xx-rta-adaptations");
 		return bIsContextBasedAdaptationEnabled === "true" || this._getBooleanProperty("isContextBasedAdaptationEnabled");
 	};

package/src/sap/ui/fl/support/_internal/extractChangeDependencies.js

@@ -6,10 +6,12 @@
 
 sap.ui.define([
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
+	"sap/ui/core/Element",
 	"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
 	"sap/ui/thirdparty/jquery"
 ], function(
 	JsControlTreeModifier,
+	Element,
 	ManifestUtils,
 	jQuery
 ) {
@@ -31,7 +33,7 @@ sap.ui.define([
 		var aComponentContainers = document.querySelector(".sapUiComponentContainer");
 		aComponentContainers = Array.isArray(aComponentContainers) ? aComponentContainers : [aComponentContainers];
 		aComponentContainers.some(function(oComponentContainerDomRef) {
-			var oComponentContainer = sap.ui.getCore().byId(oComponentContainerDomRef.id);
+			var oComponentContainer = Element.getElementById(oComponentContainerDomRef.id);
 			var oAppComponent = oComponentContainer && oComponentContainer.getComponentInstance();
 
 			if (oAppComponent && ManifestUtils.getFlexReferenceForControl(oAppComponent) === sComponentName) {
@@ -122,7 +124,7 @@ sap.ui.define([
 				aNotApplicableChanges: []
 			};
 
-			var oControl = sap.ui.getCore().byId(sControlId);
+			var oControl = Element.getElementById(sControlId);
 
 			if (oControl) {
 				mControlData.bPresent = true;

package/src/sap/ui/fl/support/_internal/getChangeDependencies.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.support._internal.getChangeDependencies
 	 * @since 1.98
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.support.api.SupportAPI
 	 */

package/src/sap/ui/fl/support/_internal/getFlexSettings.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.support._internal.getFlexSettings
 	 * @since 1.99
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.support.api.SupportAPI
 	 */

package/src/sap/ui/fl/support/api/SupportAPI.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.support.api.SupportAPI
 	 * @since 1.98
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @private
 	 * @ui5-restricted ui5 support tools
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetails.controller.js

@@ -15,7 +15,8 @@ sap.ui.define([
 	"sap/ui/fl/Layer",
 	"sap/m/library",
 	"sap/ui/model/json/JSONModel",
-	"sap/ui/core/UIComponent"
+	"sap/ui/core/UIComponent",
+	"sap/ui/core/Element"
 ], function(
 	Controller,
 	Dialog,
@@ -27,7 +28,8 @@ sap.ui.define([
 	Layer,
 	mobileLibrary,
 	JSONModel,
-	UIComponent
+	UIComponent,
+	Element
 ) {
 	"use strict";
 
@@ -40,7 +42,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.ContentDetails
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @since 1.45
 	 * @private
 	 */
@@ -150,9 +152,8 @@ sap.ui.define([
 					return true;
 				}
 			}.bind(this));
-			var oCore = sap.ui.getCore();
 			var sIconTabBarId = this.getView().createId("contentDetailsIconTabBar");
-			var oIconTabBar = oCore.byId(sIconTabBarId);
+			var oIconTabBar = Element.getElementById(sIconTabBarId);
 			if (oIconTabBar) {
 				var oFirstIconTabBarItem = oIconTabBar.getItems()[0];
 				if (oIconTabBar.getSelectedKey() !== oFirstIconTabBarItem.getId()) {

package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetailsEdit.controller.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.ContentDetailsEdit
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/controller/LayerContentMaster.controller.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.LayerContentMaster
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/controller/Layers.controller.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.controller.Layers
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/lrepConnector/LRepConnector.js

@@ -13,7 +13,7 @@ sap.ui.define(["sap/ui/fl/Utils", "sap/ui/thirdparty/jquery"], function(Utils, j
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.lrepConnector.LRepConnector
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/utils/DataUtils.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.utils.DataUtils
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @since 1.45
 	 * @private
 	 */

package/src/sap/ui/fl/support/apps/contentbrowser/utils/ErrorUtils.js

@@ -17,7 +17,7 @@ function(MessageItem, MessagePopover, JSONModel) {
 		 * @constructor
 		 * @alias sap.ui.fl.support.apps.contentbrowser.utils.ErrorUtils
 		 * @author SAP SE
-		 * @version 1.119.0
+		 * @version 1.120.0
 		 * @since 1.45
 		 * @private
 		 */

package/src/sap/ui/fl/transport/TransportSelection.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.transport.TransportSelection
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @since 1.38.0
 	 * Helper object to select an ABAP transport for an LREP object. This is not a generic utility to select a transport request, but part
 	 *        of the SmartVariant control.

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

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @private
@@ -200,7 +200,7 @@ sap.ui.define([
 				} else {
 					Object.keys(mSettings)
 					.filter(function(sPropertyName) {
-						return !!mSettings[sPropertyName];
+						return mSettings[sPropertyName] !== undefined;
 					})
 					.forEach(function(sPropertyName) {
 						mMergedSettings[sPropertyName] = unbind(mSettings[sPropertyName]);

package/src/sap/ui/fl/util/ManagedObjectModel.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @private
@@ -64,7 +64,7 @@ sap.ui.define([
 			Element.apply(this, aArgs);
 
 			this._oManagedObjectModel = new ManagedObjectModel(
-				sap.ui.getCore().byId(this.getObject()),
+				Element.getElementById(this.getObject()),
 				this.getData()
 			);
 

package/src/sap/ui/fl/util/resolveBinding.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 *
 	 * @function
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @alias sap.ui.fl.util.resolveBinding
 	 * @since 1.91
 	 * @private

package/src/sap/ui/fl/variants/VariantManagement.js

@@ -14,6 +14,7 @@ sap.ui.define([
 	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/ui/fl/registry/Settings",
 	"sap/ui/core/Control",
+	"sap/ui/core/Lib",
 	"sap/ui/core/library",
 	"sap/base/Log"
 ], function(
@@ -25,6 +26,7 @@ sap.ui.define([
 	ControlVariantApplyAPI,
 	flSettings,
 	Control,
+	Lib,
 	coreLibrary,
 	Log
 ) {
@@ -324,7 +326,7 @@ sap.ui.define([
 		Control.prototype.init.apply(this); // Call base class
 
 		this.addStyleClass("sapUiFlVarMngmt"); // required for finding the control by RTA/FL
-		this._oRb = sap.ui.getCore().getLibraryResourceBundle("sap.ui.fl");
+		this._oRb = Lib.getResourceBundleFor("sap.ui.fl");
 
 		this.setModelName(ControlVariantApplyAPI.getVariantModelName());
 
@@ -619,18 +621,10 @@ sap.ui.define([
 	 * @returns {array} All variants. In case the model is not yet set, an empty array will be returned.
 	 */
 	VariantManagement.prototype.getVariants = function() {
-		var aItems = [];
-		if (this.oContext && this.oContext.getObject()) {
-			aItems = this.oContext.getObject().variants.filter(function(oItem) {
-				if (!oItem.hasOwnProperty("visible")) {
-					return true;
-				}
-
-				return oItem.visible;
-			});
-		}
-
-		return aItems;
+		return this._oVM ? this._oVM.getItems() : [];
+	};
+	VariantManagement.prototype.getVariantByKey = function(sKey) {
+		return this._oVM ? this._oVM._getItemByKey(sKey) : null;
 	};
 
 	VariantManagement.prototype.getTitle = function() {
@@ -698,12 +692,6 @@ sap.ui.define([
 		return this;
 	};
 
-	VariantManagement.prototype.setExecuteOnSelectionForStandardDefault = function(bValue) {
-		this.setProperty("executeOnSelectionForStandardDefault", bValue);
-		this._oVM.setExecuteOnSelectionForStandardDefault(bValue);
-		return this;
-	};
-
 	VariantManagement.prototype.setDisplayTextForExecuteOnSelectionForStandardVariant = function(sValue) {
 		this.setProperty("displayTextForExecuteOnSelectionForStandardVariant", sValue);
 		this._oVM.setDisplayTextForExecuteOnSelectionForStandardVariant(sValue);
@@ -716,6 +704,10 @@ sap.ui.define([
 		return this;
 	};
 
+	VariantManagement.prototype._setStandardVariantKey = function(sKey) {
+		this._oVM.setStandardVariantKey(sKey);
+	};
+
 	VariantManagement.prototype.openManagementDialog = function(bCreateAlways, sClass, oRolesComponentContainer) {
 		this._oVM.openManagementDialog(bCreateAlways, sClass, oRolesComponentContainer);
 	};
@@ -836,6 +828,7 @@ sap.ui.define([
 			oModel = this.getModel(sModelName);
 			if (oModel) {
 				sLocalId = this._getLocalId(oModel);
+
 				if (sLocalId) {
 					this.oContext = new Context(oModel, `/${sLocalId}`);
 					this.setBindingContext(this.oContext, sModelName);
@@ -883,6 +876,7 @@ sap.ui.define([
 					});
 
 					this._oVM.setPopoverTitle(this._oRb.getText("VARIANT_MANAGEMENT_VARIANTS"));
+					this._setStandardVariantKey(sLocalId);
 				}
 			}
 		}
@@ -895,16 +889,12 @@ sap.ui.define([
 			sharing: `{${sModelName}>sharing}`,
 			remove: `{${sModelName}>remove}`,
 			favorite: `{${sModelName}>favorite}`,
-			originalFavorite: `{${sModelName}>originalFavorite}`,
 			executeOnSelect: `{${sModelName}>executeOnSelect}`,
-			originalExecuteOnSelect: `{${sModelName}>originalExecuteOnSelect}`,
 			rename: `{${sModelName}>rename}`,
-			originalTitle: `{${sModelName}>originalTitle}`,
 			visible: `{${sModelName}>visible}`,
 			changeable: `{${sModelName}>change}`,
 			author: `{${sModelName}>author}`,
-			contexts: `{${sModelName}>contexts}`,
-			originalContexts: `{${sModelName}>originalContexts}`
+			contexts: `{${sModelName}>contexts}`
 		});
 
 		this._oVM.bindAggregation("items", {