@openui5/sap.ui.fl 1.115.1 → 1.116.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/.eslintrc.json +33 -2
- package/.reuse/dep5 +0 -5
- package/THIRDPARTY.txt +1 -7
- package/package.json +3 -3
- package/src/sap/ui/fl/.library +1 -1
- package/src/sap/ui/fl/Cache.js +29 -29
- package/src/sap/ui/fl/ChangePersistence.js +69 -71
- package/src/sap/ui/fl/ChangePersistenceFactory.js +1 -1
- package/src/sap/ui/fl/FakeLrepConnector.js +7 -7
- package/src/sap/ui/fl/FakeLrepConnectorLocalStorage.js +7 -7
- package/src/sap/ui/fl/FakeLrepConnectorSessionStorage.js +5 -5
- package/src/sap/ui/fl/FakeLrepLocalStorage.js +1 -1
- package/src/sap/ui/fl/FlexController.js +157 -130
- package/src/sap/ui/fl/FlexControllerFactory.js +1 -1
- package/src/sap/ui/fl/Layer.js +1 -1
- package/src/sap/ui/fl/LayerUtils.js +11 -11
- package/src/sap/ui/fl/Utils.js +16 -17
- package/src/sap/ui/fl/apply/_internal/DelegateMediator.js +41 -38
- package/src/sap/ui/fl/apply/_internal/appVariant/DescriptorChangeTypes.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/Applier.js +114 -94
- package/src/sap/ui/fl/apply/_internal/changes/FlexCustomData.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/Reverter.js +2 -2
- package/src/sap/ui/fl/apply/_internal/changes/Utils.js +2 -2
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/Applier.js +19 -19
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ApplyStrategyFactory.js +4 -5
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ApplyUtil.js +1 -2
- 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 +15 -15
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddNewInbound.js +8 -8
- 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 +6 -6
- 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 -2
- 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 +3 -5
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddLibrary.js +4 -6
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModel.js +10 -10
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModelEnhanceWith.js +1 -3
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetFlexExtensionPointEnabled.js +1 -2
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetMinUI5Version.js +2 -4
- package/src/sap/ui/fl/apply/_internal/connectors/ObjectStorageConnector.js +4 -5
- package/src/sap/ui/fl/apply/_internal/connectors/ObjectStorageUtils.js +29 -29
- package/src/sap/ui/fl/apply/_internal/controlVariants/URLHandler.js +1 -2
- package/src/sap/ui/fl/apply/_internal/controlVariants/Utils.js +6 -4
- package/src/sap/ui/fl/apply/_internal/extensionPoint/Processor.js +44 -44
- package/src/sap/ui/fl/apply/_internal/flexObjects/AppDescriptorChange.js +3 -3
- package/src/sap/ui/fl/apply/_internal/flexObjects/CompVariant.js +15 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/CompVariantRevertData.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 -14
- package/src/sap/ui/fl/apply/_internal/flexObjects/FlexObject.js +3 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory.js +6 -5
- package/src/sap/ui/fl/apply/_internal/flexObjects/RevertData.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/States.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/UIChange.js +12 -4
- package/src/sap/ui/fl/apply/_internal/flexObjects/UpdatableChange.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/Variant.js +23 -5
- package/src/sap/ui/fl/apply/_internal/flexState/FlexState.js +183 -64
- package/src/sap/ui/fl/apply/_internal/flexState/InitialPrepareFunctions.js +27 -17
- package/src/sap/ui/fl/apply/_internal/flexState/Loader.js +5 -5
- package/src/sap/ui/fl/apply/_internal/flexState/ManifestUtils.js +5 -5
- package/src/sap/ui/fl/apply/_internal/flexState/UI2Personalization/UI2PersonalizationState.js +2 -2
- package/src/sap/ui/fl/apply/_internal/flexState/appDescriptorChanges/prepareAppDescriptorMap.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler.js +4 -4
- package/src/sap/ui/fl/apply/_internal/flexState/changes/ExtensionPointState.js +50 -50
- package/src/sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger.js +27 -13
- package/src/sap/ui/fl/apply/_internal/flexState/compVariants/prepareCompVariantsMap.js +5 -5
- package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/Switcher.js +5 -5
- package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState.js +55 -37
- package/src/sap/ui/fl/apply/_internal/preprocessors/ComponentLifecycleHooks.js +12 -12
- package/src/sap/ui/fl/apply/_internal/preprocessors/ControllerExtension.js +5 -5
- package/src/sap/ui/fl/apply/_internal/preprocessors/EventHistory.js +6 -6
- package/src/sap/ui/fl/apply/_internal/preprocessors/RegistrationDelegator.js +1 -2
- package/src/sap/ui/fl/apply/_internal/preprocessors/XmlPreprocessor.js +4 -4
- package/src/sap/ui/fl/apply/api/ControlVariantApplyAPI.js +5 -5
- package/src/sap/ui/fl/apply/api/DelegateMediatorAPI.js +10 -4
- package/src/sap/ui/fl/apply/api/FlexRuntimeInfoAPI.js +5 -5
- package/src/sap/ui/fl/apply/api/SmartVariantManagementApplyAPI.js +6 -6
- package/src/sap/ui/fl/changeHandler/AddIFrame.js +21 -21
- package/src/sap/ui/fl/changeHandler/AddXML.js +1 -1
- package/src/sap/ui/fl/changeHandler/AddXMLAtExtensionPoint.js +34 -34
- package/src/sap/ui/fl/changeHandler/Base.js +7 -7
- package/src/sap/ui/fl/changeHandler/BaseAddViaDelegate.js +107 -107
- package/src/sap/ui/fl/changeHandler/BaseAddXml.js +45 -45
- package/src/sap/ui/fl/changeHandler/BaseRename.js +26 -26
- package/src/sap/ui/fl/changeHandler/BaseTreeModifier.js +1 -1
- package/src/sap/ui/fl/changeHandler/HideControl.js +15 -16
- package/src/sap/ui/fl/changeHandler/MoveControls.js +190 -191
- package/src/sap/ui/fl/changeHandler/MoveElements.js +36 -36
- package/src/sap/ui/fl/changeHandler/PropertyBindingChange.js +7 -7
- package/src/sap/ui/fl/changeHandler/PropertyChange.js +7 -7
- package/src/sap/ui/fl/changeHandler/StashControl.js +35 -35
- package/src/sap/ui/fl/changeHandler/UnhideControl.js +7 -7
- package/src/sap/ui/fl/changeHandler/UnstashControl.js +21 -21
- package/src/sap/ui/fl/changeHandler/UpdateIFrame.js +39 -39
- package/src/sap/ui/fl/changeHandler/common/ChangeCategories.js +1 -1
- package/src/sap/ui/fl/changeHandler/common/createIFrame.js +5 -5
- package/src/sap/ui/fl/changeHandler/common/getTargetAggregationIndex.js +5 -5
- package/src/sap/ui/fl/descriptorRelated/api/DescriptorChangeFactory.js +12 -12
- package/src/sap/ui/fl/descriptorRelated/api/DescriptorInlineChangeFactory.js +7 -9
- package/src/sap/ui/fl/descriptorRelated/api/DescriptorVariantFactory.js +1 -1
- package/src/sap/ui/fl/descriptorRelated/internal/Utils.js +12 -12
- package/src/sap/ui/fl/designtime/util/IFrame.designtime.js +60 -60
- package/src/sap/ui/fl/designtime/variants/VariantManagement.designtime.js +2 -5
- package/src/sap/ui/fl/initial/_internal/Storage.js +18 -19
- package/src/sap/ui/fl/initial/_internal/StorageResultMerger.js +4 -4
- package/src/sap/ui/fl/initial/_internal/StorageUtils.js +20 -21
- package/src/sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerRegistration.js +6 -6
- package/src/sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerStorage.js +1 -1
- package/src/sap/ui/fl/initial/_internal/connectors/BackendConnector.js +2 -2
- package/src/sap/ui/fl/initial/_internal/connectors/KeyUserConnector.js +1 -1
- package/src/sap/ui/fl/initial/_internal/connectors/LrepConnector.js +4 -4
- package/src/sap/ui/fl/initial/_internal/connectors/StaticFileConnector.js +2 -2
- package/src/sap/ui/fl/initial/_internal/connectors/Utils.js +18 -18
- package/src/sap/ui/fl/initial/_internal/storageResultDisassemble.js +4 -4
- package/src/sap/ui/fl/interfaces/BaseLoadConnector.js +2 -2
- package/src/sap/ui/fl/interfaces/Delegate.js +7 -9
- package/src/sap/ui/fl/library.js +44 -45
- package/src/sap/ui/fl/library.support.js +59 -59
- package/src/sap/ui/fl/messagebundle.properties +4 -119
- package/src/sap/ui/fl/messagebundle_ar.properties +2 -79
- package/src/sap/ui/fl/messagebundle_bg.properties +2 -79
- package/src/sap/ui/fl/messagebundle_ca.properties +2 -79
- package/src/sap/ui/fl/messagebundle_cs.properties +2 -79
- package/src/sap/ui/fl/messagebundle_cy.properties +2 -79
- package/src/sap/ui/fl/messagebundle_da.properties +2 -79
- package/src/sap/ui/fl/messagebundle_de.properties +2 -79
- package/src/sap/ui/fl/messagebundle_el.properties +2 -79
- package/src/sap/ui/fl/messagebundle_en.properties +2 -79
- package/src/sap/ui/fl/messagebundle_en_GB.properties +2 -79
- package/src/sap/ui/fl/messagebundle_en_US_sappsd.properties +2 -79
- package/src/sap/ui/fl/messagebundle_en_US_saprigi.properties +2 -79
- package/src/sap/ui/fl/messagebundle_en_US_saptrc.properties +2 -79
- package/src/sap/ui/fl/messagebundle_es.properties +2 -79
- package/src/sap/ui/fl/messagebundle_es_MX.properties +2 -79
- package/src/sap/ui/fl/messagebundle_et.properties +2 -79
- package/src/sap/ui/fl/messagebundle_fi.properties +2 -79
- package/src/sap/ui/fl/messagebundle_fr.properties +2 -79
- package/src/sap/ui/fl/messagebundle_fr_CA.properties +2 -79
- package/src/sap/ui/fl/messagebundle_hi.properties +2 -79
- package/src/sap/ui/fl/messagebundle_hr.properties +2 -79
- package/src/sap/ui/fl/messagebundle_hu.properties +2 -79
- package/src/sap/ui/fl/messagebundle_id.properties +2 -79
- package/src/sap/ui/fl/messagebundle_it.properties +2 -79
- package/src/sap/ui/fl/messagebundle_iw.properties +2 -79
- package/src/sap/ui/fl/messagebundle_ja.properties +2 -79
- package/src/sap/ui/fl/messagebundle_kk.properties +2 -79
- package/src/sap/ui/fl/messagebundle_ko.properties +2 -79
- package/src/sap/ui/fl/messagebundle_lt.properties +2 -79
- package/src/sap/ui/fl/messagebundle_lv.properties +2 -79
- package/src/sap/ui/fl/messagebundle_ms.properties +2 -79
- package/src/sap/ui/fl/messagebundle_nl.properties +2 -79
- package/src/sap/ui/fl/messagebundle_no.properties +2 -79
- package/src/sap/ui/fl/messagebundle_pl.properties +2 -79
- package/src/sap/ui/fl/messagebundle_pt.properties +2 -79
- package/src/sap/ui/fl/messagebundle_pt_PT.properties +2 -79
- package/src/sap/ui/fl/messagebundle_ro.properties +2 -79
- package/src/sap/ui/fl/messagebundle_ru.properties +2 -79
- package/src/sap/ui/fl/messagebundle_sh.properties +2 -79
- package/src/sap/ui/fl/messagebundle_sk.properties +2 -79
- package/src/sap/ui/fl/messagebundle_sl.properties +2 -79
- package/src/sap/ui/fl/messagebundle_sv.properties +2 -79
- package/src/sap/ui/fl/messagebundle_th.properties +2 -79
- package/src/sap/ui/fl/messagebundle_tr.properties +2 -79
- package/src/sap/ui/fl/messagebundle_uk.properties +3 -80
- package/src/sap/ui/fl/messagebundle_vi.properties +2 -79
- package/src/sap/ui/fl/messagebundle_zh_CN.properties +2 -79
- package/src/sap/ui/fl/messagebundle_zh_TW.properties +2 -79
- package/src/sap/ui/fl/registry/Settings.js +41 -43
- package/src/sap/ui/fl/requireAsync.js +7 -1
- package/src/sap/ui/fl/support/_internal/extractChangeDependencies.js +8 -8
- package/src/sap/ui/fl/support/_internal/getChangeDependencies.js +22 -22
- package/src/sap/ui/fl/support/_internal/getFlexSettings.js +3 -3
- package/src/sap/ui/fl/support/api/SupportAPI.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/Component.js +3 -5
- package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetails.controller.js +27 -27
- package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetailsEdit.controller.js +20 -20
- package/src/sap/ui/fl/support/apps/contentbrowser/controller/LayerContentMaster.controller.js +17 -17
- package/src/sap/ui/fl/support/apps/contentbrowser/controller/Layers.controller.js +4 -4
- package/src/sap/ui/fl/support/apps/contentbrowser/lrepConnector/LRepConnector.js +34 -34
- package/src/sap/ui/fl/support/apps/contentbrowser/utils/DataUtils.js +10 -10
- package/src/sap/ui/fl/support/apps/contentbrowser/utils/ErrorUtils.js +5 -5
- package/src/sap/ui/fl/transport/TransportSelection.js +1 -1
- package/src/sap/ui/fl/util/DescriptorChangeCheck.js +2 -2
- package/src/sap/ui/fl/util/IFrame.js +18 -18
- package/src/sap/ui/fl/util/IFrameRenderer.js +1 -1
- package/src/sap/ui/fl/util/ManagedObjectModel.js +7 -7
- package/src/sap/ui/fl/util/changePropertyValueByPath.js +2 -2
- package/src/sap/ui/fl/util/getContainerUserInfo.js +25 -25
- package/src/sap/ui/fl/util/resolveBinding.js +3 -3
- package/src/sap/ui/fl/variants/VariantManagement.js +8 -32
- package/src/sap/ui/fl/variants/VariantModel.js +182 -124
- package/src/sap/ui/fl/variants/context/Component.js +1 -2
- package/src/sap/ui/fl/variants/context/controller/ContextVisibility.controller.js +2 -5
- package/src/sap/ui/fl/write/_internal/SaveAs.js +143 -143
- package/src/sap/ui/fl/write/_internal/Storage.js +46 -49
- package/src/sap/ui/fl/write/_internal/StorageFeaturesMerger.js +4 -4
- package/src/sap/ui/fl/write/_internal/Versions.js +104 -94
- package/src/sap/ui/fl/write/_internal/appVariant/AppVariant.js +9 -9
- package/src/sap/ui/fl/write/_internal/appVariant/AppVariantFactory.js +7 -7
- package/src/sap/ui/fl/write/_internal/appVariant/AppVariantInlineChange.js +2 -2
- package/src/sap/ui/fl/write/_internal/appVariant/AppVariantInlineChangeFactory.js +3 -5
- package/src/sap/ui/fl/write/_internal/condenser/Condenser.js +15 -10
- package/src/sap/ui/fl/write/_internal/condenser/UIReconstruction.js +1 -1
- package/src/sap/ui/fl/write/_internal/condenser/classifications/Create.js +1 -1
- package/src/sap/ui/fl/write/_internal/condenser/classifications/Destroy.js +1 -1
- package/src/sap/ui/fl/write/_internal/condenser/classifications/Move.js +1 -1
- package/src/sap/ui/fl/write/_internal/connectors/BackendConnector.js +10 -10
- package/src/sap/ui/fl/write/_internal/connectors/KeyUserConnector.js +23 -24
- package/src/sap/ui/fl/write/_internal/connectors/LrepConnector.js +60 -61
- package/src/sap/ui/fl/write/_internal/connectors/NeoLrepConnector.js +4 -4
- package/src/sap/ui/fl/write/_internal/connectors/ObjectPathConnector.js +6 -6
- package/src/sap/ui/fl/write/_internal/connectors/PersonalizationConnector.js +2 -2
- package/src/sap/ui/fl/write/_internal/connectors/Utils.js +14 -14
- package/src/sap/ui/fl/write/_internal/extensionPoint/Processor.js +3 -3
- package/src/sap/ui/fl/write/_internal/extensionPoint/Registry.js +15 -7
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPAccess.js +2 -2
- 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 +2 -2
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/ServiceValidation.js +1 -3
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/SingleTenantABAPExtensibilityVariant.js +2 -2
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/UriParser.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/Utils.js +3 -3
- 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 +2 -2
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/getEditorConfig.js +2 -2
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/booleanEditor/BooleanEditor.js +2 -2
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/rangeEditor/RangeEditor.js +3 -3
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/timeEditor/TimeEditor.js +4 -4
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/validators/IsRequired.js +2 -2
- package/src/sap/ui/fl/write/_internal/flexState/FlexObjectState.js +26 -26
- package/src/sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState.js +78 -57
- package/src/sap/ui/fl/write/_internal/transport/TransportDialog.js +12 -13
- package/src/sap/ui/fl/write/_internal/transport/TransportSelection.js +12 -12
- package/src/sap/ui/fl/write/_internal/transport/Transports.js +7 -7
- package/src/sap/ui/fl/write/api/AppVariantWriteAPI.js +7 -7
- package/src/sap/ui/fl/write/api/ChangesWriteAPI.js +9 -9
- package/src/sap/ui/fl/write/api/ContextBasedAdaptationsAPI.js +546 -110
- package/src/sap/ui/fl/write/api/ControlPersonalizationWriteAPI.js +109 -67
- package/src/sap/ui/fl/write/api/ExtensionPointRegistryAPI.js +3 -3
- package/src/sap/ui/fl/write/api/FeaturesAPI.js +19 -20
- package/src/sap/ui/fl/write/api/FieldExtensibility.js +1 -1
- package/src/sap/ui/fl/write/api/LocalResetAPI.js +19 -19
- package/src/sap/ui/fl/write/api/PersistenceWriteAPI.js +59 -54
- package/src/sap/ui/fl/write/api/ReloadInfoAPI.js +8 -8
- package/src/sap/ui/fl/write/api/SmartBusinessWriteAPI.js +6 -6
- package/src/sap/ui/fl/write/api/SmartVariantManagementWriteAPI.js +14 -13
- package/src/sap/ui/fl/write/api/TranslationAPI.js +13 -13
- package/src/sap/ui/fl/write/api/UI2PersonalizationWriteAPI.js +1 -1
- package/src/sap/ui/fl/write/api/VersionsAPI.js +14 -14
- package/src/sap/ui/fl/write/api/connectors/FileListBaseConnector.js +1 -1
- package/src/sap/ui/fl/write/api/connectors/ObjectStorageConnector.js +7 -7
- package/src/sap/ui/fl/write/connectors/BaseConnector.js +17 -17
|
@@ -41,35 +41,36 @@ sap.ui.define([
|
|
|
41
41
|
|
|
42
42
|
function revertChangesAndUpdateVariantModel(oComponent, bSkipUrlUpdate, aChanges) {
|
|
43
43
|
return Promise.resolve()
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
}
|
|
44
|
+
.then(function() {
|
|
45
|
+
if (aChanges.length !== 0) {
|
|
46
|
+
// Always revert changes in reverse order
|
|
47
|
+
aChanges.reverse();
|
|
48
|
+
return Reverter.revertMultipleChanges(aChanges, {
|
|
49
|
+
appComponent: oComponent,
|
|
50
|
+
modifier: JsControlTreeModifier,
|
|
51
|
+
flexController: this
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
return undefined;
|
|
55
|
+
}.bind(this))
|
|
56
|
+
.then(function() {
|
|
57
|
+
if (oComponent) {
|
|
58
|
+
var oModel = oComponent.getModel(ControlVariantApplyAPI.getVariantModelName());
|
|
59
|
+
if (oModel) {
|
|
60
|
+
// Temporary fix, parameters generally should not be removed
|
|
61
|
+
if (!bSkipUrlUpdate) {
|
|
62
|
+
URLHandler.update({
|
|
63
|
+
parameters: [],
|
|
64
|
+
updateURL: true,
|
|
65
|
+
updateHashEntry: true,
|
|
66
|
+
model: oModel
|
|
67
|
+
});
|
|
68
68
|
}
|
|
69
69
|
}
|
|
70
|
+
}
|
|
70
71
|
|
|
71
|
-
|
|
72
|
-
|
|
72
|
+
return aChanges;
|
|
73
|
+
});
|
|
73
74
|
}
|
|
74
75
|
|
|
75
76
|
/**
|
|
@@ -81,7 +82,7 @@ sap.ui.define([
|
|
|
81
82
|
* @alias sap.ui.fl.FlexController
|
|
82
83
|
* @experimental Since 1.27.0
|
|
83
84
|
* @author SAP SE
|
|
84
|
-
* @version 1.
|
|
85
|
+
* @version 1.116.0
|
|
85
86
|
*/
|
|
86
87
|
var FlexController = function(sComponentName) {
|
|
87
88
|
this._oChangePersistence = undefined;
|
|
@@ -133,11 +134,15 @@ sap.ui.define([
|
|
|
133
134
|
*/
|
|
134
135
|
FlexController.prototype.createBaseChange = function(oChangeSpecificData, oAppComponent) {
|
|
135
136
|
if (!oAppComponent) {
|
|
136
|
-
throw new Error(
|
|
137
|
+
throw new Error(
|
|
138
|
+
"No application component found. To offer flexibility a valid relation to its owning component must be present."
|
|
139
|
+
);
|
|
137
140
|
}
|
|
138
141
|
|
|
139
|
-
|
|
140
|
-
oChangeSpecificData.
|
|
142
|
+
// in this case the component name can also be the value of sap-app-id
|
|
143
|
+
oChangeSpecificData.reference = this.getComponentName();
|
|
144
|
+
// first a flex change is always local, until all changes of a component are made transportable
|
|
145
|
+
oChangeSpecificData.packageName = "$TMP";
|
|
141
146
|
|
|
142
147
|
var oChange = FlexObjectFactory.createUIChange(oChangeSpecificData);
|
|
143
148
|
|
|
@@ -154,25 +159,31 @@ sap.ui.define([
|
|
|
154
159
|
|
|
155
160
|
var oChange = this.createBaseChange(oChangeSpecificData, oAppComponent);
|
|
156
161
|
|
|
157
|
-
return ChangeHandlerStorage.getChangeHandler(
|
|
158
|
-
.
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
162
|
+
return ChangeHandlerStorage.getChangeHandler(
|
|
163
|
+
oChange.getChangeType(),
|
|
164
|
+
sControlType,
|
|
165
|
+
oControl,
|
|
166
|
+
JsControlTreeModifier,
|
|
167
|
+
oChange.getLayer()
|
|
168
|
+
)
|
|
169
|
+
.then(function(oChangeHandler) {
|
|
170
|
+
if (oChangeHandler) {
|
|
171
|
+
return oChangeHandler.completeChangeContent(oChange, oChangeSpecificData, {
|
|
172
|
+
modifier: JsControlTreeModifier,
|
|
173
|
+
appComponent: oAppComponent,
|
|
174
|
+
view: Utils.getViewForControl(oControl)
|
|
175
|
+
});
|
|
176
|
+
}
|
|
177
|
+
throw new Error("Change handler could not be retrieved for change " + JSON.stringify(oChangeSpecificData) + ".");
|
|
178
|
+
})
|
|
179
|
+
.then(function() {
|
|
180
|
+
// completeChangeContent changes the content and might make it dirty
|
|
181
|
+
oChange.setState(States.LifecycleState.NEW);
|
|
182
|
+
return oChange;
|
|
183
|
+
})
|
|
184
|
+
.catch(function(oError) {
|
|
185
|
+
return Promise.reject(oError);
|
|
186
|
+
});
|
|
176
187
|
};
|
|
177
188
|
|
|
178
189
|
/**
|
|
@@ -189,21 +200,21 @@ sap.ui.define([
|
|
|
189
200
|
*/
|
|
190
201
|
FlexController.prototype.createChangeWithExtensionPointSelector = function(oChangeSpecificData, mExtensionPointReference) {
|
|
191
202
|
return Promise.resolve()
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
203
|
+
.then(function() {
|
|
204
|
+
if (!mExtensionPointReference) {
|
|
205
|
+
throw new Error("A flexibility change on extension point cannot be created without a valid extension point reference.");
|
|
206
|
+
}
|
|
207
|
+
var oView = mExtensionPointReference.view;
|
|
208
|
+
var oAppComponent = Utils.getAppComponentForControl(oView);
|
|
209
|
+
oChangeSpecificData.selector = {
|
|
210
|
+
name: mExtensionPointReference.name,
|
|
211
|
+
viewSelector: JsControlTreeModifier.getSelector(oView.getId(), oAppComponent)
|
|
212
|
+
};
|
|
213
|
+
return oAppComponent;
|
|
214
|
+
})
|
|
215
|
+
.then(function(oAppComponent) {
|
|
216
|
+
return this._createChange(oChangeSpecificData, oAppComponent);
|
|
217
|
+
}.bind(this));
|
|
207
218
|
};
|
|
208
219
|
|
|
209
220
|
/**
|
|
@@ -219,32 +230,25 @@ sap.ui.define([
|
|
|
219
230
|
* @public
|
|
220
231
|
*/
|
|
221
232
|
FlexController.prototype.createChangeWithControlSelector = function(oChangeSpecificData, oControl) {
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
if (!oControl) {
|
|
226
|
-
throw new Error("A flexibility change cannot be created without a targeted control.");
|
|
227
|
-
}
|
|
233
|
+
if (!oControl) {
|
|
234
|
+
return Promise.reject(new Error("A flexibility change cannot be created without a targeted control."));
|
|
235
|
+
}
|
|
228
236
|
|
|
229
|
-
|
|
237
|
+
var sControlId = oControl.id || oControl.getId();
|
|
230
238
|
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
+
if (!oChangeSpecificData.selector) {
|
|
240
|
+
oChangeSpecificData.selector = {};
|
|
241
|
+
}
|
|
242
|
+
var oAppComponent = oControl.appComponent || Utils.getAppComponentForControl(oControl);
|
|
243
|
+
if (!oAppComponent) {
|
|
244
|
+
return Promise.reject(new Error("No application component found. To offer flexibility, the control with the ID '"
|
|
245
|
+
+ sControlId + "' has to have a valid relation to its owning application component."));
|
|
246
|
+
}
|
|
239
247
|
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
})
|
|
245
|
-
.then(function(oAppComponent) {
|
|
246
|
-
return this._createChange(oChangeSpecificData, oAppComponent, oControl);
|
|
247
|
-
}.bind(this));
|
|
248
|
+
// differentiate between controls containing the component id as a prefix and others
|
|
249
|
+
// get local Id for control at root component and use it as selector id
|
|
250
|
+
Object.assign(oChangeSpecificData.selector, JsControlTreeModifier.getSelector(sControlId, oAppComponent));
|
|
251
|
+
return this._createChange(oChangeSpecificData, oAppComponent, oControl);
|
|
248
252
|
};
|
|
249
253
|
|
|
250
254
|
/**
|
|
@@ -258,19 +262,19 @@ sap.ui.define([
|
|
|
258
262
|
*/
|
|
259
263
|
FlexController.prototype.addChange = function(oChangeSpecificData, oControl) {
|
|
260
264
|
return this.createChangeWithControlSelector(oChangeSpecificData, oControl)
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
265
|
+
.then(function(oChange) {
|
|
266
|
+
var oAppComponent = Utils.getAppComponentForControl(oControl);
|
|
267
|
+
// adding a change to the persistence will trigger the propagation listener which would try to apply the change
|
|
268
|
+
// but in this scenario the change is applied in .createAndApplyChange and no dependencies are added,
|
|
269
|
+
// so the propagation listener should ignore this change once
|
|
270
|
+
oChange._ignoreOnce = true;
|
|
271
|
+
this.addPreparedChange(oChange, oAppComponent);
|
|
272
|
+
|
|
273
|
+
// TODO this should go into an API that applied multiple changes, that does not yet exist
|
|
274
|
+
// all changes should be queued to apply before the first change gets applied
|
|
275
|
+
oChange.setQueuedForApply();
|
|
276
|
+
return oChange;
|
|
277
|
+
}.bind(this));
|
|
274
278
|
};
|
|
275
279
|
|
|
276
280
|
/**
|
|
@@ -375,10 +379,10 @@ sap.ui.define([
|
|
|
375
379
|
return this._waitForChangesToBeApplied(mSelector);
|
|
376
380
|
}.bind(this));
|
|
377
381
|
return Promise.all(aPromises)
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
+
.then(function() {
|
|
383
|
+
// the return value is not important in this function, only that it resolves
|
|
384
|
+
return undefined;
|
|
385
|
+
});
|
|
382
386
|
};
|
|
383
387
|
|
|
384
388
|
/**
|
|
@@ -450,7 +454,14 @@ sap.ui.define([
|
|
|
450
454
|
* @returns {Promise} resolving with an array of responses or rejecting with the first error
|
|
451
455
|
* @public
|
|
452
456
|
*/
|
|
453
|
-
FlexController.prototype.saveAll = function(
|
|
457
|
+
FlexController.prototype.saveAll = function(
|
|
458
|
+
oAppComponent,
|
|
459
|
+
bSkipUpdateCache,
|
|
460
|
+
bDraft,
|
|
461
|
+
sLayer,
|
|
462
|
+
bRemoveOtherLayerChanges,
|
|
463
|
+
bCondenseAnyLayer
|
|
464
|
+
) {
|
|
454
465
|
var sParentVersion;
|
|
455
466
|
var aDraftFilenames;
|
|
456
467
|
if (bDraft) {
|
|
@@ -462,26 +473,35 @@ sap.ui.define([
|
|
|
462
473
|
aDraftFilenames = oVersionModel.getProperty("/draftFilenames");
|
|
463
474
|
}
|
|
464
475
|
return this._removeOtherLayerChanges(oAppComponent, sLayer, bRemoveOtherLayerChanges)
|
|
465
|
-
|
|
466
|
-
.
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
476
|
+
.then(this._oChangePersistence.saveDirtyChanges.bind(
|
|
477
|
+
this._oChangePersistence,
|
|
478
|
+
oAppComponent,
|
|
479
|
+
bSkipUpdateCache,
|
|
480
|
+
undefined,
|
|
481
|
+
sParentVersion,
|
|
482
|
+
aDraftFilenames,
|
|
483
|
+
bCondenseAnyLayer,
|
|
484
|
+
sLayer
|
|
485
|
+
))
|
|
486
|
+
.then(function(oResult) {
|
|
487
|
+
if (bDraft && oResult && oResult.response) {
|
|
488
|
+
var vChangeDefinition = oResult.response;
|
|
489
|
+
var aDraftFilenames = [];
|
|
490
|
+
if (Array.isArray(vChangeDefinition)) {
|
|
491
|
+
vChangeDefinition.forEach(function(change) {
|
|
492
|
+
aDraftFilenames.push(change.fileName);
|
|
481
493
|
});
|
|
494
|
+
// the reference and layer of all items are the same
|
|
495
|
+
vChangeDefinition = vChangeDefinition[0];
|
|
482
496
|
}
|
|
483
|
-
|
|
484
|
-
|
|
497
|
+
Versions.onAllChangesSaved({
|
|
498
|
+
reference: vChangeDefinition.reference,
|
|
499
|
+
layer: vChangeDefinition.layer,
|
|
500
|
+
draftFilenames: aDraftFilenames
|
|
501
|
+
});
|
|
502
|
+
}
|
|
503
|
+
return oResult;
|
|
504
|
+
});
|
|
485
505
|
};
|
|
486
506
|
|
|
487
507
|
/**
|
|
@@ -503,8 +523,8 @@ sap.ui.define([
|
|
|
503
523
|
mPropertyBag.view = oView;
|
|
504
524
|
|
|
505
525
|
return this._oChangePersistence.getChangesForView(mPropertyBag)
|
|
506
|
-
|
|
507
|
-
|
|
526
|
+
.then(Applier.applyAllChangesForXMLView.bind(Applier, mPropertyBag))
|
|
527
|
+
.catch(handleXMLApplyError.bind(this, mPropertyBag.view));
|
|
508
528
|
};
|
|
509
529
|
|
|
510
530
|
function handleXMLApplyError(oView, oError) {
|
|
@@ -554,7 +574,7 @@ sap.ui.define([
|
|
|
554
574
|
*/
|
|
555
575
|
FlexController.prototype.resetChanges = function(sLayer, sGenerator, oComponent, aSelectorIds, aChangeTypes) {
|
|
556
576
|
return this._oChangePersistence.resetChanges(sLayer, sGenerator, aSelectorIds, aChangeTypes)
|
|
557
|
-
|
|
577
|
+
.then(revertChangesAndUpdateVariantModel.bind(this, oComponent, undefined));
|
|
558
578
|
};
|
|
559
579
|
|
|
560
580
|
/**
|
|
@@ -596,21 +616,28 @@ sap.ui.define([
|
|
|
596
616
|
return Applier.applyChangeOnControl(oChange, oControl, mPropertyBag);
|
|
597
617
|
}
|
|
598
618
|
Log.error("A flexibility change tries to change a nonexistent control.");
|
|
619
|
+
return undefined;
|
|
599
620
|
}.bind(this));
|
|
600
|
-
}.bind(this), new Utils.FakePromise());
|
|
621
|
+
}.bind(this), (Utils.FakePromise ? new Utils.FakePromise() : Promise.resolve()));
|
|
601
622
|
};
|
|
602
623
|
|
|
603
624
|
/**
|
|
604
625
|
* Saves changes sequentially on the associated change persistence instance;
|
|
605
|
-
* This API must be only used in
|
|
626
|
+
* This API must be only used in scenarios without draft (like personalization).
|
|
606
627
|
*
|
|
607
628
|
* @param {sap.ui.fl.apply._internal.flexObjects.FlexObject[]} aDirtyChanges Array of dirty changes to be saved
|
|
608
629
|
* @param {sap.ui.core.UIComponent} [oAppComponent] - AppComponent instance
|
|
609
|
-
* @returns {Promise} A Promise which resolves when all changes have been saved
|
|
630
|
+
* @returns {Promise} A Promise which resolves when all changes have been saved with the backend response
|
|
610
631
|
* @public
|
|
611
632
|
*/
|
|
612
633
|
FlexController.prototype.saveSequenceOfDirtyChanges = function(aDirtyChanges, oAppComponent) {
|
|
613
|
-
return this._oChangePersistence.saveDirtyChanges(oAppComponent, false, aDirtyChanges)
|
|
634
|
+
return this._oChangePersistence.saveDirtyChanges(oAppComponent, false, aDirtyChanges)
|
|
635
|
+
.then(function(oResponse) {
|
|
636
|
+
aDirtyChanges.forEach(function(oDirtyChange) {
|
|
637
|
+
oDirtyChange.setState(States.LifecycleState.PERSISTED);
|
|
638
|
+
});
|
|
639
|
+
return oResponse;
|
|
640
|
+
});
|
|
614
641
|
};
|
|
615
642
|
|
|
616
643
|
return FlexController;
|
package/src/sap/ui/fl/Layer.js
CHANGED
|
@@ -15,7 +15,7 @@ sap.ui.define([
|
|
|
15
15
|
) {
|
|
16
16
|
"use strict";
|
|
17
17
|
|
|
18
|
-
//Stack of layers in the layered repository
|
|
18
|
+
// Stack of layers in the layered repository
|
|
19
19
|
var aLayers = [
|
|
20
20
|
Layer.BASE,
|
|
21
21
|
Layer.VENDOR,
|
|
@@ -26,7 +26,7 @@ sap.ui.define([
|
|
|
26
26
|
Layer.USER
|
|
27
27
|
];
|
|
28
28
|
|
|
29
|
-
//Precalculates index of layers
|
|
29
|
+
// Precalculates index of layers
|
|
30
30
|
var mLayersIndex = {};
|
|
31
31
|
aLayers.forEach(function(sLayer, iIndex) {
|
|
32
32
|
mLayersIndex[sLayer] = iIndex;
|
|
@@ -41,7 +41,7 @@ sap.ui.define([
|
|
|
41
41
|
*
|
|
42
42
|
* @namespace sap.ui.fl.LayerUtils
|
|
43
43
|
* @author SAP SE
|
|
44
|
-
* @version 1.
|
|
44
|
+
* @version 1.116.0
|
|
45
45
|
*/
|
|
46
46
|
var LayerUtils = {
|
|
47
47
|
_mLayersIndex: mLayersIndex,
|
|
@@ -55,8 +55,8 @@ sap.ui.define([
|
|
|
55
55
|
* @returns {boolean} <code>true</code> if the layer is valid
|
|
56
56
|
* @public
|
|
57
57
|
*/
|
|
58
|
-
isValidLayer: function
|
|
59
|
-
return Object.keys(Layer).some(function
|
|
58
|
+
isValidLayer: function(sLayer) {
|
|
59
|
+
return Object.keys(Layer).some(function(sExistingLayer) {
|
|
60
60
|
return sExistingLayer === sLayer;
|
|
61
61
|
});
|
|
62
62
|
},
|
|
@@ -67,7 +67,7 @@ sap.ui.define([
|
|
|
67
67
|
* @returns {boolean} true if it's an application variant
|
|
68
68
|
* @public
|
|
69
69
|
*/
|
|
70
|
-
isVendorLayer: function
|
|
70
|
+
isVendorLayer: function() {
|
|
71
71
|
return this.getCurrentLayer() === Layer.VENDOR;
|
|
72
72
|
},
|
|
73
73
|
|
|
@@ -101,7 +101,7 @@ sap.ui.define([
|
|
|
101
101
|
* @returns {boolean} Indicates whether a new variant needs an ABAP package
|
|
102
102
|
* @public
|
|
103
103
|
*/
|
|
104
|
-
doesCurrentLayerRequirePackage: function
|
|
104
|
+
doesCurrentLayerRequirePackage: function() {
|
|
105
105
|
var sCurrentLayer = this.getCurrentLayer();
|
|
106
106
|
return (sCurrentLayer === Layer.VENDOR) || (sCurrentLayer === Layer.PARTNER) || (sCurrentLayer === Layer.CUSTOMER_BASE);
|
|
107
107
|
},
|
|
@@ -113,7 +113,7 @@ sap.ui.define([
|
|
|
113
113
|
* @param {sap.ui.core.service.Service} oURLParsingService Unified Shell URL Parsing Service
|
|
114
114
|
* @return {string} maxLayer
|
|
115
115
|
*/
|
|
116
|
-
getMaxLayer: function
|
|
116
|
+
getMaxLayer: function(oURLParsingService) {
|
|
117
117
|
var sParseMaxLayer = LayerUtils.getMaxLayerTechnicalParameter(hasher.getHash(), oURLParsingService);
|
|
118
118
|
return sParseMaxLayer || getUrlParameter(this.FL_MAX_LAYER_PARAM) || LayerUtils._sTopLayer;
|
|
119
119
|
},
|
|
@@ -148,7 +148,7 @@ sap.ui.define([
|
|
|
148
148
|
* @returns {boolean} <code>true</code> if the first input layer is higher than the second input layer, otherwise <code>false</code>
|
|
149
149
|
* @public
|
|
150
150
|
*/
|
|
151
|
-
isOverLayer: function
|
|
151
|
+
isOverLayer: function(sObjectsLayer, sComparedLayer) {
|
|
152
152
|
return this.getLayerIndex(sObjectsLayer) > this.getLayerIndex(sComparedLayer);
|
|
153
153
|
},
|
|
154
154
|
|
|
@@ -189,7 +189,7 @@ sap.ui.define([
|
|
|
189
189
|
* @returns {boolean} <code>true</code> if the top layer is also the max layer, otherwise <code>false</code>
|
|
190
190
|
* @public
|
|
191
191
|
*/
|
|
192
|
-
isSapUiLayerParameterProvided: function
|
|
192
|
+
isSapUiLayerParameterProvided: function() {
|
|
193
193
|
return !!getUrlParameter("sap-ui-layer");
|
|
194
194
|
},
|
|
195
195
|
|
|
@@ -199,7 +199,7 @@ sap.ui.define([
|
|
|
199
199
|
* @returns {string} the current layer
|
|
200
200
|
* @public
|
|
201
201
|
*/
|
|
202
|
-
getCurrentLayer: function
|
|
202
|
+
getCurrentLayer: function() {
|
|
203
203
|
var sLayer = getUrlParameter("sap-ui-layer") || "";
|
|
204
204
|
return sLayer.toUpperCase() || Layer.CUSTOMER;
|
|
205
205
|
},
|
package/src/sap/ui/fl/Utils.js
CHANGED
|
@@ -37,7 +37,6 @@ sap.ui.define([
|
|
|
37
37
|
) {
|
|
38
38
|
"use strict";
|
|
39
39
|
|
|
40
|
-
|
|
41
40
|
/**
|
|
42
41
|
* Returns the type of "sap.app" from the manifest object passed.
|
|
43
42
|
* @param {sap.ui.core.Manifest} oManifest - Manifest object
|
|
@@ -67,7 +66,7 @@ sap.ui.define([
|
|
|
67
66
|
* @namespace
|
|
68
67
|
* @alias sap.ui.fl.Utils
|
|
69
68
|
* @author SAP SE
|
|
70
|
-
* @version 1.
|
|
69
|
+
* @version 1.116.0
|
|
71
70
|
*
|
|
72
71
|
* @private
|
|
73
72
|
* @ui5-restricted sap.ui.fl, sap.ui.rta
|
|
@@ -82,7 +81,7 @@ sap.ui.define([
|
|
|
82
81
|
* @param {string} [sCallStack] - Passes the callstack to the logging function
|
|
83
82
|
*/
|
|
84
83
|
formatAndLogMessage: function(sLogType, aMessageComponents, aValuesToInsert, sCallStack) {
|
|
85
|
-
var sLogMessage = aMessageComponents.join(
|
|
84
|
+
var sLogMessage = aMessageComponents.join(" ");
|
|
86
85
|
sLogMessage = formatMessage(sLogMessage, aValuesToInsert);
|
|
87
86
|
Log[sLogType](sLogMessage, sCallStack || "");
|
|
88
87
|
},
|
|
@@ -197,7 +196,7 @@ sap.ui.define([
|
|
|
197
196
|
* @ui5-restricted sap.ui.fl
|
|
198
197
|
*/
|
|
199
198
|
getComponentForControl: function(oControl) {
|
|
200
|
-
function getComponentIdForControl
|
|
199
|
+
function getComponentIdForControl(oControl) {
|
|
201
200
|
var sComponentId = Component.getOwnerIdFor(oControl);
|
|
202
201
|
if (!sComponentId) {
|
|
203
202
|
if (oControl && typeof oControl.getParent === "function") {
|
|
@@ -319,7 +318,6 @@ sap.ui.define([
|
|
|
319
318
|
return Utils.convertBrowserLanguageToISO639_1(sLanguage);
|
|
320
319
|
},
|
|
321
320
|
|
|
322
|
-
|
|
323
321
|
/**
|
|
324
322
|
* Converts the browser language into a 2-character ISO 639-1 language. If the browser language is in format RFC4646, the first part will be
|
|
325
323
|
* used: For example en-us will be converted to EN. If the browser language already is in ISO 639-1, it will be returned after an upper case
|
|
@@ -418,7 +416,7 @@ sap.ui.define([
|
|
|
418
416
|
createDefaultFileName: function(sNameAddition) {
|
|
419
417
|
var sFileName = uid().replace(/-/g, "_");
|
|
420
418
|
if (sNameAddition) {
|
|
421
|
-
sFileName +=
|
|
419
|
+
sFileName += "_" + sNameAddition;
|
|
422
420
|
}
|
|
423
421
|
return sFileName;
|
|
424
422
|
},
|
|
@@ -428,8 +426,8 @@ sap.ui.define([
|
|
|
428
426
|
if (sFileType === "ctrl_variant") {
|
|
429
427
|
sSubfolder = "variants";
|
|
430
428
|
}
|
|
431
|
-
var sReferenceName = oPropertyBag.reference.replace(
|
|
432
|
-
var sNamespace =
|
|
429
|
+
var sReferenceName = oPropertyBag.reference.replace(".Component", "");
|
|
430
|
+
var sNamespace = "apps/" + sReferenceName + "/" + sSubfolder + "/";
|
|
433
431
|
return sNamespace;
|
|
434
432
|
},
|
|
435
433
|
|
|
@@ -570,7 +568,7 @@ sap.ui.define([
|
|
|
570
568
|
if (bAsync) {
|
|
571
569
|
return Promise.resolve();
|
|
572
570
|
}
|
|
573
|
-
return new Utils.FakePromise();
|
|
571
|
+
return (Utils.FakePromise ? new Utils.FakePromise() : Promise.resolve());
|
|
574
572
|
}
|
|
575
573
|
var fnPromise = aPromiseQueue.shift();
|
|
576
574
|
if (typeof fnPromise === "function") {
|
|
@@ -614,6 +612,7 @@ sap.ui.define([
|
|
|
614
612
|
* @param {any} vError - value on reject FakePromise
|
|
615
613
|
* @param {string} sInitialPromiseIdentifier - value identifies previous promise in chain. If the identifier is passed to the function and don't match with the FakePromiseIdentifier then native Promise execution is used for further processing
|
|
616
614
|
* @returns {sap.ui.fl.Utils.FakePromise|Promise} Returns instantiated FakePromise only if no Promise is passed by value parameter
|
|
615
|
+
* @deprecated As of Version 1.114
|
|
617
616
|
* @private
|
|
618
617
|
* @ui5-restricted
|
|
619
618
|
*/
|
|
@@ -724,7 +723,7 @@ sap.ui.define([
|
|
|
724
723
|
sParameters = "?" + aFilterUrl.join("&");
|
|
725
724
|
}
|
|
726
725
|
} else {
|
|
727
|
-
sParameters += (sParameters.length > 0 ?
|
|
726
|
+
sParameters += (sParameters.length > 0 ? "&" : "?") + sParameterName + "=" + sParameterValue;
|
|
728
727
|
}
|
|
729
728
|
return sParameters;
|
|
730
729
|
},
|
|
@@ -748,7 +747,7 @@ sap.ui.define([
|
|
|
748
747
|
* @param {sap.ushell.services.URLParsing} oURLParsingService - The Unified Shell's internal URL parsing service
|
|
749
748
|
* @returns {string} The value of the given parameter or undefined
|
|
750
749
|
*/
|
|
751
|
-
getParameter: function
|
|
750
|
+
getParameter: function(sParameterName, oURLParsingService) {
|
|
752
751
|
if (oURLParsingService) {
|
|
753
752
|
var mParsedHash = Utils.getParsedURLHash(oURLParsingService);
|
|
754
753
|
return mParsedHash.params &&
|
|
@@ -783,7 +782,7 @@ sap.ui.define([
|
|
|
783
782
|
* @param {string} sAggregationName - Aggregation name
|
|
784
783
|
* @returns {sap.ui.base.ManagedObject[]|Element[]} Aggregation content
|
|
785
784
|
*/
|
|
786
|
-
getAggregation: function
|
|
785
|
+
getAggregation: function(oParent, sAggregationName) {
|
|
787
786
|
var oAggregation = Utils.findAggregation(oParent, sAggregationName);
|
|
788
787
|
if (oAggregation) {
|
|
789
788
|
return oParent[oAggregation._sGetter]();
|
|
@@ -797,7 +796,7 @@ sap.ui.define([
|
|
|
797
796
|
* @param {string} sPropertyName - Property name
|
|
798
797
|
* @returns {any} Value of the property
|
|
799
798
|
*/
|
|
800
|
-
getProperty: function
|
|
799
|
+
getProperty: function(oControl, sPropertyName) {
|
|
801
800
|
var oMetadata = oControl.getMetadata().getPropertyLikeSetting(sPropertyName);
|
|
802
801
|
if (oMetadata) {
|
|
803
802
|
var sPropertyGetter = oMetadata._sGetter;
|
|
@@ -827,12 +826,12 @@ sap.ui.define([
|
|
|
827
826
|
* @param {array} aServiceNames - List of service names
|
|
828
827
|
* @returns {Promise<object>} Resolves to an object with the requested ushell services
|
|
829
828
|
*/
|
|
830
|
-
getUShellServices: function
|
|
831
|
-
var aServicePromises = aServiceNames.map(function
|
|
829
|
+
getUShellServices: function(aServiceNames) {
|
|
830
|
+
var aServicePromises = aServiceNames.map(function(sServiceName) {
|
|
832
831
|
return this.getUShellService(sServiceName);
|
|
833
832
|
}.bind(this));
|
|
834
|
-
return Promise.all(aServicePromises).then(function
|
|
835
|
-
return aServiceNames.reduce(function
|
|
833
|
+
return Promise.all(aServicePromises).then(function(aServices) {
|
|
834
|
+
return aServiceNames.reduce(function(mServices, sService, iIndex) {
|
|
836
835
|
mServices[sService] = aServices && aServices[iIndex];
|
|
837
836
|
return mServices;
|
|
838
837
|
}, {});
|