@openui5/sap.ui.fl 1.101.0 → 1.102.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/THIRDPARTY.txt +1 -1
- package/package.json +3 -3
- package/src/sap/ui/fl/.library +1 -1
- package/src/sap/ui/fl/Cache.js +1 -1
- package/src/sap/ui/fl/ChangePersistence.js +6 -3
- 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 +4 -6
- package/src/sap/ui/fl/FlexControllerFactory.js +1 -1
- package/src/sap/ui/fl/LayerUtils.js +1 -1
- package/src/sap/ui/fl/Scenario.js +27 -0
- package/src/sap/ui/fl/Utils.js +8 -6
- package/src/sap/ui/fl/Variant.js +1 -1
- package/src/sap/ui/fl/apply/_internal/DelegateMediator.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/FlexCustomData.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/Utils.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/Preprocessor.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/Registration.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/RegistrationBuild.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/AddAnnotationsToOData.js +1 -1
- package/src/sap/ui/fl/apply/_internal/changes/descriptor/app/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/controlVariants/Utils.js +9 -5
- package/src/sap/ui/fl/apply/_internal/extensionPoint/Processor.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/flexState/FlexState.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexState/Loader.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexState/ManifestUtils.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexState/UI2Personalization/UI2PersonalizationState.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexState/changes/DependencyHandler.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexState/changes/ExtensionPointState.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexState/compVariants/CompVariantMerger.js +2 -2
- package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/Switcher.js +1 -1
- package/src/sap/ui/fl/apply/_internal/flexState/controlVariants/VariantManagementState.js +1 -1
- package/src/sap/ui/fl/apply/_internal/preprocessors/ControllerExtension.js +1 -1
- package/src/sap/ui/fl/apply/_internal/preprocessors/EventHistory.js +1 -1
- package/src/sap/ui/fl/apply/_internal/preprocessors/RegistrationDelegator.js +1 -1
- package/src/sap/ui/fl/apply/_internal/preprocessors/XmlPreprocessor.js +1 -1
- package/src/sap/ui/fl/apply/api/ControlVariantApplyAPI.js +1 -1
- package/src/sap/ui/fl/changeHandler/AddIFrame.js +1 -1
- package/src/sap/ui/fl/changeHandler/AddXML.js +1 -1
- package/src/sap/ui/fl/changeHandler/AddXMLAtExtensionPoint.js +1 -1
- package/src/sap/ui/fl/changeHandler/Base.js +1 -1
- package/src/sap/ui/fl/changeHandler/BaseAddViaDelegate.js +4 -2
- package/src/sap/ui/fl/changeHandler/BaseAddXml.js +1 -1
- package/src/sap/ui/fl/changeHandler/BaseRename.js +6 -4
- package/src/sap/ui/fl/changeHandler/HideControl.js +4 -2
- package/src/sap/ui/fl/changeHandler/MoveControls.js +4 -2
- package/src/sap/ui/fl/changeHandler/MoveElements.js +1 -1
- package/src/sap/ui/fl/changeHandler/PropertyBindingChange.js +6 -4
- package/src/sap/ui/fl/changeHandler/PropertyChange.js +4 -2
- package/src/sap/ui/fl/changeHandler/StashControl.js +17 -4
- package/src/sap/ui/fl/changeHandler/UnhideControl.js +6 -4
- package/src/sap/ui/fl/changeHandler/UnstashControl.js +7 -3
- package/src/sap/ui/fl/changeHandler/UpdateIFrame.js +1 -1
- package/src/sap/ui/fl/changeHandler/condenser/Classification.js +43 -0
- 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 +8 -6
- 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 +7 -2
- 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 +18 -62
- package/src/sap/ui/fl/library.support.js +1 -1
- package/src/sap/ui/fl/support/Flexibility.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/diagnostics/Flexibility.controller.js +1 -1
- package/src/sap/ui/fl/themes/base/VariantManagement.less +23 -20
- 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/VariantManagement.js +2 -1
- package/src/sap/ui/fl/variants/VariantModel.js +1 -1
- package/src/sap/ui/fl/write/_internal/Storage.js +7 -1
- package/src/sap/ui/fl/write/_internal/StorageFeaturesMerger.js +1 -1
- package/src/sap/ui/fl/write/_internal/Versions.js +89 -40
- 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 +13 -11
- package/src/sap/ui/fl/write/_internal/condenser/UIReconstruction.js +5 -3
- package/src/sap/ui/fl/write/_internal/connectors/BackendConnector.js +1 -1
- package/src/sap/ui/fl/write/_internal/connectors/KeyUserConnector.js +2 -2
- package/src/sap/ui/fl/write/_internal/connectors/LrepConnector.js +78 -12
- 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 +27 -6
- package/src/sap/ui/fl/write/_internal/flexState/compVariants/CompVariantState.js +98 -41
- package/src/sap/ui/fl/write/_internal/transport/TransportDialog.js +13 -2
- package/src/sap/ui/fl/write/_internal/transport/TransportSelection.js +7 -4
- package/src/sap/ui/fl/write/_internal/transport/Transports.js +1 -1
- package/src/sap/ui/fl/write/api/FeaturesAPI.js +2 -2
- package/src/sap/ui/fl/write/api/FieldExtensibility.js +1 -1
- package/src/sap/ui/fl/write/api/ReloadInfoAPI.js +18 -11
- package/src/sap/ui/fl/write/api/TranslationAPI.js +54 -17
- package/src/sap/ui/fl/write/api/Version.js +22 -0
- package/src/sap/ui/fl/write/api/VersionsAPI.js +92 -74
package/THIRDPARTY.txt
CHANGED
|
@@ -450,7 +450,7 @@ License: Apache-2.0
|
|
|
450
450
|
License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
|
|
451
451
|
Contained in: lib/jsdoc/ui5/plugin.js
|
|
452
452
|
|
|
453
|
-
Component: SAP Theming Base Content, version: 11.1.
|
|
453
|
+
Component: SAP Theming Base Content, version: 11.1.39
|
|
454
454
|
Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
|
|
455
455
|
License: Apache-2.0
|
|
456
456
|
License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openui5/sap.ui.fl",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.102.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.
|
|
18
|
-
"@openui5/sap.ui.core": "1.
|
|
17
|
+
"@openui5/sap.m": "1.102.2",
|
|
18
|
+
"@openui5/sap.ui.core": "1.102.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-2022 SAP SE or an SAP affiliate company.
|
|
8
8
|
* Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
|
|
9
|
-
<version>1.
|
|
9
|
+
<version>1.102.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
|
@@ -21,6 +21,7 @@ sap.ui.define([
|
|
|
21
21
|
"sap/ui/fl/registry/Settings",
|
|
22
22
|
"sap/ui/fl/write/_internal/condenser/Condenser",
|
|
23
23
|
"sap/ui/fl/write/_internal/Storage",
|
|
24
|
+
"sap/ui/fl/write/api/Version",
|
|
24
25
|
"sap/ui/fl/Cache",
|
|
25
26
|
"sap/ui/fl/Change",
|
|
26
27
|
"sap/ui/fl/LayerUtils",
|
|
@@ -46,6 +47,7 @@ sap.ui.define([
|
|
|
46
47
|
Settings,
|
|
47
48
|
Condenser,
|
|
48
49
|
Storage,
|
|
50
|
+
Version,
|
|
49
51
|
Cache,
|
|
50
52
|
Change,
|
|
51
53
|
LayerUtils,
|
|
@@ -62,7 +64,7 @@ sap.ui.define([
|
|
|
62
64
|
*
|
|
63
65
|
* @constructor
|
|
64
66
|
* @author SAP SE
|
|
65
|
-
* @version 1.
|
|
67
|
+
* @version 1.102.2
|
|
66
68
|
* @experimental Since 1.25.0
|
|
67
69
|
* @param {object} mComponent - Component data to initiate <code>ChangePersistence</code> instance
|
|
68
70
|
* @param {string} mComponent.name - Name of the component this instance is responsible for
|
|
@@ -714,7 +716,7 @@ sap.ui.define([
|
|
|
714
716
|
switch (oDirtyChange.getState()) {
|
|
715
717
|
case Change.states.NEW:
|
|
716
718
|
if (sParentVersion !== undefined) {
|
|
717
|
-
sParentVersion = oDirtyChange === oFirstChange ? sParentVersion :
|
|
719
|
+
sParentVersion = oDirtyChange === oFirstChange ? sParentVersion : Version.Number.Draft;
|
|
718
720
|
}
|
|
719
721
|
return Storage.write({
|
|
720
722
|
layer: oDirtyChange.getLayer(),
|
|
@@ -726,7 +728,8 @@ sap.ui.define([
|
|
|
726
728
|
return Storage.remove({
|
|
727
729
|
flexObject: oDirtyChange.getDefinition(),
|
|
728
730
|
layer: oDirtyChange.getLayer(),
|
|
729
|
-
transport: oDirtyChange.getRequest()
|
|
731
|
+
transport: oDirtyChange.getRequest(),
|
|
732
|
+
parentVersion: sParentVersion
|
|
730
733
|
});
|
|
731
734
|
default:
|
|
732
735
|
}
|
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
|
|
7
7
|
sap.ui.define([
|
|
8
8
|
"sap/ui/fl/initial/_internal/changeHandlers/ChangeHandlerStorage",
|
|
9
|
+
"sap/ui/fl/write/api/Version",
|
|
9
10
|
"sap/ui/fl/Utils",
|
|
10
11
|
"sap/ui/fl/Layer",
|
|
11
12
|
"sap/ui/fl/Change",
|
|
@@ -20,6 +21,7 @@ sap.ui.define([
|
|
|
20
21
|
"sap/base/Log"
|
|
21
22
|
], function(
|
|
22
23
|
ChangeHandlerStorage,
|
|
24
|
+
Version,
|
|
23
25
|
Utils,
|
|
24
26
|
Layer,
|
|
25
27
|
Change,
|
|
@@ -84,7 +86,7 @@ sap.ui.define([
|
|
|
84
86
|
* @alias sap.ui.fl.FlexController
|
|
85
87
|
* @experimental Since 1.27.0
|
|
86
88
|
* @author SAP SE
|
|
87
|
-
* @version 1.
|
|
89
|
+
* @version 1.102.2
|
|
88
90
|
*/
|
|
89
91
|
var FlexController = function(sComponentName) {
|
|
90
92
|
this._oChangePersistence = undefined;
|
|
@@ -473,11 +475,7 @@ sap.ui.define([
|
|
|
473
475
|
layer: Layer.CUSTOMER // only the customer layer has draft active
|
|
474
476
|
});
|
|
475
477
|
sParentVersion = oVersionModel.getProperty("/persistedVersion");
|
|
476
|
-
|
|
477
|
-
if (aVersions && aVersions.length > 0) {
|
|
478
|
-
var oLatestVersion = aVersions[0];
|
|
479
|
-
aDraftFilenames = oLatestVersion.version === sap.ui.fl.Versions.Draft ? oLatestVersion.filenames : undefined;
|
|
480
|
-
}
|
|
478
|
+
aDraftFilenames = oVersionModel.getProperty("/draftFilenames");
|
|
481
479
|
}
|
|
482
480
|
return this._removeOtherLayerChanges(oAppComponent, sLayer, bRemoveOtherLayerChanges)
|
|
483
481
|
.then(this._oChangePersistence.saveDirtyChanges.bind(this._oChangePersistence, oAppComponent, bSkipUpdateCache, undefined, sParentVersion, aDraftFilenames))
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/*!
|
|
2
|
+
* OpenUI5
|
|
3
|
+
* (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
|
|
4
|
+
* Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
|
|
5
|
+
*/
|
|
6
|
+
|
|
7
|
+
sap.ui.define([], function() {
|
|
8
|
+
"use strict";
|
|
9
|
+
|
|
10
|
+
// TODO: move to an api-folder for external consumption
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* Available scenarios
|
|
14
|
+
*
|
|
15
|
+
* @private
|
|
16
|
+
* @ui5-restricted sap.ui.fl
|
|
17
|
+
*
|
|
18
|
+
* @enum {string}
|
|
19
|
+
*/
|
|
20
|
+
return {
|
|
21
|
+
AppVariant: "APP_VARIANT",
|
|
22
|
+
VersionedAppVariant: "VERSIONED_APP_VARIANT",
|
|
23
|
+
AdaptationProject: "ADAPTATION_PROJECT",
|
|
24
|
+
FioriElementsFromScratch: "FE_FROM_SCRATCH",
|
|
25
|
+
UiAdaptation: "UI_ADAPTATION"
|
|
26
|
+
};
|
|
27
|
+
});
|
package/src/sap/ui/fl/Utils.js
CHANGED
|
@@ -14,6 +14,7 @@ sap.ui.define([
|
|
|
14
14
|
"sap/ui/base/ManagedObject",
|
|
15
15
|
"sap/ui/core/util/reflection/BaseTreeModifier",
|
|
16
16
|
"sap/ui/core/Component",
|
|
17
|
+
"sap/ui/fl/Scenario",
|
|
17
18
|
"sap/ui/thirdparty/hasher",
|
|
18
19
|
"sap/ui/thirdparty/jquery"
|
|
19
20
|
], function(
|
|
@@ -26,6 +27,7 @@ sap.ui.define([
|
|
|
26
27
|
ManagedObject,
|
|
27
28
|
BaseTreeModifier,
|
|
28
29
|
Component,
|
|
30
|
+
Scenario,
|
|
29
31
|
hasher,
|
|
30
32
|
jQuery
|
|
31
33
|
) {
|
|
@@ -37,7 +39,7 @@ sap.ui.define([
|
|
|
37
39
|
* @namespace
|
|
38
40
|
* @alias sap.ui.fl.Utils
|
|
39
41
|
* @author SAP SE
|
|
40
|
-
* @version 1.
|
|
42
|
+
* @version 1.102.2
|
|
41
43
|
* @experimental Since 1.25.0
|
|
42
44
|
*/
|
|
43
45
|
var Utils = {
|
|
@@ -584,29 +586,29 @@ sap.ui.define([
|
|
|
584
586
|
}
|
|
585
587
|
|
|
586
588
|
switch (sScenario) {
|
|
587
|
-
case
|
|
589
|
+
case Scenario.VersionedAppVariant:
|
|
588
590
|
if (!sProjectId) {
|
|
589
591
|
oError.message += "in a versioned app variant scenario you additionally need a project ID";
|
|
590
592
|
throw oError;
|
|
591
593
|
}
|
|
592
594
|
sRootNamespace += sBaseId + "/appVariants/" + sProjectId + "/";
|
|
593
595
|
break;
|
|
594
|
-
case
|
|
596
|
+
case Scenario.AppVariant:
|
|
595
597
|
if (!sProjectId) {
|
|
596
598
|
oError.message += "in an app variant scenario you additionally need a project ID";
|
|
597
599
|
throw oError;
|
|
598
600
|
}
|
|
599
601
|
sRootNamespace += sBaseId + "/appVariants/" + sProjectId + "/";
|
|
600
602
|
break;
|
|
601
|
-
case
|
|
603
|
+
case Scenario.AdaptationProject:
|
|
602
604
|
if (!sProjectId) {
|
|
603
605
|
oError.message += "in a adaptation project scenario you additionally need a project ID";
|
|
604
606
|
throw oError;
|
|
605
607
|
}
|
|
606
608
|
sRootNamespace += sBaseId + "/adapt/" + sProjectId + "/";
|
|
607
609
|
break;
|
|
608
|
-
case
|
|
609
|
-
case
|
|
610
|
+
case Scenario.FioriElementsFromScratch:
|
|
611
|
+
case Scenario.UiAdaptation:
|
|
610
612
|
default:
|
|
611
613
|
sRootNamespace += sBaseId + "/";
|
|
612
614
|
}
|
package/src/sap/ui/fl/Variant.js
CHANGED
|
@@ -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.
|
|
142
|
+
* @version 1.102.2
|
|
143
143
|
* @private
|
|
144
144
|
* @ui5-restricted sap.ui.fl.apply._internal
|
|
145
145
|
*/
|
|
@@ -115,11 +115,15 @@ sap.ui.define([
|
|
|
115
115
|
}
|
|
116
116
|
var aAssociatedControlIds = aVMControlIds.reduce(function(aCurrentControlIds, sVMControlId) {
|
|
117
117
|
var oVMControl = Core.byId(sVMControlId);
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
118
|
+
// there could be additional VMControl Ids that are not yet available
|
|
119
|
+
if (oVMControl) {
|
|
120
|
+
var aForControls = oVMControl.getFor();
|
|
121
|
+
aForControls.forEach(function(sControlId) {
|
|
122
|
+
oAssociatedControls[sControlId] = sVMControlId;
|
|
123
|
+
});
|
|
124
|
+
aCurrentControlIds = aCurrentControlIds.concat(aForControls);
|
|
125
|
+
}
|
|
126
|
+
return aCurrentControlIds;
|
|
123
127
|
}, []);
|
|
124
128
|
|
|
125
129
|
var sAssociatedVMControlId = getAssociatedControlId(aAssociatedControlIds, oControl);
|
|
@@ -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.
|
|
117
|
+
* @version 1.102.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.
|
|
182
|
+
* @version 1.102.2
|
|
183
183
|
* @private
|
|
184
184
|
* @ui5-restricted sap.ui.fl
|
|
185
185
|
*
|