@openui5/sap.ui.fl 1.123.1 → 1.124.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/package.json +3 -3
- package/src/sap/ui/fl/.library +1 -1
- package/src/sap/ui/fl/ChangePersistence.js +39 -48
- package/src/sap/ui/fl/ChangePersistenceFactory.js +1 -1
- package/src/sap/ui/fl/FakeLrepConnectorLocalStorage.js +1 -1
- package/src/sap/ui/fl/FakeLrepConnectorSessionStorage.js +1 -1
- package/src/sap/ui/fl/FakeLrepLocalStorage.js +1 -1
- package/src/sap/ui/fl/FlexController.js +3 -34
- package/src/sap/ui/fl/FlexControllerFactory.js +1 -1
- package/src/sap/ui/fl/LayerUtils.js +1 -1
- package/src/sap/ui/fl/Utils.js +1 -1
- package/src/sap/ui/fl/apply/_internal/DelegateMediator.js +113 -270
- package/src/sap/ui/fl/apply/_internal/appVariant/DescriptorChangeTypes.js +2 -1
- package/src/sap/ui/fl/apply/_internal/changes/Applier.js +36 -3
- package/src/sap/ui/fl/apply/_internal/changes/FlexCustomData.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/Utils.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/Preprocessor.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/Registration.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/RegistrationBuild.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddAnnotationsToOData.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddNewInbound.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeDataSource.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/ChangeInbound.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/RemoveAllInboundsExceptOne.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/SetTitle.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetAbstract.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/fiori/SetRegistrationIds.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/AddNewCard.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/ChangeCard.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ovp/DeleteCard.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddComponentUsages.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddLibrary.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModel.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/AddNewModelEnhanceWith.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetFlexExtensionPointEnabled.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/ui5/SetMinUI5Version.js +49 -5
- package/src/sap/ui/fl/apply/_internal/connectors/ObjectStorageUtils.js +1 -1
- package/src/sap/ui/fl/apply/_internal/controlVariants/URLHandler.js +28 -27
- package/src/sap/ui/fl/apply/_internal/extensionPoint/Processor.js +1 -1
- package/src/sap/ui/fl/apply/_internal/extensionPoint/Registry.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/AppDescriptorChange.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/CompVariant.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/ControllerExtensionChange.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/FlVariant.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/FlexObject.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/FlexObjectFactory.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/UIChange.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/Variant.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexObjects/getVariantAuthor.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexState/FlexState.js +81 -44
- 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 +30 -11
- package/src/sap/ui/fl/apply/_internal/flexState/changes/ExtensionPointState.js +67 -70
- package/src/sap/ui/fl/apply/_internal/flexState/changes/UIChangesState.js +14 -6
- package/src/sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger.js +2 -2
- package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/Switcher.js +8 -7
- package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState.js +108 -41
- package/src/sap/ui/fl/apply/_internal/preprocessors/ControllerExtension.js +8 -15
- package/src/sap/ui/fl/apply/_internal/preprocessors/RegistrationDelegator.js +7 -12
- package/src/sap/ui/fl/apply/_internal/preprocessors/XmlPreprocessor.js +15 -19
- package/src/sap/ui/fl/apply/api/ControlVariantApplyAPI.js +1 -1
- package/src/sap/ui/fl/apply/api/DelegateMediatorAPI.js +13 -86
- package/src/sap/ui/fl/apply/api/FlexRuntimeInfoAPI.js +14 -11
- 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 +14 -29
- 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 +2 -2
- package/src/sap/ui/fl/changeHandler/common/createIFrame.js +3 -2
- package/src/sap/ui/fl/descriptorRelated/Utils.js +16 -7
- 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/designtime/util/IFrame.designtime.js +26 -0
- package/src/sap/ui/fl/designtime/util/editIFrame.js +8 -4
- package/src/sap/ui/fl/initial/_internal/FlexConfiguration.js +1 -1
- package/src/sap/ui/fl/initial/_internal/Storage.js +2 -2
- package/src/sap/ui/fl/initial/_internal/StorageFeaturesMerger.js +1 -1
- package/src/sap/ui/fl/initial/_internal/StorageUtils.js +1 -1
- package/src/sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerRegistration.js +1 -1
- package/src/sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerStorage.js +1 -1
- package/src/sap/ui/fl/initial/_internal/connectors/KeyUserConnector.js +1 -1
- package/src/sap/ui/fl/initial/_internal/connectors/Utils.js +1 -1
- package/src/sap/ui/fl/initial/_internal/storageResultDisassemble.js +1 -1
- package/src/sap/ui/fl/interfaces/BaseLoadConnector.js +1 -1
- package/src/sap/ui/fl/interfaces/Delegate.js +1 -1
- package/src/sap/ui/fl/library.js +43 -43
- package/src/sap/ui/fl/messagebundle_sh.properties +9 -9
- package/src/sap/ui/fl/support/_internal/getAllUIChanges.js +1 -1
- package/src/sap/ui/fl/support/_internal/getChangeDependencies.js +1 -1
- package/src/sap/ui/fl/support/_internal/getFlexSettings.js +1 -1
- package/src/sap/ui/fl/support/api/SupportAPI.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetails.controller.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/controller/ContentDetailsEdit.controller.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/controller/LayerContentMaster.controller.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/controller/Layers.controller.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/lrepConnector/LRepConnector.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/utils/DataUtils.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/utils/ErrorUtils.js +1 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/view/ContentDetails.view.xml +0 -1
- package/src/sap/ui/fl/support/apps/contentbrowser/view/ContentDetailsEdit.view.xml +0 -1
- package/src/sap/ui/fl/transport/TransportSelection.js +1 -1
- package/src/sap/ui/fl/util/IFrame.js +51 -64
- package/src/sap/ui/fl/util/IFrameRenderer.js +15 -9
- 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 +5 -5
- package/src/sap/ui/fl/write/_internal/Storage.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 +2 -2
- 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/BtpServiceConnector.js +1 -1
- package/src/sap/ui/fl/write/_internal/connectors/KeyUserConnector.js +1 -1
- package/src/sap/ui/fl/write/_internal/connectors/LrepConnector.js +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/delegates/ODataV2ReadDelegate.js +3 -3
- package/src/sap/ui/fl/write/_internal/extensionPoint/Processor.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPAccess.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPExtensibilityVariant.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/ABAPExtensibilityVariantFactory.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/MultiTenantABAPExtensibilityVariant.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/ServiceValidation.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/SingleTenantABAPExtensibilityVariant.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/UriParser.js +1 -1
- package/src/sap/ui/fl/write/_internal/fieldExtensibility/Utils.js +12 -23
- 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 +68 -95
- package/src/sap/ui/fl/write/_internal/flexState/UI2Personalization/UI2PersonalizationState.js +1 -1
- package/src/sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState.js +2 -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/src/sap/ui/fl/write/api/LocalResetAPI.js +9 -8
- package/src/sap/ui/fl/write/api/PersistenceWriteAPI.js +3 -7
- package/src/sap/ui/fl/write/api/SACIntegrationUpdateVariant.js +78 -0
- package/src/sap/ui/fl/write/api/VersionsAPI.js +4 -1
- package/src/sap/ui/fl/write/api/connectors/ObjectStorageConnector.js +9 -1
- package/src/sap/ui/fl/apply/_internal/DelegateMediatorNew.js +0 -193
- package/src/sap/ui/fl/apply/_internal/flexState/appDescriptorChanges/prepareAppDescriptorMap.js +0 -39
|
@@ -8,10 +8,10 @@ sap.ui.define([
|
|
|
8
8
|
"sap/base/Log",
|
|
9
9
|
"sap/ui/core/util/reflection/JsControlTreeModifier",
|
|
10
10
|
"sap/ui/fl/apply/_internal/controlVariants/Utils",
|
|
11
|
+
"sap/ui/fl/apply/_internal/flexState/FlexState",
|
|
11
12
|
"sap/ui/fl/apply/_internal/flexState/ManifestUtils",
|
|
12
13
|
"sap/ui/fl/initial/_internal/FlexConfiguration",
|
|
13
14
|
"sap/ui/fl/initial/_internal/FlexInfoSession",
|
|
14
|
-
"sap/ui/fl/ChangePersistenceFactory",
|
|
15
15
|
"sap/ui/fl/FlexControllerFactory",
|
|
16
16
|
"sap/ui/fl/Layer",
|
|
17
17
|
"sap/ui/fl/Utils",
|
|
@@ -20,10 +20,10 @@ sap.ui.define([
|
|
|
20
20
|
Log,
|
|
21
21
|
JsControlTreeModifier,
|
|
22
22
|
VariantUtils,
|
|
23
|
+
FlexState,
|
|
23
24
|
ManifestUtils,
|
|
24
25
|
FlexConfiguration,
|
|
25
26
|
FlexInfoSession,
|
|
26
|
-
ChangePersistenceFactory,
|
|
27
27
|
FlexControllerFactory,
|
|
28
28
|
Layer,
|
|
29
29
|
Utils,
|
|
@@ -58,6 +58,10 @@ sap.ui.define([
|
|
|
58
58
|
return Promise.reject(sMessage);
|
|
59
59
|
}
|
|
60
60
|
|
|
61
|
+
function filterByLayer(oChange) {
|
|
62
|
+
return oChange.getLayer() === Layer.USER;
|
|
63
|
+
}
|
|
64
|
+
|
|
61
65
|
function filterByValidFileType(oChange) {
|
|
62
66
|
return oChange.getFileType() === "change";
|
|
63
67
|
}
|
|
@@ -86,15 +90,14 @@ sap.ui.define([
|
|
|
86
90
|
return logAndReject("App Component could not be determined");
|
|
87
91
|
}
|
|
88
92
|
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
.
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
}.bind(this));
|
|
93
|
+
const sFlexReference = ManifestUtils.getFlexReferenceForControl(oAppComponent);
|
|
94
|
+
const aFlexObjects = FlexState.getFlexObjectsDataSelector().get({reference: sFlexReference})
|
|
95
|
+
.filter(filterByValidFileType)
|
|
96
|
+
.filter(filterByLayer)
|
|
97
|
+
.filter(filterBySelectors.bind(this, oAppComponent, mPropertyBag.selectors))
|
|
98
|
+
.filter(filterByChangeType.bind(this, mPropertyBag.changeTypes));
|
|
99
|
+
|
|
100
|
+
return Promise.resolve(aFlexObjects.length > 0);
|
|
98
101
|
},
|
|
99
102
|
|
|
100
103
|
/**
|
|
@@ -23,24 +23,13 @@ sap.ui.define([
|
|
|
23
23
|
return typeof fn === "function";
|
|
24
24
|
}
|
|
25
25
|
|
|
26
|
-
function getModelType(mChangeContent) {
|
|
27
|
-
if (mChangeContent.modelType) {
|
|
28
|
-
return mChangeContent.modelType;
|
|
29
|
-
} else if (mChangeContent.oDataServiceVersion) {
|
|
30
|
-
// fallback for changes created with old addODataProperty action
|
|
31
|
-
// that was replaced by default OData V2 delegate
|
|
32
|
-
return "sap.ui.model.odata.v2.ODataModel";
|
|
33
|
-
}
|
|
34
|
-
return undefined;
|
|
35
|
-
}
|
|
36
|
-
|
|
37
26
|
/**
|
|
38
27
|
* Base Change Handler for AddViaDelegate
|
|
39
28
|
*
|
|
40
29
|
* @constructor
|
|
41
30
|
* @alias sap.ui.fl.changeHandler.BaseAddViaDelegate
|
|
42
31
|
* @author SAP SE
|
|
43
|
-
* @version 1.
|
|
32
|
+
* @version 1.124.0
|
|
44
33
|
* @private
|
|
45
34
|
*/
|
|
46
35
|
const BaseAddViaDelegate = {
|
|
@@ -56,7 +45,6 @@ sap.ui.define([
|
|
|
56
45
|
* @param {string} mAddViaDelegateSettings.fieldSuffix - Aggregation name to be passed to the delegate
|
|
57
46
|
* @param {boolean|function} [mAddViaDelegateSettings.skipCreateLabel] - Skip delegate method, is a function is passed it has to return a boolean
|
|
58
47
|
* @param {boolean|function} [mAddViaDelegateSettings.skipCreateLayout] - Skip delegate method, is a function is passed it has to return a boolean
|
|
59
|
-
* @param {boolean} [mAddViaDelegateSettings.supportsDefault] - Are default delegates supported?
|
|
60
48
|
* @return {any} The addViaDelegate change handler object
|
|
61
49
|
* @public
|
|
62
50
|
*/
|
|
@@ -88,14 +76,11 @@ sap.ui.define([
|
|
|
88
76
|
// or the handler opts out
|
|
89
77
|
|
|
90
78
|
const oControl = mPropertyBag.modifier.bySelector(mChange.getSelector(), mPropertyBag.appComponent);
|
|
91
|
-
const sModelType = getModelType(mChange.getContent());
|
|
92
79
|
|
|
93
80
|
const DelegateMediatorAPI = await requireAsync("sap/ui/fl/apply/api/DelegateMediatorAPI");
|
|
94
|
-
const oDelegate = await DelegateMediatorAPI.
|
|
81
|
+
const oDelegate = await DelegateMediatorAPI.getWriteDelegateForControl({
|
|
95
82
|
control: oControl,
|
|
96
|
-
modifier: mPropertyBag.modifier
|
|
97
|
-
modelType: sModelType,
|
|
98
|
-
supportsDefault: mAddViaDelegateSettings.supportsDefault
|
|
83
|
+
modifier: mPropertyBag.modifier
|
|
99
84
|
});
|
|
100
85
|
const bCondensingSupported = !isFunction(oDelegate.instance.createLayout);
|
|
101
86
|
return bCondensingSupported || skipCreateLayout(mChange.getSupportInformation().oDataInformation);
|
|
@@ -119,6 +104,9 @@ sap.ui.define([
|
|
|
119
104
|
}
|
|
120
105
|
|
|
121
106
|
async function getControlsFromDelegate(oChangeContent, mDelegate, mPropertyBag, oChangeODataInformation) {
|
|
107
|
+
if (!mDelegate) {
|
|
108
|
+
return undefined;
|
|
109
|
+
}
|
|
122
110
|
const mDelegatePropertyBag = merge({
|
|
123
111
|
aggregationName: mAddViaDelegateSettings.aggregationName,
|
|
124
112
|
payload: mDelegate.payload || {},
|
|
@@ -180,15 +168,17 @@ sap.ui.define([
|
|
|
180
168
|
// so that the addProperty-hook can access it and enhance it
|
|
181
169
|
oChange.setRevertData(oRevertData);
|
|
182
170
|
|
|
183
|
-
const sModelType = getModelType(oChangeContent);
|
|
184
|
-
|
|
185
171
|
const DelegateMediatorAPI = await requireAsync("sap/ui/fl/apply/api/DelegateMediatorAPI");
|
|
186
|
-
const mDelegate = await DelegateMediatorAPI.
|
|
172
|
+
const mDelegate = await DelegateMediatorAPI.getWriteDelegateForControl({
|
|
187
173
|
control: oControl,
|
|
188
|
-
modifier: mPropertyBag.modifier
|
|
189
|
-
modelType: sModelType,
|
|
190
|
-
supportsDefault: mAddViaDelegateSettings.supportsDefault
|
|
174
|
+
modifier: mPropertyBag.modifier
|
|
191
175
|
});
|
|
176
|
+
if (!mDelegate) {
|
|
177
|
+
Base.markAsNotApplicable(
|
|
178
|
+
`No delegate found for control ${mPropertyBag.modifier.getId(oControl)}`,
|
|
179
|
+
/* bAsync */false
|
|
180
|
+
);
|
|
181
|
+
}
|
|
192
182
|
const mInnerControls = await getControlsFromDelegate(
|
|
193
183
|
oChangeContent,
|
|
194
184
|
mDelegate,
|
|
@@ -274,7 +264,6 @@ sap.ui.define([
|
|
|
274
264
|
* @param {string} mSpecificChangeInfo.parentId FormContainer where the new control will be added
|
|
275
265
|
* @param {number} mSpecificChangeInfo.index The index where the field will be added
|
|
276
266
|
* @param {string} [mSpecificChangeInfo.oDataServiceVersion] The OData service version
|
|
277
|
-
* @param {string} [mSpecificChangeInfo.modelType] Then UI5 model type name, only pass it if default delegate should be taken
|
|
278
267
|
* @param {Object} mPropertyBag The property bag containing the App Component
|
|
279
268
|
* @param {object} mPropertyBag.modifier Modifier for the controls
|
|
280
269
|
* @param {object} mPropertyBag.appComponent Application component
|
|
@@ -319,10 +308,6 @@ sap.ui.define([
|
|
|
319
308
|
// used to connect to change handler mediator
|
|
320
309
|
oContent.oDataServiceVersion = mSpecificChangeInfo.oDataServiceVersion;
|
|
321
310
|
}
|
|
322
|
-
if (mSpecificChangeInfo.modelType && mAddViaDelegateSettings.supportsDefault) {
|
|
323
|
-
// used to connect to default delegate
|
|
324
|
-
oContent.modelType = mSpecificChangeInfo.modelType;
|
|
325
|
-
}
|
|
326
311
|
oChange.setContent(oContent);
|
|
327
312
|
},
|
|
328
313
|
|
|
@@ -18,13 +18,13 @@ sap.ui.define([
|
|
|
18
18
|
*
|
|
19
19
|
* @alias sap.ui.fl.changeHandler.UpdateIFrame
|
|
20
20
|
* @author SAP SE
|
|
21
|
-
* @version 1.
|
|
21
|
+
* @version 1.124.0
|
|
22
22
|
* @since 1.72
|
|
23
23
|
* @private
|
|
24
24
|
*/
|
|
25
25
|
var UpdateIFrame = {};
|
|
26
26
|
|
|
27
|
-
|
|
27
|
+
const aUpdatableProperties = ["width", "height", "url", "_settings", "advancedSettings"];
|
|
28
28
|
|
|
29
29
|
/**
|
|
30
30
|
* Extract an IFrame control settings.
|
|
@@ -35,8 +35,9 @@ sap.ui.define([
|
|
|
35
35
|
mIFrameSettings[sIFrameProperty] = vValue;
|
|
36
36
|
mIFrameSettings._settings[sIFrameProperty] = vValue;
|
|
37
37
|
});
|
|
38
|
-
|
|
39
|
-
mIFrameSettings.
|
|
38
|
+
|
|
39
|
+
mIFrameSettings.advancedSettings = oChangeContent?.advancedSettings;
|
|
40
|
+
mIFrameSettings._settings.advancedSettings = oChangeContent?.advancedSettings;
|
|
40
41
|
|
|
41
42
|
if (mRenameInfo) {
|
|
42
43
|
mIFrameSettings.renameInfo = mRenameInfo;
|
|
@@ -44,14 +44,23 @@ sap.ui.define([
|
|
|
44
44
|
}
|
|
45
45
|
};
|
|
46
46
|
|
|
47
|
-
Utils.prototype.checkParameterAndType = function(mParameters, sParameterName,
|
|
48
|
-
if (
|
|
49
|
-
|
|
50
|
-
|
|
47
|
+
Utils.prototype.checkParameterAndType = function(mParameters, sParameterName, aTypes) {
|
|
48
|
+
if (typeof aTypes === "string") {
|
|
49
|
+
aTypes = [aTypes];
|
|
50
|
+
}
|
|
51
|
+
var bTypeValid;
|
|
52
|
+
aTypes.forEach(function(sType) {
|
|
53
|
+
if (sType === "array") {
|
|
54
|
+
if (mParameters !== undefined && mParameters[sParameterName] !== undefined && Array.isArray(mParameters[sParameterName])) {
|
|
55
|
+
bTypeValid = true;
|
|
56
|
+
}
|
|
57
|
+
// eslint-disable-next-line valid-typeof
|
|
58
|
+
} else if (mParameters !== undefined && mParameters[sParameterName] !== undefined && typeof mParameters[sParameterName] === sType) {
|
|
59
|
+
bTypeValid = true;
|
|
51
60
|
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
throw new Error(`No parameter "${sParameterName}" of type ${
|
|
61
|
+
});
|
|
62
|
+
if (!bTypeValid) {
|
|
63
|
+
throw new Error(`No parameter "${sParameterName}" of type ${aTypes} provided`);
|
|
55
64
|
}
|
|
56
65
|
};
|
|
57
66
|
|
|
@@ -19,7 +19,7 @@ sap.ui.define([
|
|
|
19
19
|
* @namespace
|
|
20
20
|
* @name sap.ui.fl.descriptorRelated
|
|
21
21
|
* @author SAP SE
|
|
22
|
-
* @version 1.
|
|
22
|
+
* @version 1.124.0
|
|
23
23
|
* @private
|
|
24
24
|
* @ui5-restricted sap.ui.rta, smart business
|
|
25
25
|
*/
|
|
@@ -29,7 +29,7 @@ sap.ui.define([
|
|
|
29
29
|
* @namespace
|
|
30
30
|
* @name sap.ui.fl.descriptorRelated.api
|
|
31
31
|
* @author SAP SE
|
|
32
|
-
* @version 1.
|
|
32
|
+
* @version 1.124.0
|
|
33
33
|
* @private
|
|
34
34
|
* @ui5-restricted sap.ui.rta, smart business
|
|
35
35
|
*/
|
|
@@ -43,7 +43,7 @@ sap.ui.define([
|
|
|
43
43
|
* @constructor
|
|
44
44
|
* @alias sap.ui.fl.descriptorRelated.api.DescriptorChange
|
|
45
45
|
* @author SAP SE
|
|
46
|
-
* @version 1.
|
|
46
|
+
* @version 1.124.0
|
|
47
47
|
* @private
|
|
48
48
|
* @ui5-restricted sap.ui.rta, smart business
|
|
49
49
|
*/
|
|
@@ -124,7 +124,7 @@ sap.ui.define([
|
|
|
124
124
|
* @constructor
|
|
125
125
|
* @alias sap.ui.fl.descriptorRelated.api.DescriptorChangeFactory
|
|
126
126
|
* @author SAP SE
|
|
127
|
-
* @version 1.
|
|
127
|
+
* @version 1.124.0
|
|
128
128
|
* @private
|
|
129
129
|
* @ui5-restricted sap.ui.rta, smart business
|
|
130
130
|
*/
|
|
@@ -38,7 +38,7 @@ sap.ui.define([
|
|
|
38
38
|
* @namespace
|
|
39
39
|
* @alias sap.ui.fl.descriptorRelated.api.DescriptorInlineChangeFactory
|
|
40
40
|
* @author SAP SE
|
|
41
|
-
* @version 1.
|
|
41
|
+
* @version 1.124.0
|
|
42
42
|
* @private
|
|
43
43
|
* @deprecated Since version 1.76
|
|
44
44
|
* @ui5-restricted sap.ui.rta, smart business
|
|
@@ -16,7 +16,7 @@ sap.ui.define([
|
|
|
16
16
|
* @namespace
|
|
17
17
|
* @alias sap.ui.fl.descriptorRelated.api.DescriptorVariantFactory
|
|
18
18
|
* @author SAP SE
|
|
19
|
-
* @version 1.
|
|
19
|
+
* @version 1.124.0
|
|
20
20
|
* @private
|
|
21
21
|
* @deprecated Since version 1.73
|
|
22
22
|
* @ui5-restricted sap.ui.rta, smart business
|
|
@@ -27,6 +27,32 @@ sap.ui.define([
|
|
|
27
27
|
reveal: {
|
|
28
28
|
changeType: "unhideControl"
|
|
29
29
|
}
|
|
30
|
+
},
|
|
31
|
+
properties: {
|
|
32
|
+
url: {
|
|
33
|
+
ignore: true
|
|
34
|
+
},
|
|
35
|
+
width: {
|
|
36
|
+
ignore: true
|
|
37
|
+
},
|
|
38
|
+
height: {
|
|
39
|
+
ignore: true
|
|
40
|
+
},
|
|
41
|
+
title: {
|
|
42
|
+
ignore: true
|
|
43
|
+
},
|
|
44
|
+
asContainer: {
|
|
45
|
+
ignore: true
|
|
46
|
+
},
|
|
47
|
+
renameInfo: {
|
|
48
|
+
ignore: true
|
|
49
|
+
},
|
|
50
|
+
advancedSettings: {
|
|
51
|
+
ignore: true
|
|
52
|
+
},
|
|
53
|
+
_settings: {
|
|
54
|
+
ignore: true
|
|
55
|
+
}
|
|
30
56
|
}
|
|
31
57
|
};
|
|
32
58
|
});
|
|
@@ -5,9 +5,13 @@
|
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
sap.ui.define([
|
|
8
|
+
"sap/base/util/restricted/_isEqual",
|
|
9
|
+
"sap/base/util/deepClone",
|
|
8
10
|
"sap/ui/core/Element",
|
|
9
11
|
"sap/ui/rta/plugin/iframe/AddIFrameDialog"
|
|
10
12
|
], function(
|
|
13
|
+
_isEqual,
|
|
14
|
+
deepClone,
|
|
11
15
|
Element,
|
|
12
16
|
AddIFrameDialog
|
|
13
17
|
) {
|
|
@@ -33,7 +37,7 @@ sap.ui.define([
|
|
|
33
37
|
frameHeight: oInitialSettings.height,
|
|
34
38
|
title: oInitialSettings.title,
|
|
35
39
|
asContainer: !!oInitialSettings.title,
|
|
36
|
-
|
|
40
|
+
advancedSettings: deepClone(oInitialSettings.advancedSettings),
|
|
37
41
|
updateMode: true
|
|
38
42
|
};
|
|
39
43
|
const mSettings = await oAddIFrameDialog.open(mDialogSettings, oIFrame);
|
|
@@ -46,7 +50,7 @@ sap.ui.define([
|
|
|
46
50
|
url: oInitialSettings.url,
|
|
47
51
|
height: oInitialSettings.height,
|
|
48
52
|
width: oInitialSettings.width,
|
|
49
|
-
|
|
53
|
+
advancedSettings: oInitialSettings.advancedSettings
|
|
50
54
|
};
|
|
51
55
|
|
|
52
56
|
if (mSettings.frameHeight + mSettings.frameHeightUnit !== oInitialSettings.height) {
|
|
@@ -61,9 +65,9 @@ sap.ui.define([
|
|
|
61
65
|
bContentChanged = true;
|
|
62
66
|
oNewContent.url = mSettings.frameUrl;
|
|
63
67
|
}
|
|
64
|
-
if (mSettings.
|
|
68
|
+
if (!_isEqual(mSettings.advancedSettings, oInitialSettings.advancedSettings)) {
|
|
65
69
|
bContentChanged = true;
|
|
66
|
-
oNewContent.
|
|
70
|
+
oNewContent.advancedSettings = mSettings.advancedSettings;
|
|
67
71
|
}
|
|
68
72
|
|
|
69
73
|
if (bContentChanged) {
|
|
@@ -28,7 +28,7 @@ sap.ui.define([
|
|
|
28
28
|
*
|
|
29
29
|
* @namespace sap.ui.fl.initial._internal.Storage
|
|
30
30
|
* @since 1.67
|
|
31
|
-
* @version 1.
|
|
31
|
+
* @version 1.124.0
|
|
32
32
|
* @private
|
|
33
33
|
* @ui5-restricted sap.ui.fl
|
|
34
34
|
*/
|
|
@@ -49,7 +49,7 @@ sap.ui.define([
|
|
|
49
49
|
)
|
|
50
50
|
) {
|
|
51
51
|
delete oConnectorSpecificPropertyBag.version;
|
|
52
|
-
} else {
|
|
52
|
+
} else if (oFlexInfoSession.reloadFlexData) {
|
|
53
53
|
// a sign that we are in the RTA mode and allContexts query parameter should be set for flex/data request
|
|
54
54
|
if (oFlexInfoSession.initialAllContexts) {
|
|
55
55
|
oConnectorSpecificPropertyBag.allContexts = true;
|
|
@@ -25,7 +25,7 @@ sap.ui.define([
|
|
|
25
25
|
*
|
|
26
26
|
* @namespace sap.ui.fl.initial._internal.StorageUtils
|
|
27
27
|
* @since 1.74
|
|
28
|
-
* @version 1.
|
|
28
|
+
* @version 1.124.0
|
|
29
29
|
* @private
|
|
30
30
|
* @ui5-restricted sap.ui.fl.initial._internal.Storage, sap.ui.fl.write._internal.Storage,
|
|
31
31
|
* sap.ui.fl.initial._internal.connectors.ObjectStorageConnector, sap.ui.fl.initial._internal.connectors.ObjectPathConnector
|
|
@@ -48,7 +48,7 @@ sap.ui.define([
|
|
|
48
48
|
oResult.contents.map(function(oContent, iIndex, oResult) {
|
|
49
49
|
oResult[iIndex].changes = (oContent.changes || []).concat(oContent.compVariants);
|
|
50
50
|
});
|
|
51
|
-
oResult.contents.cacheKey = oResult.cacheKey;
|
|
51
|
+
oResult.contents[0].cacheKey = oResult.cacheKey;
|
|
52
52
|
return oResult.contents;
|
|
53
53
|
});
|
|
54
54
|
}
|
|
@@ -59,7 +59,7 @@ sap.ui.define([
|
|
|
59
59
|
*
|
|
60
60
|
* @namespace sap.ui.fl.initial._internal.connectors.Utils
|
|
61
61
|
* @since 1.70
|
|
62
|
-
* @version 1.
|
|
62
|
+
* @version 1.124.0
|
|
63
63
|
* @private
|
|
64
64
|
* @ui5-restricted sap.ui.fl.initial._internal.connectors, sap.ui.fl.write._internal.connectors, sap.ui.fl.write._internal.transport
|
|
65
65
|
*/
|
|
@@ -51,7 +51,7 @@ function(
|
|
|
51
51
|
* @name sap.ui.fl.initial._internal.storageResultDisassemble
|
|
52
52
|
* @function
|
|
53
53
|
* @since 1.70
|
|
54
|
-
* @version 1.
|
|
54
|
+
* @version 1.124.0
|
|
55
55
|
* @private
|
|
56
56
|
* @ui5-restricted sap.ui.fl.initial._internal.Storage
|
|
57
57
|
* Disassembles a response with a variant section into one or more plain responses.
|