@openui5/sap.ui.fl 1.96.0 → 1.96.2
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/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/ChangePersistenceFactory.js +1 -1
- package/src/sap/ui/fl/ControlPersonalizationAPI.js +1 -1
- package/src/sap/ui/fl/EventHistory.js +1 -1
- package/src/sap/ui/fl/FakeLrepConnectorLocalStorage.js +1 -1
- package/src/sap/ui/fl/FakeLrepConnectorSessionStorage.js +1 -1
- package/src/sap/ui/fl/FakeLrepLocalStorage.js +1 -1
- package/src/sap/ui/fl/FlexController.js +1 -1
- package/src/sap/ui/fl/FlexControllerFactory.js +1 -1
- package/src/sap/ui/fl/LayerUtils.js +1 -1
- package/src/sap/ui/fl/PreprocessorImpl.js +1 -1
- package/src/sap/ui/fl/RegistrationDelegator.js +1 -1
- package/src/sap/ui/fl/Utils.js +1 -1
- package/src/sap/ui/fl/Variant.js +1 -1
- package/src/sap/ui/fl/XmlPreprocessorImpl.js +1 -1
- package/src/sap/ui/fl/apply/_internal/DelegateMediator.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/Applier.js +30 -11
- 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/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/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/extensionPoint/Processor.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexState/FlexState.js +33 -2
- 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/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/codeExt/CodeExtManager.js +1 -1
- package/src/sap/ui/fl/descriptorRelated/api/DescriptorChangeFactory.js +4 -4
- package/src/sap/ui/fl/descriptorRelated/api/DescriptorInlineChangeFactory.js +1 -1
- package/src/sap/ui/fl/descriptorRelated/api/DescriptorVariantFactory.js +1 -1
- package/src/sap/ui/fl/initial/_internal/Storage.js +1 -1
- package/src/sap/ui/fl/initial/_internal/StorageUtils.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 +9 -9
- package/src/sap/ui/fl/messagebundle_ar.properties +19 -2
- package/src/sap/ui/fl/messagebundle_bg.properties +19 -2
- package/src/sap/ui/fl/messagebundle_ca.properties +19 -2
- package/src/sap/ui/fl/messagebundle_cs.properties +19 -2
- package/src/sap/ui/fl/messagebundle_cy.properties +19 -2
- package/src/sap/ui/fl/messagebundle_da.properties +19 -2
- package/src/sap/ui/fl/messagebundle_de.properties +19 -2
- package/src/sap/ui/fl/messagebundle_el.properties +19 -2
- package/src/sap/ui/fl/messagebundle_en.properties +17 -0
- package/src/sap/ui/fl/messagebundle_en_GB.properties +19 -2
- package/src/sap/ui/fl/messagebundle_es.properties +19 -2
- package/src/sap/ui/fl/messagebundle_es_MX.properties +19 -2
- package/src/sap/ui/fl/messagebundle_et.properties +19 -2
- package/src/sap/ui/fl/messagebundle_fi.properties +19 -2
- package/src/sap/ui/fl/messagebundle_fr.properties +19 -2
- package/src/sap/ui/fl/messagebundle_fr_CA.properties +19 -2
- package/src/sap/ui/fl/messagebundle_hi.properties +19 -2
- package/src/sap/ui/fl/messagebundle_hr.properties +19 -2
- package/src/sap/ui/fl/messagebundle_hu.properties +19 -2
- package/src/sap/ui/fl/messagebundle_id.properties +19 -2
- package/src/sap/ui/fl/messagebundle_it.properties +19 -2
- package/src/sap/ui/fl/messagebundle_iw.properties +19 -2
- package/src/sap/ui/fl/messagebundle_ja.properties +19 -2
- package/src/sap/ui/fl/messagebundle_kk.properties +19 -2
- package/src/sap/ui/fl/messagebundle_ko.properties +19 -2
- package/src/sap/ui/fl/messagebundle_lt.properties +19 -2
- package/src/sap/ui/fl/messagebundle_lv.properties +19 -2
- package/src/sap/ui/fl/messagebundle_ms.properties +19 -2
- package/src/sap/ui/fl/messagebundle_nl.properties +19 -2
- package/src/sap/ui/fl/messagebundle_no.properties +19 -2
- package/src/sap/ui/fl/messagebundle_pl.properties +19 -2
- package/src/sap/ui/fl/messagebundle_pt.properties +19 -2
- package/src/sap/ui/fl/messagebundle_pt_PT.properties +19 -2
- package/src/sap/ui/fl/messagebundle_ro.properties +19 -2
- package/src/sap/ui/fl/messagebundle_ru.properties +19 -2
- package/src/sap/ui/fl/messagebundle_sh.properties +19 -2
- package/src/sap/ui/fl/messagebundle_sk.properties +19 -2
- package/src/sap/ui/fl/messagebundle_sl.properties +19 -2
- package/src/sap/ui/fl/messagebundle_sv.properties +19 -2
- package/src/sap/ui/fl/messagebundle_th.properties +17 -0
- package/src/sap/ui/fl/messagebundle_tr.properties +19 -2
- package/src/sap/ui/fl/messagebundle_uk.properties +19 -2
- package/src/sap/ui/fl/messagebundle_vi.properties +19 -2
- package/src/sap/ui/fl/messagebundle_zh_CN.properties +19 -2
- package/src/sap/ui/fl/messagebundle_zh_TW.properties +19 -2
- package/src/sap/ui/fl/support/Flexibility.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetails.controller.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetailsEdit.controller.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/controller/LayerContentMaster.controller.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/controller/Layers.controller.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/lrepConnector/LRepConnector.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/utils/DataUtils.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/utils/ErrorUtils.js +1 -1
- package/src/sap/ui/fl/support/diagnostics/Flexibility.controller.js +1 -1
- package/src/sap/ui/fl/transport/TransportSelection.js +1 -1
- package/src/sap/ui/fl/util/IFrame.js +1 -1
- package/src/sap/ui/fl/util/ManagedObjectModel.js +1 -1
- package/src/sap/ui/fl/util/resolveBinding.js +1 -1
- package/src/sap/ui/fl/variants/VariantModel.js +1 -1
- package/src/sap/ui/fl/write/_internal/Storage.js +1 -1
- package/src/sap/ui/fl/write/_internal/StorageFeaturesMerger.js +1 -1
- package/src/sap/ui/fl/write/_internal/Versions.js +1 -1
- 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 +1 -1
- package/src/sap/ui/fl/write/_internal/condenser/UIReconstruction.js +1 -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 +1 -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/FieldExtensibility.js +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openui5/sap.ui.fl",
|
|
3
|
-
"version": "1.96.
|
|
3
|
+
"version": "1.96.2",
|
|
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.96.
|
|
18
|
-
"@openui5/sap.ui.core": "1.96.
|
|
17
|
+
"@openui5/sap.m": "1.96.2",
|
|
18
|
+
"@openui5/sap.ui.core": "1.96.2"
|
|
19
19
|
}
|
|
20
20
|
}
|
package/src/sap/ui/fl/.library
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
<copyright>OpenUI5
|
|
7
7
|
* (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
|
|
8
8
|
* Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
|
|
9
|
-
<version>1.96.
|
|
9
|
+
<version>1.96.2</version>
|
|
10
10
|
|
|
11
11
|
<documentation>SAPUI5 library with sap.ui.fl controls.</documentation>
|
|
12
12
|
|
package/src/sap/ui/fl/Cache.js
CHANGED
package/src/sap/ui/fl/Utils.js
CHANGED
package/src/sap/ui/fl/Variant.js
CHANGED
|
@@ -50,7 +50,8 @@ sap.ui.define([
|
|
|
50
50
|
function _checkAndAdjustChangeStatusSync(oControl, oChange, mChangesMap, oFlexController, mPropertyBag) {
|
|
51
51
|
var mControl = Utils.getControlIfTemplateAffected(oChange, oControl, mPropertyBag);
|
|
52
52
|
var oModifier = mPropertyBag.modifier;
|
|
53
|
-
var
|
|
53
|
+
var bHasAppliedCustomData = !!FlexCustomData.sync.getAppliedCustomDataValue(mControl.control, oChange);
|
|
54
|
+
var bIsCurrentlyAppliedOnControl = bHasAppliedCustomData || FlexCustomData.sync.hasChangeApplyFinishedCustomData(mControl.control, oChange);
|
|
54
55
|
var bChangeStatusAppliedFinished = oChange.isApplyProcessFinished();
|
|
55
56
|
if (bChangeStatusAppliedFinished && !bIsCurrentlyAppliedOnControl) {
|
|
56
57
|
// if a change was already processed and is not applied anymore, then the control was destroyed and recreated.
|
|
@@ -60,9 +61,11 @@ sap.ui.define([
|
|
|
60
61
|
oChange.setInitialApplyState();
|
|
61
62
|
} else if (!bChangeStatusAppliedFinished && bIsCurrentlyAppliedOnControl) {
|
|
62
63
|
// if a change is already applied on the control, but the status does not reflect that, the status has to be updated
|
|
63
|
-
// and the revert data fetched from the Custom Data
|
|
64
64
|
// scenario: viewCache
|
|
65
|
-
|
|
65
|
+
if (bHasAppliedCustomData) {
|
|
66
|
+
// if the change was applied, set the revert data fetched from the custom data
|
|
67
|
+
oChange.setRevertData(FlexCustomData.sync.getParsedRevertDataFromCustomData(oControl, oChange));
|
|
68
|
+
}
|
|
66
69
|
oChange.markFinished();
|
|
67
70
|
}
|
|
68
71
|
}
|
|
@@ -75,8 +78,20 @@ sap.ui.define([
|
|
|
75
78
|
var bXmlModifier = _isXmlModifier(mPropertyBag);
|
|
76
79
|
var mControl = Utils.getControlIfTemplateAffected(oChange, oControl, mPropertyBag);
|
|
77
80
|
var oModifier = mPropertyBag.modifier;
|
|
78
|
-
return FlexCustomData.
|
|
79
|
-
.then(function
|
|
81
|
+
return FlexCustomData.getAppliedCustomDataValue(mControl.control, oChange, oModifier)
|
|
82
|
+
.then(function(oAppliedCustomData) {
|
|
83
|
+
var bHasAppliedCustomData = !!oAppliedCustomData;
|
|
84
|
+
return Promise.all([
|
|
85
|
+
bHasAppliedCustomData,
|
|
86
|
+
(
|
|
87
|
+
bHasAppliedCustomData
|
|
88
|
+
|| FlexCustomData.hasChangeApplyFinishedCustomData(mControl.control, oChange, oModifier)
|
|
89
|
+
)
|
|
90
|
+
]);
|
|
91
|
+
})
|
|
92
|
+
.then(function(aCustomDataState) {
|
|
93
|
+
var bHasAppliedCustomData = aCustomDataState[0];
|
|
94
|
+
var bIsCurrentlyAppliedOnControl = aCustomDataState[1];
|
|
80
95
|
var bChangeStatusAppliedFinished = oChange.isApplyProcessFinished();
|
|
81
96
|
var oModifier = mPropertyBag.modifier;
|
|
82
97
|
var oAppComponent = mPropertyBag.appComponent;
|
|
@@ -93,13 +108,17 @@ sap.ui.define([
|
|
|
93
108
|
return oPromise.then(oChange.setInitialApplyState.bind(oChange));
|
|
94
109
|
} else if (!bChangeStatusAppliedFinished && bIsCurrentlyAppliedOnControl) {
|
|
95
110
|
// if a change is already applied on the control, but the status does not reflect that, the status has to be updated
|
|
96
|
-
// and the revert data fetched from the Custom Data
|
|
97
111
|
// scenario: viewCache
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
112
|
+
if (bHasAppliedCustomData) {
|
|
113
|
+
// if the change was applied, set the revert data fetched from the custom data
|
|
114
|
+
return FlexCustomData.getParsedRevertDataFromCustomData(oControl, oChange, oModifier)
|
|
115
|
+
.then(function (oParsedRevertDataFromCustomData) {
|
|
116
|
+
oChange.setRevertData(oParsedRevertDataFromCustomData);
|
|
117
|
+
oChange.markFinished();
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
oChange.markFinished();
|
|
121
|
+
return undefined;
|
|
103
122
|
} else if (bChangeStatusAppliedFinished && bIsCurrentlyAppliedOnControl) {
|
|
104
123
|
// both the change instance and the UI Control are already applied, so the change can be directly marked as finished
|
|
105
124
|
oChange.markFinished();
|
|
@@ -139,7 +139,7 @@ sap.ui.define([
|
|
|
139
139
|
* @namespace sap.ui.fl.apply._internal.changes.descriptor.app.AddAnnotationsToOData
|
|
140
140
|
* @experimental
|
|
141
141
|
* @since 1.87
|
|
142
|
-
* @version 1.96.
|
|
142
|
+
* @version 1.96.2
|
|
143
143
|
* @private
|
|
144
144
|
* @ui5-restricted sap.ui.fl.apply._internal
|
|
145
145
|
*/
|
|
@@ -72,7 +72,7 @@ sap.ui.define([
|
|
|
72
72
|
* @namespace sap.ui.fl.apply._internal.flexState.FlexState
|
|
73
73
|
* @experimental
|
|
74
74
|
* @since 1.73
|
|
75
|
-
* @version 1.96.
|
|
75
|
+
* @version 1.96.2
|
|
76
76
|
* @private
|
|
77
77
|
* @ui5-restricted sap.ui.fl.apply._internal
|
|
78
78
|
*/
|
|
@@ -83,6 +83,8 @@ sap.ui.define([
|
|
|
83
83
|
var _mInitPromises = {};
|
|
84
84
|
var _oShellNavigationService;
|
|
85
85
|
var _oURLParsingService;
|
|
86
|
+
var _oChangePersistenceFactory;
|
|
87
|
+
var _oFlexControllerFactory;
|
|
86
88
|
var _mFlexObjectInfo = {
|
|
87
89
|
appDescriptorChanges: {
|
|
88
90
|
prepareFunction: prepareAppDescriptorMap,
|
|
@@ -294,6 +296,22 @@ sap.ui.define([
|
|
|
294
296
|
return undefined;
|
|
295
297
|
}
|
|
296
298
|
|
|
299
|
+
// TODO: get rid of the following module dependencies as far as the change state
|
|
300
|
+
// is migrated from changePersistenceFactory to the FlexState
|
|
301
|
+
function lazyLoadModules() {
|
|
302
|
+
return Promise.all([
|
|
303
|
+
Utils.requireAsync("sap/ui/fl/ChangePersistenceFactory"),
|
|
304
|
+
Utils.requireAsync("sap/ui/fl/FlexControllerFactory")
|
|
305
|
+
])
|
|
306
|
+
.then(function(aModules) {
|
|
307
|
+
_oChangePersistenceFactory = aModules[0];
|
|
308
|
+
_oFlexControllerFactory = aModules[1];
|
|
309
|
+
})
|
|
310
|
+
.catch(function(oError) {
|
|
311
|
+
Log.error("Error loading modules: " + oError.message);
|
|
312
|
+
});
|
|
313
|
+
}
|
|
314
|
+
|
|
297
315
|
/**
|
|
298
316
|
* Initializes the FlexState for a given reference. A request for the flex data is sent to the Loader and the response is saved.
|
|
299
317
|
* The FlexState can only be initialized once, every subsequent init call will just resolve as soon as it is initialized.
|
|
@@ -310,7 +328,10 @@ sap.ui.define([
|
|
|
310
328
|
* @returns {promise<undefined>} Resolves a promise as soon as FlexState is initialized
|
|
311
329
|
*/
|
|
312
330
|
FlexState.initialize = function(mPropertyBag) {
|
|
313
|
-
return
|
|
331
|
+
return Promise.all([
|
|
332
|
+
loadUShellServices(),
|
|
333
|
+
lazyLoadModules()
|
|
334
|
+
])
|
|
314
335
|
.then(function() {
|
|
315
336
|
enhancePropertyBag(mPropertyBag);
|
|
316
337
|
var sFlexReference = mPropertyBag.reference;
|
|
@@ -362,6 +383,14 @@ sap.ui.define([
|
|
|
362
383
|
deRegisterMaxLayerHandler(sReference);
|
|
363
384
|
delete _mInstances[sReference];
|
|
364
385
|
delete _mInitPromises[sReference];
|
|
386
|
+
// TODO: get rid of the following deletes as far as the change state
|
|
387
|
+
// is migrated from changePersistenceFactory to the FlexState
|
|
388
|
+
if (_oChangePersistenceFactory && _oChangePersistenceFactory._instanceCache) {
|
|
389
|
+
delete _oChangePersistenceFactory._instanceCache[sReference];
|
|
390
|
+
}
|
|
391
|
+
if (_oFlexControllerFactory && _oFlexControllerFactory._instanceCache) {
|
|
392
|
+
delete _oFlexControllerFactory._instanceCache[sReference];
|
|
393
|
+
}
|
|
365
394
|
} else {
|
|
366
395
|
Object.keys(_mInstances).forEach(function(sReference) {
|
|
367
396
|
deRegisterMaxLayerHandler(sReference);
|
|
@@ -404,6 +433,7 @@ sap.ui.define([
|
|
|
404
433
|
* The next initialize call will add it again.
|
|
405
434
|
*
|
|
406
435
|
* @param {string} sReference - Flex reference of the app
|
|
436
|
+
* @param {string} sComponentId - ID of the component
|
|
407
437
|
*/
|
|
408
438
|
FlexState.clearFilteredResponse = function(sReference, sComponentId) {
|
|
409
439
|
if (
|
|
@@ -460,6 +490,7 @@ sap.ui.define([
|
|
|
460
490
|
return _mInstances[sReference].unfilteredStorageResponse;
|
|
461
491
|
});
|
|
462
492
|
}
|
|
493
|
+
return undefined;
|
|
463
494
|
};
|
|
464
495
|
// temporary function until the maps are ready
|
|
465
496
|
FlexState.getFlexObjectsFromStorageResponse = function(sReference) {
|
|
@@ -114,7 +114,7 @@ sap.ui.define([
|
|
|
114
114
|
*
|
|
115
115
|
* @namespace sap.ui.fl.apply._internal.flexState.compVariants.CompVariantMerger
|
|
116
116
|
* @since 1.86
|
|
117
|
-
* @version 1.96.
|
|
117
|
+
* @version 1.96.2
|
|
118
118
|
* @private
|
|
119
119
|
* @ui5-restricted sap.ui.fl
|
|
120
120
|
*/
|
|
@@ -179,7 +179,7 @@ sap.ui.define([
|
|
|
179
179
|
*
|
|
180
180
|
* @function
|
|
181
181
|
* @since 1.89
|
|
182
|
-
* @version 1.96.
|
|
182
|
+
* @version 1.96.2
|
|
183
183
|
* @private
|
|
184
184
|
* @ui5-restricted sap.ui.fl
|
|
185
185
|
*
|