@openui5/sap.ui.fl 1.112.2 → 1.113.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/Cache.js +1 -1
- package/src/sap/ui/fl/ChangePersistence.js +42 -32
- 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 +22 -18
- package/src/sap/ui/fl/LayerUtils.js +1 -1
- package/src/sap/ui/fl/Utils.js +1 -1
- package/src/sap/ui/fl/apply/_internal/DelegateMediator.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/FlexCustomData.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/Utils.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/Preprocessor.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/Registration.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/RegistrationBuild.js +1 -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/AddNewInbound.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/RemoveAllInboundsExceptOne.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/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/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/controlVariants/URLHandler.js +6 -6
- package/src/sap/ui/fl/apply/_internal/extensionPoint/Processor.js +2 -2
- 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 +5 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory.js +1 -1
- 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/flexState/FlexState.js +1 -1
- 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/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 +1 -1
- package/src/sap/ui/fl/apply/_internal/preprocessors/ControllerExtension.js +1 -1
- package/src/sap/ui/fl/apply/_internal/preprocessors/EventHistory.js +1 -1
- package/src/sap/ui/fl/apply/_internal/preprocessors/RegistrationDelegator.js +1 -1
- package/src/sap/ui/fl/apply/_internal/preprocessors/XmlPreprocessor.js +1 -1
- package/src/sap/ui/fl/apply/api/ControlVariantApplyAPI.js +1 -1
- 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/descriptorRelated/internal/Utils.js +3 -3
- package/src/sap/ui/fl/designtime/util/IFrame.designtime.js +36 -31
- package/src/sap/ui/fl/initial/_internal/Storage.js +1 -1
- package/src/sap/ui/fl/initial/_internal/StorageUtils.js +2 -1
- package/src/sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerRegistration.js +1 -1
- package/src/sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerStorage.js +1 -1
- package/src/sap/ui/fl/initial/_internal/changeHandlers/ChangeRegistryItem.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 +1 -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/messagebundle_sl.properties +2 -2
- package/src/sap/ui/fl/registry/Settings.js +1 -2
- package/src/sap/ui/fl/support/_internal/getChangeDependencies.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 +11 -13
- 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/IFrame.js +2 -2
- 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 +7 -2
- package/src/sap/ui/fl/write/_internal/Storage.js +2 -2
- package/src/sap/ui/fl/write/_internal/StorageFeaturesMerger.js +1 -1
- package/src/sap/ui/fl/write/_internal/Versions.js +7 -2
- 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 +1 -1
- package/src/sap/ui/fl/write/_internal/condenser/Condenser.js +24 -9
- package/src/sap/ui/fl/write/_internal/condenser/UIReconstruction.js +36 -27
- package/src/sap/ui/fl/write/_internal/condenser/Utils.js +1 -1
- package/src/sap/ui/fl/write/_internal/condenser/classifications/Update.js +10 -1
- package/src/sap/ui/fl/write/_internal/connectors/BackendConnector.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 +1 -1
- 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/extensionPoint/Processor.js +1 -1
- package/src/sap/ui/fl/write/_internal/extensionPoint/Registry.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/FlexObjectState.js +1 -1
- package/src/sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState.js +18 -1
- 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 +25 -5
- package/src/sap/ui/fl/write/api/ContextBasedAdaptationsAPI.js +118 -4
- package/src/sap/ui/fl/write/api/ControlPersonalizationWriteAPI.js +34 -14
- package/src/sap/ui/fl/write/api/FeaturesAPI.js +19 -9
- package/src/sap/ui/fl/write/api/FieldExtensibility.js +1 -1
- package/src/sap/ui/fl/write/api/VersionsAPI.js +5 -3
- package/src/sap/ui/fl/write/api/connectors/ObjectStorageConnector.js +2 -1
package/THIRDPARTY.txt
CHANGED
|
@@ -478,7 +478,7 @@ License: Apache-2.0
|
|
|
478
478
|
License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
|
|
479
479
|
Contained in: lib/jsdoc/ui5/plugin.js
|
|
480
480
|
|
|
481
|
-
Component: SAP Theming Base Content, version: 11.1
|
|
481
|
+
Component: SAP Theming Base Content, version: 11.2.1
|
|
482
482
|
Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
|
|
483
483
|
License: Apache-2.0
|
|
484
484
|
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.113.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.113.0",
|
|
18
|
+
"@openui5/sap.ui.core": "1.113.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-2023 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.113.0</version>
|
|
10
10
|
|
|
11
11
|
<documentation>SAPUI5 library with sap.ui.fl controls.</documentation>
|
|
12
12
|
|
package/src/sap/ui/fl/Cache.js
CHANGED
|
@@ -66,7 +66,7 @@ sap.ui.define([
|
|
|
66
66
|
*
|
|
67
67
|
* @constructor
|
|
68
68
|
* @author SAP SE
|
|
69
|
-
* @version 1.
|
|
69
|
+
* @version 1.113.0
|
|
70
70
|
* @experimental Since 1.25.0
|
|
71
71
|
* @param {object} mComponent - Component data to initiate <code>ChangePersistence</code> instance
|
|
72
72
|
* @param {string} mComponent.name - Name of the component this instance is responsible for
|
|
@@ -606,10 +606,9 @@ sap.ui.define([
|
|
|
606
606
|
return aPersistedAndSameLayerChanges.concat(aDirtyChanges);
|
|
607
607
|
}
|
|
608
608
|
|
|
609
|
-
function
|
|
609
|
+
function checkLayerAndSingleTransportRequest(aDirtyChanges) {
|
|
610
610
|
if (aDirtyChanges.length) {
|
|
611
611
|
var aRequests = getRequests(aDirtyChanges);
|
|
612
|
-
var aStates = getStates(aDirtyChanges);
|
|
613
612
|
var bCheckLayer = true;
|
|
614
613
|
if (Settings.getInstanceOrUndef() && Settings.getInstanceOrUndef().hasPersoConnector()) {
|
|
615
614
|
// Created public fl-Variant as default variant will created public and user changes
|
|
@@ -617,11 +616,45 @@ sap.ui.define([
|
|
|
617
616
|
var aLayers = getLayers(aDirtyChanges);
|
|
618
617
|
bCheckLayer = aLayers.length === 1;
|
|
619
618
|
}
|
|
620
|
-
return
|
|
619
|
+
return aRequests.length === 1 && bCheckLayer;
|
|
621
620
|
}
|
|
622
621
|
return true;
|
|
623
622
|
}
|
|
624
623
|
|
|
624
|
+
function executeWriteAndRemoveCalls(sCurrentLayer, sRequest, sParentVersion, bSkipUpdateCache, aAllChanges, aCondensedChanges) {
|
|
625
|
+
var aCondensedDeleteChanges = [];
|
|
626
|
+
var pRemoveCallsPromise = Promise.resolve();
|
|
627
|
+
var aNewChanges = aCondensedChanges.filter(function(oCondensedChange) {
|
|
628
|
+
if (oCondensedChange.getState() === States.LifecycleState.DELETED) {
|
|
629
|
+
aCondensedDeleteChanges.push(oCondensedChange);
|
|
630
|
+
return false;
|
|
631
|
+
}
|
|
632
|
+
return true;
|
|
633
|
+
});
|
|
634
|
+
|
|
635
|
+
// "remove" only supports a single change; multiple calls are required
|
|
636
|
+
if (aCondensedDeleteChanges.length) {
|
|
637
|
+
pRemoveCallsPromise = this.saveSequenceOfDirtyChanges(aCondensedDeleteChanges, bSkipUpdateCache, sParentVersion);
|
|
638
|
+
}
|
|
639
|
+
|
|
640
|
+
// "write" supports multiple changes at once
|
|
641
|
+
return pRemoveCallsPromise.then(function() {
|
|
642
|
+
if (aNewChanges.length) {
|
|
643
|
+
return Storage.write({
|
|
644
|
+
layer: sCurrentLayer,
|
|
645
|
+
flexObjects: prepareDirtyChanges(aNewChanges),
|
|
646
|
+
transport: sRequest,
|
|
647
|
+
isLegacyVariant: false,
|
|
648
|
+
parentVersion: sParentVersion
|
|
649
|
+
}).then(function(oResponse) {
|
|
650
|
+
updateCacheAndDeleteUnsavedChanges.call(this, aAllChanges, aNewChanges, bSkipUpdateCache);
|
|
651
|
+
return oResponse;
|
|
652
|
+
}.bind(this));
|
|
653
|
+
}
|
|
654
|
+
return this._deleteNotSavedChanges(aAllChanges, aCondensedChanges);
|
|
655
|
+
}.bind(this));
|
|
656
|
+
}
|
|
657
|
+
|
|
625
658
|
/**
|
|
626
659
|
* Saves the passed or all dirty changes by calling the appropriate back-end method (create for new changes, deleteChange for deleted changes);
|
|
627
660
|
* to ensure the correct order, the methods are called sequentially;
|
|
@@ -651,7 +684,8 @@ sap.ui.define([
|
|
|
651
684
|
var aChangesClone = aAllChanges.slice(0);
|
|
652
685
|
var aRequests = getRequests(aDirtyChanges);
|
|
653
686
|
|
|
654
|
-
if
|
|
687
|
+
// Condensing is only allowed if all dirty changes belong to the same Transport Request
|
|
688
|
+
if (checkLayerAndSingleTransportRequest(aDirtyChanges)) {
|
|
655
689
|
var oCondensedChangesPromise = Promise.resolve(aChangesClone);
|
|
656
690
|
if (canGivenChangesBeCondensed(oAppComponent, aChangesClone, bCondenseAnyLayer)) {
|
|
657
691
|
oCondensedChangesPromise = Condenser.condense(oAppComponent, aChangesClone);
|
|
@@ -671,22 +705,10 @@ sap.ui.define([
|
|
|
671
705
|
return oResponse;
|
|
672
706
|
}.bind(this));
|
|
673
707
|
}
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
layer: sCurrentLayer,
|
|
677
|
-
flexObjects: prepareDirtyChanges(aCondensedChanges),
|
|
678
|
-
transport: sRequest,
|
|
679
|
-
isLegacyVariant: false,
|
|
680
|
-
parentVersion: sParentVersion
|
|
681
|
-
}).then(function(oResponse) {
|
|
682
|
-
updateCacheAndDeleteUnsavedChanges.call(this, aAllChanges, aCondensedChanges, bSkipUpdateCache);
|
|
683
|
-
return oResponse;
|
|
684
|
-
}.bind(this));
|
|
685
|
-
}
|
|
686
|
-
this._deleteNotSavedChanges(aAllChanges, aCondensedChanges);
|
|
708
|
+
// Non-condensing route
|
|
709
|
+
return executeWriteAndRemoveCalls.call(this, sCurrentLayer, sRequest, sParentVersion, bSkipUpdateCache, aAllChanges, aCondensedChanges);
|
|
687
710
|
}.bind(this));
|
|
688
711
|
}
|
|
689
|
-
|
|
690
712
|
return this.saveSequenceOfDirtyChanges(aDirtyChanges, bSkipUpdateCache, sParentVersion);
|
|
691
713
|
};
|
|
692
714
|
|
|
@@ -739,6 +761,7 @@ sap.ui.define([
|
|
|
739
761
|
parentVersion: sParentVersion
|
|
740
762
|
});
|
|
741
763
|
default:
|
|
764
|
+
return Promise.resolve();
|
|
742
765
|
}
|
|
743
766
|
}
|
|
744
767
|
|
|
@@ -802,19 +825,6 @@ sap.ui.define([
|
|
|
802
825
|
return aRequests;
|
|
803
826
|
}
|
|
804
827
|
|
|
805
|
-
function getStates(aDirtyChanges) {
|
|
806
|
-
var aStates = [];
|
|
807
|
-
|
|
808
|
-
aDirtyChanges.forEach(function(oChange) {
|
|
809
|
-
var sState = oChange.getState();
|
|
810
|
-
if (aStates.indexOf(sState) === -1) {
|
|
811
|
-
aStates.push(sState);
|
|
812
|
-
}
|
|
813
|
-
});
|
|
814
|
-
|
|
815
|
-
return aStates;
|
|
816
|
-
}
|
|
817
|
-
|
|
818
828
|
function getLayers(aDirtyChanges) {
|
|
819
829
|
var aLayers = [];
|
|
820
830
|
|
|
@@ -34,7 +34,7 @@ sap.ui.define([
|
|
|
34
34
|
* @alias sap.ui.fl.FlexControllerFactory
|
|
35
35
|
* @experimental Since 1.27.0
|
|
36
36
|
* @author SAP SE
|
|
37
|
-
* @version 1.
|
|
37
|
+
* @version 1.113.0
|
|
38
38
|
*
|
|
39
39
|
* @private
|
|
40
40
|
* @ui5-restricted sap.ui.fl
|
|
@@ -46,6 +46,7 @@ sap.ui.define([
|
|
|
46
46
|
// in this object a promise is stored for every application component instance
|
|
47
47
|
// if the same instance is initialized twice the promise is replaced
|
|
48
48
|
FlexControllerFactory._componentInstantiationPromises = new WeakMap();
|
|
49
|
+
var oEmbeddedComponentsPromises = {};
|
|
49
50
|
|
|
50
51
|
/**
|
|
51
52
|
* Creates or returns an instance of the FlexController
|
|
@@ -151,31 +152,34 @@ sap.ui.define([
|
|
|
151
152
|
var oReturnPromise = FlexState.initialize({
|
|
152
153
|
componentId: sComponentId,
|
|
153
154
|
asyncHints: vConfig.asyncHints
|
|
154
|
-
})
|
|
155
|
+
})
|
|
156
|
+
.then(_propagateChangesForAppComponent.bind(this, oComponent))
|
|
157
|
+
.then(function() {
|
|
158
|
+
// update any potential embedded component waiting for this app component
|
|
159
|
+
if (oEmbeddedComponentsPromises[sComponentId]) {
|
|
160
|
+
oEmbeddedComponentsPromises[sComponentId].forEach(function(oEmbeddedComponent) {
|
|
161
|
+
var oVariantModel = oComponent.getModel(ControlVariantApplyAPI.getVariantModelName());
|
|
162
|
+
oEmbeddedComponent.setModel(oVariantModel, ControlVariantApplyAPI.getVariantModelName());
|
|
163
|
+
});
|
|
164
|
+
delete oEmbeddedComponentsPromises[sComponentId];
|
|
165
|
+
}
|
|
166
|
+
});
|
|
155
167
|
FlexControllerFactory._componentInstantiationPromises.set(oComponent, oReturnPromise);
|
|
168
|
+
|
|
156
169
|
return oReturnPromise;
|
|
157
170
|
} else if (Utils.isEmbeddedComponent(oComponent)) {
|
|
158
171
|
var oAppComponent = Utils.getAppComponentForControl(oComponent);
|
|
159
172
|
// Some embedded components might not have an app component, e.g. sap.ushell.plugins.rta, sap.ushell.plugins.rta-personalize
|
|
160
173
|
if (oAppComponent && Utils.isApplicationComponent(oAppComponent)) {
|
|
161
|
-
|
|
174
|
+
// once the VModel is set to the outer component it also has to be set to any embedded component
|
|
162
175
|
if (FlexControllerFactory._componentInstantiationPromises.has(oAppComponent)) {
|
|
163
|
-
|
|
176
|
+
return FlexControllerFactory._componentInstantiationPromises.get(oAppComponent).then(function() {
|
|
177
|
+
var oVariantModel = oAppComponent.getModel(ControlVariantApplyAPI.getVariantModelName());
|
|
178
|
+
oComponent.setModel(oVariantModel, ControlVariantApplyAPI.getVariantModelName());
|
|
179
|
+
});
|
|
164
180
|
}
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
if (!oExistingVariantModel) {
|
|
168
|
-
// If variant model is not present on the app component
|
|
169
|
-
// then a new variant model should be set on it.
|
|
170
|
-
// Setting a variant model will ensure that at least a standard variant will exist
|
|
171
|
-
// for all variant management controls.
|
|
172
|
-
return _propagateChangesForAppComponent(oAppComponent);
|
|
173
|
-
}
|
|
174
|
-
return oExistingVariantModel;
|
|
175
|
-
}).then(function (oVariantModel) {
|
|
176
|
-
// set app component's variant model on the embedded component
|
|
177
|
-
oComponent.setModel(oVariantModel, ControlVariantApplyAPI.getVariantModelName());
|
|
178
|
-
});
|
|
181
|
+
oEmbeddedComponentsPromises[oAppComponent.getId()] = oEmbeddedComponentsPromises[oAppComponent.getId()] || [];
|
|
182
|
+
oEmbeddedComponentsPromises[oAppComponent.getId()].push(oComponent);
|
|
179
183
|
}
|
|
180
184
|
return Promise.resolve();
|
|
181
185
|
}
|
package/src/sap/ui/fl/Utils.js
CHANGED
|
@@ -33,7 +33,7 @@ sap.ui.define([
|
|
|
33
33
|
* Available for build {@link sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild}.
|
|
34
34
|
*
|
|
35
35
|
* @namespace sap.ui.fl.apply._internal.changes.descriptor.app.AddNewInbound
|
|
36
|
-
* @version 1.
|
|
36
|
+
* @version 1.113.0
|
|
37
37
|
* @private
|
|
38
38
|
* @ui5-restricted sap.ui.fl.apply._internal
|
|
39
39
|
*/
|
|
@@ -24,7 +24,7 @@ sap.ui.define([
|
|
|
24
24
|
* Available for both runtime and build {@link sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild}.
|
|
25
25
|
*
|
|
26
26
|
* @namespace sap.ui.fl.apply._internal.changes.descriptor.app.ChangeInbound
|
|
27
|
-
* @version 1.
|
|
27
|
+
* @version 1.113.0
|
|
28
28
|
* @private
|
|
29
29
|
* @ui5-restricted sap.ui.fl.apply._internal
|
|
30
30
|
*/
|
|
@@ -43,7 +43,7 @@ sap.ui.define([
|
|
|
43
43
|
* Available for build {@link sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild}.
|
|
44
44
|
*
|
|
45
45
|
* @namespace sap.ui.fl.apply._internal.changes.descriptor.app.RemoveAllInboundsExceptOne
|
|
46
|
-
* @version 1.
|
|
46
|
+
* @version 1.113.0
|
|
47
47
|
* @private
|
|
48
48
|
* @ui5-restricted sap.ui.fl.apply._internal
|
|
49
49
|
*/
|
|
@@ -19,7 +19,7 @@ sap.ui.define([
|
|
|
19
19
|
* Available for both runtime and build {@link sap.ui.fl.apply._internal.changes.descriptor.Registration}.
|
|
20
20
|
*
|
|
21
21
|
* @namespace sap.ui.fl.apply._internal.changes.descriptor.app.SetTitle
|
|
22
|
-
* @version 1.
|
|
22
|
+
* @version 1.113.0
|
|
23
23
|
* @private
|
|
24
24
|
* @ui5-restricted sap.ui.fl.apply._internal
|
|
25
25
|
*/
|
|
@@ -19,7 +19,7 @@ sap.ui.define([
|
|
|
19
19
|
* Only available during build time {@link sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild}.
|
|
20
20
|
*
|
|
21
21
|
* @namespace sap.ui.fl.apply._internal.changes.descriptor.fiori.SetAbstract
|
|
22
|
-
* @version 1.
|
|
22
|
+
* @version 1.113.0
|
|
23
23
|
* @private
|
|
24
24
|
* @ui5-restricted sap.ui.fl.apply._internal
|
|
25
25
|
*/
|
|
@@ -19,7 +19,7 @@ sap.ui.define([
|
|
|
19
19
|
* Only available during build time {@link sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild}.
|
|
20
20
|
*
|
|
21
21
|
* @namespace sap.ui.fl.apply._internal.changes.descriptor.fiori.SetRegistrationIds
|
|
22
|
-
* @version 1.
|
|
22
|
+
* @version 1.113.0
|
|
23
23
|
* @private
|
|
24
24
|
* @ui5-restricted sap.ui.fl.apply._internal
|
|
25
25
|
*/
|
|
@@ -18,7 +18,7 @@ sap.ui.define([
|
|
|
18
18
|
* Available for both runtime and build {@link sap.ui.fl.apply._internal.changes.descriptor.Registration}.
|
|
19
19
|
*
|
|
20
20
|
* @namespace sap.ui.fl.apply._internal.changes.descriptor.ovp.AddNewCard
|
|
21
|
-
* @version 1.
|
|
21
|
+
* @version 1.113.0
|
|
22
22
|
* @private
|
|
23
23
|
* @ui5-restricted sap.ui.fl.apply._internal
|
|
24
24
|
*/
|
|
@@ -18,7 +18,7 @@ sap.ui.define([
|
|
|
18
18
|
* Available for both runtime and build {@link sap.ui.fl.apply._internal.changes.descriptor.Registration}.
|
|
19
19
|
*
|
|
20
20
|
* @namespace sap.ui.fl.apply._internal.changes.descriptor.ovp.ChangeCard
|
|
21
|
-
* @version 1.
|
|
21
|
+
* @version 1.113.0
|
|
22
22
|
* @private
|
|
23
23
|
* @ui5-restricted sap.ui.fl.apply._internal
|
|
24
24
|
*/
|
|
@@ -18,7 +18,7 @@ sap.ui.define([
|
|
|
18
18
|
* Available for both runtime and build {@link sap.ui.fl.apply._internal.changes.descriptor.Registration}.
|
|
19
19
|
*
|
|
20
20
|
* @namespace sap.ui.fl.apply._internal.changes.descriptor.ovp.DeleteCard
|
|
21
|
-
* @version 1.
|
|
21
|
+
* @version 1.113.0
|
|
22
22
|
* @private
|
|
23
23
|
* @ui5-restricted sap.ui.fl.apply._internal
|
|
24
24
|
*/
|
|
@@ -23,7 +23,7 @@ sap.ui.define([
|
|
|
23
23
|
* Only available during build time {@link sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild}.
|
|
24
24
|
*
|
|
25
25
|
* @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.AddNewModelEnhanceWith
|
|
26
|
-
* @version 1.
|
|
26
|
+
* @version 1.113.0
|
|
27
27
|
* @private
|
|
28
28
|
* @ui5-restricted sap.ui.fl.apply._internal
|
|
29
29
|
*/
|
package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetFlexExtensionPointEnabled.js
CHANGED
|
@@ -19,7 +19,7 @@ sap.ui.define([
|
|
|
19
19
|
* Only available during build time {@link sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild}.
|
|
20
20
|
*
|
|
21
21
|
* @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.SetFlexExtensionPointEnabled
|
|
22
|
-
* @version 1.
|
|
22
|
+
* @version 1.113.0
|
|
23
23
|
* @private
|
|
24
24
|
* @ui5-restricted sap.ui.fl.apply._internal
|
|
25
25
|
*/
|
|
@@ -21,7 +21,7 @@ sap.ui.define([
|
|
|
21
21
|
* Only available during build time {@link sap.ui.fl.apply._internal.changes.descriptor.RegistrationBuild}.
|
|
22
22
|
*
|
|
23
23
|
* @namespace sap.ui.fl.apply._internal.changes.descriptor.ui5.SetMinUI5Version
|
|
24
|
-
* @version 1.
|
|
24
|
+
* @version 1.113.0
|
|
25
25
|
* @private
|
|
26
26
|
* @ui5-restricted sap.ui.fl.apply._internal
|
|
27
27
|
*/
|
|
@@ -36,7 +36,7 @@ sap.ui.define([
|
|
|
36
36
|
var _mVariantIdChangeHandlers = {};
|
|
37
37
|
|
|
38
38
|
/**
|
|
39
|
-
* URL handler utility for <code>sap.ui.fl variants</code> (
|
|
39
|
+
* URL handler utility for <code>sap.ui.fl variants</code> (see {@link sap.ui.fl.variants.VariantManagement})
|
|
40
40
|
*
|
|
41
41
|
* @namespace
|
|
42
42
|
* @alias sap.ui.fl.apply._internal.controlVariants.URLHandler
|
|
@@ -109,7 +109,7 @@ sap.ui.define([
|
|
|
109
109
|
* @param {string} sNewHash - New hash
|
|
110
110
|
*
|
|
111
111
|
* @returns {string} Value that signifies "Continue" navigation in the "ShellNavigation" service of ushell
|
|
112
|
-
* {@
|
|
112
|
+
* (see {@link sap.ushell.services.ShellNavigation})
|
|
113
113
|
*
|
|
114
114
|
* @private
|
|
115
115
|
*/
|
|
@@ -275,8 +275,8 @@ sap.ui.define([
|
|
|
275
275
|
URLHandler.variantTechnicalParameterName = "sap-ui-fl-control-variant-id";
|
|
276
276
|
|
|
277
277
|
/**
|
|
278
|
-
* Initializes hash data for the passed variant model
|
|
279
|
-
* {@
|
|
278
|
+
* Initializes hash data for the passed variant model
|
|
279
|
+
* (see {@link sap.ui.fl.variants.VariantModel}).
|
|
280
280
|
*
|
|
281
281
|
* @param {object} mPropertyBag - Property bag
|
|
282
282
|
* @param {sap.ui.fl.variants.VariantModel} mPropertyBag.model - Variant model
|
|
@@ -461,8 +461,8 @@ sap.ui.define([
|
|
|
461
461
|
};
|
|
462
462
|
|
|
463
463
|
/**
|
|
464
|
-
* Returns the current hash parameters from the variant model's hash data
|
|
465
|
-
* {@
|
|
464
|
+
* Returns the current hash parameters from the variant model's hash data
|
|
465
|
+
* (see {@link sap.ui.fl.variants.VariantModel}).
|
|
466
466
|
*
|
|
467
467
|
* @param {object} mPropertyBag - Property bag
|
|
468
468
|
* @param {sap.ui.fl.variants.VariantModel} mPropertyBag.model - Variant model
|
|
@@ -34,7 +34,7 @@ function(
|
|
|
34
34
|
* @class
|
|
35
35
|
* @constructor
|
|
36
36
|
* @author SAP SE
|
|
37
|
-
* @version 1.
|
|
37
|
+
* @version 1.113.0
|
|
38
38
|
*/
|
|
39
39
|
var Processor;
|
|
40
40
|
|
|
@@ -45,7 +45,7 @@ function(
|
|
|
45
45
|
aResolvedControls.splice(iControlIndex + iNestedControlIndex + iNestedEPAdditionalContentCounter, 0, oNestedControl);
|
|
46
46
|
});
|
|
47
47
|
oControl.index += iNestedEPAdditionalContentCounter;
|
|
48
|
-
// the iControlIndex counts the extensionpoint as 1 control. when the EP is replaced by content with more
|
|
48
|
+
// the iControlIndex counts the extensionpoint as 1 control. when the EP is replaced by content with more than one control
|
|
49
49
|
// then we need to have an additional content counter for correct index calculations for the following extension points
|
|
50
50
|
return aNestedControls.length - 1;
|
|
51
51
|
});
|
|
@@ -32,7 +32,7 @@ sap.ui.define([
|
|
|
32
32
|
* @extends sap.ui.fl.apply._internal.flexObjects.Variant
|
|
33
33
|
* @alias sap.ui.fl.apply._internal.flexObjects.CompVariant
|
|
34
34
|
* @since 1.103
|
|
35
|
-
* @version 1.
|
|
35
|
+
* @version 1.113.0
|
|
36
36
|
* @private
|
|
37
37
|
* @ui5-restricted sap.ui.fl, sap.ui.comp
|
|
38
38
|
*/
|
|
@@ -20,7 +20,7 @@ sap.ui.define([
|
|
|
20
20
|
* @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
|
|
21
21
|
* @alias sap.ui.fl.apply._internal.flexObjects.ControllerExtensionChange
|
|
22
22
|
* @since 1.105
|
|
23
|
-
* @version 1.
|
|
23
|
+
* @version 1.113.0
|
|
24
24
|
* @private
|
|
25
25
|
* @ui5-restricted sap.ui.fl
|
|
26
26
|
*/
|