@openui5/sap.ui.integration 1.98.0 → 1.99.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.integration",
-  "version": "1.98.0",
+  "version": "1.99.0",
   "description": "OpenUI5 UI Library sap.ui.integration",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,7 +14,7 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.98.0",
-    "@openui5/sap.f": "1.98.0"
+    "@openui5/sap.ui.core": "1.99.0",
+    "@openui5/sap.f": "1.99.0"
   }
 }

package/src/sap/ui/integration/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.98.0</version>
+  <version>1.99.0</version>
 
   <documentation>SAPUI5 library with integration-related controls.</documentation>
 

package/src/sap/ui/integration/ActionDefinition.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/integration/Designtime.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/integration/Extension.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/integration/Host.js

@@ -25,7 +25,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.98.0
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/ui/integration/cards/AdaptiveContent.js

@@ -10,14 +10,13 @@ sap.ui.define([
 		"sap/ui/integration/cards/BaseContent",
 		"sap/ui/integration/cards/adaptivecards/elements/hostConfig",
 		"sap/m/VBox",
-		"sap/m/MessageStrip",
 		"sap/ui/core/HTML",
 		"sap/ui/core/Core",
 		"sap/ui/model/json/JSONModel",
 		"sap/base/Log"
 	],
 	function (library, coreLibrary, includeScript, BaseContent, hostConfig,
-			VBox, MessageStrip, HTML, Core, JSONModel, Log) {
+			VBox, HTML, Core, JSONModel, Log) {
 		"use strict";
 
 		// lazy dependencies, loaded on demand
@@ -38,7 +37,7 @@ sap.ui.define([
 		 * @extends sap.ui.integration.cards.BaseContent
 		 *
 		 * @author SAP SE
-		 * @version 1.98.0
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @private
@@ -140,16 +139,13 @@ sap.ui.define([
 		 * @private
 		 */
 		AdaptiveContent.prototype._setupCardContent = function () {
-			var oMessageStrip = new MessageStrip(this.getId() + "-message", {showCloseButton: true, visible: false}),
-				oHTMLContainer = new HTML(this.getId() + "content", {
+			var oHTMLContainer = new HTML(this.getId() + "content", {
 					preferDOM: false,
 					content: "<div>&nbsp;</div>"
 				});
 
-			oMessageStrip.addStyleClass("sapUiTinyMargin");
-
 			this.setAggregation("_content", new VBox({
-				items: [oMessageStrip, oHTMLContainer]
+				items: [oHTMLContainer]
 			}));
 		};
 
@@ -316,22 +312,6 @@ sap.ui.define([
 			this.getParent().setBusy(false); // Loading indicator
 		};
 
-		/**
-		 * Displays a message strip on top of the content with the given text.
-		 *
-		 * @param {string} sMessage The message.
-		 * @param {sap.ui.core.MessageType} sType Type of the message.
-		 */
-		AdaptiveContent.prototype.showMessage = function (sMessage, sType) {
-			var oMessage = this.getAggregation("_content").getItems()[0];
-
-			oMessage.applySettings({
-				"type": sType,
-				"text": sMessage,
-				"visible": true
-			});
-		};
-
 		/**
 		 * Replaces MS Cards Elements with UI5WebComponents
 		 *
@@ -428,7 +408,7 @@ sap.ui.define([
 		 * @private
 		 */
 		AdaptiveContent.prototype._renderMSCardContent = function (oCard) {
-			var oDom = this.getAggregation("_content").getItems()[1].$(),
+			var oDom = this.getAggregation("_content").getItems()[0].$(),
 				bIsLoading = !!this.isLoading();
 
 			// Do not show content until the data for it is fully loaded

package/src/sap/ui/integration/cards/AnalyticalContent.js

@@ -88,7 +88,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseContent
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/cards/AnalyticsCloudContent.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseContent
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/cards/BaseContent.js

@@ -8,27 +8,38 @@
 
 sap.ui.define([
 	"./BaseContentRenderer",
+	"sap/m/MessageStrip",
+	"sap/m/VBox",
+	"sap/m/library",
 	"sap/ui/core/Core",
 	"sap/ui/core/Control",
+	"sap/ui/core/InvisibleMessage",
+	"sap/ui/core/library",
 	"sap/ui/integration/model/ObservableModel",
 	"sap/ui/base/ManagedObjectObserver",
-	"sap/ui/integration/util/BindingResolver",
 	"sap/ui/integration/util/LoadingProvider",
 	"sap/ui/integration/util/BindingHelper",
 	"sap/base/util/merge"
 ], function (
 	BaseContentRenderer,
+	MessageStrip,
+	VBox,
+	mLibrary,
 	Core,
 	Control,
+	InvisibleMessage,
+	coreLibrary,
 	ObservableModel,
 	ManagedObjectObserver,
-	BindingResolver,
 	LoadingProvider,
 	BindingHelper,
 	merge
 ) {
 	"use strict";
 
+	// shortcut for sap.ui.core.InvisibleMessageMode
+	var InvisibleMessageMode = coreLibrary.InvisibleMessageMode;
+
 	/**
 	 * Constructor for a new <code>BaseContent</code>.
 	 *
@@ -41,7 +52,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @private
@@ -68,6 +79,12 @@ sap.ui.define([
 					type: "sap.ui.core.Element",
 					multiple: false,
 					visibility: "hidden"
+				},
+
+				_messageContainer: {
+					type: "sap.m.VBox",
+					multiple: false,
+					visibility: "hidden"
 				}
 			},
 			associations: {
@@ -250,6 +267,36 @@ sap.ui.define([
 		return this.getConfiguration();
 	};
 
+	/**
+	 * Displays a message strip above the content.
+	 *
+	 * @param {string} sMessage The message.
+	 * @param {sap.ui.core.MessageType} sType Type of the message.
+	 * @private
+	 * @ui5-restricted
+	 */
+	BaseContent.prototype.showMessage = function (sMessage, sType) {
+		var oMessagePopup = this._getMessageContainer();
+		var oMessage = new MessageStrip({
+			text: sMessage,
+			type: sType,
+			showCloseButton: true,
+			showIcon: true,
+			close: function () {
+				this._getMessageContainer().destroy();
+			}.bind(this)
+		}).addStyleClass("sapFCardContentMessage");
+
+		oMessagePopup.destroyItems();
+		oMessagePopup.addItem(oMessage);
+
+		if (this.getDomRef().contains(document.activeElement)) {
+			InvisibleMessage.getInstance().announce(sMessage, InvisibleMessageMode.Assertive);
+		} else {
+			InvisibleMessage.getInstance().announce(sMessage, InvisibleMessageMode.Polite);
+		}
+	};
+
 	/**
 	 * Requests data and bind it to the item template.
 	 *
@@ -328,6 +375,11 @@ sap.ui.define([
 	 * @protected
 	 */
 	BaseContent.prototype.onDataRequestComplete = function () {
+		var oCard = this.getCardInstance();
+		if (oCard) {
+			oCard._fireContentDataChange();
+		}
+
 		this.fireEvent("_dataReady");
 	};
 
@@ -459,12 +511,10 @@ sap.ui.define([
 	/**
 	 * @protected
 	 * @param {string} sLogMessage Message that will be logged.
-	 * @param {string} [sDisplayMessage] Message that will be displayed in the card's content. If not provided, a default message is displayed.
 	 */
-	BaseContent.prototype.handleError = function (sLogMessage, sDisplayMessage) {
+	BaseContent.prototype.handleError = function (sLogMessage) {
 		this.fireEvent("_error", {
-			logMessage: sLogMessage,
-			displayMessage: sDisplayMessage
+			logMessage: sLogMessage
 		});
 	};
 
@@ -542,5 +592,25 @@ sap.ui.define([
 		return oCard && oCard.isSkeleton();
 	};
 
+	BaseContent.prototype.sliceData = function (iStartIndex, iEndIndex) { };
+
+	BaseContent.prototype.getDataLength = function () {
+		return 0;
+	};
+
+	BaseContent.prototype._getMessageContainer = function () {
+		var oMessageContainer = this.getAggregation("_messageContainer");
+
+		if (!oMessageContainer) {
+			oMessageContainer = new VBox({
+				renderType: mLibrary.FlexRendertype.Bare,
+				alignItems: mLibrary.FlexAlignItems.Center
+			}).addStyleClass("sapFCardContentMessageContainer");
+			this.setAggregation("_messageContainer", oMessageContainer);
+		}
+
+		return oMessageContainer;
+	};
+
 	return BaseContent;
 });

package/src/sap/ui/integration/cards/BaseContentRenderer.js

@@ -34,7 +34,8 @@ sap.ui.define(["sap/ui/core/Renderer"], function (Renderer) {
 			sType = sName.slice(sName.lastIndexOf(".") + 1),
 			oCard = oCardContent.getParent(),
 			bIsCardValid = oCard && oCard.isA("sap.f.ICard"),
-			bLoading = sType !== "AdaptiveContent" && bIsCardValid && oCardContent.isLoading();
+			bLoading = sType !== "AdaptiveContent" && bIsCardValid && oCardContent.isLoading(),
+			oMessageContainer = oCardContent.getAggregation("_messageContainer");
 
 		sClass += sType;
 
@@ -47,7 +48,7 @@ sap.ui.define(["sap/ui/core/Renderer"], function (Renderer) {
 		}
 
 		if (bIsCardValid && oCard.getHeight() === "auto") { // if there is no height specified the default value is "auto"
-			var sHeight = this.getMinHeight(oCardContent.getParsedConfiguration(), oCardContent);
+			var sHeight = this.getMinHeight(oCardContent.getParsedConfiguration(), oCardContent, oCard);
 			oRm.style("min-height", sHeight);
 		}
 
@@ -61,6 +62,10 @@ sap.ui.define(["sap/ui/core/Renderer"], function (Renderer) {
 			oRm.renderControl(oCardContent._oLoadingPlaceholder);
 		}
 
+		if (oMessageContainer) {
+			oRm.renderControl(oMessageContainer);
+		}
+
 		this.renderContent(oRm, oCardContent);
 
 		oRm.close("div");
@@ -78,7 +83,7 @@ sap.ui.define(["sap/ui/core/Renderer"], function (Renderer) {
 	/**
 	 * @protected
 	 * @param {object} oConfiguration The manifest configuration of the content
-	 * @param {sap.ui.core.Control} oContent The content
+	 * @param {sap.ui.integration.cards.BaseContent} oContent The content
 	 * @returns {string} Min height in Rems.
 	 */
 	BaseContentRenderer.getMinHeight = function (oConfiguration, oContent) {

package/src/sap/ui/integration/cards/BaseListContent.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseContent
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @private
@@ -80,9 +80,10 @@ sap.ui.define([
 		}
 
 		var oList = this.getInnerList(),
+			bHasPaginator = this.getCard() ? this.getCardInstance().hasPaginator() : false,
 			maxItems = oConfiguration.maxItems;
 
-		if (oList && maxItems) {
+		if (oList && maxItems && !bHasPaginator) {
 			oList.setGrowing(true);
 			//If pass trough parameters maxItems is a string
 			oList.setGrowingThreshold(parseInt(maxItems));
@@ -119,7 +120,7 @@ sap.ui.define([
 		}
 
 		var oInnerList = this.getInnerList(),
-			aItems = oInnerList.getItems(),
+			aItems = this.isA("sap.ui.integration.cards.TimelineContent") ? oInnerList.getContent() : oInnerList.getItems(),
 			aPromises = [],
 			oAction = mItemConfig.actions[0],
 			sActionName,
@@ -177,6 +178,29 @@ sap.ui.define([
 			}.bind(this));
 	};
 
+	/**
+	 * Used to show the illustrated message for no data retrived from server.
+	 *
+	 * @protected
+	 * @param {Object} mItemConfig The item template.
+	 */
+	BaseListContent.prototype._handleNoItemsError = function (mItemConfig) {
+
+		if (!this.getInnerList()) {
+			return;
+		}
+
+		var oInnerList = this.getInnerList(),
+			oBindingInfo = oInnerList.getBinding(oInnerList.getMetadata().getDefaultAggregationName()),
+			oModel = oBindingInfo.getModel(),
+			sPath = oBindingInfo.getPath(),
+			aItems = oModel.getProperty(sPath);
+
+		if (aItems && aItems.length === 0){
+			this.getParent()._handleError("No items available", true);
+		}
+	};
+
 	/**
 	 * Define the sorting of a group.
 	 * @param {object} oGroup The group which will be sorted
@@ -195,5 +219,19 @@ sap.ui.define([
 		return oSorter;
 	};
 
+	BaseListContent.prototype.sliceData = function (iStartIndex, iEndIndex) {
+		this.getModel().sliceData(iStartIndex, iEndIndex);
+	};
+
+	BaseListContent.prototype.getDataLength = function () {
+		var oData = this.getModel().getProperty(this.getInnerList().getBindingContext().getPath());
+
+		if (Array.isArray(oData)) {
+			return oData.length;
+		}
+
+		return Object.getOwnPropertyNames(oData).length;
+	};
+
 	return BaseListContent;
 });

package/src/sap/ui/integration/cards/CalendarContent.js

@@ -64,7 +64,7 @@ sap.ui.define([
 		 * @extends sap.ui.integration.cards.BaseContent
 		 *
 		 * @author SAP SE
-		 * @version 1.98.0
+		 * @version 1.99.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/ui/integration/cards/ComponentContent.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseContent
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @experimental
 	 * @constructor

package/src/sap/ui/integration/cards/Footer.js

@@ -7,12 +7,14 @@ sap.ui.define([
 	"sap/ui/core/Control",
 	"sap/ui/core/Core",
 	"sap/ui/integration/controls/ActionsStrip",
+	"sap/ui/integration/controls/Paginator",
 	"sap/ui/integration/util/BindingHelper",
 	"sap/ui/integration/util/BindingResolver"
 ], function (
 	Control,
 	Core,
 	ActionsStrip,
+	Paginator,
 	BindingHelper,
 	BindingResolver
 ) {
@@ -29,7 +31,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @private
@@ -51,6 +53,11 @@ sap.ui.define([
 				actionsStrip: {
 					type: "sap.ui.integration.controls.ActionsStrip",
 					multiple: false
+				},
+
+				paginator: {
+					type: "sap.ui.integration.controls.Paginator",
+					multiple: false
 				}
 			},
 
@@ -70,15 +77,28 @@ sap.ui.define([
 		renderer: {
 			apiVersion: 2,
 			render: function (oRM, oFooter) {
+				var oActionsStrip = oFooter.getActionsStrip(),
+					oPaginator = oFooter.getPaginator();
+
 				oRM.openStart("div", oFooter).class("sapFCardFooter");
 
+				if (oActionsStrip) {
+					oRM.class("sapFCardFooterWithActionsStrip");
+				}
+
 				if (oFooter.getCardInstance().isLoading() && oFooter._hasBinding()) {
 					oRM.class("sapFCardFooterLoading");
 				}
 
 				oRM.openEnd();
 
-				oRM.renderControl(oFooter.getActionsStrip());
+				if (oPaginator) {
+					oRM.renderControl(oPaginator);
+				}
+
+				if (oActionsStrip) {
+					oRM.renderControl(oActionsStrip);
+				}
 
 				oRM.close("div");
 			}
@@ -89,7 +109,7 @@ sap.ui.define([
 		var oConfiguration = BindingHelper.createBindingInfos(this.getConfiguration(), this.getCardInstance().getBindingNamespaces());
 
 		// to do: if more precise check is needed search recursively
-		return oConfiguration.actionsStrip.some(function (oButtonConfig) {
+		return (oConfiguration.actionsStrip || []).some(function (oButtonConfig) {
 			for (var sKey in oButtonConfig) {
 				if (BindingResolver.isBindingInfo(oButtonConfig[sKey])) {
 					return true;
@@ -111,14 +131,11 @@ sap.ui.define([
 	};
 
 	Footer.create = function (oCard, oConfiguration) {
-		if (!oConfiguration.actionsStrip) {
-			return null;
-		}
-
 		return new Footer({
 			configuration: oConfiguration,
 			card: oCard,
-			actionsStrip: ActionsStrip.create(oCard, oConfiguration.actionsStrip)
+			actionsStrip: ActionsStrip.create(oCard, oConfiguration.actionsStrip),
+			paginator: Paginator.create(oCard, oConfiguration.paginator)
 		});
 	};
 

package/src/sap/ui/integration/cards/Header.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @extends sap.f.cards.Header
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/cards/ListContent.js

@@ -66,7 +66,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseListContent
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @private
@@ -203,6 +203,7 @@ sap.ui.define([
 	 * Handler for when data is changed.
 	 */
 	ListContent.prototype.onDataChanged = function () {
+		this._handleNoItemsError(this.getParsedConfiguration().item);
 		this._checkHiddenNavigationItems(this.getParsedConfiguration().item);
 	};
 
@@ -378,7 +379,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * @overwrite
+	 * @override
 	 * @returns {sap.m.List} The inner list.
 	 */
 	ListContent.prototype.getInnerList = function () {

package/src/sap/ui/integration/cards/ListContentRenderer.js

@@ -38,15 +38,19 @@ sap.ui.define([
 	/**
 	 * @override
 	 */
-	ListContentRenderer.getMinHeight = function (oConfiguration, oContent) {
-		if (!oConfiguration || !oConfiguration.maxItems || !oConfiguration.item) {
+	ListContentRenderer.getMinHeight = function (oConfiguration, oContent, oCard) {
+		var iMaxItems = oCard.getContentPageSize(oConfiguration),
+			fItemHeight;
+
+		if (!oConfiguration ||
+			!oConfiguration.item ||
+			!iMaxItems) {
 			return this.DEFAULT_MIN_HEIGHT;
 		}
 
-		var fItemHeight = this.getItemMinHeight(oConfiguration, oContent),
-			iCount = parseInt(oConfiguration.maxItems) || 0;
+		fItemHeight = this.getItemMinHeight(oConfiguration, oContent);
 
-		return (iCount * fItemHeight) + "rem";
+		return (iMaxItems * fItemHeight) + "rem";
 	};
 
 	ListContentRenderer.getItemMinHeight = function (oConfiguration, oControl) {

package/src/sap/ui/integration/cards/NumericHeader.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.f.cards.NumericHeader
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/cards/ObjectContent.js

@@ -72,7 +72,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.integration.cards.BaseContent
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @experimental

package/src/sap/ui/integration/cards/TableContent.js

@@ -77,7 +77,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseListContent
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @private
@@ -146,6 +146,7 @@ sap.ui.define([
 	 * Handler for when data is changed.
 	 */
 	TableContent.prototype.onDataChanged = function () {
+		this._handleNoItemsError(this.getParsedConfiguration().row);
 		this._checkHiddenNavigationItems(this.getParsedConfiguration().row);
 	};
 
@@ -352,7 +353,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * @overwrite
+	 * @override
 	 * @returns {sap.m.Table} The inner table.
 	 */
 	TableContent.prototype.getInnerList = function () {

package/src/sap/ui/integration/cards/TableContentRenderer.js

@@ -19,17 +19,18 @@ sap.ui.define(["./BaseContentRenderer"], function (BaseContentRenderer) {
 	/**
 	 * @override
 	 */
-	TableContentRenderer.getMinHeight = function (oConfiguration, oContent) {
-		if (!oConfiguration) {
+	TableContentRenderer.getMinHeight = function (oConfiguration, oContent, oCard) {
+		var  iMaxItems = oCard.getContentPageSize(oConfiguration);
+
+		if (!iMaxItems) {
 			return this.DEFAULT_MIN_HEIGHT;
 		}
 
 		var bIsCompact = this.isCompact(oContent),
-			iCount = parseInt(oConfiguration.maxItems) || 0,
 			iRowHeight = bIsCompact ? 2 : 2.75, // table row height in "rem"
 			iTableHeaderHeight = bIsCompact ? 2 : 2.75; // table header height in "rem"
 
-		return (iCount * iRowHeight + iTableHeaderHeight) + "rem";
+		return (iMaxItems * iRowHeight + iTableHeaderHeight) + "rem";
 	};
 
 	return TableContentRenderer;