@openui5/sap.ui.fl 1.118.0 → 1.119.0

package/THIRDPARTY.txt

@@ -401,7 +401,7 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptive-expressions.js
 
-Component: Markdown-it, version: 12.2.0
+Component: Markdown-it, version: 12.3.2
 Copyright: 2014 Vitaly Puzrin, Alex Kocharin
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
@@ -466,7 +466,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.4.2
+Component: SAP Theming Base Content, version: 11.6.8
 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.118.0",
+  "version": "1.119.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.118.0",
-    "@openui5/sap.ui.core": "1.118.0"
+    "@openui5/sap.m": "1.119.0",
+    "@openui5/sap.ui.core": "1.119.0"
   }
 }

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

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

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

@@ -76,7 +76,7 @@ sap.ui.define([
 	 *
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @since 1.25.0
 	 * @private
 	 * @param {object} mComponent - Component data to initiate <code>ChangePersistence</code> instance

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

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.ChangePersistenceFactory
 	 * @since 1.27.0
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

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

@@ -20,7 +20,7 @@ function(
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 *
 	 * @private
 	 * @since 1.48

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

@@ -20,7 +20,7 @@ function(
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 *
 	 * @private
 	 * @since 1.58

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

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 *
 	 * @private
 	 * @since 1.48

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

@@ -75,7 +75,7 @@ sap.ui.define([
 	 * @since 1.27.0
 	 * @private
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 */
 	var FlexController = function(sComponentName) {
 		this._oChangePersistence = undefined;

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.FlexControllerFactory
 	 * @since 1.27.0
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

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

@@ -7,11 +7,13 @@
 sap.ui.define([
 	"sap/base/util/UriParameters",
 	"sap/ui/thirdparty/hasher",
-	"sap/ui/fl/Layer"
+	"sap/ui/fl/Layer",
+	"sap/ui/fl/initial/_internal/FlexInfoSession"
 ], function(
 	UriParameters,
 	hasher,
-	Layer
+	Layer,
+	FlexInfoSession
 ) {
 	"use strict";
 
@@ -41,7 +43,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.LayerUtils
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 */
 	var LayerUtils = {
 		_mLayersIndex: mLayersIndex,
@@ -113,6 +115,7 @@ sap.ui.define([
 		 * @ui5-restricted sap.ui.fl.apply._internal.Connector
 		 * @param {sap.ui.core.service.Service} oURLParsingService Unified Shell URL Parsing Service
 		 * @return {string} maxLayer
+		 * @deprecated Since version 1.118
 		 */
 		getMaxLayer(oURLParsingService) {
 			var sParseMaxLayer = LayerUtils.getMaxLayerTechnicalParameter(hasher.getHash(), oURLParsingService);
@@ -135,7 +138,7 @@ sap.ui.define([
 		 * @param {string} sLayer Layer name to be evaluated
 		 * @param {sap.ui.core.service.Service} oURLParsingService Unified Shell URL Parsing Service
 		 * @returns {boolean} <code>true</code> if input layer is higher than max layer, otherwise <code>false</code>
-		 * @public
+		 * @deprecated Since version 1.118
 		 */
 		isOverMaxLayer(sLayer, oURLParsingService) {
 			return this.isOverLayer(sLayer, this.getMaxLayer(oURLParsingService));
@@ -177,11 +180,13 @@ sap.ui.define([
 		 * Determines if filtering of changes based on layer is required.
 		 *
 		 * @returns {boolean} <code>true</code> if the top layer is also the max layer, otherwise <code>false</code>
-		 * @param {sap.ui.core.service.Service} oURLParsingService Unified Shell URL Parsing Service
+		 * @param {string} sReference - Reference of the application
 		 * @public
 		 */
-		isLayerFilteringRequired(oURLParsingService) {
-			return this._sTopLayer !== this.getMaxLayer(oURLParsingService);
+		isLayerFilteringRequired(sReference) {
+			var oFlexInfoSession = FlexInfoSession.getByReference(sReference);
+			var sMaxLayer = oFlexInfoSession && oFlexInfoSession.maxLayer ? oFlexInfoSession.maxLayer : LayerUtils._sTopLayer;
+			return this._sTopLayer !== sMaxLayer;
 		},
 
 		/**
@@ -211,6 +216,7 @@ sap.ui.define([
 		 * @param {object[]} aChangeDefinitions - Array of change definitions
 		 * @param {sap.ui.core.service.Service} oURLParsingService Unified Shell URL Parsing Service
 		 * @returns {object[]} Array of filtered change definitions
+		 * @deprecated Since version 1.118
 		 */
 		filterChangeDefinitionsByMaxLayer(aChangeDefinitions, oURLParsingService) {
 			return aChangeDefinitions.filter(function(oChangeDefinition) {
@@ -242,6 +248,7 @@ sap.ui.define([
 		 * @param {string} sHash Hash value
 		 * @param {sap.ui.core.service.Service} oURLParsingService Unified Shell URL Parsing Service
 		 * @returns {string|undefined} Max layer parameter value, if available
+		 * @deprecated Since version 1.118
 		 */
 		getMaxLayerTechnicalParameter(sHash, oURLParsingService) {
 			if (oURLParsingService) {

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

@@ -9,6 +9,7 @@ sap.ui.define([
 	"sap/base/util/isPlainObject",
 	"sap/base/util/uid",
 	"sap/base/util/UriParameters",
+	"sap/base/util/restricted/_isEqual",
 	"sap/base/Log",
 	"sap/ui/base/SyncPromise",
 	"sap/ui/base/ManagedObject",
@@ -23,6 +24,7 @@ sap.ui.define([
 	isPlainObject,
 	uid,
 	UriParameters,
+	isEqual,
 	Log,
 	SyncPromise,
 	ManagedObject,
@@ -42,19 +44,17 @@ sap.ui.define([
 	 */
 	function getComponentType(oManifest) {
 		// manifest instance
-		if (oManifest && oManifest.getEntry) {
-			return oManifest.getEntry("sap.app") && oManifest.getEntry("sap.app").type;
+		if (oManifest?.getEntry) {
+			return oManifest.getEntry?.("sap.app")?.type;
 		}
 
 		// raw manifest
-		return oManifest && oManifest["sap.app"] && oManifest["sap.app"].type;
+		return oManifest?.["sap.app"]?.type;
 	}
 
 	function getStartUpParameter(oComponentData, sParameterName) {
-		if (oComponentData && oComponentData.startupParameters && sParameterName) {
-			if (Array.isArray(oComponentData.startupParameters[sParameterName])) {
-				return oComponentData.startupParameters[sParameterName][0];
-			}
+		if (oComponentData?.startupParameters && sParameterName && Array.isArray(oComponentData.startupParameters[sParameterName])) {
+			return oComponentData.startupParameters[sParameterName][0];
 		}
 	}
 
@@ -64,21 +64,18 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.Utils
 	 * @author SAP SE
-	 * @version 1.118.0
+	 * @version 1.119.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta
 	 */
-	var Utils = {
+	const Utils = {
 		isVariantByStartupParameter(oControl) {
 			// determine UI5 component out of given control
-			if (oControl) {
-				var oAppComponent = this.getAppComponentForControl(oControl);
-				if (oAppComponent && oAppComponent.getComponentData) {
-					return !!getStartUpParameter(oAppComponent.getComponentData(), "sap-app-id");
-				}
+			const oAppComponent = this.getAppComponentForControl(oControl);
+			if (oAppComponent?.getComponentData) {
+				return !!getStartUpParameter(oAppComponent.getComponentData(), "sap-app-id");
 			}
-
 			return false;
 		},
 
@@ -94,18 +91,7 @@ sap.ui.define([
 		 * @ui5-restricted sap.ui.fl, sap.ui.rta
 		 */
 		getAppDescriptor(oControl) {
-			// determine UI5 component out of given control
-			if (oControl) {
-				var oComponent = this.getAppComponentForControl(oControl);
-
-				// determine manifest out of found component
-				if (oComponent && oComponent.getMetadata) {
-					var oComponentMetaData = oComponent.getMetadata();
-					if (oComponentMetaData && oComponentMetaData.getManifestObject) {
-						return oComponentMetaData.getManifestObject().getJson();
-					}
-				}
-			}
+			return this.getAppComponentForControl(oControl)?.getMetadata?.()?.getManifestObject?.().getJson();
 		},
 
 		/**
@@ -149,10 +135,10 @@ sap.ui.define([
 		 */
 		getComponentForControl(oControl) {
 			function getComponentIdForControl(oControl) {
-				var sComponentId = Component.getOwnerIdFor(oControl);
+				const sComponentId = Component.getOwnerIdFor(oControl);
 				if (!sComponentId) {
-					if (oControl && typeof oControl.getParent === "function") {
-						var oParent = oControl.getParent();
+					if (typeof oControl?.getParent === "function") {
+						const oParent = oControl.getParent();
 						if (oParent) {
 							return getComponentIdForControl(oParent);
 						}
@@ -163,7 +149,7 @@ sap.ui.define([
 
 			// determine UI5 component out of given control
 			if (oControl) {
-				var sComponentId = getComponentIdForControl(oControl);
+				const sComponentId = getComponentIdForControl(oControl);
 				if (sComponentId) {
 					return Component.get(sComponentId);
 				}
@@ -180,22 +166,22 @@ sap.ui.define([
 		 * @ui5-restricted sap.ui.fl
 		 */
 		getAppComponentForControl(oControl) {
-			var oComponent = oControl instanceof Component ? oControl : Utils.getComponentForControl(oControl);
+			let oComponent = oControl instanceof Component ? oControl : Utils.getComponentForControl(oControl);
 
 			// special case for Fiori Elements to reach the real appComponent
-			if (oComponent && oComponent.getAppComponent && oComponent.getAppComponent() instanceof Component) {
+			if (oComponent?.getAppComponent?.() instanceof Component) {
 				return oComponent.getAppComponent();
 			}
 
 			// special case for OVP
-			if (oComponent && oComponent.oComponentData && oComponent.oComponentData.appComponent) {
+			if (oComponent?.oComponentData?.appComponent) {
 				return oComponent.oComponentData.appComponent;
 			}
 
-			if (oComponent && oComponent.getManifestEntry) {
+			if (oComponent?.getManifestEntry) {
 				var oSapApp = oComponent.getManifestEntry("sap.app");
 
-				if (oSapApp && oSapApp.type && oSapApp.type !== "application") {
+				if (oSapApp?.type && oSapApp.type !== "application") {
 					if (oComponent instanceof Component) {
 						// we need to call this method only when the component is an instance of Component in order to walk up the tree
 						// returns owner app component
@@ -238,7 +224,7 @@ sap.ui.define([
 				return oControl;
 			}
 
-			if (oControl && typeof oControl.getParent === "function") {
+			if (typeof oControl?.getParent === "function") {
 				oControl = oControl.getParent();
 				return Utils.getViewForControl(oControl);
 			}
@@ -255,20 +241,13 @@ sap.ui.define([
 		 * @ui5-restricted sap.ui.fl.write._internal.transport.Transport
 		 */
 		getClient() {
-			var oUriParams;
-			var sClient;
-			oUriParams = UriParameters.fromQuery(window.location.search);
-			sClient = oUriParams.get("sap-client");
-			return sClient || undefined;
+			return UriParameters.fromQuery(window.location.search).get("sap-client");
 		},
 
 		getLrepUrl() {
-			var aFlexibilityServices = Configuration.getFlexibilityServices();
-			var oLrepConfiguration = aFlexibilityServices.find(function(oServiceConfig) {
-				return oServiceConfig.connector === "LrepConnector";
-			});
-
-			return oLrepConfiguration ? oLrepConfiguration.url : "";
+			const aFlexibilityServices = Configuration.getFlexibilityServices();
+			const oLrepConfiguration = aFlexibilityServices.find((oServiceConfig) => oServiceConfig.connector === "LrepConnector");
+			return oLrepConfiguration?.url || "";
 		},
 
 		/**
@@ -280,12 +259,12 @@ sap.ui.define([
 		 * @ui5-restricted sap.ui.fl
 		 */
 		getCurrentLanguage() {
-			var sLanguage = Configuration.getLanguage();
-			if (!sLanguage || typeof sLanguage !== "string") {
+			const sLanguage = Configuration.getLanguage();
+			if (typeof sLanguage !== "string") {
 				return "";
 			}
 
-			var nIndex = sLanguage.indexOf("-");
+			const nIndex = sLanguage.indexOf("-");
 			if ((nIndex < 0) && (sLanguage.length <= 2)) {
 				return sLanguage.toUpperCase();
 			}
@@ -304,13 +283,7 @@ sap.ui.define([
 		 * @private
 		 */
 		getControlType(oControl) {
-			var oMetadata;
-			if (oControl && typeof oControl.getMetadata === "function") {
-				oMetadata = oControl.getMetadata();
-				if (oMetadata && typeof oMetadata.getElementName === "function") {
-					return oMetadata.getElementName();
-				}
-			}
+			return oControl?.getMetadata?.()?.getElementName?.();
 		},
 
 		/**
@@ -336,10 +309,7 @@ sap.ui.define([
 		 * @returns {object} Returns the parsed URL hash object or an empty object if ushell container is not available
 		 */
 		getParsedURLHash(oURLParsingService) {
-			if (oURLParsingService) {
-				return oURLParsingService.parseShellHash(hasher.getHash()) || {};
-			}
-			return {};
+			return oURLParsingService?.parseShellHash(hasher.getHash()) || {};
 		},
 
 		/**
@@ -364,21 +334,14 @@ sap.ui.define([
 		},
 
 		createDefaultFileName(sNameAddition) {
-			var sFileName = uid().replace(/-/g, "_");
-			if (sNameAddition) {
-				sFileName += `_${sNameAddition}`;
-			}
-			return sFileName;
+			const sFileName = uid().replace(/-/g, "_");
+			return sNameAddition ? `${sFileName}_${sNameAddition}` : sFileName;
 		},
 
 		createNamespace(oPropertyBag, sFileType) {
-			var sSubfolder = "changes";
-			if (sFileType === "ctrl_variant") {
-				sSubfolder = "variants";
-			}
-			var sReferenceName = oPropertyBag.reference.replace(".Component", "");
-			var sNamespace = `apps/${sReferenceName}/${sSubfolder}/`;
-			return sNamespace;
+			const sSubfolder = sFileType === "ctrl_variant" ? "variants" : "changes";
+			const sReferenceName = oPropertyBag.reference.replace(".Component", "");
+			return `apps/${sReferenceName}/${sSubfolder}/`;
 		},
 
 		/**
@@ -391,42 +354,30 @@ sap.ui.define([
 		 * @returns {string} Returns the root LRep namespace
 		 */
 		buildLrepRootNamespace(sBaseId, sScenario, sProjectId) {
-			var sRootNamespace = "apps/";
-			var oError = new Error("Error in sap.ui.fl.Utils#buildLrepRootNamespace: ");
+			const sRootNamespace = "apps";
+			const sBaseErrorMessage = "Error in sap.ui.fl.Utils#buildLrepRootNamespace:";
+
 			if (!sBaseId) {
-				oError.message += "for every scenario you need a base ID";
-				throw oError;
+				throw new Error(`${sBaseErrorMessage} for every scenario you need a base ID`);
 			}
 
 			switch (sScenario) {
 				case Scenario.VersionedAppVariant:
-					if (!sProjectId) {
-						oError.message += "in a versioned app variant scenario you additionally need a project ID";
-						throw oError;
-					}
-					sRootNamespace += `${sBaseId}/appVariants/${sProjectId}/`;
-					break;
 				case Scenario.AppVariant:
 					if (!sProjectId) {
-						oError.message += "in an app variant scenario you additionally need a project ID";
-						throw oError;
+						throw new Error(`${sBaseErrorMessage} in the ${sScenario} scenario you additionally need a project ID`);
 					}
-					sRootNamespace += `${sBaseId}/appVariants/${sProjectId}/`;
-					break;
+					return `${sRootNamespace}/${sBaseId}/appVariants/${sProjectId}/`;
 				case Scenario.AdaptationProject:
 					if (!sProjectId) {
-						oError.message += "in a adaptation project scenario you additionally need a project ID";
-						throw oError;
+						throw new Error(`${sBaseErrorMessage} in the ${sScenario} scenario you additionally need a project ID`);
 					}
-					sRootNamespace += `${sBaseId}/adapt/${sProjectId}/`;
-					break;
+					return `${sRootNamespace}/${sBaseId}/adapt/${sProjectId}/`;
 				case Scenario.FioriElementsFromScratch:
 				case Scenario.UiAdaptation:
 				default:
-					sRootNamespace += `${sBaseId}/`;
+					return `${sRootNamespace}/${sBaseId}/`;
 			}
-
-			return sRootNamespace;
 		},
 
 		/** Returns <code>true</code> if the passed manifest object is of type "application".
@@ -437,8 +388,7 @@ sap.ui.define([
 		 * @ui5-restricted sap.ui.fl
 		 */
 		isApplication(oManifest) {
-			var sComponentType = getComponentType(oManifest);
-			return sComponentType === "application";
+			return getComponentType(oManifest) === "application";
 		},
 
 		/** Returns <code>true</code> if the passed component is an application component.
@@ -460,7 +410,7 @@ sap.ui.define([
 		 * @ui5-restricted sap.ui.fl
 		 */
 		isEmbeddedComponent(oComponent) {
-			var oAppComponent = Utils.getAppComponentForControl(oComponent);
+			const oAppComponent = Utils.getAppComponentForControl(oComponent);
 			return !!(
 				oComponent instanceof Component
 				&& getComponentType(oComponent.getManifestObject()) === "component"
@@ -482,33 +432,9 @@ sap.ui.define([
 		 * @ui5-restricted sap.ui.fl
 		 */
 		indexOfObject(aArray, oObject) {
-			var iObjectIndex = -1;
-			aArray.some(function(oArrayObject, iIndex) {
-				var aKeysArray;
-				var aKeysObject;
-				if (!oArrayObject) {
-					aKeysArray = [];
-				} else {
-					aKeysArray = Object.keys(oArrayObject);
-				}
-
-				if (!oObject) {
-					aKeysObject = [];
-				} else {
-					aKeysObject = Object.keys(oObject);
-				}
-				var bSameNumberOfAttributes = aKeysArray.length === aKeysObject.length;
-				var bContains = bSameNumberOfAttributes && !aKeysArray.some(function(sKey) {
-					return oArrayObject[sKey] !== oObject[sKey];
-				});
-
-				if (bContains) {
-					iObjectIndex = iIndex;
-				}
-
-				return bContains;
+			return aArray.findIndex((oArrayObject) => {
+				return isEqual(oArrayObject, oObject);
 			});
-			return iObjectIndex;
 		},
 
 		/**
@@ -649,16 +575,13 @@ sap.ui.define([
 		 * @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject | undefined} Returns the change if it is in the map, otherwise undefined
 		 */
 		getChangeFromChangesMap(mChanges, sChangeId) {
-			var oResult;
-			Object.keys(mChanges).forEach(function(sControlId) {
-				mChanges[sControlId].some(function(oChange) {
-					if (oChange.getId() === sChangeId) {
-						oResult = oChange;
-						return true;
-					}
-				});
+			let oMatch;
+			Object.values(mChanges).some((aControlChanges) => {
+				oMatch = aControlChanges.find((oChange) => oChange.getId() === sChangeId);
+				return oMatch;
 			});
-			return oResult;
+
+			return oMatch;
 		},
 
 		/**
@@ -671,11 +594,11 @@ sap.ui.define([
 		 * @returns {string} The modified URL
 		 */
 		handleUrlParameters(sParameters, sParameterName, sParameterValue, oURLParsingService) {
-			if (this.hasParameterAndValue(sParameterName, sParameterValue, oURLParsingService)) {
+			if (Utils.hasParameterAndValue(sParameterName, sParameterValue, oURLParsingService)) {
 				if (sParameters.startsWith("?")) {
 					sParameters = sParameters.substr(1, sParameters.length);
 				}
-				var aFilterUrl = sParameters.split("&").filter(function(sParameter) {
+				const aFilterUrl = sParameters.split("&").filter((sParameter) => {
 					return sParameter !== `${sParameterName}=${sParameterValue}`;
 				});
 				sParameters = "";
@@ -697,7 +620,7 @@ sap.ui.define([
 		 * @returns {boolean} <code>true</code> if the parameter and the given value are in the URL
 		 */
 		hasParameterAndValue(sParameterName, sParameterValue, oURLParsingService) {
-			return this.getParameter(sParameterName, oURLParsingService) === sParameterValue;
+			return Utils.getParameter(sParameterName, oURLParsingService) === sParameterValue;
 		},
 
 		/**
@@ -708,13 +631,7 @@ sap.ui.define([
 		 * @returns {string} The value of the given parameter or undefined
 		 */
 		getParameter(sParameterName, oURLParsingService) {
-			if (oURLParsingService) {
-				var mParsedHash = Utils.getParsedURLHash(oURLParsingService);
-				return mParsedHash.params &&
-					mParsedHash.params[sParameterName] &&
-					mParsedHash.params[sParameterName][0];
-			}
-			return Utils.getUrlParameter(sParameterName);
+			return Utils.getParsedURLHash(oURLParsingService)?.params?.[sParameterName]?.[0] || Utils.getUrlParameter(sParameterName);
 		},
 
 		/**
@@ -724,16 +641,7 @@ sap.ui.define([
 		 * @returns {object} Aggregation metadata
 		 */
 		findAggregation(oControl, sAggregationName) {
-			if (oControl) {
-				if (oControl.getMetadata) {
-					var oMetadata = oControl.getMetadata();
-					var oAggregations = oMetadata.getAllAggregations();
-					if (oAggregations) {
-						return oAggregations[sAggregationName];
-					}
-				}
-			}
-			return undefined;
+			return oControl?.getMetadata?.()?.getAllAggregations?.()?.[sAggregationName];
 		},
 
 		/**
@@ -743,7 +651,7 @@ sap.ui.define([
 		 * @returns {sap.ui.base.ManagedObject[]|Element[]} Aggregation content
 		 */
 		getAggregation(oParent, sAggregationName) {
-			var oAggregation = Utils.findAggregation(oParent, sAggregationName);
+			const oAggregation = Utils.findAggregation(oParent, sAggregationName);
 			if (oAggregation) {
 				return oParent[oAggregation._sGetter]();
 			}
@@ -757,12 +665,8 @@ sap.ui.define([
 		 * @returns {any} Value of the property
 		 */
 		getProperty(oControl, sPropertyName) {
-			var oMetadata = oControl.getMetadata().getPropertyLikeSetting(sPropertyName);
-			if (oMetadata) {
-				var sPropertyGetter = oMetadata._sGetter;
-				return oControl[sPropertyGetter]();
-			}
-			return undefined;
+			const sPropertyGetter = oControl.getMetadata().getPropertyLikeSetting(sPropertyName)?._sGetter;
+			return oControl[sPropertyGetter]();
 		},
 
 		/**
@@ -773,7 +677,7 @@ sap.ui.define([
 		 */
 		 getUShellService(sServiceName) {
 			if (sServiceName) {
-				var oUShellContainer = this.getUshellContainer();
+				const oUShellContainer = this.getUshellContainer();
 				if (oUShellContainer) {
 					return oUShellContainer.getServiceAsync(sServiceName);
 				}
@@ -786,18 +690,14 @@ sap.ui.define([
 		 * @param {array} aServiceNames - List of service names
 		 * @returns {Promise<object>} Resolves to an object with the requested ushell services
 		 */
-		getUShellServices(aServiceNames) {
-			var aServicePromises = aServiceNames.map(function(sServiceName) {
-				return this.getUShellService(sServiceName);
-			}.bind(this));
-			return Promise.all(aServicePromises).then(function(aServices) {
-				return aServiceNames.reduce(function(mServices, sService, iIndex) {
-					mServices[sService] = aServices && aServices[iIndex];
-					return mServices;
-				}, {});
-			});
+		async getUShellServices(aServiceNames) {
+			const mServices = {};
+			for (const sServiceName of aServiceNames) {
+				mServices[sServiceName] = await this.getUShellService(sServiceName);
+			}
+			return mServices;
 		}
 
 	};
 	return Utils;
-}, true);
+});