@openui5/sap.ui.fl 1.141.1 → 1.142.0

package/src/sap/ui/fl/write/_internal/connectors/ObjectPathConnector.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.ObjectPathConnector
 	 * @since 1.73
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/PersonalizationConnector.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.PersonalizationConnector
 	 * @since 1.70
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.Storage
 	 */

package/src/sap/ui/fl/write/_internal/connectors/Utils.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.connectors.Utils
 	 * @since 1.70
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.connectors, sap.ui.fl.write._internal.transport
 	 */

package/src/sap/ui/fl/write/_internal/extensionPoint/Processor.js

@@ -35,7 +35,7 @@ function(
 	 * @class
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 */
 	var Processor = {
 		applyExtensionPoint(oExtensionPoint) {

package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPAccess.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPAccess
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @private
 	 */
 	var ABAPAccess = {};

package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPExtensibilityVariant.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @class
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPExtensibilityVariant
 	 * @since 1.87
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @public
 	 * @param {sap.ui.base.ManagedObject} oControl - Control to add extensions
 	 */

package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPExtensibilityVariantFactory.js

@@ -115,7 +115,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ABAPExtensibilityVariantFactory
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @private
 	 */
 	var ABAPExtensibilityVariantFactory = {};

package/src/sap/ui/fl/write/_internal/fieldExtensibility/MultiTenantABAPExtensibilityVariant.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.MultiTenantABAPExtensibilityVariant
 	 * @since 1.87
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @public
 	 */
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/ServiceValidation.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.ServiceValidation
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @private
 	 */
 	var ServiceValidation = {};

package/src/sap/ui/fl/write/_internal/fieldExtensibility/SingleTenantABAPExtensibilityVariant.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.SingleTenantABAPExtensibilityVariant
 	 * @since 1.87
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @public
 	 */
 	const SingleTenantABAPExtensibilityVariant = ABAPExtensibilityVariant.extend(sNamespace, {

package/src/sap/ui/fl/write/_internal/fieldExtensibility/UriParser.js

@@ -134,7 +134,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.UriParser
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @private
 	 */
 	var UriParser = {};

package/src/sap/ui/fl/write/_internal/fieldExtensibility/Utils.js

@@ -245,7 +245,7 @@ sap.ui.define([
 	 * @namespace sap.ui.fl.write._internal.fieldExtensibility.Utils
 	 * @since 1.87.0
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @private
 	 */
 	var Utils = {};

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/CAPAccess.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @since 1.93
 	 * @private
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 */
 	var CAPAccess = {};
 

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/dialog/CustomFieldCAPDialog.js

@@ -82,7 +82,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.dialog.CustomFieldCAPDialog
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @since 1.93
 	 * @private
 	 * @ui5-restricted

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/booleanEditor/BooleanEditor.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.booleanEditor.BooleanEditor
 	 * @author SAP SE
 	 * @since 1.93
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/rangeEditor/RangeEditor.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.rangeEditor.RangeEditor
 	 * @author SAP SE
 	 * @since 1.93
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/timeEditor/TimeEditor.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.timeEditor.TimeEditor
 	 * @author SAP SE
 	 * @since 1.93
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.fl

package/src/sap/ui/fl/write/_internal/flexState/FlexObjectManager.js

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.flexState.FlexObjectManager
 	 * @since 1.83
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/write/_internal/flexState/UI2Personalization/UI2PersonalizationState.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.flexState.UI2Personalization.UI2PersonalizationState
 	 * @since 1.120
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/fl/write/_internal/flexState/changes/UIChangeManager.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias sap.ui.fl.write._internal.flexState.changes.UIChangeManager
 	 * @since 1.129
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/write/_internal/flexState/compVariants/CompVariantManager.js

@@ -257,7 +257,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write._internal.flexState.compVariants.CompVariantState
 	 * @since 1.83
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl
 	 */

package/src/sap/ui/fl/write/_internal/init.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 *
 	 * @name sap.ui.fl.write._internal.init
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @since 1.141.0
 	 * @private
 	 */

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @private
 	 * @alias sap.ui.fl.write._internal.transport.TransportSelection
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @since 1.74.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/write/_internal/transport/Transports.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * Entity that handles ABAP transport related information.
 	 * @alias sap.ui.fl.write._internal.transport.Transports
 	 * @author SAP SE
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @since 1.74.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl.write._internal.transport

package/src/sap/ui/fl/write/api/BusinessNetworkAPI.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @namespace
 	 * @alias module:sap/ui/fl/write/api/BusinessNetworkAPI
 	 * @since 1.135
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @private
 	 * @ui5-restricted SAP Business Network
 	 */

package/src/sap/ui/fl/write/api/FieldExtensibility.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 *
 	 * @namespace sap.ui.fl.write.api.FieldExtensibility
 	 * @since 1.87
-	 * @version 1.141.1
+	 * @version 1.142.0
 	 * @private
 	 * @ui5-restricted sap.ui.fl, sap.ui.rta, sap.ui.mdc
 	 */

package/src/sap/ui/fl/write/api/connectors/ObjectStorageConnector.js

@@ -184,18 +184,31 @@ sap.ui.define([
 		return aReturn;
 	}
 
-	function handleCondenseDelete(oDeleteInformation) {
-		var aPromises = [];
+	function handleCondenseDelete(oDeleteInformation, aFlexObjects) {
+		const aReturn = [];
 		if (oDeleteInformation) {
 			Object.values(oDeleteInformation).forEach(function(aChangeIds) {
 				aChangeIds.forEach(function(sChangeId) {
-					var sKey = ObjectStorageUtils.createFlexKey(sChangeId);
-					aPromises.push(this.storage.removeItem(sKey));
-				}.bind(this));
-			}.bind(this));
+					const sKey = ObjectStorageUtils.createFlexKey(sChangeId);
+					aFlexObjects.forEach(function(oFlexObject) {
+						if (oFlexObject.fileType !== "version" && oFlexObject.fileName === sChangeId) {
+							const oChangeDeleteVersion = aFlexObjects.find(
+								(oFlexObjectVersion) => oFlexObjectVersion.fileType === "version" && oFlexObjectVersion.id === oFlexObject.version);
+							if (oChangeDeleteVersion === undefined || oChangeDeleteVersion.isDraft) {
+								aReturn.push({key: sKey, value: "delete"});
+							} else {
+								const oFlexObjectNew = { ...oFlexObject };
+								oFlexObjectNew.fileName += "_hide";
+								delete (oFlexObjectNew.content);
+								aReturn.push({key: `${sKey}_hide`, value: oFlexObjectNew});
+							}
+						}
+					});
+				});
+			});
 		}
 
-		return aPromises;
+		return aReturn;
 	}
 
 	/**
@@ -237,9 +250,24 @@ sap.ui.define([
 			});
 
 			const aVersionChain = await this.versions.getVersionChain.call(this, mPropertyBag, mPropertyBag.version);
-			const aFilteredFlexObjects = aFlexObjects.filter((oFlexObject) =>
-				oFlexObject.version === undefined || aVersionChain.includes(oFlexObject.version)
-			);
+			var aHiddenChanges = [];
+			let aFilteredFlexObjects = aFlexObjects.filter(function(oFlexObject) {
+				if (oFlexObject.version === undefined || aVersionChain.includes(oFlexObject.version)) {
+					if (oFlexObject.fileName !== undefined && oFlexObject.fileName.endsWith("_hide")) {
+						aHiddenChanges.push(oFlexObject.fileName.replace("_hide", ""));
+						return false;
+					}
+					return true;
+				}
+				return false;
+			});
+
+			if (aHiddenChanges.length) {
+				aFilteredFlexObjects = aFilteredFlexObjects.filter((oFlexObject) =>
+					oFlexObject.fileName === undefined || !aHiddenChanges.includes(oFlexObject.fileName)
+				);
+			}
+
 			const aSortedFilteredFlexObjects = StorageUtils.sortFlexObjects(aFilteredFlexObjects);
 			const mGroupedFlexObjects = StorageUtils.getGroupedFlexObjects(aSortedFilteredFlexObjects);
 			const aResponses = StorageUtils.filterAndSortResponses(mGroupedFlexObjects);
@@ -374,33 +402,40 @@ sap.ui.define([
 			aObjectsToSet = aObjectsToSet.concat(handleCondenseCreate(oCondenseInformation.create, mPropertyBag));
 			aObjectsToSet = aObjectsToSet.concat(handleCondenseUpdate(oCondenseInformation.update, mPropertyBag.condensedChanges));
 			aObjectsToSet = aObjectsToSet.concat(handleCondenseReorder(oCondenseInformation.reorder, mPropertyBag.condensedChanges));
+			if (oCondenseInformation.delete) {
+				const aFlexObjects = await loadDataFromStorage({
+					storage: this.storage,
+					reference: mPropertyBag.reference
+				});
+				aObjectsToSet = aObjectsToSet.concat(handleCondenseDelete(oCondenseInformation.delete, aFlexObjects));
+			}
+
 			aObjectsToSet = _uniqBy(aObjectsToSet, "key");
 
 			var aPromises = [];
 			var aResponse = [];
-			aPromises = aPromises.concat(handleCondenseDelete.call(this, oCondenseInformation.delete));
 
 			const mFeatures = await this.loadFeatures();
 			let sDraftVersionId;
-			if (
-				mFeatures.isVersioningEnabled
-				&& mPropertyBag.layer === Layer.CUSTOMER
-				&& ((oCondenseInformation.create && Object.keys(oCondenseInformation.create).length !== 0)
-				|| (oCondenseInformation.update && Object.keys(oCondenseInformation.update).length !== 0)
-				|| (oCondenseInformation.reorder && Object.keys(oCondenseInformation.reorder).length !== 0))
-			) {
+			if (mFeatures.isVersioningEnabled && mPropertyBag.layer === Layer.CUSTOMER) {
 				// the reference for the versions have to be determined by a flex object
-				sDraftVersionId = await this.versions.getDraftId.call(this, mPropertyBag);
+				sDraftVersionId = await this.versions.getDraftId.call(this, mPropertyBag, aObjectsToSet);
 			}
 
 			aObjectsToSet.forEach(function(oItemToSet) {
-				var oFileContent = oItemToSet.value.convertToFileContent();
-				if (sDraftVersionId) {
-					oFileContent.version = sDraftVersionId;
+				if (oItemToSet.value === "delete") {
+					aPromises.push(this.storage.removeItem(oItemToSet.key));
+				} else {
+					const oFileContent = oItemToSet.key.endsWith("_hide") ? oItemToSet.value : oItemToSet.value.convertToFileContent();
+					if (sDraftVersionId) {
+						oFileContent.version = sDraftVersionId;
+					}
+					if (!oItemToSet.key.endsWith("_hide")) {
+						aResponse.push(oFileContent);
+					}
+					var vFlexObject = this.storage._itemsStoredAsObjects ? oFileContent : JSON.stringify(oFileContent);
+					aPromises.push(this.storage.setItem(oItemToSet.key, vFlexObject));
 				}
-				aResponse.push(oFileContent);
-				var vFlexObject = this.storage._itemsStoredAsObjects ? oFileContent : JSON.stringify(oFileContent);
-				aPromises.push(this.storage.setItem(oItemToSet.key, vFlexObject));
 			}.bind(this));
 			// discard draft when last draft change is delete
 			if (mFeatures.isVersioningEnabled && mPropertyBag.layer === Layer.CUSTOMER
@@ -427,13 +462,20 @@ sap.ui.define([
 		 * @inheritDoc
 		 */
 		versions: {
-			async getDraftId(mPropertyBag) {
+			async getDraftId(mPropertyBag, aObjectsToSet) {
 				let aDraftFilenames = [];
 				if (mPropertyBag.condensedChanges) {
 					aDraftFilenames = mPropertyBag.condensedChanges.map((change) => {return change.sId;});
 				} else {
 					aDraftFilenames = mPropertyBag.flexObjects.map((flexObject) => {return flexObject.fileName;});
 				}
+				if (aObjectsToSet) {
+					aObjectsToSet.forEach(function(oObjectChange) {
+						if (oObjectChange.key.endsWith("_hide")) {
+							aDraftFilenames.push(oObjectChange.value.fileName);
+						}
+					});
+				}
 
 				const aVersions = await this.versions.load.call(this, mPropertyBag);
 				let oDraftVersion = aVersions.find((oVersion) => oVersion.isDraft);