@openui5/sap.ui.mdc 1.96.5 → 1.99.0

package/src/sap/ui/mdc/filterbar/FilterBarBaseRenderer.js

@@ -28,7 +28,7 @@ sap.ui.define([],
 		 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 		 *
 		 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer
-		 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered
+		 * @param {sap.ui.mdc.filterbar.FilterBarBase} oControl An object representation of the control that should be rendered
 		 */
 		FilterBarBaseRenderer.render = function (oRm, oControl) {
 			oRm.openStart("div", oControl);

package/src/sap/ui/mdc/filterbar/PropertyHelper.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 *
 	 * @private
 	 * @experimental

package/src/sap/ui/mdc/filterbar/p13n/AdaptationFilterBar.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.mdc.filterbar.FilterBarBase
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 * @constructor
 	 * @private
 	 * @since 1.80.0
@@ -52,6 +52,12 @@ sap.ui.define([
 		this._bPersistValues = true;
 	};
 
+	AdaptationFilterBar.prototype._initControlDelegate = function() {
+		this._retrieveMetadata().then(function() {
+			this._applyInitialFilterConditions();
+		}.bind(this));
+	};
+
 	AdaptationFilterBar.prototype.setMessageStrip = function(oStrip) {
 		this._oFilterBarLayout.setMessageStrip(oStrip);
 	};
@@ -316,4 +322,4 @@ sap.ui.define([
 
 	return AdaptationFilterBar;
 
-});
+});

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

@@ -10,6 +10,7 @@ sap.ui.define([
 	"sap/ui/model/FilterOperator",
 	"sap/ui/Device",
 	"sap/ui/core/InvisibleText",
+	"sap/ui/core/Item",
 	"sap/ui/core/Control",
 	"sap/ui/layout/HorizontalLayout",
 	"sap/m/SearchField",
@@ -28,6 +29,7 @@ sap.ui.define([
 	FilterOperator,
 	Device,
 	InvisibleText,
+	Item,
 	Control,
 	HorizontalLayout,
 	SearchField,
@@ -300,7 +302,7 @@ sap.ui.define([
 		this.oList.bindAggregation("items", {
 			path: "/items",
 			model: "$mdcColSearch",
-			template: new sap.ui.core.Item({
+			template: new Item({
 				key: "{$mdcColSearch>key}",
 				text: "{$mdcColSearch>text}"
 			})

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

@@ -33,7 +33,7 @@ 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.96.5
+		 * @version 1.99.0
 		 * @constructor
 		 * @private
 		 * @since 1.84.0
@@ -140,6 +140,12 @@ sap.ui.define(
 			this._oFilterBarLayout.addEndContent(this._oShowAllFiltersBtn);
 		};
 
+		FilterBar.prototype.applySettings = function(mSettings, oScope) {
+			this._applySettings(mSettings, oScope);
+			this._waitForMetadata();
+		};
+
+
 		FilterBar.prototype.exit = function() {
 			FilterBarBase.prototype.exit.apply(this, arguments);
 			this._oBasicSearchField = null;

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

@@ -31,7 +31,7 @@ sap.ui.define([
 	 */
 	GenericFilterBarDelegate.fetchProperties = function(oFilterBar) {
 		if (!oFilterBar.__oObserver) {
-			oFilterBar.__oObserver = new ManagedObjectObserver(_observeChanges);
+			oFilterBar.__oObserver = new ManagedObjectObserver(_observeChanges.bind(this));
 			oFilterBar.__oObserver.observe(oFilterBar, {
 				aggregations: ["filterItems"]
 			});
@@ -41,11 +41,11 @@ sap.ui.define([
 			var aFilterItems = oFilterBar.getFilterItems();
 			oFilterBar.__aProperties = [];
 			aFilterItems.forEach(function(oFF){
-				addFilterField(oFF, oFilterBar.__aProperties);
-			});
+				addFilterField.call(this, oFF, oFilterBar.__aProperties);
+			}.bind(this));
 
 			fResolve(oFilterBar.__aProperties);
-		});
+		}.bind(this));
 
 	};
 
@@ -63,7 +63,7 @@ sap.ui.define([
 			type: oFF.getDataType(),
 			formatOptions: oFF.getDataTypeFormatOptions(),
 			constraints: oFF.getDataTypeConstraints(),
-			typeConfig: oFF._getFormatOptions().delegate.getTypeUtil().getTypeConfig(oFF.getDataType(), oFF.getDataTypeFormatOptions(), oFF.getDataTypeConstraints()),
+			typeConfig: this.getTypeUtil().getTypeConfig(oFF.getDataType(), oFF.getDataTypeFormatOptions(), oFF.getDataTypeConstraints()),
 			required: oFF.getRequired(),
 			hiddenFilter: false,
 			visible: oFF.getVisible(),
@@ -123,7 +123,7 @@ sap.ui.define([
 				var oNewFF = oChanges.child;
 				oFilterBar = oNewFF.getParent();
 				aProperties = oFilterBar.__aProperties;
-				addFilterField(oNewFF, aProperties);
+				addFilterField.call(this, oNewFF, aProperties);
 				return;
 			}
 			if (oChanges.mutation === "remove") {

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/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.96.5
+	 * @version 1.99.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/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/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.96.5
+	 * @version 1.99.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.96.5
+	 * @version 1.99.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/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,110 @@
+/*
+ * ! 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([
+	'sap/base/util/merge'
+], function(merge) {
+	"use strict";
+
+	/*
+	* NOTE: As the PropertyInfoFlex is the central change handler for property info
+	* processing, it might happen that the in/out handling of the ConditionModel
+	* might cause multiple condition changes to be applied in parallel. Due to the
+	* asynchronous modifier handling, we need to make sure to queue these changes in their
+	* incoming order as parallel processing might falsely overwrite the 'filterConditions' or the 'propertyInfo'
+	* properties causing the change handler to break the controls housekeeping and the last
+	* parallel filter change would always win.
+	*
+	* Same processing is done in the ConditionFlex - handler.
+	*/
+	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;
+	};
+
+	var fAddFilterInfo = function(oChange, oChangeContent, oControl, mPropertyBag) {
+
+		return fnQueueChange(oControl, function(){
+			var oModifier = mPropertyBag.modifier;
+
+			return oModifier.getProperty(oControl, "propertyInfo")
+			.then(function(aPropertyInfo) {
+
+				var aPropertiesInfo = merge([], aPropertyInfo);
+				var nIdx = aPropertiesInfo.findIndex(function(oEntry) {
+					return oEntry.name === oChangeContent.name;
+				});
+				if (nIdx < 0) {
+					aPropertiesInfo.push({
+						name: oChangeContent.name,
+						dataType: oChangeContent.dataType,
+						maxConditions: oChangeContent.maxConditions,
+						constraints: oChangeContent.constraints,
+						formatOptions: oChangeContent.formatOptions,
+						required: oChangeContent.required,
+						caseSensitive: oChangeContent.caseSensitive,
+						display: oChangeContent.display
+					});
+
+					oModifier.setProperty(oControl, "propertyInfo", aPropertiesInfo);
+
+					// Set revert data on the change
+					oChange.setRevertData({ name: oChangeContent.name});
+				}
+			});
+		});
+	};
+
+	var fRemoveFilterInfo = function(oChange, oChangeContent, oControl, mPropertyBag) {
+
+		return fnQueueChange(oControl, function(){
+			var oModifier = mPropertyBag.modifier;
+
+			return oModifier.getProperty(oControl, "propertyInfo")
+			.then(function(aPropertyInfos) {
+				var aPropertiesInfo = merge([], aPropertyInfos);
+				var nIdx = aPropertiesInfo.findIndex(function(oEntry) {
+					return oEntry.name === oChangeContent.name;
+				});
+				if (nIdx >= 0) {
+					aPropertiesInfo.splice(nIdx, 1);
+					oModifier.setProperty(oControl, "propertyInfo", aPropertiesInfo);
+				}
+			});
+		});
+	};
+
+
+	var oPropertyInfoFlex = {};
+
+	oPropertyInfoFlex.addPropertyInfo = {
+		"changeHandler": {
+			applyChange: function(oChange, oControl, mPropertyBag) {
+				return fAddFilterInfo(oChange, oChange.getContent(), oControl, mPropertyBag);
+			},
+			completeChangeContent: function(oChange, mChangeSpecificInfo, mPropertyBag) {
+				// TODO
+			},
+			revertChange: function(oChange, oControl, mPropertyBag) {
+				return fRemoveFilterInfo(oChange, oChange.getRevertData(), oControl, mPropertyBag).then(function() {
+					oChange.resetRevertData();
+				});
+			}
+		},
+		"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);
+});