@openui5/sap.ui.fl 1.129.0 → 1.130.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/THIRDPARTY.txt +1 -1
- package/package.json +3 -3
- package/src/sap/ui/fl/.library +1 -1
- package/src/sap/ui/fl/ChangePersistence.js +26 -38
- package/src/sap/ui/fl/ChangePersistenceFactory.js +1 -1
- package/src/sap/ui/fl/FakeLrepConnectorLocalStorage.js +1 -1
- package/src/sap/ui/fl/FakeLrepConnectorSessionStorage.js +1 -1
- package/src/sap/ui/fl/FakeLrepLocalStorage.js +1 -1
- package/src/sap/ui/fl/FlexController.js +1 -1
- package/src/sap/ui/fl/FlexControllerFactory.js +1 -1
- package/src/sap/ui/fl/LayerUtils.js +1 -1
- package/src/sap/ui/fl/Utils.js +8 -8
- package/src/sap/ui/fl/apply/_internal/DelegateMediator.js +1 -1
- package/src/sap/ui/fl/apply/_internal/appVariant/DescriptorChangeTypes.js +2 -1
- package/src/sap/ui/fl/apply/_internal/changes/Applier.js +152 -197
- package/src/sap/ui/fl/apply/_internal/changes/FlexCustomData.js +23 -17
- package/src/sap/ui/fl/apply/_internal/changes/Reverter.js +27 -37
- package/src/sap/ui/fl/apply/_internal/changes/Utils.js +26 -31
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/Preprocessor.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/Registration.js +3 -2
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/RegistrationBuild.js +2 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddAnnotationsToOData.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddNewDataSource.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddNewInbound.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddNewOutbound.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddTechnicalAttributes.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeDataSource.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeInbound.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeOutbound.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/RemoveAllInboundsExceptOne.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/SetAch.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/SetDescription.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/SetTitle.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetAbstract.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetCloudDevAdaptationStatus.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetRegistrationIds.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/AddNewCard.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/ChangeCard.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/DeleteCard.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddComponentUsages.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddLibrary.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModel.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModelEnhanceWith.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/ChangeModel.js +78 -0
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetFlexExtensionPointEnabled.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetMinUI5Version.js +1 -1
- package/src/sap/ui/fl/apply/_internal/connectors/ObjectStorageUtils.js +1 -1
- package/src/sap/ui/fl/apply/_internal/extensionPoint/Processor.js +1 -1
- package/src/sap/ui/fl/apply/_internal/extensionPoint/Registry.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/AnnotationChange.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/AppDescriptorChange.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/CompVariant.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/ControllerExtensionChange.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/FlVariant.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/FlexObject.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory.js +7 -3
- package/src/sap/ui/fl/apply/_internal/flexObjects/UIChange.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/Variant.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/getVariantAuthor.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexState/FlexObjectState.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexState/FlexState.js +34 -13
- package/src/sap/ui/fl/apply/_internal/flexState/Loader.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexState/ManifestUtils.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexState/UI2Personalization/UI2PersonalizationState.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexState/changes/ExtensionPointState.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexState/changes/UIChangesState.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantManagementState.js +105 -0
- package/src/sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger.js +2 -2
- package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/Switcher.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState.js +57 -9
- package/src/sap/ui/fl/apply/_internal/preprocessors/ComponentLifecycleHooks.js +2 -2
- package/src/sap/ui/fl/apply/_internal/preprocessors/ControllerExtension.js +1 -1
- package/src/sap/ui/fl/apply/_internal/preprocessors/RegistrationDelegator.js +6 -6
- package/src/sap/ui/fl/apply/_internal/preprocessors/XmlPreprocessor.js +1 -1
- package/src/sap/ui/fl/apply/api/ControlVariantApplyAPI.js +25 -10
- package/src/sap/ui/fl/apply/api/SmartVariantManagementApplyAPI.js +18 -45
- package/src/sap/ui/fl/changeHandler/AddIFrame.js +1 -1
- package/src/sap/ui/fl/changeHandler/AddXML.js +1 -1
- package/src/sap/ui/fl/changeHandler/AddXMLAtExtensionPoint.js +1 -1
- package/src/sap/ui/fl/changeHandler/Base.js +1 -1
- package/src/sap/ui/fl/changeHandler/BaseAddViaDelegate.js +1 -1
- package/src/sap/ui/fl/changeHandler/BaseAddXml.js +1 -1
- package/src/sap/ui/fl/changeHandler/BaseRename.js +1 -1
- package/src/sap/ui/fl/changeHandler/HideControl.js +1 -1
- package/src/sap/ui/fl/changeHandler/MoveControls.js +1 -1
- package/src/sap/ui/fl/changeHandler/MoveElements.js +1 -1
- package/src/sap/ui/fl/changeHandler/PropertyBindingChange.js +1 -1
- package/src/sap/ui/fl/changeHandler/PropertyChange.js +1 -1
- package/src/sap/ui/fl/changeHandler/StashControl.js +1 -1
- package/src/sap/ui/fl/changeHandler/UnhideControl.js +1 -1
- package/src/sap/ui/fl/changeHandler/UnstashControl.js +1 -1
- package/src/sap/ui/fl/changeHandler/UpdateIFrame.js +1 -1
- package/src/sap/ui/fl/descriptorRelated/api/DescriptorChangeFactory.js +4 -4
- package/src/sap/ui/fl/descriptorRelated/api/DescriptorInlineChangeFactory.js +1 -1
- package/src/sap/ui/fl/descriptorRelated/api/DescriptorVariantFactory.js +1 -1
- package/src/sap/ui/fl/initial/_internal/FlexConfiguration.js +1 -1
- package/src/sap/ui/fl/initial/_internal/Storage.js +37 -1
- package/src/sap/ui/fl/initial/_internal/StorageFeaturesMerger.js +1 -1
- package/src/sap/ui/fl/initial/_internal/StorageUtils.js +1 -1
- package/src/sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerRegistration.js +3 -2
- package/src/sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerStorage.js +1 -1
- package/src/sap/ui/fl/initial/_internal/connectors/Utils.js +1 -1
- package/src/sap/ui/fl/initial/_internal/storageResultDisassemble.js +1 -1
- package/src/sap/ui/fl/interfaces/BaseLoadConnector.js +15 -1
- package/src/sap/ui/fl/interfaces/Delegate.js +1 -1
- package/src/sap/ui/fl/library.js +43 -43
- package/src/sap/ui/fl/support/_internal/getAllUIChanges.js +1 -1
- package/src/sap/ui/fl/support/_internal/getChangeDependencies.js +1 -1
- package/src/sap/ui/fl/support/_internal/getFlexObjectInfos.js +1 -1
- package/src/sap/ui/fl/support/_internal/getFlexSettings.js +1 -1
- package/src/sap/ui/fl/support/api/SupportAPI.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetails.controller.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetailsEdit.controller.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/controller/LayerContentMaster.controller.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/controller/Layers.controller.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/lrepConnector/LRepConnector.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/utils/DataUtils.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/utils/ErrorUtils.js +1 -1
- package/src/sap/ui/fl/transport/TransportSelection.js +1 -1
- package/src/sap/ui/fl/util/DescriptorChangeCheck.js +35 -16
- package/src/sap/ui/fl/util/IFrame.js +1 -1
- package/src/sap/ui/fl/util/ManagedObjectModel.js +1 -1
- package/src/sap/ui/fl/util/resolveBinding.js +1 -1
- package/src/sap/ui/fl/variants/VariantModel.js +33 -11
- package/src/sap/ui/fl/write/_internal/Storage.js +1 -1
- package/src/sap/ui/fl/write/_internal/Versions.js +7 -3
- package/src/sap/ui/fl/write/_internal/appVariant/AppVariant.js +1 -1
- package/src/sap/ui/fl/write/_internal/appVariant/AppVariantFactory.js +1 -1
- package/src/sap/ui/fl/write/_internal/appVariant/AppVariantInlineChange.js +1 -1
- package/src/sap/ui/fl/write/_internal/appVariant/AppVariantInlineChangeFactory.js +34 -1
- package/src/sap/ui/fl/write/_internal/condenser/Condenser.js +163 -176
- package/src/sap/ui/fl/write/_internal/condenser/UIReconstruction.js +62 -61
- package/src/sap/ui/fl/write/_internal/condenser/Utils.js +17 -19
- package/src/sap/ui/fl/write/_internal/condenser/classifications/Create.js +13 -13
- package/src/sap/ui/fl/write/_internal/condenser/classifications/Destroy.js +17 -19
- package/src/sap/ui/fl/write/_internal/condenser/classifications/Move.js +32 -35
- package/src/sap/ui/fl/write/_internal/condenser/classifications/Update.js +2 -10
- package/src/sap/ui/fl/write/_internal/connectors/BackendConnector.js +1 -1
- package/src/sap/ui/fl/write/_internal/connectors/BtpServiceConnector.js +1 -1
- package/src/sap/ui/fl/write/_internal/connectors/KeyUserConnector.js +1 -1
- package/src/sap/ui/fl/write/_internal/connectors/LrepConnector.js +56 -4
- package/src/sap/ui/fl/write/_internal/connectors/NeoLrepConnector.js +1 -1
- package/src/sap/ui/fl/write/_internal/connectors/ObjectPathConnector.js +1 -1
- package/src/sap/ui/fl/write/_internal/connectors/PersonalizationConnector.js +1 -1
- package/src/sap/ui/fl/write/_internal/connectors/Utils.js +1 -1
- package/src/sap/ui/fl/write/_internal/controlVariants/ControlVariantWriteUtils.js +59 -0
- package/src/sap/ui/fl/write/_internal/delegates/ODataV2ReadDelegate.js +1 -2
- package/src/sap/ui/fl/write/_internal/extensionPoint/Processor.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPAccess.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPExtensibilityVariant.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPExtensibilityVariantFactory.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/MultiTenantABAPExtensibilityVariant.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/ServiceValidation.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/SingleTenantABAPExtensibilityVariant.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/UriParser.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/Utils.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/CAPAccess.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/dialog/CustomFieldCAPDialog.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/booleanEditor/BooleanEditor.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/rangeEditor/RangeEditor.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/timeEditor/TimeEditor.js +1 -1
- package/src/sap/ui/fl/write/_internal/flexState/FlexObjectManager.js +33 -2
- package/src/sap/ui/fl/write/_internal/flexState/UI2Personalization/UI2PersonalizationState.js +1 -1
- package/src/sap/ui/fl/write/_internal/flexState/changes/UIChangeManager.js +26 -3
- package/src/sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState.js +20 -12
- package/src/sap/ui/fl/write/_internal/transport/TransportSelection.js +1 -1
- package/src/sap/ui/fl/write/_internal/transport/Transports.js +1 -1
- package/src/sap/ui/fl/write/api/ChangesWriteAPI.js +73 -3
- package/src/sap/ui/fl/write/api/FieldExtensibility.js +1 -1
- package/src/sap/ui/fl/write/api/LocalResetAPI.js +17 -27
- package/src/sap/ui/fl/write/api/VersionsAPI.js +26 -4
package/THIRDPARTY.txt
CHANGED
|
@@ -6,7 +6,7 @@ The full text of all referenced licenses is appended at the end of this file.
|
|
|
6
6
|
|
|
7
7
|
Library: sap.m:
|
|
8
8
|
|
|
9
|
-
Component: purify.js, version:
|
|
9
|
+
Component: purify.js, version: 3.1.7
|
|
10
10
|
Copyright: Mario Heiderich
|
|
11
11
|
License: Apache-2.0
|
|
12
12
|
License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openui5/sap.ui.fl",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.130.0",
|
|
4
4
|
"description": "OpenUI5 UI Library sap.ui.fl",
|
|
5
5
|
"author": "SAP SE (https://www.sap.com)",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"url": "https://github.com/SAP/openui5.git"
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@openui5/sap.m": "1.
|
|
18
|
-
"@openui5/sap.ui.core": "1.
|
|
17
|
+
"@openui5/sap.m": "1.130.0",
|
|
18
|
+
"@openui5/sap.ui.core": "1.130.0"
|
|
19
19
|
}
|
|
20
20
|
}
|
package/src/sap/ui/fl/.library
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
<copyright>OpenUI5
|
|
7
7
|
* (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
|
|
8
8
|
* Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
|
|
9
|
-
<version>1.
|
|
9
|
+
<version>1.130.0</version>
|
|
10
10
|
|
|
11
11
|
<documentation>SAPUI5 library with sap.ui.fl controls.</documentation>
|
|
12
12
|
|
|
@@ -40,7 +40,7 @@ sap.ui.define([
|
|
|
40
40
|
*
|
|
41
41
|
* @constructor
|
|
42
42
|
* @author SAP SE
|
|
43
|
-
* @version 1.
|
|
43
|
+
* @version 1.130.0
|
|
44
44
|
* @since 1.25.0
|
|
45
45
|
* @private
|
|
46
46
|
* @param {object} mComponent - Component data to initiate <code>ChangePersistence</code> instance
|
|
@@ -111,13 +111,8 @@ sap.ui.define([
|
|
|
111
111
|
return bCondenserEnabled;
|
|
112
112
|
}
|
|
113
113
|
|
|
114
|
-
function isBackendCondensingEnabled(
|
|
115
|
-
|
|
116
|
-
if (bEnabled && !checkIfOnlyOne(aChanges, "getNamespace")) {
|
|
117
|
-
bEnabled = false;
|
|
118
|
-
}
|
|
119
|
-
|
|
120
|
-
return bEnabled;
|
|
114
|
+
function isBackendCondensingEnabled() {
|
|
115
|
+
return Settings.getInstanceOrUndef()?.isCondensingEnabled();
|
|
121
116
|
}
|
|
122
117
|
|
|
123
118
|
function updateCacheAndDeleteUnsavedChanges(aAllChanges, aCondensedChanges, bSkipUpdateCache, bAlreadyDeletedViaCondense) {
|
|
@@ -155,19 +150,13 @@ sap.ui.define([
|
|
|
155
150
|
}
|
|
156
151
|
|
|
157
152
|
function executeWriteAndRemoveCalls(sCurrentLayer, sRequest, sParentVersion, bSkipUpdateCache, aAllChanges, aCondensedChanges) {
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
if (oCondensedChange.getState() === States.LifecycleState.DELETED) {
|
|
162
|
-
aCondensedDeleteChanges.push(oCondensedChange);
|
|
163
|
-
return false;
|
|
164
|
-
}
|
|
165
|
-
return true;
|
|
166
|
-
});
|
|
153
|
+
let pRemoveCallsPromise = Promise.resolve();
|
|
154
|
+
const aDeletedChanges = aAllChanges.filter((oChange) => oChange.getState() === States.LifecycleState.DELETED);
|
|
155
|
+
const aNewChanges = aCondensedChanges.filter((oCondensedChange) => (oCondensedChange.getState() !== States.LifecycleState.DELETED));
|
|
167
156
|
|
|
168
157
|
// "remove" only supports a single change; multiple calls are required
|
|
169
|
-
if (
|
|
170
|
-
pRemoveCallsPromise = this.saveSequenceOfDirtyChanges(
|
|
158
|
+
if (aDeletedChanges.length) {
|
|
159
|
+
pRemoveCallsPromise = this.saveSequenceOfDirtyChanges(aDeletedChanges, bSkipUpdateCache, sParentVersion);
|
|
171
160
|
}
|
|
172
161
|
|
|
173
162
|
// "write" supports multiple changes at once
|
|
@@ -216,52 +205,50 @@ sap.ui.define([
|
|
|
216
205
|
bCondenseAnyLayer,
|
|
217
206
|
sLayer
|
|
218
207
|
) {
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
208
|
+
const aDirtyChanges = aChanges || FlexObjectState.getDirtyFlexObjects(this._mComponent.name);
|
|
209
|
+
const sCurrentLayer = aDirtyChanges.length && aDirtyChanges[0].getLayer() || sLayer;
|
|
210
|
+
const aRelevantChangesForCondensing = getAllRelevantChangesForCondensing.call(
|
|
222
211
|
this,
|
|
223
212
|
aDirtyChanges,
|
|
224
213
|
aDraftFilenames,
|
|
225
214
|
bCondenseAnyLayer,
|
|
226
215
|
sCurrentLayer
|
|
227
216
|
);
|
|
228
|
-
|
|
229
|
-
isBackendCondensingEnabled(
|
|
217
|
+
const bIsCondensingEnabled = (
|
|
218
|
+
isBackendCondensingEnabled()
|
|
230
219
|
&& canGivenChangesBeCondensed(oAppComponent, aRelevantChangesForCondensing, bCondenseAnyLayer)
|
|
231
220
|
);
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
221
|
+
const aAllFlexObjects = bIsCondensingEnabled ? aRelevantChangesForCondensing : aDirtyChanges;
|
|
222
|
+
const aChangesClone = aAllFlexObjects.slice(0);
|
|
223
|
+
const aRequests = getRequests(aDirtyChanges);
|
|
235
224
|
|
|
236
225
|
// Condensing is only allowed if all dirty changes belong to the same Transport Request
|
|
237
226
|
if (checkLayerAndSingleTransportRequest(aDirtyChanges)) {
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
}
|
|
227
|
+
const oCondensedChangesPromise = canGivenChangesBeCondensed(oAppComponent, aChangesClone, bCondenseAnyLayer)
|
|
228
|
+
? Condenser.condense(oAppComponent, aChangesClone)
|
|
229
|
+
: Promise.resolve(aChangesClone);
|
|
242
230
|
return oCondensedChangesPromise.then(function(aCondensedChanges) {
|
|
243
|
-
|
|
231
|
+
const sRequest = aRequests[0];
|
|
244
232
|
if (bIsCondensingEnabled) {
|
|
245
233
|
return Storage.condense({
|
|
246
|
-
allChanges:
|
|
234
|
+
allChanges: aAllFlexObjects,
|
|
247
235
|
condensedChanges: aCondensedChanges,
|
|
248
236
|
layer: sCurrentLayer,
|
|
249
237
|
transport: sRequest,
|
|
250
238
|
isLegacyVariant: false,
|
|
251
239
|
parentVersion: sParentVersion
|
|
252
240
|
}).then(function(oResponse) {
|
|
253
|
-
updateCacheAndDeleteUnsavedChanges.call(this,
|
|
241
|
+
updateCacheAndDeleteUnsavedChanges.call(this, aAllFlexObjects, aCondensedChanges, bSkipUpdateCache, true);
|
|
254
242
|
return oResponse;
|
|
255
243
|
}.bind(this));
|
|
256
244
|
}
|
|
257
|
-
// Non-condensing route
|
|
258
245
|
return executeWriteAndRemoveCalls.call(
|
|
259
246
|
this,
|
|
260
247
|
sCurrentLayer,
|
|
261
248
|
sRequest,
|
|
262
249
|
sParentVersion,
|
|
263
250
|
bSkipUpdateCache,
|
|
264
|
-
|
|
251
|
+
aAllFlexObjects,
|
|
265
252
|
aCondensedChanges
|
|
266
253
|
);
|
|
267
254
|
}.bind(this));
|
|
@@ -285,7 +272,7 @@ sap.ui.define([
|
|
|
285
272
|
var oFirstNewChange;
|
|
286
273
|
if (sParentVersion) {
|
|
287
274
|
// in case of changes saved for a draft only the first writing operation must have the parentVersion targeting the basis
|
|
288
|
-
// followup changes must point the
|
|
275
|
+
// followup changes must point the existing draft created with the first request
|
|
289
276
|
var aNewChanges = aDirtyChanges.filter(function(oChange) {
|
|
290
277
|
return oChange.getState() === States.LifecycleState.NEW;
|
|
291
278
|
});
|
|
@@ -305,6 +292,7 @@ sap.ui.define([
|
|
|
305
292
|
oCollectedResponse.response.push(...oResponse.response);
|
|
306
293
|
}
|
|
307
294
|
}
|
|
295
|
+
FlexState.getFlexObjectsDataSelector().checkUpdate({reference: this._mComponent.name});
|
|
308
296
|
return oCollectedResponse;
|
|
309
297
|
};
|
|
310
298
|
|
|
@@ -362,7 +350,6 @@ sap.ui.define([
|
|
|
362
350
|
default:
|
|
363
351
|
}
|
|
364
352
|
oDirtyChange.setState(States.LifecycleState.PERSISTED);
|
|
365
|
-
FlexState.getFlexObjectsDataSelector().checkUpdate({reference: this._mComponent.name});
|
|
366
353
|
}
|
|
367
354
|
};
|
|
368
355
|
|
|
@@ -375,6 +362,7 @@ sap.ui.define([
|
|
|
375
362
|
aDirtyChanges.forEach(function(oDirtyChange) {
|
|
376
363
|
this._updateCacheAndDirtyState(oDirtyChange, bSkipUpdateCache);
|
|
377
364
|
}, this);
|
|
365
|
+
FlexState.getFlexObjectsDataSelector().checkUpdate({reference: this._mComponent.name});
|
|
378
366
|
};
|
|
379
367
|
|
|
380
368
|
function getRequests(aDirtyChanges) {
|
package/src/sap/ui/fl/Utils.js
CHANGED
|
@@ -65,7 +65,7 @@ sap.ui.define([
|
|
|
65
65
|
* @namespace
|
|
66
66
|
* @alias sap.ui.fl.Utils
|
|
67
67
|
* @author SAP SE
|
|
68
|
-
* @version 1.
|
|
68
|
+
* @version 1.130.0
|
|
69
69
|
*
|
|
70
70
|
* @private
|
|
71
71
|
* @ui5-restricted sap.ui.fl, sap.ui.rta
|
|
@@ -450,12 +450,12 @@ sap.ui.define([
|
|
|
450
450
|
* Error message will be written in any case.
|
|
451
451
|
*
|
|
452
452
|
* @param {array.<function>} aPromiseQueue - List of asynchronous functions that returns promises
|
|
453
|
-
* @param {boolean} bThrowError - true: errors will be
|
|
453
|
+
* @param {boolean} bThrowError - true: errors will be re-thrown and therefore break the execution
|
|
454
454
|
* @param {boolean} bAsync - true: asynchronous processing with Promise, false: synchronous processing with FakePromise
|
|
455
|
-
* @param {boolean}
|
|
455
|
+
* @param {boolean} bSuppressAdditionalErrorMessage - true: additional error message will be suppressed
|
|
456
456
|
* @returns {Promise} Returns empty resolved Promise or FakePromise when all passed promises inside functions have been executed
|
|
457
457
|
*/
|
|
458
|
-
execPromiseQueueSequentially(aPromiseQueue, bThrowError, bAsync,
|
|
458
|
+
execPromiseQueueSequentially(aPromiseQueue, bThrowError, bAsync, bSuppressAdditionalErrorMessage) {
|
|
459
459
|
if (aPromiseQueue.length === 0) {
|
|
460
460
|
if (bAsync) {
|
|
461
461
|
return Promise.resolve();
|
|
@@ -482,7 +482,7 @@ sap.ui.define([
|
|
|
482
482
|
Log.error(sErrorMessage, e);
|
|
483
483
|
|
|
484
484
|
if (bThrowError) {
|
|
485
|
-
if (
|
|
485
|
+
if (bSuppressAdditionalErrorMessage) {
|
|
486
486
|
throw new Error(e.message);
|
|
487
487
|
} else {
|
|
488
488
|
throw new Error(sErrorMessage);
|
|
@@ -490,12 +490,12 @@ sap.ui.define([
|
|
|
490
490
|
}
|
|
491
491
|
})
|
|
492
492
|
.then(function() {
|
|
493
|
-
return this.execPromiseQueueSequentially(aPromiseQueue, bThrowError, bAsync,
|
|
493
|
+
return this.execPromiseQueueSequentially(aPromiseQueue, bThrowError, bAsync, bSuppressAdditionalErrorMessage);
|
|
494
494
|
}.bind(this));
|
|
495
495
|
}
|
|
496
496
|
|
|
497
497
|
Log.error("Changes could not be applied, promise not wrapped inside function.");
|
|
498
|
-
return this.execPromiseQueueSequentially(aPromiseQueue, bThrowError, bAsync,
|
|
498
|
+
return this.execPromiseQueueSequentially(aPromiseQueue, bThrowError, bAsync, bSuppressAdditionalErrorMessage);
|
|
499
499
|
},
|
|
500
500
|
|
|
501
501
|
/**
|
|
@@ -648,7 +648,7 @@ sap.ui.define([
|
|
|
648
648
|
},
|
|
649
649
|
|
|
650
650
|
/**
|
|
651
|
-
* Searches in the control metadata for the aggregation
|
|
651
|
+
* Searches in the control metadata for the aggregation definition
|
|
652
652
|
* @param {sap.ui.base.ManagedObject|Element} oControl - Control which has the aggregation
|
|
653
653
|
* @param {string} sAggregationName - Aggregation name
|
|
654
654
|
* @returns {object} Aggregation metadata
|
|
@@ -61,7 +61,8 @@ sap.ui.define([
|
|
|
61
61
|
"appdescr_fe_changePageConfiguration",
|
|
62
62
|
"appdescr_ui5_changeModel",
|
|
63
63
|
"appdescr_ui_generic_app_addNewObjectPage",
|
|
64
|
-
"appdescr_ui_generic_app_changePageConfiguration"
|
|
64
|
+
"appdescr_ui_generic_app_changePageConfiguration",
|
|
65
|
+
"appdescr_fe_addNewPage"
|
|
65
66
|
];
|
|
66
67
|
},
|
|
67
68
|
getCondensableChangeTypes() {
|