@openui5/sap.ui.rta 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 +6 -6
- package/src/sap/ui/rta/.library +1 -1
- package/src/sap/ui/rta/Client.js +60 -59
- package/src/sap/ui/rta/RuntimeAuthoring.js +256 -254
- package/src/sap/ui/rta/Utils.js +42 -42
- package/src/sap/ui/rta/api/startAdaptation.js +2 -2
- package/src/sap/ui/rta/appVariant/AppVariantDialog.js +3 -3
- package/src/sap/ui/rta/appVariant/AppVariantManager.js +27 -27
- package/src/sap/ui/rta/appVariant/AppVariantUtils.js +100 -103
- package/src/sap/ui/rta/appVariant/Feature.js +75 -77
- package/src/sap/ui/rta/appVariant/S4HanaCloudBackend.js +6 -7
- package/src/sap/ui/rta/appVariant/Utils.js +17 -17
- package/src/sap/ui/rta/appVariant/manageApps/webapp/controller/ManageApps.controller.js +36 -36
- package/src/sap/ui/rta/command/AddIFrame.js +7 -7
- package/src/sap/ui/rta/command/AddProperty.js +7 -7
- package/src/sap/ui/rta/command/AddXML.js +1 -1
- package/src/sap/ui/rta/command/AddXMLAtExtensionPoint.js +7 -7
- package/src/sap/ui/rta/command/AppDescriptorCommand.js +18 -18
- package/src/sap/ui/rta/command/BaseCommand.js +1 -2
- package/src/sap/ui/rta/command/BindProperty.js +1 -1
- package/src/sap/ui/rta/command/Combine.js +1 -1
- package/src/sap/ui/rta/command/CommandFactory.js +11 -11
- package/src/sap/ui/rta/command/CompositeCommand.js +1 -1
- package/src/sap/ui/rta/command/ControlVariantConfigure.js +28 -3
- package/src/sap/ui/rta/command/ControlVariantSave.js +1 -1
- package/src/sap/ui/rta/command/ControlVariantSaveAs.js +26 -24
- package/src/sap/ui/rta/command/ControlVariantSetTitle.js +7 -7
- package/src/sap/ui/rta/command/ControlVariantSwitch.js +11 -11
- package/src/sap/ui/rta/command/CreateContainer.js +2 -2
- package/src/sap/ui/rta/command/CustomAdd.js +1 -1
- package/src/sap/ui/rta/command/FlexCommand.js +30 -30
- package/src/sap/ui/rta/command/LREPSerializer.js +20 -10
- package/src/sap/ui/rta/command/LocalReset.js +1 -1
- package/src/sap/ui/rta/command/Move.js +1 -1
- package/src/sap/ui/rta/command/Property.js +1 -1
- package/src/sap/ui/rta/command/Remove.js +1 -1
- package/src/sap/ui/rta/command/Rename.js +1 -1
- package/src/sap/ui/rta/command/Resize.js +1 -1
- package/src/sap/ui/rta/command/Reveal.js +1 -1
- package/src/sap/ui/rta/command/Settings.js +1 -1
- package/src/sap/ui/rta/command/Split.js +1 -1
- package/src/sap/ui/rta/command/Stack.js +4 -4
- package/src/sap/ui/rta/command/appDescriptor/AddLibrary.js +1 -1
- package/src/sap/ui/rta/command/compVariant/CompVariantContent.js +1 -1
- package/src/sap/ui/rta/command/compVariant/CompVariantSaveAs.js +1 -1
- package/src/sap/ui/rta/command/compVariant/CompVariantSwitch.js +1 -1
- package/src/sap/ui/rta/command/compVariant/CompVariantUpdate.js +1 -1
- package/src/sap/ui/rta/enablement/TestDelegate.js +92 -92
- package/src/sap/ui/rta/enablement/elementActionTest.js +230 -112
- package/src/sap/ui/rta/library.js +2 -2
- package/src/sap/ui/rta/messagebundle.properties +11 -1
- package/src/sap/ui/rta/messagebundle_ar.properties +5 -0
- package/src/sap/ui/rta/messagebundle_bg.properties +5 -0
- package/src/sap/ui/rta/messagebundle_ca.properties +5 -0
- package/src/sap/ui/rta/messagebundle_cs.properties +5 -0
- package/src/sap/ui/rta/messagebundle_cy.properties +5 -0
- package/src/sap/ui/rta/messagebundle_da.properties +5 -0
- package/src/sap/ui/rta/messagebundle_de.properties +6 -1
- package/src/sap/ui/rta/messagebundle_el.properties +5 -0
- package/src/sap/ui/rta/messagebundle_en.properties +5 -0
- package/src/sap/ui/rta/messagebundle_en_GB.properties +5 -0
- package/src/sap/ui/rta/messagebundle_en_US_sappsd.properties +5 -0
- package/src/sap/ui/rta/messagebundle_en_US_saprigi.properties +5 -0
- package/src/sap/ui/rta/messagebundle_en_US_saptrc.properties +6 -1
- package/src/sap/ui/rta/messagebundle_es.properties +5 -0
- package/src/sap/ui/rta/messagebundle_es_MX.properties +5 -0
- package/src/sap/ui/rta/messagebundle_et.properties +5 -0
- package/src/sap/ui/rta/messagebundle_fi.properties +5 -0
- package/src/sap/ui/rta/messagebundle_fr.properties +5 -0
- package/src/sap/ui/rta/messagebundle_fr_CA.properties +5 -0
- package/src/sap/ui/rta/messagebundle_hi.properties +5 -0
- package/src/sap/ui/rta/messagebundle_hr.properties +5 -0
- package/src/sap/ui/rta/messagebundle_hu.properties +5 -0
- package/src/sap/ui/rta/messagebundle_id.properties +5 -0
- package/src/sap/ui/rta/messagebundle_it.properties +5 -0
- package/src/sap/ui/rta/messagebundle_iw.properties +5 -0
- package/src/sap/ui/rta/messagebundle_ja.properties +5 -0
- package/src/sap/ui/rta/messagebundle_kk.properties +5 -0
- package/src/sap/ui/rta/messagebundle_ko.properties +5 -0
- package/src/sap/ui/rta/messagebundle_lt.properties +5 -0
- package/src/sap/ui/rta/messagebundle_lv.properties +5 -0
- package/src/sap/ui/rta/messagebundle_ms.properties +5 -0
- package/src/sap/ui/rta/messagebundle_nl.properties +5 -0
- package/src/sap/ui/rta/messagebundle_no.properties +5 -0
- package/src/sap/ui/rta/messagebundle_pl.properties +5 -0
- package/src/sap/ui/rta/messagebundle_pt.properties +5 -0
- package/src/sap/ui/rta/messagebundle_pt_PT.properties +5 -0
- package/src/sap/ui/rta/messagebundle_ro.properties +5 -0
- package/src/sap/ui/rta/messagebundle_ru.properties +5 -0
- package/src/sap/ui/rta/messagebundle_sh.properties +5 -0
- package/src/sap/ui/rta/messagebundle_sk.properties +5 -0
- package/src/sap/ui/rta/messagebundle_sl.properties +5 -0
- package/src/sap/ui/rta/messagebundle_sv.properties +5 -0
- package/src/sap/ui/rta/messagebundle_th.properties +5 -0
- package/src/sap/ui/rta/messagebundle_tr.properties +5 -0
- package/src/sap/ui/rta/messagebundle_uk.properties +5 -0
- package/src/sap/ui/rta/messagebundle_vi.properties +5 -0
- package/src/sap/ui/rta/messagebundle_zh_CN.properties +5 -0
- package/src/sap/ui/rta/messagebundle_zh_TW.properties +5 -0
- package/src/sap/ui/rta/plugin/AddXMLAtExtensionPoint.js +44 -44
- package/src/sap/ui/rta/plugin/BaseCreate.js +29 -29
- package/src/sap/ui/rta/plugin/Combine.js +9 -9
- package/src/sap/ui/rta/plugin/ControlVariant.js +21 -21
- package/src/sap/ui/rta/plugin/CreateContainer.js +6 -6
- package/src/sap/ui/rta/plugin/CutPaste.js +46 -46
- package/src/sap/ui/rta/plugin/DragDrop.js +2 -2
- package/src/sap/ui/rta/plugin/EasyAdd.js +4 -4
- package/src/sap/ui/rta/plugin/EasyRemove.js +5 -5
- package/src/sap/ui/rta/plugin/LocalReset.js +25 -25
- package/src/sap/ui/rta/plugin/Plugin.js +20 -20
- package/src/sap/ui/rta/plugin/RTAElementMover.js +42 -42
- package/src/sap/ui/rta/plugin/Remove.js +11 -11
- package/src/sap/ui/rta/plugin/Rename.js +7 -7
- package/src/sap/ui/rta/plugin/RenameHandler.js +17 -17
- package/src/sap/ui/rta/plugin/Resize.js +62 -62
- package/src/sap/ui/rta/plugin/Selection.js +14 -14
- package/src/sap/ui/rta/plugin/Settings.js +20 -20
- package/src/sap/ui/rta/plugin/Split.js +7 -7
- package/src/sap/ui/rta/plugin/Stretch.js +4 -4
- package/src/sap/ui/rta/plugin/additionalElements/ActionExtractor.js +94 -87
- package/src/sap/ui/rta/plugin/additionalElements/AddElementsDialog.js +18 -18
- package/src/sap/ui/rta/plugin/additionalElements/AdditionalElementsAnalyzer.js +98 -99
- package/src/sap/ui/rta/plugin/additionalElements/AdditionalElementsPlugin.js +144 -144
- package/src/sap/ui/rta/plugin/additionalElements/AdditionalElementsUtils.js +3 -4
- package/src/sap/ui/rta/plugin/additionalElements/CommandBuilder.js +67 -67
- package/src/sap/ui/rta/plugin/iframe/AddIFrame.js +38 -39
- package/src/sap/ui/rta/plugin/iframe/AddIFrameDialog.fragment.xml +1 -0
- package/src/sap/ui/rta/plugin/iframe/AddIFrameDialog.js +29 -29
- package/src/sap/ui/rta/plugin/iframe/AddIFrameDialogController.js +5 -5
- package/src/sap/ui/rta/plugin/iframe/urlCleaner.js +1 -1
- package/src/sap/ui/rta/service/Action.js +36 -37
- package/src/sap/ui/rta/service/ControllerExtension.js +4 -4
- package/src/sap/ui/rta/service/Outline.js +59 -59
- package/src/sap/ui/rta/service/Property.js +125 -125
- package/src/sap/ui/rta/service/Receiver.js +78 -77
- package/src/sap/ui/rta/service/Selection.js +6 -6
- package/src/sap/ui/rta/service/SupportTools.js +188 -37
- package/src/sap/ui/rta/service/index.js +1 -1
- package/src/sap/ui/rta/themes/base/FlexSupportExtension.less +14 -0
- package/src/sap/ui/rta/themes/base/library.source.less +2 -1
- package/src/sap/ui/rta/toolbar/Adaptation.js +81 -26
- package/src/sap/ui/rta/toolbar/AdaptationRenderer.js +1 -1
- package/src/sap/ui/rta/toolbar/Base.js +17 -15
- package/src/sap/ui/rta/toolbar/BaseRenderer.js +1 -2
- package/src/sap/ui/rta/toolbar/Fiori.js +8 -8
- package/src/sap/ui/rta/toolbar/FioriLike.js +1 -1
- package/src/sap/ui/rta/toolbar/OverflowToolbarButton.js +4 -4
- package/src/sap/ui/rta/toolbar/Personalization.js +2 -2
- package/src/sap/ui/rta/toolbar/Standalone.js +1 -1
- package/src/sap/ui/rta/toolbar/contextBased/ManageAdaptations.js +13 -6
- package/src/sap/ui/rta/toolbar/contextBased/ManageAdaptationsDialog.fragment.xml +2 -8
- package/src/sap/ui/rta/toolbar/contextBased/SaveAsAdaptation.js +2 -3
- package/src/sap/ui/rta/toolbar/contextBased/SaveAsAdaptationDialog.fragment.xml +0 -2
- package/src/sap/ui/rta/toolbar/translation/Translation.js +41 -41
- package/src/sap/ui/rta/toolbar/versioning/Versioning.js +9 -9
- package/src/sap/ui/rta/util/Animation.js +5 -5
- package/src/sap/ui/rta/util/BindingsExtractor.js +33 -33
- package/src/sap/ui/rta/util/PluginManager.js +25 -25
- package/src/sap/ui/rta/util/PopupManager.js +27 -27
- package/src/sap/ui/rta/util/ReloadManager.js +1 -1
- package/src/sap/ui/rta/util/ServiceEventBus.js +3 -4
- package/src/sap/ui/rta/util/StylesLoader.js +9 -9
- package/src/sap/ui/rta/util/UrlParser.js +19 -19
- package/src/sap/ui/rta/util/adaptationStarter.js +34 -31
- package/src/sap/ui/rta/util/changeVisualization/ChangeIndicator.js +23 -19
- package/src/sap/ui/rta/util/changeVisualization/ChangeIndicatorRegistry.js +61 -61
- package/src/sap/ui/rta/util/changeVisualization/ChangeVisualization.js +76 -63
- package/src/sap/ui/rta/util/changeVisualization/commands/CombineVisualization.js +6 -6
- package/src/sap/ui/rta/util/changeVisualization/commands/CreateContainerVisualization.js +1 -1
- package/src/sap/ui/rta/util/changeVisualization/commands/SplitVisualization.js +1 -1
- package/src/sap/ui/rta/util/hasStableId.js +2 -2
- package/src/sap/ui/rta/util/showMessageBox.js +4 -5
- package/src/sap/ui/rta/util/validateFlexEnabled.js +5 -5
- package/src/sap/ui/rta/util/validateStableIds.js +8 -8
- package/ui5.yaml +1 -1
package/src/sap/ui/rta/Utils.js
CHANGED
|
@@ -47,7 +47,7 @@ function(
|
|
|
47
47
|
*
|
|
48
48
|
* @namespace
|
|
49
49
|
* @author SAP SE
|
|
50
|
-
* @version 1.
|
|
50
|
+
* @version 1.117.0
|
|
51
51
|
*
|
|
52
52
|
* @private
|
|
53
53
|
* @since 1.30
|
|
@@ -62,7 +62,7 @@ function(
|
|
|
62
62
|
|
|
63
63
|
Utils._sFocusableOverlayClass = ".sapUiDtOverlaySelectable";
|
|
64
64
|
|
|
65
|
-
Utils._sRtaStyleClassName =
|
|
65
|
+
Utils._sRtaStyleClassName = "";
|
|
66
66
|
|
|
67
67
|
/**
|
|
68
68
|
* Returns the rta specific Style Class
|
|
@@ -100,7 +100,7 @@ function(
|
|
|
100
100
|
return FieldExtensibility.isServiceOutdated(oModel.sServiceUrl).then(function(bServiceOutdated) {
|
|
101
101
|
if (bServiceOutdated) {
|
|
102
102
|
FieldExtensibility.setServiceValid(oModel.sServiceUrl);
|
|
103
|
-
//needs FLP to trigger UI restart popup
|
|
103
|
+
// needs FLP to trigger UI restart popup
|
|
104
104
|
Core.getEventBus().publish("sap.ui.core.UnrecoverableClientStateCorruption", "RequestReload", {});
|
|
105
105
|
}
|
|
106
106
|
});
|
|
@@ -306,7 +306,7 @@ function(
|
|
|
306
306
|
|
|
307
307
|
while (oPreviousFocusableSiblingOverlay && !this.isOverlaySelectable(oPreviousFocusableSiblingOverlay)) {
|
|
308
308
|
oPreviousFocusableSiblingOverlay = OverlayUtil
|
|
309
|
-
|
|
309
|
+
.getPreviousSiblingOverlay(oPreviousFocusableSiblingOverlay);
|
|
310
310
|
}
|
|
311
311
|
if (!oPreviousFocusableSiblingOverlay) {
|
|
312
312
|
oPreviousFocusableSiblingOverlay = this._findSiblingOverlay(oOverlay, PREVIOUS);
|
|
@@ -405,7 +405,7 @@ function(
|
|
|
405
405
|
return aPaths;
|
|
406
406
|
};
|
|
407
407
|
|
|
408
|
-
Utils.isOriginalFioriToolbarAccessible = function
|
|
408
|
+
Utils.isOriginalFioriToolbarAccessible = function() {
|
|
409
409
|
var oRenderer = Utils.getFiori2Renderer();
|
|
410
410
|
return oRenderer
|
|
411
411
|
&& oRenderer.getRootControl
|
|
@@ -431,9 +431,9 @@ function(
|
|
|
431
431
|
* @param {Function} fnCustomizer - The customizer is invoked with five arguments:
|
|
432
432
|
* (vDestinationValue, vSourceValue, sProperty, mDestination, mSource).
|
|
433
433
|
*/
|
|
434
|
-
Utils.extendWith = function
|
|
434
|
+
Utils.extendWith = function(mDestination, mSource, fnCustomizer) {
|
|
435
435
|
if (!(typeof fnCustomizer === "function")) {
|
|
436
|
-
throw new Error(
|
|
436
|
+
throw new Error("In order to use extendWith() utility function fnCustomizer should be provided!");
|
|
437
437
|
}
|
|
438
438
|
|
|
439
439
|
for (var sSourceProperty in mSource) {
|
|
@@ -458,7 +458,7 @@ function(
|
|
|
458
458
|
* @returns{boolean} - Returns if <code>oDomElement</code> is currently visible on the screen.
|
|
459
459
|
*/
|
|
460
460
|
Utils.isElementInViewport = function(oDomElement) {
|
|
461
|
-
//TODO: remove when all calls are replaced
|
|
461
|
+
// TODO: remove when all calls are replaced
|
|
462
462
|
oDomElement = oDomElement.jquery ? oDomElement.get(0) : oDomElement;
|
|
463
463
|
|
|
464
464
|
var mRect = oDomElement.getBoundingClientRect();
|
|
@@ -573,8 +573,8 @@ function(
|
|
|
573
573
|
* @param {string} sValueFieldName - Field name to use as value
|
|
574
574
|
* @returns {object} Hashmap
|
|
575
575
|
*/
|
|
576
|
-
Utils.buildHashMapFromArray = function
|
|
577
|
-
return aArray.reduce(function
|
|
576
|
+
Utils.buildHashMapFromArray = function(aArray, sKeyFieldName, sValueFieldName) {
|
|
577
|
+
return aArray.reduce(function(mMap, oItem) {
|
|
578
578
|
mMap[oItem[sKeyFieldName]] = oItem[sValueFieldName];
|
|
579
579
|
return mMap;
|
|
580
580
|
}, {});
|
|
@@ -601,49 +601,49 @@ function(
|
|
|
601
601
|
}
|
|
602
602
|
|
|
603
603
|
return ElementUtil.checkTargetZone(oAggregationOverlay, oMovedOverlay, bOverlayNotInDom)
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
604
|
+
.then(function(bTargetZone) {
|
|
605
|
+
if (!bTargetZone) {
|
|
606
|
+
return false;
|
|
607
|
+
}
|
|
608
608
|
|
|
609
|
-
|
|
610
|
-
|
|
611
|
-
|
|
609
|
+
var oMovedElement = oMovedOverlay.getElement();
|
|
610
|
+
var oTargetOverlay = oAggregationOverlay.getParent();
|
|
611
|
+
var oMovedRelevantContainer = oMovedOverlay.getRelevantContainer();
|
|
612
612
|
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
613
|
+
// the element or the parent overlay might be destroyed or not available
|
|
614
|
+
if (!oMovedElement || !oTargetOverlay) {
|
|
615
|
+
return false;
|
|
616
|
+
}
|
|
617
617
|
|
|
618
|
-
|
|
619
|
-
|
|
618
|
+
var oTargetElement = oTargetOverlay.getElement();
|
|
619
|
+
var oAggregationDtMetadata = oAggregationOverlay.getDesignTimeMetadata();
|
|
620
620
|
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
|
|
621
|
+
// determine target relevantContainer
|
|
622
|
+
var vTargetRelevantContainerAfterMove = MetadataPropagationUtil.getRelevantContainerForPropagation(oAggregationDtMetadata.getData(), oMovedElement);
|
|
623
|
+
vTargetRelevantContainerAfterMove = vTargetRelevantContainerAfterMove || oTargetElement;
|
|
624
624
|
|
|
625
|
-
|
|
626
|
-
|
|
627
|
-
|
|
625
|
+
// check for same relevantContainer
|
|
626
|
+
if (
|
|
627
|
+
!oMovedRelevantContainer
|
|
628
628
|
|| !vTargetRelevantContainerAfterMove
|
|
629
629
|
|| !hasStableId(oTargetOverlay)
|
|
630
630
|
|| oMovedRelevantContainer !== vTargetRelevantContainerAfterMove
|
|
631
|
-
|
|
632
|
-
|
|
633
|
-
|
|
631
|
+
) {
|
|
632
|
+
return false;
|
|
633
|
+
}
|
|
634
634
|
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
635
|
+
// check if binding context is the same
|
|
636
|
+
if (
|
|
637
|
+
// binding context is not relevant if the element is being moved inside its parent
|
|
638
|
+
oMovedOverlay.getParent().getElement() !== oTargetElement
|
|
639
639
|
&& !Utils.checkSourceTargetBindingCompatibility(oMovedElement, oTargetElement)
|
|
640
|
-
|
|
641
|
-
|
|
642
|
-
|
|
640
|
+
) {
|
|
641
|
+
return false;
|
|
642
|
+
}
|
|
643
643
|
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
644
|
+
// check if movedOverlay is movable into the target aggregation
|
|
645
|
+
return fnHasMoveAction(oAggregationOverlay, oMovedElement, vTargetRelevantContainerAfterMove, oPlugin);
|
|
646
|
+
});
|
|
647
647
|
};
|
|
648
648
|
|
|
649
649
|
/**
|
|
@@ -52,8 +52,8 @@ sap.ui.define([
|
|
|
52
52
|
};
|
|
53
53
|
mOptions = merge(mDefaultOptions, mOptions);
|
|
54
54
|
return Promise.resolve()
|
|
55
|
-
|
|
56
|
-
|
|
55
|
+
.then(checkLayer.bind(this, mOptions.flexSettings.layer))
|
|
56
|
+
.then(adaptationStarter.bind(this, mOptions, loadPlugins, onStart, onFailed, onStop));
|
|
57
57
|
}
|
|
58
58
|
|
|
59
59
|
return startAdaptation;
|
|
@@ -315,9 +315,9 @@ function(
|
|
|
315
315
|
this.addStyleClass(RtaUtils.getRtaStyleClassName());
|
|
316
316
|
},
|
|
317
317
|
onAfterRendering: function() {
|
|
318
|
-
document.getElementById(
|
|
319
|
-
document.getElementById(
|
|
320
|
-
document.getElementById(
|
|
318
|
+
document.getElementById("title1").style.height = "0px";
|
|
319
|
+
document.getElementById("title2").style.height = "0px";
|
|
320
|
+
document.getElementById("tile").style.float = "left";
|
|
321
321
|
},
|
|
322
322
|
_onCreate: function() {
|
|
323
323
|
var sTitle = oTitleInput.getValue() || " ";
|
|
@@ -24,7 +24,7 @@ sap.ui.define([
|
|
|
24
24
|
* @class
|
|
25
25
|
* @extends sap.ui.base.ManagedObject
|
|
26
26
|
* @author SAP SE
|
|
27
|
-
* @version 1.
|
|
27
|
+
* @version 1.117.0
|
|
28
28
|
* @constructor
|
|
29
29
|
* @private
|
|
30
30
|
* @since 1.53
|
|
@@ -104,33 +104,33 @@ sap.ui.define([
|
|
|
104
104
|
oPropertyChange = AppVariantUtils.getInlineChangeInputIcon(oAppVariantSpecificData.icon);
|
|
105
105
|
aAllInlineChangeOperations.push(AppVariantUtils.createInlineChange(oPropertyChange, "appdescr_ui_setIcon", vSelector));
|
|
106
106
|
|
|
107
|
-
|
|
107
|
+
/** *********************************************************Inbounds handling******************************************************************/
|
|
108
108
|
return AppVariantUtils.getInboundInfo(oAppVariantSpecificData.inbounds)
|
|
109
|
-
|
|
110
|
-
|
|
109
|
+
.then(function(oInboundInfo) {
|
|
110
|
+
var sCurrentRunningInboundId = oInboundInfo.currentRunningInbound;
|
|
111
111
|
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
112
|
+
// If there is no inbound, create a new inbound
|
|
113
|
+
if (oInboundInfo.addNewInboundRequired) {
|
|
114
|
+
// create a inline change using a change type 'appdescr_app_addNewInbound'
|
|
115
|
+
var oInlineChangePromise = AppVariantUtils.prepareAddNewInboundChange(sCurrentRunningInboundId, sAppVariantId, oAppVariantSpecificData)
|
|
116
|
+
.then(function(oPropertyChange) {
|
|
117
|
+
return AppVariantUtils.createInlineChange(oPropertyChange, "appdescr_app_addNewInbound", vSelector);
|
|
118
|
+
});
|
|
119
119
|
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
120
|
+
aAllInlineChangeOperations.push(oInlineChangePromise);
|
|
121
|
+
} else {
|
|
122
|
+
// create a inline change using a change type 'appdescr_app_changeInbound'
|
|
123
|
+
oPropertyChange = AppVariantUtils.prepareChangeInboundChange(sCurrentRunningInboundId, sAppVariantId, oAppVariantSpecificData);
|
|
124
|
+
aAllInlineChangeOperations.push(AppVariantUtils.createInlineChange(oPropertyChange, "appdescr_app_changeInbound", vSelector));
|
|
125
|
+
}
|
|
126
126
|
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
127
|
+
// remove all other inbounds except appVariant inbound
|
|
128
|
+
// create a inline change using a change type 'appdescr_app_removeAllInboundsExceptOne'
|
|
129
|
+
oPropertyChange = AppVariantUtils.prepareRemoveAllInboundsExceptOneChange(sCurrentRunningInboundId);
|
|
130
|
+
aAllInlineChangeOperations.push(AppVariantUtils.createInlineChange(oPropertyChange, "appdescr_app_removeAllInboundsExceptOne", vSelector));
|
|
131
131
|
|
|
132
|
-
|
|
133
|
-
|
|
132
|
+
return Promise.all(aAllInlineChangeOperations);
|
|
133
|
+
});
|
|
134
134
|
};
|
|
135
135
|
|
|
136
136
|
/**
|
|
@@ -221,10 +221,10 @@ sap.ui.define([
|
|
|
221
221
|
AppVariantManager.prototype.triggerCatalogPublishing = function(sAppVariantId, sReferenceAppId, bSaveAs) {
|
|
222
222
|
var fnTriggerCatalogOperation = bSaveAs ? AppVariantUtils.triggerCatalogAssignment : AppVariantUtils.triggerCatalogUnAssignment;
|
|
223
223
|
return fnTriggerCatalogOperation(sAppVariantId, this.getLayer(), sReferenceAppId)
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
224
|
+
.catch(function(oError) {
|
|
225
|
+
var sMessageKey = bSaveAs ? "MSG_CATALOG_ASSIGNMENT_FAILED" : "MSG_DELETE_APP_VARIANT_FAILED";
|
|
226
|
+
return AppVariantUtils.catchErrorDialog(oError, sMessageKey, sAppVariantId);
|
|
227
|
+
});
|
|
228
228
|
};
|
|
229
229
|
|
|
230
230
|
/**
|
|
@@ -49,7 +49,7 @@ sap.ui.define([
|
|
|
49
49
|
|
|
50
50
|
AppVariantUtils.trimIdIfRequired = function(sId) {
|
|
51
51
|
if (sId.length > HANA_CLOUD_ID_LENGTH) {
|
|
52
|
-
var aIdStrings = sId.split(
|
|
52
|
+
var aIdStrings = sId.split(".");
|
|
53
53
|
var sTrimmedId;
|
|
54
54
|
var sGuidLength = aIdStrings[aIdStrings.length - 1].length;
|
|
55
55
|
var sGuidString = aIdStrings.pop();
|
|
@@ -64,7 +64,7 @@ sap.ui.define([
|
|
|
64
64
|
}
|
|
65
65
|
|
|
66
66
|
// After adjusting the id, if the last character of string has period '.', just append the guid string otherwise append period '.' in between
|
|
67
|
-
if (sTrimmedId[sTrimmedId.length - 1] ===
|
|
67
|
+
if (sTrimmedId[sTrimmedId.length - 1] === ".") {
|
|
68
68
|
sTrimmedId = sTrimmedId + sGuidString;
|
|
69
69
|
} else {
|
|
70
70
|
sTrimmedId = sTrimmedId + "." + sGuidString;
|
|
@@ -79,7 +79,7 @@ sap.ui.define([
|
|
|
79
79
|
|
|
80
80
|
AppVariantUtils.getId = function(sBaseAppID) {
|
|
81
81
|
var sChangedId;
|
|
82
|
-
var aIdStrings = sBaseAppID.split(
|
|
82
|
+
var aIdStrings = sBaseAppID.split(".");
|
|
83
83
|
|
|
84
84
|
if (aIdStrings[0] !== "customer") {
|
|
85
85
|
aIdStrings[0] = "customer." + aIdStrings[0];
|
|
@@ -153,44 +153,44 @@ sap.ui.define([
|
|
|
153
153
|
}
|
|
154
154
|
|
|
155
155
|
return FlexUtils.getUShellService("URLParsing")
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
156
|
+
.then(function(oURLParsingService) {
|
|
157
|
+
return FlexUtils.getParsedURLHash(oURLParsingService);
|
|
158
|
+
})
|
|
159
|
+
.then(function(oParsedHash) {
|
|
160
|
+
var aInbounds = Object.keys(oInbounds);
|
|
161
|
+
var aInboundsFound = [];
|
|
162
|
+
|
|
163
|
+
// This will only happen if app variants are created on top of app variants
|
|
164
|
+
if (aInbounds.length === 1 && aInbounds[0] === "customer.savedAsAppVariant") {
|
|
165
|
+
return {
|
|
166
|
+
currentRunningInbound: "customer.savedAsAppVariant",
|
|
167
|
+
addNewInboundRequired: false
|
|
168
|
+
};
|
|
169
|
+
}
|
|
170
170
|
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
}
|
|
175
|
-
});
|
|
176
|
-
|
|
177
|
-
switch (aInboundsFound.length) {
|
|
178
|
-
case 0:
|
|
179
|
-
oInboundInfo.currentRunningInbound = "customer.savedAsAppVariant";
|
|
180
|
-
oInboundInfo.addNewInboundRequired = true;
|
|
181
|
-
break;
|
|
182
|
-
case 1:
|
|
183
|
-
oInboundInfo.currentRunningInbound = aInboundsFound[0];
|
|
184
|
-
oInboundInfo.addNewInboundRequired = false;
|
|
185
|
-
break;
|
|
186
|
-
default:
|
|
187
|
-
oInboundInfo.currentRunningInbound = "customer.savedAsAppVariant";
|
|
188
|
-
oInboundInfo.addNewInboundRequired = true;
|
|
189
|
-
break;
|
|
171
|
+
aInbounds.forEach(function(sInboundId) {
|
|
172
|
+
if ((oInbounds[sInboundId].action === oParsedHash.action) && (oInbounds[sInboundId].semanticObject === oParsedHash.semanticObject)) {
|
|
173
|
+
aInboundsFound.push(sInboundId);
|
|
190
174
|
}
|
|
191
|
-
|
|
192
|
-
return oInboundInfo;
|
|
193
175
|
});
|
|
176
|
+
|
|
177
|
+
switch (aInboundsFound.length) {
|
|
178
|
+
case 0:
|
|
179
|
+
oInboundInfo.currentRunningInbound = "customer.savedAsAppVariant";
|
|
180
|
+
oInboundInfo.addNewInboundRequired = true;
|
|
181
|
+
break;
|
|
182
|
+
case 1:
|
|
183
|
+
oInboundInfo.currentRunningInbound = aInboundsFound[0];
|
|
184
|
+
oInboundInfo.addNewInboundRequired = false;
|
|
185
|
+
break;
|
|
186
|
+
default:
|
|
187
|
+
oInboundInfo.currentRunningInbound = "customer.savedAsAppVariant";
|
|
188
|
+
oInboundInfo.addNewInboundRequired = true;
|
|
189
|
+
break;
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
return oInboundInfo;
|
|
193
|
+
});
|
|
194
194
|
};
|
|
195
195
|
|
|
196
196
|
AppVariantUtils.getInboundPropertiesKey = function(sAppVariantId, sCurrentRunningInboundId, sPropertyName) {
|
|
@@ -227,50 +227,50 @@ sap.ui.define([
|
|
|
227
227
|
*/
|
|
228
228
|
AppVariantUtils.prepareAddNewInboundChange = function(sCurrentRunningInboundId, sAppVariantId, oAppVariantSpecificData) {
|
|
229
229
|
return FlexUtils.getUShellService("URLParsing")
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
230
|
+
.then(function(oURLParsingService) {
|
|
231
|
+
return FlexUtils.getParsedURLHash(oURLParsingService);
|
|
232
|
+
})
|
|
233
|
+
.then(function(oParsedHash) {
|
|
234
|
+
var oProperty = {
|
|
235
|
+
content: {
|
|
236
|
+
inbound: {}
|
|
237
|
+
},
|
|
238
|
+
texts: {}
|
|
239
|
+
};
|
|
240
240
|
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
}
|
|
241
|
+
var sInboundTitleKey = this.getInboundPropertiesKey(oAppVariantSpecificData.referenceAppId, sCurrentRunningInboundId, "title");
|
|
242
|
+
var sInboundSubTitleKey = this.getInboundPropertiesKey(oAppVariantSpecificData.referenceAppId, sCurrentRunningInboundId, "subTitle");
|
|
243
|
+
|
|
244
|
+
// Filling change content
|
|
245
|
+
oProperty.content.inbound[sCurrentRunningInboundId] = {
|
|
246
|
+
semanticObject: oParsedHash.semanticObject,
|
|
247
|
+
action: oParsedHash.action,
|
|
248
|
+
title: "{{" + sInboundTitleKey + "}}",
|
|
249
|
+
subTitle: "{{" + sInboundSubTitleKey + "}}",
|
|
250
|
+
icon: oAppVariantSpecificData.icon,
|
|
251
|
+
signature: {
|
|
252
|
+
parameters: {
|
|
253
|
+
"sap-appvar-id": {
|
|
254
|
+
required: true,
|
|
255
|
+
filter: {
|
|
256
|
+
value: sAppVariantId,
|
|
257
|
+
format: "plain"
|
|
258
|
+
},
|
|
259
|
+
launcherValue: {
|
|
260
|
+
value: sAppVariantId
|
|
262
261
|
}
|
|
263
|
-
}
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
}
|
|
262
|
+
}
|
|
263
|
+
},
|
|
264
|
+
additionalParameters: "ignored"
|
|
265
|
+
}
|
|
266
|
+
};
|
|
267
267
|
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
268
|
+
// Filling change texts
|
|
269
|
+
oProperty.texts[sInboundTitleKey] = this.prepareTextsChange("title", oAppVariantSpecificData.title);
|
|
270
|
+
oProperty.texts[sInboundSubTitleKey] = this.prepareTextsChange("subTitle", oAppVariantSpecificData.subTitle);
|
|
271
271
|
|
|
272
|
-
|
|
273
|
-
|
|
272
|
+
return oProperty;
|
|
273
|
+
}.bind(this));
|
|
274
274
|
};
|
|
275
275
|
|
|
276
276
|
AppVariantUtils.prepareChangeInboundChange = function(sCurrentRunningInboundId, sAppVariantId, oAppVariantSpecificData) {
|
|
@@ -334,13 +334,10 @@ sap.ui.define([
|
|
|
334
334
|
};
|
|
335
335
|
|
|
336
336
|
AppVariantUtils.addChangesToPersistence = function(aAllInlineChanges, vSelector) {
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
selector: vSelector
|
|
341
|
-
});
|
|
337
|
+
PersistenceWriteAPI.add({
|
|
338
|
+
flexObjects: aAllInlineChanges,
|
|
339
|
+
selector: vSelector
|
|
342
340
|
});
|
|
343
|
-
|
|
344
341
|
return Promise.resolve();
|
|
345
342
|
};
|
|
346
343
|
|
|
@@ -394,7 +391,7 @@ sap.ui.define([
|
|
|
394
391
|
document.body.appendChild(textArea);
|
|
395
392
|
textArea.select();
|
|
396
393
|
|
|
397
|
-
document.execCommand(
|
|
394
|
+
document.execCommand("copy");
|
|
398
395
|
document.body.removeChild(textArea);
|
|
399
396
|
|
|
400
397
|
return true;
|
|
@@ -504,7 +501,7 @@ sap.ui.define([
|
|
|
504
501
|
aActions.push(sRightButtonText);
|
|
505
502
|
|
|
506
503
|
return new Promise(function(resolve, reject) {
|
|
507
|
-
var fnCallback = function
|
|
504
|
+
var fnCallback = function(sAction) {
|
|
508
505
|
if (sAction === sCopyIdButtonText) {
|
|
509
506
|
AppVariantUtils.copyId(oInfo.appVariantId);
|
|
510
507
|
}
|
|
@@ -552,22 +549,22 @@ sap.ui.define([
|
|
|
552
549
|
var oComponentInstance;
|
|
553
550
|
if (oUshellContainer) {
|
|
554
551
|
return oUshellContainer.getServiceAsync("AppLifeCycle")
|
|
555
|
-
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
|
|
559
|
-
|
|
560
|
-
|
|
561
|
-
|
|
562
|
-
|
|
563
|
-
|
|
564
|
-
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
|
|
552
|
+
.then(function(oAppConfiguration) {
|
|
553
|
+
var oApplication = oAppConfiguration.getCurrentApplication();
|
|
554
|
+
oComponentInstance = oApplication.componentInstance;
|
|
555
|
+
if (oComponentInstance) {
|
|
556
|
+
return oUshellContainer.getServiceAsync("CrossApplicationNavigation");
|
|
557
|
+
}
|
|
558
|
+
return undefined;
|
|
559
|
+
})
|
|
560
|
+
.then(function(oCrossAppNav) {
|
|
561
|
+
if (oCrossAppNav && oCrossAppNav.toExternal) {
|
|
562
|
+
oCrossAppNav.toExternal({target: {shellHash: "#"}}, oComponentInstance);
|
|
563
|
+
}
|
|
564
|
+
})
|
|
565
|
+
.catch(function(vError) {
|
|
566
|
+
throw new Error("Error navigating to FLP Homepage: " + vError);
|
|
567
|
+
});
|
|
571
568
|
}
|
|
572
569
|
return Promise.resolve();
|
|
573
570
|
};
|
|
@@ -580,7 +577,7 @@ sap.ui.define([
|
|
|
580
577
|
});
|
|
581
578
|
};
|
|
582
579
|
|
|
583
|
-
AppVariantUtils.handleBeforeUnloadEvent = function
|
|
580
|
+
AppVariantUtils.handleBeforeUnloadEvent = function() {
|
|
584
581
|
return AppVariantUtils.getText("MSG_DO_NOT_CLOSE_BROWSER");
|
|
585
582
|
};
|
|
586
583
|
|