@openui5/sap.ui.fl 1.128.0 → 1.130.0

package/src/sap/ui/fl/apply/_internal/changes/FlexCustomData.js

@@ -5,11 +5,9 @@
  */
 
 sap.ui.define([
-	"sap/ui/fl/Utils",
 	"sap/base/Log",
 	"sap/ui/core/CustomData" // needs to be preloaded
 ], function(
-	FlUtils,
 	Log
 ) {
 	"use strict";
@@ -31,9 +29,9 @@ sap.ui.define([
 	 * @since 1.61.0
 	 * @private
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 */
-	var FlexCustomData = {};
+	const FlexCustomData = {};
 
 	FlexCustomData.appliedChangesCustomDataKey = "sap.ui.fl.appliedChanges";
 	FlexCustomData.failedChangesCustomDataKeyJs = "sap.ui.fl.failedChanges.js";
@@ -41,7 +39,7 @@ sap.ui.define([
 	FlexCustomData.notApplicableChangesCustomDataKey = "sap.ui.fl.notApplicableChanges";
 
 	function writeCustomData(oControl, sKey, sValue, mPropertyBag) {
-		var mCustomData = mPropertyBag.modifier.getCustomDataInfo(oControl, sKey);
+		const mCustomData = mPropertyBag.modifier.getCustomDataInfo(oControl, sKey);
 		if (!mCustomData.customData) {
 			return mPropertyBag.modifier.createAndAddCustomData(oControl, sKey, sValue, mPropertyBag.appComponent);
 		}
@@ -49,7 +47,7 @@ sap.ui.define([
 	}
 
 	function getCustomValueData(bSaveRevertData, oChange) {
-		var vRevertData = oChange.getRevertData();
+		const vRevertData = oChange.getRevertData();
 		if (bSaveRevertData && vRevertData !== undefined) {
 			return JSON.stringify(vRevertData);
 		}
@@ -66,7 +64,9 @@ sap.ui.define([
 	 * @returns {string|undefined} Custom data or 'undefined'
 	 */
 	FlexCustomData.getAppliedCustomDataValue = function(oControl, oChange, oModifier) {
-		var mCustomData = oModifier.getCustomDataInfo(oControl, FlexCustomData._getCustomDataKey(oChange, FlexCustomData.appliedChangesCustomDataKey));
+		const mCustomData = oModifier.getCustomDataInfo(
+			oControl, FlexCustomData._getCustomDataKey(oChange, FlexCustomData.appliedChangesCustomDataKey)
+		);
 		return mCustomData.customDataValue;
 	};
 
@@ -80,7 +80,7 @@ sap.ui.define([
 	 * @returns {object|undefined} Returns the revert data from the custom data as object or 'undefined'
 	 */
 	FlexCustomData.getParsedRevertDataFromCustomData = function(oControl, oChange, oModifier) {
-		var sCustomDataValue = FlexCustomData.getAppliedCustomDataValue(oControl, oChange, oModifier);
+		const sCustomDataValue = FlexCustomData.getAppliedCustomDataValue(oControl, oChange, oModifier);
 		try {
 			return sCustomDataValue && JSON.parse(sCustomDataValue);
 		} catch (oError) {
@@ -99,17 +99,23 @@ sap.ui.define([
 	 * @returns {boolean} <code>true</code> if the custom data is there.
 	 */
 	FlexCustomData.hasChangeApplyFinishedCustomData = function(oControl, oChange, oModifier) {
-		var oAppliedCD = oModifier.getCustomDataInfo(oControl, FlexCustomData._getCustomDataKey(oChange, FlexCustomData.appliedChangesCustomDataKey));
+		const oAppliedCD = oModifier.getCustomDataInfo(
+			oControl, FlexCustomData._getCustomDataKey(oChange, FlexCustomData.appliedChangesCustomDataKey)
+		);
 		if (oAppliedCD.customData) {
 			return true;
 		}
 
-		var oFailedCD = oModifier.getCustomDataInfo(oControl, FlexCustomData._getCustomDataKey(oChange, FlexCustomData.failedChangesCustomDataKeyJs));
+		const oFailedCD = oModifier.getCustomDataInfo(
+			oControl, FlexCustomData._getCustomDataKey(oChange, FlexCustomData.failedChangesCustomDataKeyJs)
+		);
 		if (oFailedCD.customData) {
 			return true;
 		}
 
-		var oNotApplicableCD = oModifier.getCustomDataInfo(oControl, FlexCustomData._getCustomDataKey(oChange, FlexCustomData.notApplicableChangesCustomDataKey));
+		const oNotApplicableCD = oModifier.getCustomDataInfo(
+			oControl, FlexCustomData._getCustomDataKey(oChange, FlexCustomData.notApplicableChangesCustomDataKey)
+		);
 		if (oNotApplicableCD.customData) {
 			return true;
 		}
@@ -131,8 +137,8 @@ sap.ui.define([
 	 * @returns {Promise} resolves when custom data is written
 	 */
 	FlexCustomData.addAppliedCustomData = function(oControl, oChange, mPropertyBag, bSaveRevertData) {
-		var sCustomDataValue = getCustomValueData(bSaveRevertData, oChange);
-		var sCustomDataKey = FlexCustomData._getCustomDataKey(oChange, FlexCustomData.appliedChangesCustomDataKey);
+		const sCustomDataValue = getCustomValueData(bSaveRevertData, oChange);
+		const sCustomDataKey = FlexCustomData._getCustomDataKey(oChange, FlexCustomData.appliedChangesCustomDataKey);
 		return writeCustomData(oControl, sCustomDataKey, sCustomDataValue, mPropertyBag);
 	};
 
@@ -150,7 +156,7 @@ sap.ui.define([
 	 * @returns {Promise} resolves when custom data is written
 	 */
 	FlexCustomData.addFailedCustomData = function(oControl, oChange, mPropertyBag, sIdentifier) {
-		var sCustomDataKey = FlexCustomData._getCustomDataKey(oChange, sIdentifier);
+		const sCustomDataKey = FlexCustomData._getCustomDataKey(oChange, sIdentifier);
 		return writeCustomData(oControl, sCustomDataKey, "true", mPropertyBag);
 	};
 
@@ -162,8 +168,8 @@ sap.ui.define([
 	 * @param {sap.ui.core.util.reflection.BaseTreeModifier} oModifier The control tree modifier
 	 */
 	FlexCustomData.destroyAppliedCustomData = function(oControl, oChange, oModifier) {
-		var sKey = FlexCustomData._getCustomDataKey(oChange, FlexCustomData.appliedChangesCustomDataKey);
-		var mCustomData = oModifier.getCustomDataInfo(oControl, sKey);
+		const sKey = FlexCustomData._getCustomDataKey(oChange, FlexCustomData.appliedChangesCustomDataKey);
+		const mCustomData = oModifier.getCustomDataInfo(oControl, sKey);
 		if (mCustomData.customData) {
 			oModifier.destroy(mCustomData.customData);
 		}
@@ -209,4 +215,4 @@ sap.ui.define([
 	};
 
 	return FlexCustomData;
-}, /* bExport= */true);
+});

package/src/sap/ui/fl/apply/_internal/changes/Reverter.js

@@ -23,19 +23,17 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	var Reverter = {};
+	const Reverter = {};
 
-	function _waitForApplyIfNecessary(oChange) {
+	async function waitForApplyIfNecessary(oChange) {
 		if (!oChange.isApplyProcessFinished() && oChange.hasApplyProcessStarted()) {
 			// wait for the change to be applied
-			return oChange.addPromiseForApplyProcessing().then(function(oResult) {
-				if (oResult && oResult.error) {
-					oChange.markRevertFinished(oResult.error);
-					throw Error(oResult.error);
-				}
-			});
+			const oResult = await oChange.addPromiseForApplyProcessing();
+			if (oResult && oResult.error) {
+				oChange.markRevertFinished(oResult.error);
+				throw Error(oResult.error);
+			}
 		}
-		return Promise.resolve();
 	}
 
 	function removeChangeFromMaps(oChange, sReference) {
@@ -63,41 +61,33 @@ sap.ui.define([
 	 * @param {object} mPropertyBag.appDescriptor - App descriptor containing the metadata of the current application
 	 * @param {sap.ui.core.util.reflection.BaseTreeModifier} mPropertyBag.modifier - Polymorph reuse operations handling the changes on the given view type
 	 * @param {sap.ui.core.mvc.View} mPropertyBag.view - View to process
-	 * @returns {Promise|sap.ui.fl.Utils.FakePromise} Resolving Promise/FakePromise with either the control (success) or <code>false</code> (failure) as value
+	 * @returns {Promise} Resolving Promise with either the control (success) or <code>false</code> (failure) as value
 	 */
-	Reverter.revertChangeOnControl = function(oChange, oControl, mPropertyBag) {
-		var mControl = Utils.getControlIfTemplateAffected(oChange, oControl, mPropertyBag);
-		var oChangeHandler;
-
-		return Utils.getChangeHandler(oChange, mControl, mPropertyBag).then(function(oReturnedChangeHandler) {
-			oChangeHandler = oReturnedChangeHandler;
-		})
-		.then(_waitForApplyIfNecessary.bind(null, oChange))
-		.then(function() {
+	Reverter.revertChangeOnControl = async function(oChange, oControl, mPropertyBag) {
+		const mControl = Utils.getControlIfTemplateAffected(oChange, oControl, mPropertyBag);
+		try {
+			const oChangeHandler = await Utils.getChangeHandler(oChange, mControl, mPropertyBag);
+			await waitForApplyIfNecessary(oChange);
 			if (oChange.isSuccessfullyApplied()) {
 				oChange.startReverting();
-				return oChangeHandler.revertChange(oChange, mControl.control, mPropertyBag);
+			} else {
+				throw Error("Change was never applied");
 			}
-			throw Error("Change was never applied");
-		})
-		.then(function() {
+
+			await oChangeHandler.revertChange(oChange, mControl.control, mPropertyBag);
 			// After revert the relevant control for the change might have changed, therefore it must be retrieved again (e.g. stashing)
 			mControl.control = mPropertyBag.modifier.bySelector(oChange.getSelector(), mPropertyBag.appComponent, mPropertyBag.view);
 			if (mControl.bTemplateAffected) {
-				return mPropertyBag.modifier.updateAggregation(mControl.control, oChange.getContent().boundAggregation);
+				await mPropertyBag.modifier.updateAggregation(mControl.control, oChange.getContent().boundAggregation);
 			}
-			return undefined;
-		})
-		.then(function() {
 			oChange.markRevertFinished();
 			return mControl.control;
-		})
-		.catch(function(oError) {
-			var sErrorMessage = `Change could not be reverted: ${oError.message}`;
+		} catch (oError) {
+			const sErrorMessage = `Change could not be reverted: ${oError.message}`;
 			Log.error(sErrorMessage);
 			oChange.markRevertFinished(sErrorMessage);
 			return false;
-		});
+		}
 	};
 
 	/**
@@ -111,18 +101,18 @@ sap.ui.define([
 	 * @returns {Promise|sap.ui.fl.Utils.FakePromise} Promise/FakePromise that resolves as soon as all changes are reverted
 	 */
 	Reverter.revertMultipleChanges = function(aChanges, mPropertyBag) {
-		var aPromiseStack = [];
-		aChanges.forEach(function(oChange) {
+		const aPromiseStack = [];
+		aChanges.forEach((oChange) => {
 			// Queued 'state' will be removed once the revert process is done
 			oChange.setQueuedForRevert();
-			aPromiseStack.push(function() {
-				var oSelector = oChange.getSelector && oChange.getSelector();
-				var oControl = mPropertyBag.modifier.bySelector(oSelector, mPropertyBag.appComponent);
+			aPromiseStack.push(() => {
+				const oSelector = oChange.getSelector && oChange.getSelector();
+				const oControl = mPropertyBag.modifier.bySelector(oSelector, mPropertyBag.appComponent);
 				if (!oControl) {
 					removeChangeFromMaps(oChange, mPropertyBag.reference);
 					return (FlUtils.FakePromise ? new FlUtils.FakePromise() : Promise.resolve());
 				}
-				var mRevertProperties = {
+				const mRevertProperties = {
 					modifier: mPropertyBag.modifier,
 					appComponent: mPropertyBag.appComponent,
 					view: FlUtils.getViewForControl(oControl)

package/src/sap/ui/fl/apply/_internal/changes/Utils.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.Utils
 	 * @since 1.70
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal, sap.ui.fl.write._internal
 	 */
@@ -36,7 +36,7 @@ sap.ui.define([
 		return true;
 	}
 
-	var Utils = {
+	const Utils = {
 		/**
 		 * Returns the control map containing control, controlType, bTemplateAffected and originalControl
 		 *
@@ -45,16 +45,16 @@ sap.ui.define([
 		 * @param {object} mPropertyBag - Contains additional data that are needed for reading of changes
 		 * @param {sap.ui.core.util.reflection.BaseTreeModifier} mPropertyBag.modifier - Control tree modifier
 		 * @param {sap.ui.core.Component} mPropertyBag.appComponent - Component instance that is currently loading
-		 * @param {object} mPropertyBag.view - The currenty loaded view
+		 * @param {object} mPropertyBag.view - The currently loaded view
 		 * @returns {object} Contains the information about the control
 		 * @private
 		 */
 		getControlIfTemplateAffected(oChange, oControl, mPropertyBag) {
-			var oModifier = mPropertyBag.modifier;
-			var mControl = {
+			const oModifier = mPropertyBag.modifier;
+			const mControl = {
 				originalControl: oControl
 			};
-			var oOriginalDependentSelector = oChange.getOriginalSelector();
+			const oOriginalDependentSelector = oChange.getOriginalSelector();
 			if (oChange.getContent().boundAggregation && oOriginalDependentSelector) {
 				mControl.control = oModifier.bySelector(oOriginalDependentSelector, mPropertyBag.appComponent, mPropertyBag.view);
 				mControl.controlType = oModifier.getControlType(mControl.control);
@@ -79,38 +79,33 @@ sap.ui.define([
 		 * @param {sap.ui.core.util.reflection.BaseTreeModifier} mPropertyBag.modifier - Control tree modifier
 		 * @returns {Promise} Promise resolving with the change handler or an empty object
 		 */
-		getChangeHandler(oChange, mControl, mPropertyBag) {
-			var oLibraryNamePromise = mPropertyBag.modifier.getLibraryName(mControl.control);
+		async getChangeHandler(oChange, mControl, mPropertyBag) {
+			const sLibraryName = await mPropertyBag.modifier.getLibraryName(mControl.control);
 			// the ChangeHandlerRegistration includes all the predefined ChangeHandlers.
 			// With this as a standard import the ChangeHandlers would not be able to access API classes due to circular dependencies.
 			// TODO should be removed as soon as the ChangePersistence / FlexController are gone
-			return Promise.all([
-				requireAsync("sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerRegistration"),
-				oLibraryNamePromise
-			])
-			.then(function(aPromiseValues) {
-				return aPromiseValues[0].waitForChangeHandlerRegistration(aPromiseValues[1]);
-			})
-			.then(function() {
-				var sChangeType = oChange.getChangeType();
-				var sLayer = oChange.getLayer();
-				return ChangeHandlerStorage.getChangeHandler(sChangeType, mControl.controlType, mControl.control, mPropertyBag.modifier, sLayer);
-			});
+			const ChangeHandlerRegistration = await requireAsync("sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerRegistration");
+			await ChangeHandlerRegistration.waitForChangeHandlerRegistration(sLibraryName);
+			const sChangeType = oChange.getChangeType();
+			const sLayer = oChange.getLayer();
+			return ChangeHandlerStorage.getChangeHandler(
+				sChangeType, mControl.controlType, mControl.control, mPropertyBag.modifier, sLayer
+			);
 		},
 
 		checkIfDependencyIsStillValid(oAppComponent, oModifier, mChangesMap, sChangeId) {
-			var oChange = FlUtils.getChangeFromChangesMap(mChangesMap.mChanges, sChangeId);
+			const oChange = FlUtils.getChangeFromChangesMap(mChangesMap.mChanges, sChangeId);
 			// Change could be deleted after a save (condensing) so it is no longer a relevant dependency
 			if (!oChange) {
 				return false;
 			}
-			var oControl = oModifier.bySelector(oChange.getSelector(), oAppComponent);
+			const oControl = oModifier.bySelector(oChange.getSelector(), oAppComponent);
 			// if the control is currently not available,
 			// the change is also not applied anymore and the dependency is still valid
 			if (!oControl) {
 				return true;
 			}
-			var bHasChangeApplyFinishedCustomData = FlexCustomData.hasChangeApplyFinishedCustomData(oControl, oChange, oModifier);
+			const bHasChangeApplyFinishedCustomData = FlexCustomData.hasChangeApplyFinishedCustomData(oControl, oChange, oModifier);
 			return isDependencyStillValid(oChange, bHasChangeApplyFinishedCustomData);
 		},
 
@@ -125,19 +120,19 @@ sap.ui.define([
 		 * @returns {boolean} <code>true</code> if the change belongs to the given view
 		 */
 		isChangeInView(mPropertyBag, oChange) {
-			var oModifier = mPropertyBag.modifier;
-			var oAppComponent = mPropertyBag.appComponent;
-			var oSelector = oChange.getSelector();
+			const oModifier = mPropertyBag.modifier;
+			const oAppComponent = mPropertyBag.appComponent;
+			const oSelector = oChange.getSelector();
 			if (!oSelector) {
 				return false;
 			}
 			if (oSelector.viewSelector) {
-				var sSelectorViewId = oModifier.getControlIdBySelector(oSelector.viewSelector, oAppComponent);
+				const sSelectorViewId = oModifier.getControlIdBySelector(oSelector.viewSelector, oAppComponent);
 				return sSelectorViewId === mPropertyBag.viewId;
 			}
-			var sSelectorId = oSelector.id;
+			const sSelectorId = oSelector.id;
 			if (sSelectorId) {
-				var sViewId;
+				let sViewId;
 				if (oChange.getSelector().idIsLocal) {
 					if (oAppComponent) {
 						sViewId = oAppComponent.getLocalId(mPropertyBag.viewId);
@@ -145,8 +140,8 @@ sap.ui.define([
 				} else {
 					sViewId = mPropertyBag.viewId;
 				}
-				var iIndex = 0;
-				var sSelectorIdViewPrefix;
+				let iIndex = 0;
+				let sSelectorIdViewPrefix;
 				do {
 					iIndex = sSelectorId.indexOf("--", iIndex);
 					sSelectorIdViewPrefix = sSelectorId.slice(0, iIndex);

package/src/sap/ui/fl/apply/_internal/changes/descriptor/Preprocessor.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Preprocessor
 	 * @since 1.74
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -50,8 +50,8 @@ sap.ui.define([
 
 			Measurement.start("flexStateInitialize", "Initialization of flex state", ["sap.ui.fl"]);
 
-			var oComponentData = oConfig.componentData || {};
-			var sReference = ManifestUtils.getFlexReference({
+			const oComponentData = oConfig.componentData || {};
+			const sReference = ManifestUtils.getFlexReference({
 				manifest: oManifest,
 				componentData: oComponentData
 			});
@@ -80,8 +80,8 @@ sap.ui.define([
 			}).then(function() {
 				Measurement.end("flexStateInitialize");
 				Measurement.start("flexAppDescriptorMerger", "Client side app descriptor merger", ["sap.ui.fl"]);
-				var oUpdatedManifest = Object.assign({}, oManifest);
-				var aAppDescriptorChanges = FlexState.getAppDescriptorChanges(sReference);
+				const oUpdatedManifest = { ...oManifest };
+				const aAppDescriptorChanges = FlexState.getAppDescriptorChanges(sReference);
 				return Applier.applyChanges(oUpdatedManifest, aAppDescriptorChanges, ApplyStrategyFactory.getRuntimeStrategy());
 			}).then(function(oManifest) {
 				Measurement.end("flexAppDescriptorMerger");

package/src/sap/ui/fl/apply/_internal/changes/descriptor/Registration.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.Registration
 	 * @since 1.74
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
@@ -30,7 +30,8 @@ sap.ui.define([
 		appdescr_ovp_removeCard: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/ovp/DeleteCard"),
 		appdescr_ui_generic_app_addNewObjectPage: requireAsync.bind(this, "sap/suite/ui/generic/template/manifestMerger/AddNewObjectPage"),
 		appdescr_ui_generic_app_changePageConfiguration: requireAsync.bind(this, "sap/suite/ui/generic/template/manifestMerger/ChangePageConfiguration"),
-		appdescr_fe_changePageConfiguration: requireAsync.bind(this, "sap/fe/core/manifestMerger/ChangePageConfiguration")
+		appdescr_fe_changePageConfiguration: requireAsync.bind(this, "sap/fe/core/manifestMerger/ChangePageConfiguration"),
+		appdescr_fe_addNewPage: requireAsync.bind(this, "sap/fe/core/manifestMerger/AddNewPage")
 	};
 	return Registration;
 });

package/src/sap/ui/fl/apply/_internal/changes/descriptor/RegistrationBuild.js

@@ -20,14 +20,15 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild
 	 * @since 1.77
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */
-	var RegistrationBuild = {
+	const RegistrationBuild = {
 		appdescr_app_changeDataSource: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeDataSource"),
 		appdescr_ui5_addNewModelEnhanceWith: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModelEnhanceWith"),
 		appdescr_ui5_addComponentUsages: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddComponentUsages"),
+		appdescr_ui5_changeModel: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/ui5/ChangeModel"),
 		appdescr_ui5_setMinUI5Version: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetMinUI5Version"),
 		appdescr_fiori_setRegistrationIds: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetRegistrationIds"),
 		appdescr_ui5_setFlexExtensionPointEnabled: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetFlexExtensionPointEnabled"),
@@ -37,12 +38,13 @@ sap.ui.define([
 		appdescr_app_changeInbound: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeInbound"),
 		appdescr_app_changeOutbound: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeOutbound"),
 		appdescr_app_addNewInbound: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/app/AddNewInbound"),
+		appdescr_app_addNewOutbound: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/app/AddNewOutbound"),
+		appdescr_app_addNewDataSource: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/app/AddNewDataSource"),
 		appdescr_app_setAch: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/app/SetAch"),
 		appdescr_app_addTechnicalAttributes: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/app/AddTechnicalAttributes"),
 		appdescr_fiori_setAbstract: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetAbstract"),
 		appdescr_fiori_setCloudDevAdaptationStatus: requireAsync.bind(this, "sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetCloudDevAdaptationStatus")
 	};
 
-	var RegistrationCopy = Object.assign({}, Registration);
-	return Object.assign(RegistrationCopy, RegistrationBuild);
+	return { ...Registration, ...RegistrationBuild };
 });

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddAnnotationsToOData.js

@@ -135,7 +135,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.apply._internal.changes.descriptor.app.AddAnnotationsToOData
 	 * @since 1.87
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.apply._internal
 	 */

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddNewDataSource.js

@@ -0,0 +1,152 @@
+
+/*!
+ * 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/fl/util/DescriptorChangeCheck"
+], function(
+	DescriptorChangeCheck
+) {
+	"use strict";
+
+	const MANDATORY_PROPERTIES = ["uri"];
+	const SUPPORTED_PROPERTIES = [...MANDATORY_PROPERTIES, "type", "settings", "customType"];
+	const PROPERTIES_PATTERNS = {
+		type: "^(OData|ODataAnnotation|INA|XML|JSON|FHIR|WebSocket|http)$",
+		customType: "^false$"
+	};
+	const SUPPORTED_TYPES = {
+		uri: typeof "string",
+		type: typeof "string",
+		settings: typeof {},
+		dataSourceCustom: typeof false,
+		annotations: typeof []
+	};
+
+	function isDataSourceIdExistingInManifest(oManifestDataSources, sDataSourceId) {
+		return Object.keys(oManifestDataSources).includes(sDataSourceId);
+	}
+
+	function getDataSourceType(oDataSource) {
+		return oDataSource.type || "OData";
+	}
+
+	function getDataSourceNameByType(oChangeDataSource, sType) {
+		const [sDataSourceName] = Object.entries(oChangeDataSource).find(([, oDataSource]) => getDataSourceType(oDataSource) === sType) || [];
+		return sDataSourceName;
+	}
+
+	function checkDefinedAnnotationsExistInManifest(oManifestDataSources, sDataSourceOfTypeOData, aToBeCheckedInManifestAnnotations) {
+		aToBeCheckedInManifestAnnotations.forEach(function(sAnnotation) {
+			if (!isDataSourceIdExistingInManifest(oManifestDataSources, sAnnotation)) {
+				throw new Error(`Referenced annotation '${sAnnotation}' in the annotation array of data source '${sDataSourceOfTypeOData}' does not exist in the manifest.`);
+			}
+		});
+	}
+
+	function checksWhenAddingTwoDataSources(oManifestDataSources, oChangeDataSource) {
+		const sDataSourceOfTypeOData = getDataSourceNameByType(oChangeDataSource, "OData");
+		const sDataSourceOfTypeODataAnnotation = getDataSourceNameByType(oChangeDataSource, "ODataAnnotation");
+
+		if (!(sDataSourceOfTypeOData && sDataSourceOfTypeODataAnnotation)) {
+			throw new Error(`When adding two data sources it is only allwoed to add a data source with type 'OData' and the other one must be of type 'ODataAnnotation'.`);
+		}
+
+		if (!oChangeDataSource[sDataSourceOfTypeOData]?.settings?.annotations?.includes(sDataSourceOfTypeODataAnnotation)) {
+			throw new Error(`Data source '${sDataSourceOfTypeOData}' does not include annotation '${sDataSourceOfTypeODataAnnotation}' under 'settings/annotations' array.`);
+		}
+
+		const aToBeCheckedInManifestAnnotations = oChangeDataSource[sDataSourceOfTypeOData].settings.annotations.filter(function(sAnnotation) {
+			return sAnnotation !== sDataSourceOfTypeODataAnnotation;
+		});
+		checkDefinedAnnotationsExistInManifest(oManifestDataSources, sDataSourceOfTypeOData, aToBeCheckedInManifestAnnotations);
+	}
+
+	function checksWhenAddingOneDataSource(oManifestDataSources, oChangeDataSource) {
+		const sDataSourceOfTypeOData = getDataSourceNameByType(oChangeDataSource, "OData");
+		if (oChangeDataSource[sDataSourceOfTypeOData].settings?.annotations) {
+			checkDefinedAnnotationsExistInManifest(oManifestDataSources, sDataSourceOfTypeOData, oChangeDataSource[sDataSourceOfTypeOData].settings.annotations);
+		}
+	}
+
+	function postChecks(oManifestDataSources, oChangeDataSource, aDataSources) {
+		aDataSources.forEach(function(sDataSource) {
+			if (isDataSourceIdExistingInManifest(oManifestDataSources, sDataSource)) {
+				throw new Error(`There is already a dataSource '${sDataSource}' existing in the manifest.`);
+			}
+
+			checkIfAnnotationsPropertyIsAnArray(oChangeDataSource, sDataSource);
+		});
+		if (aDataSources.length === 1) {
+			checksWhenAddingOneDataSource(oManifestDataSources, oChangeDataSource);
+		}
+		if (aDataSources.length === 2) {
+			checksWhenAddingTwoDataSources(oManifestDataSources, oChangeDataSource);
+		}
+	}
+
+	function checkIfAnnotationsPropertyIsAnArray(oChangeDataSource, sDataSource) {
+		const sDataSourceType = getDataSourceType(oChangeDataSource[sDataSource]);
+
+		if (oChangeDataSource[sDataSource].settings?.annotations) {
+			if (sDataSourceType !== "OData") {
+				throw new Error(`Data source '${sDataSource}' which is of type '${sDataSourceType}' contains the annotations array. Only data sources with type 'OData' could contain the 'settings/annotations' array.`);
+			}
+
+			if (!Array.isArray(oChangeDataSource[sDataSource].settings.annotations)) {
+				throw new Error(`Property 'annotations' must be of type 'array'.`);
+			}
+		}
+	}
+
+	/**
+	 * Descriptor change merger for change type <code>appdescr_app_addNewDataSource</code>.
+	 * Adds a new data source to the manifest.json file under the path sap.app.dataSources.
+	 *
+	 * Available only for build {@link sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild}.
+	 *
+	 * @namespace
+	 * @alias sap.ui.fl.apply._internal.changes.descriptor.app.AddNewDataSource
+	 * @since 1.87
+	 * @version 1.130.0
+	 * @private
+	 * @ui5-restricted sap.ui.fl.apply._internal
+	 */
+	const AddNewDataSource = {
+
+		/**
+		 * Applies the <code>appdescr_app_addNewDataSource</code> change to the manifest.
+		 *
+		 * @param {object} oManifest - Original manifest
+		 * @param {sap.ui.fl.apply._internal.flexObjects.AppDescriptorChange} oChange - Change with type <code>appdescr_app_addNewDataSource</code>
+		 * @param {object} oChange.content - Details of the change
+		 * @param {object} oChange.content.dataSource - Data source of <code>sap.app/dataSource</code> that is being changed
+		 * @returns {object} Updated manifest with changed <code>sap.app/dataSource</code>
+		 *
+		 * @private
+		 * @ui5-restricted sap.ui.fl.apply._internal
+		 */
+		applyChange(oManifest, oChange) {
+			oManifest["sap.app"].dataSources ||= {};
+			const oChangeContent = oChange.getContent();
+
+			const aDataSources = DescriptorChangeCheck.getAndCheckContentObject(oChangeContent, "dataSource", oChange.getChangeType(), MANDATORY_PROPERTIES, SUPPORTED_PROPERTIES, PROPERTIES_PATTERNS, SUPPORTED_TYPES);
+
+			aDataSources.forEach(function(sDataSource) {
+				DescriptorChangeCheck.checkIdNamespaceCompliance(sDataSource, oChange);
+			});
+
+			postChecks(oManifest["sap.app"].dataSources, oChangeContent.dataSource, aDataSources);
+
+			Object.assign(oManifest["sap.app"].dataSources, oChangeContent.dataSource);
+
+			return oManifest;
+		}
+
+	};
+
+	return AddNewDataSource;
+});

package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddNewInbound.js

@@ -12,19 +12,13 @@ sap.ui.define([
 ) {
 	"use strict";
 
-	function getAndCheckInboundId(oChangeContent) {
-		var aInbounds = Object.keys(oChangeContent.inbound);
-		if (aInbounds.length > 1) {
-			throw new Error("It is not allowed to add more than one inbound");
-		}
-		if (aInbounds.length < 1) {
-			throw new Error("Inbound does not exist");
-		}
-		if (aInbounds[0] === "") {
-			throw new Error("The ID of your inbound is empty");
-		}
-		return aInbounds[aInbounds.length - 1];
-	}
+	const MANDATORY_PROPERTIES = ["semanticObject", "action"];
+	const SUPPORTED_PROPERTIES = [...MANDATORY_PROPERTIES, "hideLauncher", "icon", "title", "shortTitle", "subTitle", "info", "indicatorDataSource", "deviceTypes", "displayMode", "signature"];
+
+	const PROPERTIES_PATTERNS = {
+		semanticObject: "^[\\w\\*]{0,30}$",
+		action: "^[\\w\\*]{0,60}$"
+	};
 
 	/**
 	* Descriptor change merger for change type <code>appdescr_app_addNewInbound</code>.
@@ -34,11 +28,11 @@ sap.ui.define([
 	*
 	* @namespace
 	* @alias sap.ui.fl.apply._internal.changes.descriptor.app.AddNewInbound
-	* @version 1.128.0
+	* @version 1.130.0
 	* @private
 	* @ui5-restricted sap.ui.fl.apply._internal
 	*/
-	var AddNewInbound = /** @lends sap.ui.fl.apply._internal.changes.descriptor.app.AddNewInbound */ {
+	const AddNewInbound = /** @lends sap.ui.fl.apply._internal.changes.descriptor.app.AddNewInbound */ {
 
 		/**
 		* Method to apply the  <code>appdescr_app_addNewInbound</code> change to the manifest.
@@ -56,9 +50,9 @@ sap.ui.define([
 			oManifest["sap.app"].crossNavigation ||= {};
 			oManifest["sap.app"].crossNavigation.inbounds ||= {};
 
-			var oChangeContent = oChange.getContent();
-			var sInboundId = getAndCheckInboundId(oChangeContent);
-			var oInboundInManifest = oManifest["sap.app"].crossNavigation.inbounds[sInboundId];
+			const oChangeContent = oChange.getContent();
+			const sInboundId = DescriptorChangeCheck.getAndCheckContentObject(oChangeContent, "inbound", oChange.getChangeType(), MANDATORY_PROPERTIES, SUPPORTED_PROPERTIES, PROPERTIES_PATTERNS);
+			const oInboundInManifest = oManifest["sap.app"].crossNavigation.inbounds[sInboundId];
 			if (!oInboundInManifest) {
 				DescriptorChangeCheck.checkIdNamespaceCompliance(sInboundId, oChange);
 				oManifest["sap.app"].crossNavigation.inbounds[sInboundId] = oChangeContent.inbound[sInboundId];