@openui5/sap.ui.fl 1.115.1 → 1.117.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 +30 -33
- package/src/sap/ui/fl/ChangePersistence.js +139 -84
- 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 +82 -210
- package/src/sap/ui/fl/FlexControllerFactory.js +12 -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 +45 -88
- 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 +130 -94
- package/src/sap/ui/fl/apply/_internal/changes/FlexCustomData.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/Reverter.js +10 -4
- package/src/sap/ui/fl/apply/_internal/changes/Utils.js +7 -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 +18 -16
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddNewInbound.js +11 -9
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeDataSource.js +2 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeInbound.js +4 -2
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/RemoveAllInboundsExceptOne.js +9 -7
- 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 +4 -2
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetRegistrationIds.js +4 -3
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/AddNewCard.js +4 -2
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/ChangeCard.js +4 -2
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/DeleteCard.js +2 -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 +7 -7
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModel.js +13 -11
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModelEnhanceWith.js +4 -4
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetFlexExtensionPointEnabled.js +4 -3
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetMinUI5Version.js +5 -5
- 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 +16 -8
- 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 +206 -64
- package/src/sap/ui/fl/apply/_internal/flexState/InitialPrepareFunctions.js +27 -17
- package/src/sap/ui/fl/apply/_internal/flexState/Loader.js +16 -10
- package/src/sap/ui/fl/apply/_internal/flexState/ManifestUtils.js +23 -7
- 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 +20 -23
- 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 +6 -6
- package/src/sap/ui/fl/apply/api/ControlVariantApplyAPI.js +15 -5
- package/src/sap/ui/fl/apply/api/DelegateMediatorAPI.js +10 -4
- package/src/sap/ui/fl/apply/api/FlexRuntimeInfoAPI.js +6 -8
- package/src/sap/ui/fl/apply/api/SmartVariantManagementApplyAPI.js +6 -6
- package/src/sap/ui/fl/apply/api/UI2PersonalizationApplyAPI.js +3 -5
- package/src/sap/ui/fl/changeHandler/AddIFrame.js +22 -22
- package/src/sap/ui/fl/changeHandler/AddXML.js +1 -1
- package/src/sap/ui/fl/changeHandler/AddXMLAtExtensionPoint.js +43 -36
- 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 +20 -21
- 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 +3 -3
- package/src/sap/ui/fl/initial/_internal/connectors/Utils.js +22 -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 +9 -9
- 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 -47
- package/src/sap/ui/fl/variants/VariantModel.js +236 -146
- 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 +163 -161
- package/src/sap/ui/fl/write/_internal/Storage.js +51 -53
- package/src/sap/ui/fl/write/_internal/StorageFeaturesMerger.js +4 -4
- package/src/sap/ui/fl/write/_internal/Versions.js +105 -97
- 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 +40 -10
- 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 +33 -35
- package/src/sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState.js +81 -59
- 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 +12 -15
- package/src/sap/ui/fl/write/api/ChangesWriteAPI.js +222 -185
- package/src/sap/ui/fl/write/api/ContextBasedAdaptationsAPI.js +546 -110
- package/src/sap/ui/fl/write/api/ControlPersonalizationWriteAPI.js +122 -68
- package/src/sap/ui/fl/write/api/ExtensionPointRegistryAPI.js +19 -4
- 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 +32 -33
- package/src/sap/ui/fl/write/api/PersistenceWriteAPI.js +119 -73
- package/src/sap/ui/fl/write/api/ReloadInfoAPI.js +8 -8
- package/src/sap/ui/fl/write/api/SmartBusinessWriteAPI.js +18 -21
- package/src/sap/ui/fl/write/api/SmartVariantManagementWriteAPI.js +14 -13
- package/src/sap/ui/fl/write/api/TranslationAPI.js +13 -17
- package/src/sap/ui/fl/write/api/UI2PersonalizationWriteAPI.js +5 -7
- 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
- package/ui5.yaml +1 -2
- package/src/sap/ui/fl/apply/_internal/ChangesController.js +0 -49
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
sap.ui.define([], function
|
|
7
|
+
sap.ui.define([], function() {
|
|
8
8
|
"use strict";
|
|
9
9
|
|
|
10
10
|
/**
|
|
@@ -12,7 +12,7 @@ sap.ui.define([], function () {
|
|
|
12
12
|
*
|
|
13
13
|
* @namespace sap.ui.fl.initial._internal.connectors.Utils
|
|
14
14
|
* @since 1.70
|
|
15
|
-
* @version 1.
|
|
15
|
+
* @version 1.117.0
|
|
16
16
|
* @private
|
|
17
17
|
* @ui5-restricted sap.ui.fl.initial._internal, sap.ui.fl.write._internal
|
|
18
18
|
*/
|
|
@@ -36,38 +36,38 @@ sap.ui.define([], function () {
|
|
|
36
36
|
|
|
37
37
|
// ensure a Promise
|
|
38
38
|
return Promise.resolve(oRealStorage)
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
39
|
+
.then(function(oRealStorage) {
|
|
40
|
+
var aPromises = Object.keys(oRealStorage).map(function(sKey) {
|
|
41
|
+
var bIsFlexObject = sKey.includes(FL_PREFIX);
|
|
42
42
|
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
43
|
+
if (!bIsFlexObject) {
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
46
|
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
47
|
+
var vStorageEntry = oRealStorage[sKey];
|
|
48
|
+
var oFlexObject = mPropertyBag.storage._itemsStoredAsObjects ? vStorageEntry : JSON.parse(vStorageEntry);
|
|
49
|
+
var bSameReference = true;
|
|
50
|
+
if (mPropertyBag.reference) {
|
|
51
|
+
bSameReference = this.isSameReference(oFlexObject, mPropertyBag.reference);
|
|
52
|
+
}
|
|
53
53
|
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
54
|
+
var bSameLayer = true;
|
|
55
|
+
if (mPropertyBag.layer) {
|
|
56
|
+
bSameLayer = oFlexObject.layer === mPropertyBag.layer;
|
|
57
|
+
}
|
|
58
58
|
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
59
|
+
if (!bSameReference || !bSameLayer) {
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
62
|
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
}.bind(this));
|
|
68
|
-
|
|
69
|
-
return Promise.all(aPromises);
|
|
63
|
+
return fnPredicate({
|
|
64
|
+
changeDefinition: oFlexObject,
|
|
65
|
+
key: sKey
|
|
66
|
+
});
|
|
70
67
|
}.bind(this));
|
|
68
|
+
|
|
69
|
+
return Promise.all(aPromises);
|
|
70
|
+
}.bind(this));
|
|
71
71
|
},
|
|
72
72
|
|
|
73
73
|
/**
|
|
@@ -81,7 +81,7 @@ sap.ui.define([], function () {
|
|
|
81
81
|
return this.forEachObjectInStorage(mPropertyBag, function(mFlexObject) {
|
|
82
82
|
aFlexObjects.push(mFlexObject);
|
|
83
83
|
})
|
|
84
|
-
.then(function
|
|
84
|
+
.then(function() {
|
|
85
85
|
return aFlexObjects;
|
|
86
86
|
});
|
|
87
87
|
},
|
|
@@ -110,7 +110,7 @@ sap.ui.define([
|
|
|
110
110
|
* @private
|
|
111
111
|
*/
|
|
112
112
|
function _handleVariantIdChangeInURL(oModel, sNewHash) {
|
|
113
|
-
//TODO: Check if this is really necessary, as the method is never called with a new hash and in the test the parameter is not a string
|
|
113
|
+
// TODO: Check if this is really necessary, as the method is never called with a new hash and in the test the parameter is not a string
|
|
114
114
|
try {
|
|
115
115
|
var oURLParsingService = oModel.getUShellService("URLParsing");
|
|
116
116
|
if (oURLParsingService) {
|
|
@@ -263,7 +263,6 @@ sap.ui.define([
|
|
|
263
263
|
return oParsedHash && oParsedHash.params && oParsedHash.params[VariantUtil.VARIANT_TECHNICAL_PARAMETER];
|
|
264
264
|
}
|
|
265
265
|
|
|
266
|
-
|
|
267
266
|
URLHandler.variantTechnicalParameterName = "sap-ui-fl-control-variant-id";
|
|
268
267
|
|
|
269
268
|
/**
|
|
@@ -6,9 +6,11 @@
|
|
|
6
6
|
|
|
7
7
|
sap.ui.define([
|
|
8
8
|
"sap/ui/core/Core",
|
|
9
|
+
"sap/ui/core/StaticArea",
|
|
9
10
|
"sap/ui/fl/Utils"
|
|
10
11
|
], function(
|
|
11
12
|
Core,
|
|
13
|
+
StaticArea,
|
|
12
14
|
Utils
|
|
13
15
|
) {
|
|
14
16
|
"use strict";
|
|
@@ -32,9 +34,9 @@ sap.ui.define([
|
|
|
32
34
|
aVMControls = Array.from(oRootControl.getDomRef().querySelectorAll(".sapUiFlVarMngmt"));
|
|
33
35
|
}
|
|
34
36
|
if (bUseStaticArea || aVMControls.length === 0) {
|
|
35
|
-
aVMControls = Array.from(
|
|
37
|
+
aVMControls = Array.from(StaticArea.getDomRef().querySelectorAll(".sapUiFlVarMngmt"));
|
|
36
38
|
}
|
|
37
|
-
return aVMControls.map(function
|
|
39
|
+
return aVMControls.map(function(oVariantManagementNode) {
|
|
38
40
|
return oVariantManagementNode.id;
|
|
39
41
|
});
|
|
40
42
|
}
|
|
@@ -53,9 +55,9 @@ sap.ui.define([
|
|
|
53
55
|
return 0;
|
|
54
56
|
},
|
|
55
57
|
|
|
56
|
-
getIndexToSortVariant: function
|
|
58
|
+
getIndexToSortVariant: function(aVariants, oVariantEntry) {
|
|
57
59
|
var iSortedIndex = aVariants.length;
|
|
58
|
-
aVariants.some(function
|
|
60
|
+
aVariants.some(function(oExistingVariant, index) {
|
|
59
61
|
if (VariantsApplyUtil.compareVariants(oVariantEntry.instance, oExistingVariant.instance) < 0) {
|
|
60
62
|
iSortedIndex = index;
|
|
61
63
|
return true;
|
|
@@ -34,21 +34,21 @@ function(
|
|
|
34
34
|
* @class
|
|
35
35
|
* @constructor
|
|
36
36
|
* @author SAP SE
|
|
37
|
-
* @version 1.
|
|
37
|
+
* @version 1.117.0
|
|
38
38
|
*/
|
|
39
39
|
var Processor;
|
|
40
40
|
|
|
41
41
|
function executeNestedExtensionPoint(oControl, aResolvedControls, iControlIndex, iNestedEPAdditionalContentCounter, fnNestedCallback) {
|
|
42
42
|
return fnNestedCallback(oControl, true)
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
});
|
|
47
|
-
oControl.index += iNestedEPAdditionalContentCounter;
|
|
48
|
-
// the iControlIndex counts the extensionpoint as 1 control. when the EP is replaced by content with more than one control
|
|
49
|
-
// then we need to have an additional content counter for correct index calculations for the following extension points
|
|
50
|
-
return aNestedControls.length - 1;
|
|
43
|
+
.then(function(aNestedControls) {
|
|
44
|
+
aNestedControls.forEach(function(oNestedControl, iNestedControlIndex) {
|
|
45
|
+
aResolvedControls.splice(iControlIndex + iNestedControlIndex + iNestedEPAdditionalContentCounter, 0, oNestedControl);
|
|
51
46
|
});
|
|
47
|
+
oControl.index += iNestedEPAdditionalContentCounter;
|
|
48
|
+
// the iControlIndex counts the extensionpoint as 1 control. when the EP is replaced by content with more than one control
|
|
49
|
+
// then we need to have an additional content counter for correct index calculations for the following extension points
|
|
50
|
+
return aNestedControls.length - 1;
|
|
51
|
+
});
|
|
52
52
|
}
|
|
53
53
|
|
|
54
54
|
function checkForExtensionPoint(oExtensionPoint, fnNestedCallback, aControls) {
|
|
@@ -57,7 +57,7 @@ function(
|
|
|
57
57
|
var iNestedEPAdditionalContentCounter = 0;
|
|
58
58
|
var oLastExtensionPoint;
|
|
59
59
|
// aControls is a list of controls and extension points
|
|
60
|
-
aControls.forEach(function
|
|
60
|
+
aControls.forEach(function(oControl, iControlIndex) {
|
|
61
61
|
if (oControl._isExtensionPoint) {
|
|
62
62
|
oControl.targetControl = oExtensionPoint.targetControl;
|
|
63
63
|
oControl.aggregationName = oExtensionPoint.aggregationName;
|
|
@@ -70,14 +70,14 @@ function(
|
|
|
70
70
|
|
|
71
71
|
// is required to calculate the index into the changehandler
|
|
72
72
|
oControl.referencedExtensionPoint = oExtensionPoint;
|
|
73
|
-
aNestedExtensionPointPromises.push(function
|
|
73
|
+
aNestedExtensionPointPromises.push(function() {
|
|
74
74
|
return executeNestedExtensionPoint(
|
|
75
75
|
oControl,
|
|
76
76
|
aResolvedControls,
|
|
77
77
|
iControlIndex,
|
|
78
78
|
iNestedEPAdditionalContentCounter,
|
|
79
79
|
fnNestedCallback
|
|
80
|
-
).then(function
|
|
80
|
+
).then(function(iNestedCounter) {
|
|
81
81
|
iNestedEPAdditionalContentCounter += iNestedCounter;
|
|
82
82
|
});
|
|
83
83
|
}
|
|
@@ -87,12 +87,12 @@ function(
|
|
|
87
87
|
}
|
|
88
88
|
});
|
|
89
89
|
if (aNestedExtensionPointPromises.length > 0) {
|
|
90
|
-
return aNestedExtensionPointPromises.reduce(function
|
|
90
|
+
return aNestedExtensionPointPromises.reduce(function(oPreviousPromise, oCurrentPromise) {
|
|
91
91
|
return oPreviousPromise.then(oCurrentPromise);
|
|
92
92
|
}, SyncPromise.resolve())
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
93
|
+
.then(function() {
|
|
94
|
+
return aResolvedControls;
|
|
95
|
+
});
|
|
96
96
|
}
|
|
97
97
|
return SyncPromise.resolve(aResolvedControls);
|
|
98
98
|
}
|
|
@@ -107,31 +107,31 @@ function(
|
|
|
107
107
|
mPropertyBag.componentId = oAppComponent.getId();
|
|
108
108
|
|
|
109
109
|
return Processor.registerExtensionPoint(mExtensionPointInfo)
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
110
|
+
.then(FlexState.initialize.bind(FlexState, mPropertyBag))
|
|
111
|
+
// enhance exiting extension point changes with mExtensionPointInfo
|
|
112
|
+
.then(ExtensionPointState.enhanceExtensionPointChanges.bind(ExtensionPointState, mPropertyBag, oExtensionPoint))
|
|
113
|
+
.then(Processor.createDefaultContent.bind(this, oExtensionPoint, bSkipInsertContent, applyExtensionPoint))
|
|
114
|
+
.then(Processor.addDefaultContentToExtensionPointInfo.bind(this, mExtensionPointInfo, bSkipInsertContent));
|
|
115
115
|
}
|
|
116
116
|
|
|
117
117
|
Processor = {
|
|
118
118
|
oExtensionPointRegistry: undefined,
|
|
119
119
|
oRegistryPromise: Promise.resolve(),
|
|
120
120
|
|
|
121
|
-
registerExtensionPoint: function
|
|
121
|
+
registerExtensionPoint: function(mExtensionPointInfo) {
|
|
122
122
|
if (Configuration.getDesignMode()) {
|
|
123
123
|
if (Processor.oExtensionPointRegistry) {
|
|
124
124
|
Processor.oExtensionPointRegistry.registerExtensionPoint(mExtensionPointInfo);
|
|
125
125
|
return SyncPromise.resolve();
|
|
126
126
|
}
|
|
127
127
|
|
|
128
|
-
Processor.oRegistryPromise = Processor.oRegistryPromise.then(function
|
|
129
|
-
return new Promise(function
|
|
130
|
-
sap.ui.require(["sap/ui/fl/write/_internal/extensionPoint/Registry"], function
|
|
128
|
+
Processor.oRegistryPromise = Processor.oRegistryPromise.then(function() {
|
|
129
|
+
return new Promise(function(resolve, reject) {
|
|
130
|
+
sap.ui.require(["sap/ui/fl/write/_internal/extensionPoint/Registry"], function(ExtensionPointRegistry) {
|
|
131
131
|
Processor.oExtensionPointRegistry = ExtensionPointRegistry;
|
|
132
132
|
ExtensionPointRegistry.registerExtensionPoint(mExtensionPointInfo);
|
|
133
133
|
resolve();
|
|
134
|
-
}, function
|
|
134
|
+
}, function(oError) {
|
|
135
135
|
reject(oError);
|
|
136
136
|
});
|
|
137
137
|
});
|
|
@@ -141,30 +141,30 @@ function(
|
|
|
141
141
|
return SyncPromise.resolve();
|
|
142
142
|
},
|
|
143
143
|
|
|
144
|
-
createDefaultContent: function
|
|
144
|
+
createDefaultContent: function(oExtensionPoint, bSkipInsertContent, fnNestedCallback, aChanges) {
|
|
145
145
|
if (aChanges.length === 0) {
|
|
146
146
|
return oExtensionPoint.createDefault()
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
147
|
+
.then(checkForExtensionPoint.bind(undefined, oExtensionPoint, fnNestedCallback))
|
|
148
|
+
.then(function(aControls) {
|
|
149
|
+
if (!bSkipInsertContent) {
|
|
150
|
+
aControls.forEach(function(oNewControl, iIterator) {
|
|
151
|
+
JsControlTreeModifier.insertAggregation(
|
|
152
|
+
oExtensionPoint.targetControl,
|
|
153
|
+
oExtensionPoint.aggregationName,
|
|
154
|
+
oNewControl,
|
|
155
|
+
oExtensionPoint.index + iIterator,
|
|
156
|
+
oExtensionPoint.view
|
|
157
|
+
);
|
|
158
|
+
});
|
|
159
|
+
oExtensionPoint.ready(aControls);
|
|
160
|
+
}
|
|
161
|
+
return aControls;
|
|
162
|
+
});
|
|
163
163
|
}
|
|
164
164
|
return SyncPromise.resolve([]);
|
|
165
165
|
},
|
|
166
166
|
|
|
167
|
-
addDefaultContentToExtensionPointInfo: function
|
|
167
|
+
addDefaultContentToExtensionPointInfo: function(mRegsteredExtensionPoint, bSkipInsertContent, aControls) {
|
|
168
168
|
if (!bSkipInsertContent) {
|
|
169
169
|
mRegsteredExtensionPoint.defaultContent = mRegsteredExtensionPoint.defaultContent.concat(aControls);
|
|
170
170
|
}
|
|
@@ -18,7 +18,7 @@ sap.ui.define([
|
|
|
18
18
|
* @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
|
|
19
19
|
* @alias sap.ui.fl.apply._internal.flexObjects.AppDescriptorChange
|
|
20
20
|
* @since 1.105
|
|
21
|
-
* @version 1.
|
|
21
|
+
* @version 1.117.0
|
|
22
22
|
* @private
|
|
23
23
|
* @ui5-restricted
|
|
24
24
|
*/
|
|
@@ -38,7 +38,7 @@ sap.ui.define([
|
|
|
38
38
|
* @returns {object} Mapping information
|
|
39
39
|
* @static
|
|
40
40
|
*/
|
|
41
|
-
AppDescriptorChange.getMappingInfo = function
|
|
41
|
+
AppDescriptorChange.getMappingInfo = function() {
|
|
42
42
|
return Object.assign(FlexObject.getMappingInfo(), {
|
|
43
43
|
appDescriptorChange: "appDescriptorChange"
|
|
44
44
|
});
|
|
@@ -49,7 +49,7 @@ sap.ui.define([
|
|
|
49
49
|
* Can be overridden to avoid access of static mapping within base methods.
|
|
50
50
|
* @returns {object} Mapping information
|
|
51
51
|
*/
|
|
52
|
-
AppDescriptorChange.prototype.getMappingInfo = function
|
|
52
|
+
AppDescriptorChange.prototype.getMappingInfo = function() {
|
|
53
53
|
return AppDescriptorChange.getMappingInfo();
|
|
54
54
|
};
|
|
55
55
|
|
|
@@ -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.117.0
|
|
36
36
|
* @private
|
|
37
37
|
* @ui5-restricted sap.ui.fl, sap.ui.comp
|
|
38
38
|
*/
|
|
@@ -239,6 +239,20 @@ sap.ui.define([
|
|
|
239
239
|
}
|
|
240
240
|
};
|
|
241
241
|
|
|
242
|
+
/**
|
|
243
|
+
* Sets the 'visible' flag of the runtime instance as well as the persistent representation.
|
|
244
|
+
* This results in setting the definition as well as flagging the entity as 'dirty'.
|
|
245
|
+
* @param {boolean} bVisible - Boolean to which the 'visible' flag should be set
|
|
246
|
+
* @private
|
|
247
|
+
* @ui5-restricted sap.ui.fl
|
|
248
|
+
*/
|
|
249
|
+
CompVariant.prototype.storeVisible = function(bVisible) {
|
|
250
|
+
if (bVisible !== this.getVisible()) {
|
|
251
|
+
this.setState(States.LifecycleState.DIRTY);
|
|
252
|
+
this.setVisible(bVisible);
|
|
253
|
+
}
|
|
254
|
+
};
|
|
255
|
+
|
|
242
256
|
/**
|
|
243
257
|
* Retrieves the owner ID (user)
|
|
244
258
|
* @returns {string} User ID
|
|
@@ -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.117.0
|
|
24
24
|
* @private
|
|
25
25
|
* @ui5-restricted sap.ui.fl
|
|
26
26
|
*/
|
|
@@ -24,7 +24,7 @@ sap.ui.define([
|
|
|
24
24
|
* @extends sap.ui.fl.apply._internal.flexObjects.Variant
|
|
25
25
|
* @alias sap.ui.fl.apply._internal.flexObjects.FlVariant
|
|
26
26
|
* @since 1.104
|
|
27
|
-
* @version 1.
|
|
27
|
+
* @version 1.117.0
|
|
28
28
|
* @private
|
|
29
29
|
* @ui5-restricted sap.ui.fl
|
|
30
30
|
*/
|
|
@@ -43,13 +43,6 @@ sap.ui.define([
|
|
|
43
43
|
*/
|
|
44
44
|
variantManagementReference: {
|
|
45
45
|
type: "string"
|
|
46
|
-
},
|
|
47
|
-
/**
|
|
48
|
-
* Indicates if the variant should be shown to the user.
|
|
49
|
-
*/
|
|
50
|
-
visible: {
|
|
51
|
-
type: "boolean",
|
|
52
|
-
defaultValue: true
|
|
53
46
|
}
|
|
54
47
|
}
|
|
55
48
|
},
|
|
@@ -69,11 +62,6 @@ sap.ui.define([
|
|
|
69
62
|
this.setName(mSettings.content.title);
|
|
70
63
|
}
|
|
71
64
|
|
|
72
|
-
var aTitleKeyMatch = this.getName().match(/.i18n>(\w+)./);
|
|
73
|
-
if (aTitleKeyMatch) {
|
|
74
|
-
this.setName(Core.getLibraryResourceBundle("sap.ui.fl").getText(aTitleKeyMatch[1]));
|
|
75
|
-
}
|
|
76
|
-
|
|
77
65
|
var oSupportInfo = this.getSupportInformation();
|
|
78
66
|
if (this.getId() === this.getVariantManagementReference()) {
|
|
79
67
|
this.setStandardVariant(true);
|
|
@@ -108,7 +96,6 @@ sap.ui.define([
|
|
|
108
96
|
|
|
109
97
|
FlVariant.prototype.cloneFileContentWithNewId = function() {
|
|
110
98
|
var mFileContent = Variant.prototype.cloneFileContentWithNewId.apply(this, arguments);
|
|
111
|
-
mFileContent.variantReference = mFileContent.fileName;
|
|
112
99
|
return mFileContent;
|
|
113
100
|
};
|
|
114
101
|
|
|
@@ -69,7 +69,7 @@ sap.ui.define([
|
|
|
69
69
|
* @extends sap.ui.base.ManagedObject
|
|
70
70
|
* @alias sap.ui.fl.apply._internal.flexObjects.FlexObject
|
|
71
71
|
* @since 1.100
|
|
72
|
-
* @version 1.
|
|
72
|
+
* @version 1.117.0
|
|
73
73
|
* @private
|
|
74
74
|
* @ui5-restricted sap.ui.fl
|
|
75
75
|
*/
|
|
@@ -170,6 +170,7 @@ sap.ui.define([
|
|
|
170
170
|
"flexObjectMetadata.packageName": "packageName",
|
|
171
171
|
"flexObjectMetadata.moduleName": "moduleName",
|
|
172
172
|
"supportInformation.generator": "support.generator",
|
|
173
|
+
"supportInformation.clonedFrom": "support.clonedFrom",
|
|
173
174
|
"supportInformation.service": "support.service",
|
|
174
175
|
"supportInformation.sourceSystem": "sourceSystem",
|
|
175
176
|
"supportInformation.sourceClient": "sourceClient",
|
|
@@ -529,6 +530,7 @@ sap.ui.define([
|
|
|
529
530
|
FlexObject.prototype.cloneFileContentWithNewId = function() {
|
|
530
531
|
var mFileContent = this.convertToFileContent();
|
|
531
532
|
mFileContent.fileName = Utils.createDefaultFileName(mFileContent.fileName.split("_").pop());
|
|
533
|
+
mFileContent.support.clonedFrom = this.getId();
|
|
532
534
|
return mFileContent;
|
|
533
535
|
};
|
|
534
536
|
return FlexObject;
|
|
@@ -14,6 +14,7 @@ sap.ui.define([
|
|
|
14
14
|
"sap/ui/fl/apply/_internal/flexObjects/FlVariant",
|
|
15
15
|
"sap/ui/fl/apply/_internal/flexObjects/States",
|
|
16
16
|
"sap/ui/fl/apply/_internal/flexObjects/UIChange",
|
|
17
|
+
"sap/ui/fl/registry/Settings",
|
|
17
18
|
"sap/ui/fl/Layer",
|
|
18
19
|
"sap/ui/fl/LayerUtils",
|
|
19
20
|
"sap/ui/fl/Utils"
|
|
@@ -28,6 +29,7 @@ sap.ui.define([
|
|
|
28
29
|
FlVariant,
|
|
29
30
|
States,
|
|
30
31
|
UIChange,
|
|
32
|
+
Settings,
|
|
31
33
|
Layer,
|
|
32
34
|
LayerUtils,
|
|
33
35
|
Utils
|
|
@@ -57,8 +59,12 @@ sap.ui.define([
|
|
|
57
59
|
}
|
|
58
60
|
|
|
59
61
|
function createBasePropertyBag(mProperties) {
|
|
60
|
-
|
|
61
|
-
|
|
62
|
+
const sChangeType = mProperties.type || mProperties.changeType;
|
|
63
|
+
const sFileName = mProperties.fileName || mProperties.id || Utils.createDefaultFileName(sChangeType);
|
|
64
|
+
const sUser = mProperties.user ||
|
|
65
|
+
(!LayerUtils.isDeveloperLayer(mProperties.layer)
|
|
66
|
+
? Settings.getInstanceOrUndef() && Settings.getInstanceOrUndef().getUserId()
|
|
67
|
+
: undefined);
|
|
62
68
|
return {
|
|
63
69
|
id: sFileName,
|
|
64
70
|
adaptationId: mProperties.adaptationId,
|
|
@@ -76,7 +82,7 @@ sap.ui.define([
|
|
|
76
82
|
sourceSystem: mProperties.sourceSystem,
|
|
77
83
|
sourceClient: mProperties.sourceClient,
|
|
78
84
|
originalLanguage: mProperties.originalLanguage,
|
|
79
|
-
user:
|
|
85
|
+
user: sUser
|
|
80
86
|
},
|
|
81
87
|
flexObjectMetadata: {
|
|
82
88
|
changeType: sChangeType,
|
|
@@ -92,7 +98,7 @@ sap.ui.define([
|
|
|
92
98
|
*
|
|
93
99
|
* @namespace sap.ui.fl.apply._internal.flexObjects.FlexObjectFactory
|
|
94
100
|
* @since 1.100
|
|
95
|
-
* @version 1.
|
|
101
|
+
* @version 1.117.0
|
|
96
102
|
* @private
|
|
97
103
|
* @ui5-restricted sap.ui.fl
|
|
98
104
|
*/
|
|
@@ -106,7 +112,7 @@ sap.ui.define([
|
|
|
106
112
|
* @param {boolean} [bPersisted] - Whether to set the state to PERSISTED after creation
|
|
107
113
|
* @returns {sap.ui.fl.apply._internal.flexObjects.FlexObject} Created flex object
|
|
108
114
|
*/
|
|
109
|
-
FlexObjectFactory.createFromFileContent = function
|
|
115
|
+
FlexObjectFactory.createFromFileContent = function(oFileContent, ObjectClass, bPersisted) {
|
|
110
116
|
var oNewFileContent = Object.assign({}, oFileContent);
|
|
111
117
|
var FlexObjectClass = ObjectClass || getFlexObjectClass(oNewFileContent);
|
|
112
118
|
if (!FlexObjectClass) {
|
|
@@ -121,8 +127,8 @@ sap.ui.define([
|
|
|
121
127
|
);
|
|
122
128
|
var oMappingInfo = FlexObjectClass.getMappingInfo();
|
|
123
129
|
var mCreationInfo = FlexObject.mapFileContent(oNewFileContent, oMappingInfo);
|
|
124
|
-
var mProperties = Object.entries(mCreationInfo).reduce(function
|
|
125
|
-
ObjectPath.set(aProperty[0].split(
|
|
130
|
+
var mProperties = Object.entries(mCreationInfo).reduce(function(mPropertyMap, aProperty) {
|
|
131
|
+
ObjectPath.set(aProperty[0].split("."), aProperty[1], mPropertyMap);
|
|
126
132
|
return mPropertyMap;
|
|
127
133
|
}, {});
|
|
128
134
|
var oFlexObject = new FlexObjectClass(mProperties);
|
|
@@ -134,6 +140,7 @@ sap.ui.define([
|
|
|
134
140
|
};
|
|
135
141
|
|
|
136
142
|
FlexObjectFactory.createUIChange = function(mPropertyBag) {
|
|
143
|
+
mPropertyBag.packageName = mPropertyBag.packageName || "$TMP";
|
|
137
144
|
var mProperties = createBasePropertyBag(mPropertyBag);
|
|
138
145
|
if (!mProperties.layer) {
|
|
139
146
|
mProperties.layer = mPropertyBag.isUserDependent ? Layer.USER : LayerUtils.getCurrentLayer();
|
|
@@ -141,6 +148,7 @@ sap.ui.define([
|
|
|
141
148
|
mProperties.selector = mPropertyBag.selector;
|
|
142
149
|
mProperties.jsOnly = mPropertyBag.jsOnly;
|
|
143
150
|
mProperties.variantReference = mPropertyBag.variantReference;
|
|
151
|
+
mProperties.isChangeOnStandardVariant = mPropertyBag.isChangeOnStandardVariant;
|
|
144
152
|
mProperties.fileType = mPropertyBag.fileType || "change";
|
|
145
153
|
return new UIChange(mProperties);
|
|
146
154
|
};
|
|
@@ -237,7 +245,7 @@ sap.ui.define([
|
|
|
237
245
|
*
|
|
238
246
|
* @returns {sap.ui.fl.apply._internal.flexObjects.CompVariant} Created comp variant object
|
|
239
247
|
*/
|
|
240
|
-
FlexObjectFactory.createCompVariant = function
|
|
248
|
+
FlexObjectFactory.createCompVariant = function(oFileContent) {
|
|
241
249
|
oFileContent.generator = oFileContent.generator || "FlexObjectFactory.createCompVariant";
|
|
242
250
|
oFileContent.user = ObjectPath.get("support.user", oFileContent);
|
|
243
251
|
var mCompVariantContent = createBasePropertyBag(oFileContent);
|
|
@@ -26,7 +26,7 @@ sap.ui.define([
|
|
|
26
26
|
* @extends sap.ui.fl.apply._internal.flexObjects.FlexObject
|
|
27
27
|
* @alias sap.ui.fl.apply._internal.flexObjects.UIChange
|
|
28
28
|
* @since 1.109
|
|
29
|
-
* @version 1.
|
|
29
|
+
* @version 1.117.0
|
|
30
30
|
* @private
|
|
31
31
|
* @ui5-restricted
|
|
32
32
|
*/
|
|
@@ -71,6 +71,13 @@ sap.ui.define([
|
|
|
71
71
|
type: "string"
|
|
72
72
|
},
|
|
73
73
|
|
|
74
|
+
/**
|
|
75
|
+
* Whether the change is related to the standard variant, if variant dependent
|
|
76
|
+
*/
|
|
77
|
+
isChangeOnStandardVariant: {
|
|
78
|
+
type: "boolean"
|
|
79
|
+
},
|
|
80
|
+
|
|
74
81
|
/**
|
|
75
82
|
* Indicates if the UIChange is saved to a variant
|
|
76
83
|
*/
|
|
@@ -109,7 +116,8 @@ sap.ui.define([
|
|
|
109
116
|
selector: "selector",
|
|
110
117
|
dependentSelectors: "dependentSelector",
|
|
111
118
|
jsOnly: "jsOnly",
|
|
112
|
-
variantReference: "variantReference"
|
|
119
|
+
variantReference: "variantReference",
|
|
120
|
+
isChangeOnStandardVariant: "isChangeOnStandardVariant"
|
|
113
121
|
});
|
|
114
122
|
};
|
|
115
123
|
|
|
@@ -162,7 +170,7 @@ sap.ui.define([
|
|
|
162
170
|
};
|
|
163
171
|
|
|
164
172
|
UIChange.prototype.isValidForDependencyMap = function() {
|
|
165
|
-
//Change without id in selector should be skipped from adding dependencies process
|
|
173
|
+
// Change without id in selector should be skipped from adding dependencies process
|
|
166
174
|
return !!this.getSelector().id;
|
|
167
175
|
};
|
|
168
176
|
|
|
@@ -345,7 +353,7 @@ sap.ui.define([
|
|
|
345
353
|
}
|
|
346
354
|
this.setDependentSelectors(oCurrentDependentSelectors);
|
|
347
355
|
|
|
348
|
-
//remove dependency list so that it will be created again in method getDependentSelectorList
|
|
356
|
+
// remove dependency list so that it will be created again in method getDependentSelectorList
|
|
349
357
|
delete this._aDependentSelectorList;
|
|
350
358
|
};
|
|
351
359
|
|
|
@@ -43,7 +43,7 @@ sap.ui.define([
|
|
|
43
43
|
return Object.assign(UIChange.getMappingInfo(), {});
|
|
44
44
|
};
|
|
45
45
|
|
|
46
|
-
UpdatableChange.prototype.popLatestRevertInfo = function
|
|
46
|
+
UpdatableChange.prototype.popLatestRevertInfo = function() {
|
|
47
47
|
var oLatestRevertInfo = this.getRevertInfo().pop();
|
|
48
48
|
this.removeRevertInfo(oLatestRevertInfo);
|
|
49
49
|
return oLatestRevertInfo;
|