@openui5/sap.ui.mdc 1.97.1 → 1.100.0

package/src/sap/ui/mdc/filterbar/vh/FilterBar.js

@@ -33,9 +33,11 @@ sap.ui.define(
 		 * The metadata information is provided via the {@link sap.ui.mdc.FilterBarDelegate FilterBarDelegate} implementation. This implementation has to be provided by the application.
 		 * @extends sap.ui.mdc.filterbar.FilterBarBase
 		 * @author SAP SE
-		 * @version 1.97.1
+		 * @version 1.100.0
 		 * @constructor
 		 * @private
+		 * @ui5-restricted sap.fe
+		 * @MDC_PUBLIC_CANDIDATE
 		 * @since 1.84.0
 		 * @alias sap.ui.mdc.filterbar.vh.FilterBar
 		 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
@@ -59,23 +61,8 @@ sap.ui.define(
 							type: "int",
 							defaultValue: 8
 						}
-
-						// delegate: {
-						// 	type: "object",
-						// 	group: "Data",
-						// 	defaultValue: {name: 'sap/ui/mdc/filterbar/vh/GenericFilterBarDelegate'}
-						// }
 					},
 					aggregations : {
-						/**
-						 * <code>collectiveSearch</code> control of the filterbar.
-						 *
-						 * @since 1.87.0
-						 */
-						collectiveSearch: {
-							type: "sap.ui.mdc.filterbar.vh.CollectiveSearchSelect",
-							multiple: false
-						}
 					}
 				},
 
@@ -140,10 +127,23 @@ sap.ui.define(
 			this._oFilterBarLayout.addEndContent(this._oShowAllFiltersBtn);
 		};
 
+		FilterBar.prototype.applySettings = function(mSettings, oScope) {
+			this._applySettings(mSettings, oScope);
+			this._waitForMetadata();
+		};
+
+		FilterBar.prototype._handleConditionModelPropertyChange = function() {
+			this.fireFiltersChanged({conditionsBased: true});
+		};
+
+
 		FilterBar.prototype.exit = function() {
+			if (this._oCollectiveSearch) { // do not destroy CollectiveSearch as it is owned by value help and might be reused there
+				this._oFilterBarLayout.removeControl(this._oCollectiveSearch);
+				this._oCollectiveSearch = null;
+			}
 			FilterBarBase.prototype.exit.apply(this, arguments);
 			this._oBasicSearchField = null;
-			this._oCollectiveSearch = null;
 			this._oBtnFilters = null;
 			this._oShowAllFiltersBtn = null;
 		};
@@ -156,6 +156,15 @@ sap.ui.define(
 			this._oFilterBarLayout._updateFilterBarLayout(true);
 		};
 
+		/**
+		 * Sets the <code>CollectiveSearch</code> control
+		 *
+		 * <b>Note:</b> This must only be done by the corresponding value help, not from outside.
+		 *
+		 * @param {sap.ui.mdc.filterbar.vh.CollectiveSearchSelect} oCollectiveSearch <code>CollectiveSearch</code> control
+		 * @returns {this} Reference to <code>this</code> to allow method chaining
+		 * @protected
+		 */
 		FilterBar.prototype.setCollectiveSearch = function (oCollectiveSearch) {
 			if (this._oCollectiveSearch) {
 				if (this._oFilterBarLayout) {
@@ -170,11 +179,27 @@ sap.ui.define(
 			return this;
 		};
 
+		/**
+		 * Gets the <code>CollectiveSearch</code> control
+		 *
+		 * <b>Note:</b> This must only be used by the corresponding value help, not from outside.
+		 *
+		 * @returns {sap.ui.mdc.filterbar.vh.CollectiveSearchSelect} <code>CollectiveSearch</code> control
+		 * @protected
+		 */
 		FilterBar.prototype.getCollectiveSearch = function () {
 			return this._oCollectiveSearch;
 		};
 
-		FilterBar.prototype.destroyCollectiveSearch = function () {
+		/**
+		 * Destroyes the <code>CollectiveSearch</code> control
+		 *
+		 * <b>Note:</b> This must only be used by the corresponding value help, not from outside.
+		 *
+		 * @returns {this} Reference to <code>this</code> to allow method chaining
+		 * @protected
+		 */
+		 FilterBar.prototype.destroyCollectiveSearch = function () {
 			if (this._oCollectiveSearch && this._oFilterBarLayout) {
 				this._oFilterBarLayout.removeControl(this._oCollectiveSearch);
 				this._oCollectiveSearch.destroy();
@@ -184,7 +209,6 @@ sap.ui.define(
 			return this;
 		};
 
-
 		FilterBar.prototype.setBasicSearchField = function (oBasicSearchField) {
 			if (this._oBasicSearchField) {
 				if (this._oFilterBarLayout) {

package/src/sap/ui/mdc/filterbar/vh/FilterContainer.js

@@ -27,7 +27,7 @@ sap.ui.define(
 		 * @class The FilterContainer is a IFilterContainer implementation for <code>AlignedFlowLayout</code>
 		 * @extends sap.ui.mdc.filterbar.IFilterContainer
 		 * @constructor
-		 * @private
+		 * @protected
 		 * @since 1.84.0
 		 * @alias sap.ui.mdc.filterbar.vh.FilterContainer
 		 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel

package/src/sap/ui/mdc/flexibility/AggregateFlex.js

@@ -7,7 +7,7 @@ sap.ui.define(["sap/ui/fl/apply/api/FlexRuntimeInfoAPI"], function (FlexRuntimeI
 	"use strict";
 	var fRebindControl = function (oControl) {
 		var bExecuteRebindForTable = oControl && oControl.isA && oControl.isA("sap.ui.mdc.Table") && oControl.isTableBound();
-		var bExecuteRebindForChart = oControl && oControl.isA && (oControl.isA("sap.ui.mdc.Chart") || oControl.isA("sap.ui.mdc.ChartNew"));
+		var bExecuteRebindForChart = oControl && oControl.isA && (oControl.isA("sap.ui.mdc.Chart"));
 		if (bExecuteRebindForTable || bExecuteRebindForChart) {
 			if (!oControl._bWaitForBindChanges) {
 				oControl._bWaitForBindChanges = true;
@@ -15,7 +15,7 @@ sap.ui.define(["sap/ui/fl/apply/api/FlexRuntimeInfoAPI"], function (FlexRuntimeI
 					element: oControl
 				}).then(function () {
 					if (bExecuteRebindForTable) {
-						oControl.checkAndRebind();
+						oControl.rebind();
 					} else if (bExecuteRebindForChart) {
 						oControl.rebind();
 					}

package/src/sap/ui/mdc/flexibility/AggregationConfigFlex.js

@@ -22,7 +22,7 @@ sap.ui.define([
     var AggregationConfigFlex = {};
 
     var fConfigModified = function(oControl) {
-        if (!oControl._bWaitForModificationChanges) {
+        if (!oControl._bWaitForModificationChanges && oControl.isA) {
             oControl._bWaitForModificationChanges = true;
             Engine.getInstance().waitForChanges(oControl).then(function() {
                 if (oControl._onModifications instanceof Function) {
@@ -33,6 +33,19 @@ sap.ui.define([
         }
 	};
 
+    var fnQueueChange = function(oControl, fTask) {
+		var fCleanupPromiseQueue = function(pOriginalPromise) {
+			if (oControl._pQueue === pOriginalPromise){
+				delete oControl._pQueue;
+			}
+		};
+
+		oControl._pQueue = oControl._pQueue instanceof Promise ? oControl._pQueue.then(fTask) : fTask();
+		oControl._pQueue.then(fCleanupPromiseQueue.bind(null, oControl._pQueue));
+
+		return oControl._pQueue;
+	};
+
     /**
      * Creates a changehandler specific to the provided aggregation and property name,
      * to enhance the xConfig object for a given mdc control instance.
@@ -58,39 +71,43 @@ sap.ui.define([
             "changeHandler": {
                 applyChange: function (oChange, oControl, mPropertyBag) {
 
-                    return Engine.getInstance().readXConfig(oControl, {
-                        propertyBag: mPropertyBag
-                    })
-                    .then(function(oPriorAggregationConfig) {
-                        var sOldValue = null;
-
-                        if (oPriorAggregationConfig
-                            && oPriorAggregationConfig.aggregations
-                            && oPriorAggregationConfig.aggregations[sAffectedAggregation]
-                            && oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().name]
-                            && oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().name][sAffectedProperty]
-                            ){
-                                sOldValue = oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().name][sAffectedProperty];
-                        }
-
-                        oChange.setRevertData({
-                            name: oChange.getContent().name,
-                            value: sOldValue
-                        });
-
-                        return Engine.getInstance().enhanceXConfig(oControl, {
-                            controlMeta: {
-                                aggregation: sAffectedAggregation,
-                                property: sAffectedProperty
-                            },
-                            name: oChange.getContent().name,
-                            value: oChange.getContent().value,
+                    return fnQueueChange(oControl, function(){
+                        return Engine.getInstance().readXConfig(oControl, {
                             propertyBag: mPropertyBag
+                        })
+                        .then(function(oPriorAggregationConfig) {
+                            var sOldValue = null;
+
+                            if (oPriorAggregationConfig
+                                && oPriorAggregationConfig.aggregations
+                                && oPriorAggregationConfig.aggregations[sAffectedAggregation]
+                                && oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().name]
+                                && oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().name][sAffectedProperty]
+                                ){
+                                    sOldValue = oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().name][sAffectedProperty];
+                            }
+
+                            oChange.setRevertData({
+                                name: oChange.getContent().name,
+                                value: sOldValue
+                            });
+
+                            return Engine.getInstance().enhanceXConfig(oControl, {
+                                controlMeta: {
+                                    aggregation: sAffectedAggregation,
+                                    property: sAffectedProperty
+                                },
+                                name: oChange.getContent().name,
+                                value: oChange.getContent().value,
+                                propertyBag: mPropertyBag
+                            });
+                        })
+                        .then(function() {
+                            fConfigModified(oControl);
                         });
-                    })
-                    .then(function() {
-                        fConfigModified(oControl);
+
                     });
+
                 },
                 completeChangeContent: function (oChange, mChangeSpecificInfo, mPropertyBag) {
                     // Not used, but needs to be there

package/src/sap/ui/mdc/flexibility/Chart.flexibility.js

@@ -4,15 +4,15 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	'./SortFlex', './ChartItemFlex'
-], function(SortFlex, ChartItemFlex) {
+	'./SortFlex', './ChartItemFlex', './ConditionFlex'
+], function(SortFlex, ChartItemFlex, ConditionFlex) {
 	"use strict";
 	/**
 	 * Chart-control-specific change handler that enables the storing of changes in the layered repository of the flexibility services.
 	 *
 	 * @alias sap.ui.mdc.flexibility.Chart
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 */
 	return {
 		addItem: ChartItemFlex.addItem,
@@ -58,6 +58,8 @@ sap.ui.define([
 		},
 		removeSort: SortFlex.removeSort,
 		addSort: SortFlex.addSort,
-		moveSort: SortFlex.moveSort
+		moveSort: SortFlex.moveSort,
+		addCondition: ConditionFlex.addCondition,
+		removeCondition: ConditionFlex.removeCondition
 	};
 }, /* bExport= */true);

package/src/sap/ui/mdc/flexibility/ChartItemFlex.js

@@ -11,8 +11,24 @@ sap.ui.define([
 
 	var oChartItemFlex = Object.assign({}, ItemBaseFlex);
 
+	/* Disabled until clarified with flex
+	var fnQueueChange = function(oControl, fTask) {
+		var fCleanupPromiseQueue = function(pOriginalPromise) {
+			if (oControl._pQueue === pOriginalPromise){
+				delete oControl._pQueue;
+			}
+		};
+
+		oControl._pQueue = oControl._pQueue instanceof Promise ? oControl._pQueue.then(fTask) : fTask();
+		oControl._pQueue.then(fCleanupPromiseQueue.bind(null, oControl._pQueue));
+
+		return oControl._pQueue;
+	};*/
+
 	oChartItemFlex.beforeAddItem = function(Delegate, sDataPropertyName, oControl, mPropertyBag, oChangeContent) {
+
 		return Delegate.addItem.call(Delegate, sDataPropertyName, oControl, mPropertyBag, oChangeContent.role);
+
 	};
 
 	oChartItemFlex.findItem = function(oModifier, aItems, sName) {
@@ -35,6 +51,26 @@ sap.ui.define([
 		}, Promise.resolve());
 	};
 
+	/* Disabled until clarified with flex
+	oChartItemFlex.createChangeHandler = function(fApply, fComplete, fRevert) {
+		return {
+			"changeHandler": {
+				applyChange: function(oChange, oControl, mPropertyBag) {
+					return fnQueueChange(oControl, function(){return fApply(oChange, oControl, mPropertyBag);});
+				},
+				completeChangeContent: function(oChange, mChangeSpecificInfo, mPropertyBag) {
+					fComplete(oChange, mChangeSpecificInfo, mPropertyBag);
+				},
+				revertChange: function(oChange, oControl, mPropertyBag) {
+					return fnQueueChange(fRevert(oChange, oControl, mPropertyBag, true));
+				}
+			},
+			"layers": {
+				"USER": true
+			}
+		};
+	};*/
+
 	oChartItemFlex.addItem = oChartItemFlex.createAddChangeHandler();
 	oChartItemFlex.removeItem = oChartItemFlex.createRemoveChangeHandler();
 	oChartItemFlex.moveItem = oChartItemFlex.createMoveChangeHandler();

package/src/sap/ui/mdc/flexibility/ColumnFlex.js

@@ -17,7 +17,7 @@ sap.ui.define([
 			if (!oControl._bWaitForBindChanges) {
 				oControl._bWaitForBindChanges = true;
 				Engine.getInstance().waitForChanges(oControl).then(function() {
-					oControl.checkAndRebind();
+					oControl.rebind();
 					delete oControl._bWaitForBindChanges;
 				});
 

package/src/sap/ui/mdc/flexibility/ConditionFlex.js

@@ -4,8 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	'sap/base/util/merge', 'sap/ui/mdc/condition/FilterOperatorUtil'
-], function(merge, FilterOperatorUtil) {
+	'sap/base/util/merge', 'sap/base/Log', 'sap/ui/mdc/condition/FilterOperatorUtil'
+], function(merge, Log, FilterOperatorUtil) {
 	"use strict";
 
 	/*
@@ -30,6 +30,15 @@ sap.ui.define([
 		return oControl._pQueue;
 	};
 
+
+	var fnGetDelegate = function(sDelegatePath) {
+		return new Promise(function(fResolveLoad, fRejectLoad){
+			sap.ui.require([
+				sDelegatePath
+			], fResolveLoad, fRejectLoad);
+		});
+	};
+
 	var fDetermineFilterControl = function(oControl) {
 		var oController = oControl && oControl.getEngine ? oControl.getEngine().getController(oControl, "Filter") : null;
 		return oController ? oController.getFilterControl() : null;
@@ -79,10 +88,24 @@ sap.ui.define([
 						});
 					}
 
-					// the control providing the filter functionality needs to be used to update the ConditionModel
-					if (oFilterControl && oFilterControl.addCondition) {
-						return oFilterControl.addCondition(oChangeContent.name, oChangeContent.condition);
-					}
+					return oModifier.getProperty(oControl, "delegate")
+					.then(function(oDelegate){
+						return fnGetDelegate(oDelegate.name);
+					})
+					.then(function(Delegate){
+						var fnDelegateAddCondition = Delegate && (Delegate.getFilterDelegate ? Delegate.getFilterDelegate().addCondition : Delegate.addCondition);
+						if (fnDelegateAddCondition) {
+							return fnDelegateAddCondition(oChangeContent.name, oControl, mPropertyBag)
+							.catch(function(oEx) {
+								Log.error("Error during Delegate.addCondition call: " + oEx);
+							});
+						}
+					})
+					.finally(function() {
+						if (oFilterControl && oFilterControl.addCondition) {
+							return oFilterControl.addCondition(oChangeContent.name, oChangeContent.condition);
+						}
+					});
 				}
 			});
 		});
@@ -132,10 +155,24 @@ sap.ui.define([
 								});
 							}
 
-							// the control providing the filter functionality needs to be used to update the ConditionModel
-							if (oFilterControl && oFilterControl.removeCondition) {
-								return oFilterControl.removeCondition(oChangeContent.name, oChangeContent.condition);
-							}
+							return oModifier.getProperty(oControl, "delegate")
+							.then(function(oDelegate){
+								return fnGetDelegate(oDelegate.name);
+							})
+							.then(function(Delegate){
+								var fnDelegateRemoveCondition = Delegate && (Delegate.getFilterDelegate ? Delegate.getFilterDelegate().removeCondition : Delegate.removeCondition);
+								if (fnDelegateRemoveCondition) {
+									return fnDelegateRemoveCondition(oChangeContent.name, oControl, mPropertyBag)
+									.catch(function(oEx) {
+										Log.error("Error during Delegate.removeCondition call: " + oEx);
+									});
+								}
+							})
+							.finally(function() {
+								if (oFilterControl && oFilterControl.removeCondition) {
+									return oFilterControl.removeCondition(oChangeContent.name, oChangeContent.condition);
+								}
+							});
 						}
 					}
 				});

package/src/sap/ui/mdc/flexibility/FilterBar.flexibility.js

@@ -4,7 +4,7 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-sap.ui.define(['./FilterItemFlex', './ConditionFlex'], function(FilterItemFlex, ConditionFlex) {
+sap.ui.define(['./FilterItemFlex', './ConditionFlex', './PropertyInfoFlex'], function(FilterItemFlex, ConditionFlex, PropertyInfoFlex) {
 	"use strict";
 
 	/**
@@ -12,7 +12,7 @@ sap.ui.define(['./FilterItemFlex', './ConditionFlex'], function(FilterItemFlex,
 	 *
 	 * @alias sap.ui.mdc.flexibility.FilterBar
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 */
 
 	return {
@@ -20,6 +20,7 @@ sap.ui.define(['./FilterItemFlex', './ConditionFlex'], function(FilterItemFlex,
 		"removeFilter": FilterItemFlex.createRemoveChangeHandler(),
 		"moveFilter": FilterItemFlex.createMoveChangeHandler(),
 		"addCondition": ConditionFlex.addCondition,
-		"removeCondition": ConditionFlex.removeCondition
+		"removeCondition": ConditionFlex.removeCondition,
+		"addPropertyInfo": PropertyInfoFlex.addPropertyInfo
 	};
 }, /* bExport= */true);

package/src/sap/ui/mdc/flexibility/FilterItemFlex.js

@@ -12,7 +12,7 @@ sap.ui.define(['./ItemBaseFlex'], function(ItemBaseFlex) {
 	 *
 	 * @alias sap.ui.mdc.flexibility.FilterBar
 	 * @author SAP SE
-	 * @version 1.97.1
+	 * @version 1.100.0
 	 */
 
 	var oFilterItemFlex = Object.assign({}, ItemBaseFlex);

package/src/sap/ui/mdc/flexibility/GroupFlex.js

@@ -15,7 +15,7 @@ sap.ui.define(["sap/ui/fl/apply/api/FlexRuntimeInfoAPI"], function (FlexRuntimeI
 					element: oControl
 				}).then(function () {
 					if (bExecuteRebindForTable) {
-						oControl.checkAndRebind();
+						oControl.rebind();
 					} else if (bExecuteRebindForChart) {
 						oControl.rebind();
 					}

package/src/sap/ui/mdc/flexibility/ItemBaseFlex.js

@@ -21,7 +21,6 @@ sap.ui.define([
 		 * @param {object} Delegate The control specific delegate
 		 * @param {string} sDataPropertyName The property name which should be added
 		 * @param {object} oControl The control defined as <code>selectorElement</code> in the change
-		 * @param {object} oChangeContent The current change content
 		 * @param {object} mPropertyBag Instance of property bag from Flex change API
 		 */
 		beforeAddItem: function(Delegate, sDataPropertyName, oControl, mPropertyBag) {

package/src/sap/ui/mdc/flexibility/Panel.flexibility.js

@@ -5,10 +5,16 @@
  */
 
 sap.ui.define([
-	'sap/ui/fl/changeHandler/Base'
-], function(Base) {
+	'sap/ui/fl/changeHandler/Base',
+	'./ItemBaseFlex'
+], function(Base, ItemBaseFlex) {
 	"use strict";
 
+	var oLinkHandler = Object.assign({}, ItemBaseFlex);
+    oLinkHandler.findItem = function(oModifier, aActions, sName) {
+		return Promise.resolve(sap.ui.getCore().byId(sName));
+	};
+
 	/**
 	 * Change handlers for adding and remove of a link in sap.ui.mdc.link.Panel.
 	 *
@@ -118,7 +124,7 @@ sap.ui.define([
 										href: oMetadataOfNewItem.href,
 										target: oMetadataOfNewItem.target,
 										icon: oMetadataOfNewItem.icon,
-										visible: oMetadataOfNewItem.visible
+										visible: true
 									});
 								})
 								.then(function(oItem){

package/src/sap/ui/mdc/flexibility/PropertyInfoFlex.js

@@ -0,0 +1,27 @@
+/*
+ * ! OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+sap.ui.define([], function() {
+	"use strict";
+
+	//obsolete
+	var oPropertyInfoFlex = {};
+
+	oPropertyInfoFlex.addPropertyInfo = {
+		"changeHandler": {
+			applyChange: function(oChange, oControl, mPropertyBag) {
+			},
+			completeChangeContent: function(oChange, mChangeSpecificInfo, mPropertyBag) {
+			},
+			revertChange: function(oChange, oControl, mPropertyBag) {
+			}
+		},
+		"layers": {
+			"USER": true
+		}
+	};
+
+	return oPropertyInfoFlex;
+});

package/src/sap/ui/mdc/flexibility/SortFlex.js

@@ -7,13 +7,13 @@ sap.ui.define(["sap/ui/mdc/p13n/Engine"], function(Engine) {
 	"use strict";
 	var fRebindControl = function(oControl) {
 		var bExecuteRebindForTable = oControl && oControl.isA && oControl.isA("sap.ui.mdc.Table") && oControl.isTableBound();
-		var bExecuteRebindForChart = oControl && oControl.isA && (oControl.isA("sap.ui.mdc.Chart") || oControl.isA("sap.ui.mdc.ChartNew"));
+		var bExecuteRebindForChart = oControl && oControl.isA && (oControl.isA("sap.ui.mdc.Chart"));
 		if (bExecuteRebindForTable || bExecuteRebindForChart) {
 			if (!oControl._bWaitForBindChanges) {
 				oControl._bWaitForBindChanges = true;
 				Engine.getInstance().waitForChanges(oControl).then(function() {
 					if (bExecuteRebindForTable) {
-						oControl.checkAndRebind();
+						oControl.rebind();
 					} else if (bExecuteRebindForChart) {
 						oControl.rebind();
 					}

package/src/sap/ui/mdc/flp/FlpLinkDelegate.js

@@ -58,7 +58,7 @@ sap.ui.define([
 	 * Calculates the type of link that should be displayed
 	 * @param {Object} oPayload - The Payload of the Link given by the application
 	 * @returns {Promise} once resolved an object oLinkType is returned
-	 * @returns {Number} oLinkType.type - 0 (Text) | 1 (Direct Link) | 2 (Popup)
+	 * @returns {int} oLinkType.type - 0 (Text) | 1 (Direct Link) | 2 (Popup)
 	 * @returns {sap.ui.mdc.link.LinkItem} oLinkType.directLink - instance of {@link sap.ui.mdc.link.LinkItem} which should be used for direct navigation
 	 * In case oLinkType.type is 0 the Link will get rendered as a text
 	 * In case oLinkType.type is 1 the Link will get rendered as a Link but it won't have a Popover - it will trigger a direct navigation on press
@@ -216,7 +216,7 @@ sap.ui.define([
 	 * Retrieves the actual targets for the navigation of the link. This uses the UShell loaded by the {@link sap.ui.mdc.link.Factory} to retrieve
 	 * the navigation targets from the FLP service.
 	 * @private
-	 * @param {String} sAppStateKey key of the appstate (not used yet)
+	 * @param {string} sAppStateKey key of the appstate (not used yet)
 	 * @param {Object} oSemanticAttributes calculated by _calculateSemanticAttributes
 	 * @param {Object} oPayload given by the application
 	 * @param {Object} oInfoLog of type {@link sap.ui.mdc.link.Log} - the corresponding InfoLog of the Link
@@ -345,7 +345,7 @@ sap.ui.define([
 	 * This will return an array of the SemanticObjects as strings given by the payload.
 	 * @private
 	 * @param {Object} oPayload defined by the application
-	 * @returns {String[]} containing SemanticObjects based of the payload
+	 * @returns {string[]} containing SemanticObjects based of the payload
 	 */
 	FlpLinkDelegate._getSemanticObjects = function(oPayload) {
 		return oPayload.semanticObjects ? oPayload.semanticObjects : [];
@@ -403,7 +403,7 @@ sap.ui.define([
 	 * Converts a given array of SemanticObjectMapping into a Map containing SemanticObjects as Keys and a Map of it's corresponding SemanticObjectMappings as values.
 	 * @private
 	 * @param {Object[]} aSemanticObjectMappings of type {@link sap.ui.mdc.link.SemanticObjectMapping}
-	 * @returns {Map<String, Map<String, String>>} mSemanticObjectMappings
+	 * @returns {Object<string, Object<string, string>>} mSemanticObjectMappings
 	 */
 	FlpLinkDelegate._convertSemanticObjectMapping = function(aSemanticObjectMappings) {
 		if (!aSemanticObjectMappings.length) {
@@ -426,7 +426,7 @@ sap.ui.define([
 	 * Converts a given array of SemanticObjectUnavailableActions into a Map containing SemanticObjects as Keys and a Map of it's corresponding SemanticObjectUnavailableActions as values.
 	 * @private
 	 * @param {Object[]} aSemanticObjectUnavailableActions of type {@link sap.ui.mdc.link.SemanticObjectUnavailableAction}
-	 * @returns {Map<String, Map<String, String>>} mSemanticObjectUnavailableActions
+	 * @returns {Object<string, Object<string, string>>} mSemanticObjectUnavailableActions
 	 */
 	FlpLinkDelegate._convertSemanticObjectUnavailableAction = function(aSemanticObjectUnavailableActions) {
 		if (!aSemanticObjectUnavailableActions.length) {
@@ -443,4 +443,4 @@ sap.ui.define([
 	};
 
 	return FlpLinkDelegate;
-}, /* bExport= */ true);
+});