@openui5/sap.ui.mdc 1.100.0 → 1.101.0

package/src/sap/ui/mdc/valuehelp/content/ListCollection.js

@@ -0,0 +1,205 @@
+/*
+ * ! 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/ui/mdc/valuehelp/base/Content",
+	'sap/ui/mdc/util/loadModules',
+	'sap/ui/model/BindingMode'
+], function(
+	Content,
+	loadModules
+) {
+	"use strict";
+
+	var ListCollection = Content.extend("sap.ui.mdc.valuehelp.content.ListCollection", /** @lends sap.ui.mdc.valuehelp.content.ListCollection.prototype */
+	{
+		metadata: {
+			library: "sap.ui.mdc",
+			interfaces: [
+				"sap.ui.mdc.valuehelp.IDialogContent"
+			],
+			aggregations: {
+				lists: {
+					type: "sap.ui.mdc.valuehelp.base.FilterableListContent",
+					multiple: true
+				}
+			},
+			defaultAggregation: "lists"
+		}
+	});
+
+	ListCollection.prototype.init = function() {
+
+		Content.prototype.init.apply(this, arguments);
+
+		this._oObserver.observe(this, {
+			aggregations: ["lists", "displayContent"]
+		});
+
+	};
+
+	ListCollection.prototype._getVisibleList = function () {
+		return this.getLists().find(function (oList) {
+			return this._sVisibleListId ? oList.getId() === this._sVisibleListId : true;
+		}.bind(this));
+	};
+
+	ListCollection.prototype.getFormattedTitle = function(iCount) {
+		return "ListCollection: " + this._getVisibleList().getFormattedTitle();
+	};
+
+	ListCollection.prototype.getFormattedShortTitle = function() {
+		return "ListCollection: " + this._getVisibleList().getFormattedShortTitle();
+	};
+
+	ListCollection.prototype._observeChanges = function(oChanges) {
+		Content.prototype._observeChanges.apply(this, arguments);
+
+		if (oChanges.name === "lists") {
+			this._handleListsUpdate(oChanges);
+		}
+
+		if (oChanges.name === "displayContent") {
+			this._assignCollectiveSearchToVisibleList();
+		}
+
+		// Dirty?
+		this.getLists().forEach(function (oList) {
+			oList._observeChanges(oChanges);
+		});
+	};
+
+	ListCollection.prototype.onShow = function () {
+		var oActiveList = this._getVisibleList();
+		oActiveList.onShow.apply(oActiveList, arguments);
+	};
+
+	ListCollection.prototype.onHide = function () {
+		var oActiveList = this._getVisibleList();
+		oActiveList.onHide.apply(oActiveList, arguments);
+	};
+
+
+	ListCollection.prototype._handleListsUpdate = function (oChanges) {
+		if (oChanges.mutation === "insert") {
+			if (oChanges.child.setCollectiveSearchSelect) {
+				this._updateSelectModel();
+			}
+		}
+	};
+
+	ListCollection.prototype._handleConfirmed = function (oEvent) {
+		this.fireConfirmed(oEvent.getParameters());
+	};
+
+	ListCollection.prototype._handleCanceled = function (oEvent) {
+		this.fireCanceled(oEvent.getParameters());
+	};
+
+	ListCollection.prototype._handleSelect = function (oEvent) {
+		this.fireSelect(oEvent.getParameters());
+	};
+
+
+	ListCollection.prototype._assignCollectiveSearchToVisibleList = function (oChanges) {
+		this._retrieveCollectiveSearchSelect().then(function (oSelect) {
+			var oList = this._getVisibleList();
+			oList.setCollectiveSearchSelect(oSelect);
+		}.bind(this));
+	};
+
+	ListCollection.prototype.getContent = function () {
+		var oVisibleList = this._getVisibleList();
+		return oVisibleList.getContent().then(function (oContent) {
+			this.setAggregation("displayContent", oContent);
+			return oContent;
+		}.bind(this));
+
+	};
+
+	ListCollection.prototype.onShow = function () {
+		Content.prototype.onShow.apply(this, arguments);
+		var oVisibleList = this._getVisibleList();
+		this._getContainer()._bindContent(oVisibleList);
+		oVisibleList.onShow();
+
+	};
+
+	ListCollection.prototype.onHide = function () {
+		var oVisibleList = this._getVisibleList();
+		this._getContainer()._unbindContent(oVisibleList);
+		oVisibleList.onHide();
+
+		Content.prototype.onHide.apply(this, arguments);
+	};
+
+
+	ListCollection.prototype._handleCollectiveSearchSelect = function (oEvent) {
+		var oCurrentList = this._getVisibleList();
+		this._getContainer()._unbindContent(oCurrentList);
+		oCurrentList.onHide();
+
+		this._sVisibleListId = oEvent.getParameter("key");
+		var oNextList = this._getVisibleList();
+		this.getContent().then(function () {
+			this._getContainer()._bindContent(oNextList);
+			oNextList.onShow();
+		}.bind(this));
+	};
+
+	ListCollection.prototype._updateSelectModel = function () {
+		if (this._oSelectModel) {
+			var aLists = this.getLists();
+			var oModelData = aLists.reduce(function (oResult, oCurrent) {
+				oResult.lists.push({key: oCurrent.getId(), text: oCurrent.getFormattedTitle()});
+				return oResult;
+			} , {lists: []});
+			this._oSelectModel.setData(oModelData);
+		}
+	};
+
+	ListCollection.prototype._retrieveCollectiveSearchSelect = function () {
+		return this._retrievePromise("collectiveSearchSelect", function () {
+			return loadModules([
+				"sap/ui/mdc/filterbar/vh/CollectiveSearchSelect",
+				"sap/ui/core/Item",
+				"sap/ui/model/json/JSONModel"
+			]).then(function(aModules) {
+				var CollectiveSearchSelect = aModules[0];
+				var Item = aModules[1];
+				var JSONModel = aModules[2];
+
+				this._oSelectModel = new JSONModel(this);
+				this._updateSelectModel();
+				this.setModel(this._oSelectModel, "$contenthelp");
+
+				var oItemTemplate = new Item(this.getId() + "-collSearchItem", {
+					key: "{$contenthelp>key}",
+					text: "{$contenthelp>text}",
+					enabled: true
+					/*textDirection: "{$contenthelp>textDirection}" */
+				});
+
+				var oCollectiveSearchSelect = new CollectiveSearchSelect(this.getId() + "-collSearch", {
+					items: {path: "$contenthelp>/lists", template: oItemTemplate},
+					select: this._handleCollectiveSearchSelect.bind(this),
+					selectedItemKey: this._oSelectModel.getProperty("/lists/0/key")
+				});
+				oCollectiveSearchSelect.setModel(this._oSelectModel, "$contenthelp");
+				return oCollectiveSearchSelect;
+			}.bind(this));
+		}.bind(this));
+
+	};
+
+	ListCollection.prototype.exit = function () {
+		this._oSelectModel = null;
+		this._iVisibleListIndex = null;
+		Content.prototype.exit.apply(this, arguments);
+	};
+
+	return ListCollection;
+});

package/src/sap/ui/mdc/valuehelp/content/MDCTable.js

@@ -12,8 +12,11 @@ sap.ui.define([
 	'sap/ui/mdc/library',
 	'sap/m/library',
 	"sap/ui/table/library",
-	"sap/ui/thirdparty/jquery"
-
+	"sap/ui/thirdparty/jquery",
+	// "sap/ui/mdc/p13n/Engine",
+	// "sap/ui/mdc/enum/PersistenceMode",
+	'sap/ui/mdc/condition/FilterConverter',
+	'sap/base/util/restricted/_throttle'
 ], function(
 	FilterableListContent,
 	loadModules,
@@ -22,7 +25,11 @@ sap.ui.define([
 	library,
 	mLibrary,
 	uiTableLibrary,
-	jQuery
+	jQuery,
+	// Engine,
+	// PersistenceMode,
+	FilterConverter,
+	throttle
 ) {
 	"use strict";
 
@@ -57,13 +64,17 @@ sap.ui.define([
 			return this._oUITableSelectionPlugin || oInnerTable;
 		}.bind(this);
 
-		var _fireSelect = function (oItem, bSelected) {
-			var oValues = this._getItemFromContext(oItem.getBindingContext());
-			var oCondition = oValues && this._createCondition(oValues.key, oValues.description, oValues.inParameters, oValues.outParameters);
-			var sAddRemoveType = bSelected ? SelectType.Add : SelectType.Remove;
-			this.fireSelect({type: this._isSingleSelect() ? SelectType.Set : sAddRemoveType, conditions: [oCondition]});
+		var _fireSelect = function (aConditions, bSelected) {
+			var sMultiSelectType = bSelected ? SelectType.Add : SelectType.Remove;
+
+			if (!bSelected && this._isSingleSelect()) {
+				sMultiSelectType = SelectType.Add;
+			}
+
+			this._fireSelect({type: sMultiSelectType, conditions: aConditions});
 		};
 
+
 		var MDCTableHelperConfig = {
 			"ResponsiveTable": {
 				getListBindingInfo: function () {
@@ -85,19 +96,26 @@ sap.ui.define([
 					if (!this.isTypeahead() || !this._isSingleSelect()) {
 						oItem.setSelected(!oItem.getSelected());
 					}
-					_fireSelect.call(this, oItem, oItem.getSelected());
+
+					var sModelName = this._getListBindingInfo().model;
+					var oItemContext = oItem.getBindingContext(sModelName);
+					var oValues = this._getItemFromContext(oItemContext);
+					var oCondition = oValues && this._createCondition(oValues.key, oValues.description, oValues.payload);
+
+					_fireSelect.call(this, [oCondition], oItem.getSelected());
+
 				},
 				handleSelectionChange: function (oEvent) {
 					if (!this.isTypeahead() || !this._isSingleSelect()) { // single-suggestion handled in this._handleItemPress
 						var oParams = oEvent.getParameters();
 						var aListItems = oParams.listItems || oParams.listItem && [oParams.listItem];
+						var sModelName = this._getListBindingInfo().model;
 						var aConditions = aListItems.map(function (oItem) {
-			//				var sKey = _getListItemKey.call(this, oItem);
-			//				return sKey && this._createCondition(sKey);
-							var oValues = this._getItemFromContext(oItem.getBindingContext());
-							return oValues && this._createCondition(oValues.key, oValues.description, oValues.inParameters, oValues.outParameters);
+							var oItemContext = oItem.getBindingContext(sModelName);
+							var oValues = this._getItemFromContext(oItemContext);
+							return oValues && this._createCondition(oValues.key, oValues.description, oValues.payload);
 						}.bind(this));
-						this.fireSelect({type: oParams.selected ? SelectType.Add : SelectType.Remove, conditions: aConditions});
+						_fireSelect.call(this, aConditions, oParams.selected);
 					}
 				},
 				adjustTable: function () {
@@ -179,7 +197,7 @@ sap.ui.define([
 						if (bIsInSelectedConditions !== bIsRowSelected) {
 							var aBucket = aSelectedRows.indexOf(oRow) !== -1 ? aAddConditions : aRemoveConditions;
 							var oValues = this._getItemFromContext(oRow.getBindingContext());
-							var oCondition = oValues && this._createCondition(oValues.key, oValues.description, oValues.inParameters, oValues.outParameters);
+							var oCondition = oValues && this._createCondition(oValues.key, oValues.description, oValues.payload);
 							aBucket.push(oCondition);
 						}
 					}.bind(this));
@@ -187,14 +205,14 @@ sap.ui.define([
 					var bSingle = this._isSingleSelect();
 
 					if (aAddConditions.length) {
-						this.fireSelect({type: this._isSingleSelect() ? SelectType.Set : SelectType.Add, conditions: aAddConditions});
+						_fireSelect.call(this, aAddConditions, true);
 						if (bSingle) {
 							return;
 						}
 					}
 
 					if (aRemoveConditions.length) {
-						this.fireSelect({type: this._isSingleSelect() ? SelectType.Set : SelectType.Remove, conditions: aRemoveConditions});
+						_fireSelect.call(this, aRemoveConditions, false);
 					}
 				},
 				adjustTable: function () {
@@ -234,7 +252,7 @@ sap.ui.define([
 	};
 
 	function _updateSelection () {
-		if (this._oTableHelper) {
+		if (this._oTableHelper && !this._bSelectionIsUpdating) {
 			this._bSelectionIsUpdating = true;
 			var aItems = this._oTableHelper.getItems();
 			var aConditions = this.getConditions();
@@ -250,14 +268,16 @@ sap.ui.define([
 		}
 	}
 
+	var _updateSelectionThrottled = throttle(_updateSelection, 100, {leading: true});
+
 	/**
 	 * Constructor for a new <code>MDCTable</code> content.
 	 *
-	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
-	 * @param {object} [mSettings] Initial settings for the new control
-	 * @class Content for the <code>sap.ui.mdc.valuehelp.base.Container</code> element using a sap.ui.mdc.Table.
+	 * @param {string} [sId] ID for the new element, generated automatically if no ID is given
+	 * @param {object} [mSettings] Initial settings for the new element
+	 * @class Content for the {@link sap.ui.mdc.valuehelp.base.Container Container} element using a {@link sap.ui.mdc.Table}.
 	 * @extends sap.ui.mdc.valuehelp.base.FilterableListContent
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 * @constructor
 	 * @abstract
 	 * @private
@@ -281,7 +301,7 @@ sap.ui.define([
 				 * Table to be used in value help
 				 *
 				 * <b>Note:</b> Set the right selection mode (multiple selection or single selection) as it cannot be determined automatically
-				 * for every case. (Maybe for multi-value <code>FilterField</code> controls only single selection from table might be wanted.)
+				 * for every case. (Maybe for multi-value {@link sap.ui.mdc.FilterField FilterField} controls only single selection from table might be wanted.)
 				 */
 				table: {
 					type: "sap.ui.mdc.Table",
@@ -322,17 +342,19 @@ sap.ui.define([
 	};
 
 	MDCTable.prototype._handleConditionsUpdate = function() {
-		_updateSelection.call(this);
+		_updateSelectionThrottled.call(this);
 	};
 	MDCTable.prototype._handleUpdateFinished = function (oEvent) {
+
 		this._bScrolling = false;
 		this._bSearchTriggered = false;
-		_updateSelection.call(this);
+		_updateSelectionThrottled.call(this);
 	};
 
 
 	MDCTable.prototype._handleFirstVisibleRowChanged = function (oEvent) {
 		this._bScrolling = true;
+		_updateSelectionThrottled.call(this);
 	};
 
 	MDCTable.prototype._handleBusyStateChanged = function (oEvent) {
@@ -386,7 +408,7 @@ sap.ui.define([
 		}
 	};
 
-	var _handleSearch = function (oEvent) {
+	MDCTable.prototype._handleSearch = function (oEvent) {
 		var sFilterFields = this.getFilterFields();
 		var oFilterBar = oEvent.getSource();
 		var oConditions = oFilterBar.getInternalConditions();
@@ -397,34 +419,7 @@ sap.ui.define([
 
 	MDCTable.prototype._observeChanges = function (oChanges) {
 
-		var oFilterBar, oDefaultFilterBar;
-		if (oChanges.name === "_defaultFilterBar") {
-			oDefaultFilterBar = oChanges.child;
-			if (oChanges.mutation === "insert") {
-				oFilterBar = this.getFilterBar();
-				if (!oFilterBar) {
-					oDefaultFilterBar.attachSearch(_handleSearch, this);
-				}
-			} else {
-				oDefaultFilterBar.detachSearch(_handleSearch, this);
-			}
-			_updateTableFilter.call(this);
-		}
-
-		if (oChanges.name === "filterBar") {
-			oFilterBar = oChanges.child;
-			oDefaultFilterBar = this.getAggregation("_defaultFilterBar");
-			if (oChanges.mutation === "insert") {
-				if (oDefaultFilterBar) {
-					oDefaultFilterBar.detachSearch(_handleSearch, this);
-				}
-				oFilterBar.attachSearch(_handleSearch, this);
-			} else {
-				if (oDefaultFilterBar) {
-					oDefaultFilterBar.attachSearch(_handleSearch, this);
-				}
-				oFilterBar.detachSearch(_handleSearch, this);
-			}
+		if (["_defaultFilterBar", "filterBar"].indexOf(oChanges.name) !== -1) {
 			_updateTableFilter.call(this);
 		}
 
@@ -559,7 +554,7 @@ sap.ui.define([
 		}.bind(this));
 	};
 
-	MDCTable.prototype._getListBinding = function() {
+	MDCTable.prototype.getListBinding = function() {
 		var oTable = this.getTable();
 		return oTable && oTable.getRowBinding();
 	};
@@ -583,19 +578,26 @@ sap.ui.define([
 		FilterableListContent.prototype.onShow.apply(this, arguments);
 	};
 
+	MDCTable.prototype._createFiltersFromBarConditions = function (oConditions) {
+		var oConditionTypes = this._getTypesForConditions(oConditions);
+		var oCreatedFBFilters = oConditions && oConditionTypes && FilterConverter.createFilters(oConditions, oConditionTypes, undefined, this.getCaseSensitive());
+		return oCreatedFBFilters && [].concat(oCreatedFBFilters);
+	};
+
 	MDCTable.prototype.applyFilters = function(sSearch) { // TODO the arguments are not passed as expected.
 
+
 		var oTable = this.getTable();
 		var oFilterBar = this._getPriorityFilterBar();
 
 		if (oTable && oFilterBar) {
-			var oListBinding = this._getListBinding();
+			var oListBinding = this.getListBinding();
 			var bListBindingSuspended = oListBinding && oListBinding.isSuspended();
 
 			if (oListBinding && !bListBindingSuspended && !this._bSearchTriggered) {
 				var sFBSearch = oFilterBar.getSearch() || "";
 				var sBindingSearch = oListBinding.mParameters.$search || "";
-				var aFBFilters = this._getFiltersForFilterBar();
+				var aFBFilters = this._createFiltersFromBarConditions(oFilterBar.getConditions());
 				var aBindingFilters = oListBinding.aApplicationFilters.reduce(function (aResult, oFilter) {
 					return aResult.concat(oFilter._bMultiFilter ? oFilter.aFilters : oFilter);
 				}, []);