@openui5/sap.ui.mdc 1.102.1 → 1.103.1

package/src/sap/ui/mdc/ChartDelegate.js

@@ -3,18 +3,14 @@
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
-
-// ---------------------------------------------------------------------------------------
-// Helper class used to help create content in the MDC chart and fill relevant metadata
-// ---------------------------------------------------------------------------------------
-// ---------------------------------------------------------------------------------------
 sap.ui.define([
     "sap/ui/mdc/AggregationBaseDelegate"
 ], function (AggregationBaseDelegate) {
     "use strict";
 
     /**
-     * Base delegate class for sap.ui.mdc.Chart.<br>
+     * Base delegate class for sap.ui.mdc.Chart.<br>.
+     * This helper class is used to help create content in the MDC chart and fill relevant metadata.
      * <b>Note:</b> The class is experimental and the API/behavior is not finalized and hence this should not be used for productive usage.
      *
      * @author SAP SE
@@ -31,25 +27,25 @@ sap.ui.define([
      */
 
     /**
-     * Zooms in on the inner chart.
-     * @param {int} iValue Number of steps for zooming in
-     *
+     * Notifies the inner chart to zoom in.
+     * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart
+     * @param {int} iValue Value to zoom in
      * @experimental
      * @private
-     * @ui5-restricted sap.ui.mdc
+     * @ui5-restricted Fiori Elements, sap.ui.mdc
      */
-    ChartDelegate.zoomIn = function (iValue) {
+    ChartDelegate.zoomIn = function (oMDCChart, iValue) {
     };
 
     /**
-     * Zooms out of the inner chart.
-     * @param {int} iValue Number of steps for zooming out
-     *
+     * Notifies the inner chart to zoom out.
+     * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart
+     * @param {int} iValue value to zoom in
      * @experimental
      * @private
-     * @ui5-restricted sap.ui.mdc
+     * @ui5-restricted Fiori Elements, sap.ui.mdc
      */
-    ChartDelegate.zoomOut = function (iValue) {
+    ChartDelegate.zoomOut = function (oMDCChart, iValue) {
     };
 
 
@@ -59,14 +55,14 @@ sap.ui.define([
      * @property {number} currentZoomLevel Current zoom level of the chart in percent (between 0 and 1)
      */
     /**
-     * Retrieves the current zooming information for the inner chart.
-     * @returns {ZoomState} Current zoom state on the inner chart
-     *
+     * Gets the current zooming information for the inner chart.
+     * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart
+     * @returns {ZoomState} Current <code>ZoomState</code> of the inner chart
      * @experimental
      * @private
-     * @ui5-restricted sap.ui.mdc
+     * @ui5-restricted Fiori Elements, sap.ui.mdc
      */
-    ChartDelegate.getZoomState = function () {
+    ChartDelegate.getZoomState = function (oMDCChart) {
     };
 
     ChartDelegate.getFilterDelegate = function() {
@@ -76,7 +72,7 @@ sap.ui.define([
 			 * Creates an instance of a <code>sap.ui.mdc.FilterField</code>.
 			 *
 			 * @param {string} sPropertyName The property name
-			 * @param {sap.ui.mdc.Control} oControl - the instance of the mdc control
+			 * @param {sap.ui.mdc.Control} oControl - Instance of the mdc control
 			 * @returns {Promise<sap.ui.mdc.FilterField>} <code>Promise</code> that resolves with an instance of a <code>sap.ui.mdc.FilterField</code>.
 			 * @see sap.ui.mdc.AggregationBaseDelegate#addItem
 			 */
@@ -85,26 +81,26 @@ sap.ui.define([
 		    },
 
 			/**
-			 * This methods is called during the appliance of the add condition change.
-			 * This intention is to update the propertyInfo property.
+			 * This method is called when an <code>AddCondition</code> change is applied by the personalization.
+             * It can be used to perform tasks, such as caching information or modifying the control.
 			 *
-			 * @param {string} sPropertyName The name of a property.
-			 * @param {sap.ui.mdc.Control} oControl - the instance of the mdc control
-			 * @param {Object} mPropertyBag Instance of property bag from Flex change API
-			 * @returns {Promise} Promise that resolves once the properyInfo property was updated
+			 * @param {string} sPropertyName Name of a property
+			 * @param {sap.ui.mdc.Control} oControl Instance of the MDC control
+			 * @param {Object} mPropertyBag Instance of property bag from the SAPUI5 flexibility API
+			 * @returns {Promise} <code>Promise</code> that resolves once the properyInfo property has been updated
 			 */
 			addCondition: function(sPropertyName, oControl, mPropertyBag) {
 				return Promise.resolve();
 		    },
 
 			/**
-			 * This methods is called during the appliance of the remove condition change.
-			 * This intention is to update the propertyInfo property.
+			 * This method is called when a <code>RemoveCondition</code> change is applied by the personalization.
+             * It can be used to perform tasks, such as caching information or modifying the control.
 			 *
-			 * @param {string} sPropertyName The name of a property.
-			 * @param {sap.ui.mdc.Control} oControl - the instance of the mdc control
-			 * @param {Object} mPropertyBag Instance of property bag from Flex change API
-			 * @returns {Promise} Promise that resolves once the properyInfo property was updated
+			 * @param {string} sPropertyName Name of a property
+			 * @param {sap.ui.mdc.Control} oControl Instance of the mdc control
+			 * @param {Object} mPropertyBag Instance of property bag from the SAPUI5 flexibility API
+			 * @returns {Promise} <code>Promise</code> that resolves once the properyInfo property has been updated
 			 */
 		    removeCondition: function(sPropertyName, oControl, mPropertyBag) {
 				return Promise.resolve();
@@ -116,13 +112,14 @@ sap.ui.define([
      * Creates a new MDC chart item for a given property name and updates the inner chart.
      * <b>Note:</b> This does <b>not</b> add the MDC chart item to the <code>Items</code> aggregation of the MDC chart.
      * Called and used by <code>p13n</code>.
-     * @param {string} sPropertyName Name of the property added
-     * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart to which the item is added
-     * @returns {Promise<sap.ui.mdc.Chart.Item>} <code>Promise</code> that resolves with new MDC chart item as parameter
-     *
+     * @param {string} sPropertyName the name of the property added
+     * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart to add the property to
+     * @param {object} mPropertyBag the property bag containing useful information about the change
+     * @param {strring} sRole new role for given item (if available)
+     * @returns {Promise} Promise that resolves with new MDC chart Item as parameter
      * @experimental
      * @private
-     * @ui5-restricted sap.ui.mdc
+     * @ui5-restricted Fiori Elements, sap.ui.mdc
      */
     ChartDelegate.addItem = function (sPropertyName, oMDCChart, mPropertyBag, sRole) {
     };
@@ -130,30 +127,35 @@ sap.ui.define([
     /**
      * @typedef {object} SelectionDetails
      * @property {string} eventId  ID of the selection event
-     * @property {sap.ui.core.Control} reference Reference to inner chart
+     * @property {sap.ui.core.Control} Reference Reference to inner chart
      */
     /**
-     ** Returns the event handler for <code>chartSelectionDetails</code> as an object.
-     *
-     * @returns {SelectionDetails} Event handler for chartSelectionDetails
+     ** Returns the event handler for <code>chartSelectionDetails</code> as an object:
+     * {
+     *   "eventId": ID of the selection event,
+     *   "listener": Reference to inner chart
+     *   }
      *
+     * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart
+     * @returns {object} Event handler for chartSelectionDetails
      * @experimental
      * @private
-     * @ui5-restricted sap.ui.mdc
+     * @ui5-restricted Fiori Elements, sap.ui.mdc
      */
-    ChartDelegate.getInnerChartSelectionHandler = function () {
+    ChartDelegate.getInnerChartSelectionHandler = function (oMDCChart) {
     };
 
     /**
      * Sets the visibility of the legend.
-     * <b>Note:</b> This function is called by the MDC chart only. You must not call it directly but use {@link sap.ui.mdc.Chart#setLegendVisible LegendVisible} instead.
-     * @param {boolean} bVisible <code>true</code> to show legend, <code>false</code> to hide
+     *  <b>Note:</b> This function is called by the MDC chart only. You must not call it directly but use {@link sap.ui.mdc.Chart#setLegendVisible LegendVisible} instead.
+     * @param {sap.ui.mdc.Chart} oMDCChart Chart to the set the legend visibility on
+     * @param {boolean} bVisible true to show legend, false to hide
      *
      * @experimental
      * @private
-     * @ui5-restricted sap.ui.mdc
+     * @ui5-restricted Fiori Elements, sap.ui.mdc
      */
-    ChartDelegate.setLegendVisible = function (bVisible) {
+    ChartDelegate.setLegendVisible = function (oMDCChart, bVisible) {
     };
 
     /**
@@ -172,40 +174,40 @@ sap.ui.define([
     };
 
     /**
-     * Inserts an MDC chart item (for <code>sap.chart.Chart</code>, this would be a measure/dimension) into the inner chart.
-     * This function is called by the MDC chart after a change of the <code>Items</code> aggregation.
+     * Inserts an MDC chart Item (in case of sap.chart.Chart a Measure/Dimension) on the inner chart.
+     * This function is called by MDC chart on a change of the <code>Items</code> aggregation.
      * <b>Note:</b> Do not call this yourself, as it would not be synced with the MDC chart, but instead insert the Item into the MDC chart.
-     * @param {sap.ui.mdc.chart.Item} oMDCChartItem MDC chart item that is inserted into the inner chart
-     * @param {int} iIndex The index into which items are inserted
-     *
+     * @param {sap.ui.mdc.Chart} oMDCChart MDC chart to insert the item into
+     * @param {sap.ui.mdc.chart.Item} oMDCChartItem MDC chart Item to insert into the inner chart
+     * @param {int} iIndex the index to insert into
      * @experimental
      * @private
-     * @ui5-restricted sap.ui.mdc
+     * @ui5-restricted Fiori Elements, sap.ui.mdc
      */
-    ChartDelegate.insertItemToInnerChart = function (oMDCChartItem, iIndex) {
+    ChartDelegate.insertItemToInnerChart = function (oMDCChart, oMDCChartItem, iIndex) {
     };
 
     /**
-     * Removes an item (for <code>sap.chart.Chart</code>, this would be a measure/dimension) from the inner chart.
-     * This function is called by the MDC chart after a change of the <code>Items</code> aggregation.
+     * Removes an Item (in case of sap.chart.Chart a Measure/Dimension) from the inner chart.
+     * This function is called by MDC chart on a change of the <code>Items</code> aggregation.
      * <b>Note:</b> Do not call this yourself, as it would not be synced with the MDC chart, but instead remove the item from the MDC chart.
-     * @param {sap.ui.mdc.chart.Item} oMDCChartItem The item to be removed from the inner chart
-     *
+     * @param {sap.ui.mdc.Chart} oMDCChart  MDC chart to remove the item from
+     * @param {sap.ui.mdc.chart.Item} oMDCChartItem Item to remove from the inner chart
      * @experimental
      * @private
-     * @ui5-restricted sap.ui.mdc
+     * @ui5-restricted Fiori Elements, sap.ui.mdc
      */
-    ChartDelegate.removeItemFromInnerChart = function (oMDCChartItem) {
+    ChartDelegate.removeItemFromInnerChart = function (oMDCChart, oMDCChartItem) {
     };
 
 
 
     /**
      * Removes an existing MDC chart item for a given property name and updates the inner chart.
-     * Called and used by p13n
+     * Called and used by p13n.
      * @param {string} oProperty Name of the property removed
      * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart from which property is removed
-     * @returns {Promise<boolean>} Promise containing information whether the item was deleted
+     * @returns {Promise<boolean>} <code>Promise</code> containing information whether the item was deleted
      *
      * @experimental
      * @private
@@ -260,7 +262,7 @@ sap.ui.define([
     /**
      * Returns the current chart type.
      * @returns {ChartTypeObject} Information about the current chart type
-     * @throws exception if inner chart is not initialized yet
+     * @throws Exception if inner chart is not initialized yet
      *
      * @experimental
      * @private
@@ -271,14 +273,14 @@ sap.ui.define([
 
     /**
      * This function is used by P13n to determine which chart type supports which layout options.
-     * There might be chart tyoes which do not support certain layout options (i.e. "Axis3").
-     * Layout config is defined as followed:
+     * There might be chart tyoes that do not support certain layout options (for example, "Axis3").
+     * Layout configuration is defined as followed:
      * {
-     *  key: string //identifier for the chart type
+     *  key: string, //identifier for the chart type
      *  allowedLayoutOptions : [] //array containing allowed layout options as string
      * }
      *
-     * @returns {array}
+     * @returns {array} chart type layout config
      */
     ChartDelegate.getChartTypeLayoutConfig = function() {
 
@@ -286,32 +288,33 @@ sap.ui.define([
 
     /**
      * Gets the available chart types for the current state of the inner chart.
-     *
+     * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart
      * @returns {Array<ChartTypeObject>} Array containing the available chart types
      *
      * @experimental
      * @private
      * @ui5-restricted Fiori Elements
      */
-    ChartDelegate.getAvailableChartTypes = function () {
+    ChartDelegate.getAvailableChartTypes = function (oMDCChart) {
     };
 
     /**
      * Returns the current drilling stack of the inner chart.
      * The returned objects need at least a <code>label</code> and a <code>name</code> property.
      * Also, a <code>dimension</code> array containing the dimension drill stack at the current level is required.
+     * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart
      * @returns {array} Array containing the drill stack
      *
      * @experimental
      * @private
      * @ui5-restricted sap.ui.mdc
      */
-    ChartDelegate.getDrillStack = function () {
+    ChartDelegate.getDrillStack = function (oMDCChart) {
     };
 
     /**
      * Returns all sorted dimensions of an inner chart as property.
-     * This is used to determine possible drilldown dimensions in the drill down popover of the MDC chart.
+     * This is used to determine possible drill-down dimensions in the drill-down popover of the MDC chart.
      * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart
      * @returns {Promise<Array<sap.ui.mdc.chart.Item>>} <code>Promise</code> containing an array of dimensions that is sorted
      *
@@ -340,7 +343,7 @@ sap.ui.define([
      * Sets the chart type of the inner chart.
      * This function is called by the MDC chart when the <code>chartType</code> property is updated.
      *  <b>Note:</b> This function is called by the MDC chart only. You must not call it directly but use {@link sap.ui.mdc.Chart#setChartType setChartType} instead.
-     * @param {string} sChartType The new chart type
+     * @param {string} sChartType New chart type
      *
      * @experimental
      * @private
@@ -365,8 +368,8 @@ sap.ui.define([
      * Checks the binding of the chart and rebinds it if required.
      *
      * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart
-     * @param {object} oBindingInfo The bindingInfo of the chart
-     *  @deprecated as of 1.98;: use rebind instead
+     * @param {object} oBindingInfo BindingInfo of the chart
+     * @deprecated as of 1.98;: use rebind instead
      *
      * @experimental
      * @private
@@ -380,7 +383,7 @@ sap.ui.define([
      * Checks the binding of the chart and rebinds it if required.
      *
      * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart
-     * @param {object} oBindingInfo The bindingInfo of the chart
+     * @param {object} oBindingInfo BindingInfo of the chart
      *
      * @experimental
      * @private
@@ -391,20 +394,21 @@ sap.ui.define([
 
     /**
      * Returns the information whether the inner chart is currently bound.
+     * @param {sap.ui.mdc.Chart} oMDCChart to the MDC chart
      * @returns {boolean} <code>true</code> if inner chart is bound; <code>false</code> if not
      *
      * @experimental
      * @private
      * @ui5-restricted sap.ui.mdc
      */
-    ChartDelegate.getInnerChartBound = function () {
+    ChartDelegate.getInnerChartBound = function (oMDCChart) {
     };
 
     /**
      * Updates the binding info with the relevant filters.
      *
-     * @param {Object} oMDCChart The MDC chart instance
-     * @param {Object} oBindingInfo The binding info of the chart
+     * @param {Object} oMDCChart MDC chart instance
+     * @param {Object} oBindingInfo Binding info of the chart
      *
      * @experimental
      * @private
@@ -416,35 +420,36 @@ sap.ui.define([
     /**
      * Sets tooltips to visible/invisible for the inner chart.
      * <b>Note:</b> This function is called by the MDC chart only. You must not call it directly but use {@link sap.ui.mdc.Chart#setShowChartTooltip setShowChartTooltip} instead.
+     * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart
      * @param {boolean}  bFlag <code>true</code> for visible, <code>false</code> for invisible
      *
      * @experimental
      * @private
      * @ui5-restricted sap.ui.mdc
      */
-    ChartDelegate.setChartTooltipVisibility = function (bFlag) {
+    ChartDelegate.setChartTooltipVisibility = function (oMDCChart, bFlag) {
     };
 
     /**
-     * This function returns an id which should be used in the internal chart for the measure/dimension
-     * In the standard case, this is just the id of the property.
+     * This function returns an ID which should be used in the internal chart for the measure/dimension.
+     * For standard cases, this is just the id of the property.
      * If it is necessary to use another id internally inside the chart (e.g. on duplicate property ids) this method can be overwritten.
-     * In this case, <code>getPropertyFromNameAndKind</code> needs to be overwritten aswell.
+     * In this case, <code>getPropertyFromNameAndKind</code> needs to be overwritten as well.
      * @param {string} sName ID of the property
-     * @param {string} sKind Kind of the Property (Measure/Dimension)
-     * @param {sap.ui.mdc.Chart} oMDCChart reference to the MDC Chart
-     * @returns {string} internal id for the sap.chart.Chart
+     * @param {string} sKind Type of the Property (Measure/Dimension)
+     * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart
+     * @returns {string} Internal id for the sap.chart.Chart
      */
     ChartDelegate.getInternalChartNameFromPropertyNameAndKind = function(sName, sKind, oMDCChart) {
 
     };
 
     /**
-     * This maps an id of an internal chart dimension/measure & kind of a property to its coresponding property entry.
-     * @param {string} sName the id of internal chart measure/dimension
-     * @param {string} sKind the kind of the property
-     * @param {sap.ui.mdc.Chart} oMDCChart reference to the MDC Chart
-     * @returns {object} the property object
+     * This maps an id of an internal chart dimension/measure & type of a property to its corresponding property entry.
+     * @param {string} sName ID of internal chart measure/dimension
+     * @param {string} sKind Kind of the property
+     * @param {sap.ui.mdc.Chart} oMDCChart Reference to the MDC chart
+     * @returns {object} PropertyInfo object
      */
     ChartDelegate.getPropertyFromNameAndKind = function(sName, sKind, oMDCChart) {
 

package/src/sap/ui/mdc/Control.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 * @alias sap.ui.mdc.Control
 	 *
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.awaitControlDelegate as awaitControlDelegate

package/src/sap/ui/mdc/Element.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 * @alias sap.ui.mdc.Element
 	 *
 	 * @borrows sap.ui.mdc.mixin.DelegateMixin.awaitControlDelegate as awaitControlDelegate

package/src/sap/ui/mdc/Field.js

@@ -46,12 +46,12 @@ sap.ui.define([
 	 * @implements sap.ui.core.IFormContent
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.Field
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 * @since 1.54.0
 	 * @experimental As of version 1.54
 	 *

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

@@ -21,7 +21,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.102.1
+	 * @version 1.103.1
 	 * @constructor
 	 * @experimental As of version 1.61
 	 * @private

package/src/sap/ui/mdc/FilterField.js

@@ -33,12 +33,12 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.field.FieldBase
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.FilterField
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 * @since 1.48.0
 	 *
 	 * @experimental As of version 1.48

package/src/sap/ui/mdc/Link.js

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.field.FieldInfoBase
 	 *
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 *
 	 * @constructor
 	 * @alias sap.ui.mdc.Link
@@ -231,6 +231,7 @@ sap.ui.define([
 								text: oMLinkItem.text,
 								description: oMLinkItem.description,
 								href: oMLinkItem.href,
+								internalHref: oMLinkItem.internalHref,
 								target: oMLinkItem.target,
 								icon: oMLinkItem.icon,
 								visible: true
@@ -294,6 +295,7 @@ sap.ui.define([
 				text: oLinkItem.getText(),
 				description: oLinkItem.getDescription(),
 				href: oLinkItem.getHref(),
+				internalHref: oLinkItem.getInternalHref(),
 				target: oLinkItem.getTarget(),
 				icon: oLinkItem.getIcon(),
 				initiallyVisible: oLinkItem.getInitiallyVisible(),
@@ -372,6 +374,7 @@ sap.ui.define([
 				text: oMLinkItem.text,
 				description: oMLinkItem.description,
 				href: oMLinkItem.href,
+				internalHref: oMLinkItem.internalHref,
 				target: oMLinkItem.target,
 				visible: oMLinkItem.visible
 			};

package/src/sap/ui/mdc/MultiValueField.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.mdc.MultiValueField
 	 * @author SAP SE
-	 * @version 1.102.1
+	 * @version 1.103.1
 	 * @since 1.93.0
 	 *
 	 * @private

package/src/sap/ui/mdc/Table.js

@@ -1078,13 +1078,13 @@ sap.ui.define([
 	function updateFilterInfoBar(oTable) {
 		var oFilterInfoBar = getFilterInfoBar(oTable);
 		var oFilterInfoBarText = getFilterInfoBarText(oTable);
-		var aFilteredProperties = getFilteredProperties(oTable);
+		var aFilteredProperties = getInternallyFilteredProperties(oTable);
 
 		if (!oFilterInfoBar) {
 			return;
 		}
 
-		if (aFilteredProperties.length === 0 || !oTable.isFilteringEnabled()) {
+		if (aFilteredProperties.length === 0) {
 			var oFilterInfoBarDomRef = oFilterInfoBar.getDomRef();
 
 			if (oFilterInfoBarDomRef && oFilterInfoBarDomRef.contains(document.activeElement)) {
@@ -1271,13 +1271,13 @@ sap.ui.define([
 			return oRb.getText("table.NO_DATA");
 		}
 
-	// Table is bound, but does not show any data
-	// If table-internal or external (for example FilterBar) filters are set, then show the message that the data not found and also ask to adjust the filters.
-		var oExternalFilter = Core.byId(this.getFilter());
-		if ((this.isFilteringEnabled() && getFilteredProperties(this).length > 0) ||  //internal filters check
-			(oExternalFilter && getFilteredProperties(oExternalFilter).length > 0)) { //external filters check
+		// Table is bound, but does not show any data.
+		// If the table is filtered internally or externally, e.g. FilterBar, then show the message that no data was found and that filters can be
+		// adjusted.
+		if (isFiltered(this)) {
 			return oRb.getText("table.NO_RESULTS");
 		}
+
 		// If no filters set, show only message that the data are not found, and nothing about the filters.
 		return oRb.getText("table.NO_DATA");
 	};
@@ -1521,12 +1521,44 @@ sap.ui.define([
 		return this.getEngine().readXConfig(this);
 	};
 
-	// oControl can be a Table or FilterBar - any Control that is able to have Filter
-	function getFilteredProperties(oControl) {
-		var mFilterConditions = oControl.getFilterConditions();
+	/**
+	 * Gets the keys of properties that are filtered internally via the inbuilt filtering ({@link sap.ui.mdc.filterbar.p13n.AdaptationFilterBar}).
+	 *
+	 * @param {sap.ui.mdc.Table} oTable Instance of the table.
+	 * @returns {string[]} The keys of the filtered properties.
+	 */
+	function getInternallyFilteredProperties(oTable) {
+		return oTable.isFilteringEnabled() ? getFilteredProperties(oTable.getFilterConditions()) : [];
+	}
+
+	/**
+	 * Gets the keys of properties that are filtered externally via the associated filter ({@link sap.ui.mdc.IFilter}).
+	 *
+	 * @param {sap.ui.mdc.Table} oTable Instance of the table.
+	 * @returns {string[]} The keys of the filtered properties.
+	 */
+	function getExternallyFilteredProperties(oTable) {
+		var oFilter = Core.byId(oTable.getFilter());
+		return oFilter ? getFilteredProperties(oFilter.getConditions()) : [];
+	}
+
+	/**
+	 * Whether the table is filtered internally via the inbuilt filtering ({@link sap.ui.mdc.filterbar.p13n.AdaptationFilterBar}), or externally via
+	 * the associated filter ({@link sap.ui.mdc.IFilter}).
+	 *
+	 * @param {sap.ui.mdc.Table} oTable Instance of the table.
+	 * @return {boolean} Whether the table is filtered (internally or externally).
+	 */
+	function isFiltered(oTable) {
+		var oFilter = Core.byId(oTable.getFilter());
+		return getInternallyFilteredProperties(oTable).length > 0
+			   || getExternallyFilteredProperties(oTable).length > 0
+			   || oFilter && oFilter.getSearch() !== "";
+	}
 
-		return Object.keys(mFilterConditions).filter(function(sProperty) {
-			return mFilterConditions[sProperty].length > 0;
+	function getFilteredProperties(mConditions) {
+		return Object.keys(mConditions || {}).filter(function(sProperty) {
+			return mConditions[sProperty].length > 0;
 		});
 	}
 
@@ -2209,6 +2241,10 @@ sap.ui.define([
 		if (iIndex >= 0) {
 			this._oTemplate.insertCell(oCellTemplate, iIndex);
 			this._oTable.getItems().forEach(function(oItem) {
+				// ignore group headers since it does not have "cells" aggregation
+				if (oItem.isA("sap.m.GroupHeaderListItem")) {
+					return;
+				}
 				// Add lightweight placeholders that can be rendered - if they cannot be rendered, there will be errors in the console.
 				// The actual cells are created after rebind.
 				oItem.insertAggregation("cells", new InvisibleText(), iIndex, true);