@openui5/sap.ui.integration 1.113.0 → 1.115.0

package/.reuse/dep5

@@ -192,11 +192,6 @@ Copyright: 2012 Matteo Spinelli
 License: MIT
 Comment: these files belong to: cubiq.org - swipeview
 
-Files: src/sap.ui.core/src/sap/ui/thirdparty/mobify-carousel.js
-Copyright: Mobify R&D Inc.
-License: MIT
-Comment: these files belong to: Mobify.js
-
 Files: src/sap.ui.core/src/sap/ui/thirdparty/zyngascroll.js
 Copyright: 2011 Zynga Inc.
 License: MIT

package/THIRDPARTY.txt

@@ -143,12 +143,6 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/swipe-view.js
 
-Component: Mobify.js, version: 1.1
-Copyright: Mobify R&D Inc.
-License: MIT
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.core/src/sap/ui/thirdparty/mobify-carousel.js
-
 Component: Zynga Scroller, version: 1.2.1-0-g5d43806
 Copyright: 2011 Zynga Inc.
 License: MIT
@@ -478,7 +472,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
-Component: SAP Theming Base Content, version: 11.2.1
+Component: SAP Theming Base Content, version: 11.3.0
 Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

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

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

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.113.0</version>
+  <version>1.115.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.113.0
+	 * @version 1.115.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.113.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -31,7 +31,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.113.0
+		 * @version 1.115.0
 		 *
 		 * @constructor
 		 * @public

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

@@ -37,7 +37,7 @@ sap.ui.define([
 		 * @extends sap.ui.integration.cards.BaseContent
 		 *
 		 * @author SAP SE
-		 * @version 1.113.0
+		 * @version 1.115.0
 		 *
 		 * @constructor
 		 * @private

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

@@ -6,6 +6,7 @@
 sap.ui.define([
 	"./AnalyticalContentRenderer",
 	"./BaseContent",
+	"sap/f/cards/loading/AnalyticalPlaceholder",
 	"sap/m/IllustratedMessageType",
 	"sap/ui/integration/library",
 	"sap/ui/integration/util/BindingResolver",
@@ -15,6 +16,7 @@ sap.ui.define([
 ], function (
 	AnalyticalContentRenderer,
 	BaseContent,
+	AnalyticalPlaceholder,
 	IllustratedMessageType,
 	library,
 	BindingResolver,
@@ -90,7 +92,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseContent
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @private
@@ -112,6 +114,16 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * @override
+	 */
+	AnalyticalContent.prototype.createLoadingPlaceholder = function (oConfiguration) {
+		return new AnalyticalPlaceholder({
+			chartType: oConfiguration.chartType,
+			minHeight: AnalyticalContentRenderer.getMinHeight(oConfiguration)
+		});
+	};
+
 	/**
 	 * @override
 	 */
@@ -158,10 +170,10 @@ sap.ui.define([
 					&& vizDS._FlatTableD._data.length;
 
 			if (bHasData) {
-				this.destroyAggregation("_noDataMessage");
+				this.hideNoDataMessage();
 			} else {
 				this.showNoDataMessage({
-					type: IllustratedMessageType.NoEntries,
+					illustrationType: IllustratedMessageType.NoEntries,
 					title: this.getCardInstance().getTranslatedText("CARD_NO_ITEMS_ERROR_LISTS")
 				});
 			}

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

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseContent
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @private
@@ -153,7 +153,7 @@ sap.ui.define([
 		// is Highcharts library available
 		if (!window.Highcharts) {
 			this.handleError({
-				type: IllustratedMessageType.ErrorScreen,
+				illustrationType: IllustratedMessageType.ErrorScreen,
 				title: oCard.getTranslatedText("CARD_DATA_LOAD_ERROR"),
 				description: oCard.getTranslatedText("CARD_ERROR_HIGHCHARTS_DESCRIPTION")
 			});

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

@@ -6,6 +6,7 @@
 
 sap.ui.define([
 	"./BaseContentRenderer",
+	"sap/f/cards/loading/GenericPlaceholder",
 	"sap/m/MessageStrip",
 	"sap/m/VBox",
 	"sap/m/library",
@@ -15,6 +16,7 @@ sap.ui.define([
 	"sap/ui/core/Control",
 	"sap/ui/core/InvisibleMessage",
 	"sap/ui/core/library",
+	"sap/ui/integration/controls/BlockingMessage",
 	"sap/ui/integration/model/ObservableModel",
 	"sap/ui/base/ManagedObjectObserver",
 	"sap/ui/integration/util/LoadingProvider",
@@ -24,6 +26,7 @@ sap.ui.define([
 	"sap/ui/integration/library"
 ], function (
 	BaseContentRenderer,
+	GenericPlaceholder,
 	MessageStrip,
 	VBox,
 	mLibrary,
@@ -33,6 +36,7 @@ sap.ui.define([
 	Control,
 	InvisibleMessage,
 	coreLibrary,
+	BlockingMessage,
 	ObservableModel,
 	ManagedObjectObserver,
 	LoadingProvider,
@@ -46,8 +50,12 @@ sap.ui.define([
 	// shortcut for sap.ui.core.InvisibleMessageMode
 	var InvisibleMessageMode = coreLibrary.InvisibleMessageMode;
 
-	// shortcut for sap.ui.integration.widgets.CardDesign
+	// shortcut for sap.ui.integration.CardDesign
 	var CardDesign = library.CardDesign;
+	// shortcut for sap.ui.integration.CardBlockingMessageType
+	var CardBlockingMessageType = library.CardBlockingMessageType;
+
+	var CardPreviewMode = library.CardPreviewMode;
 
 	/**
 	 * Constructor for a new <code>BaseContent</code>.
@@ -61,7 +69,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @private
@@ -117,7 +125,7 @@ sap.ui.define([
 				},
 
 				/**
-				 * Defines the internally used LoadingProvider.
+				 * Defines the internally used LoadingPlaceholder.
 				 */
 				_loadingPlaceholder: {
 					type: "sap.ui.core.Element",
@@ -131,8 +139,8 @@ sap.ui.define([
 					visibility: "hidden"
 				},
 
-				_noDataMessage: {
-					type: "sap.ui.core.Control",
+				_blockingMessage: {
+					type: "sap.ui.integration.controls.BlockingMessage",
 					multiple: false,
 					visibility: "hidden"
 				}
@@ -177,13 +185,22 @@ sap.ui.define([
 	};
 
 	BaseContent.prototype.onBeforeRendering = function () {
-		var oCard = this.getCardInstance();
+		var oConfiguration = this.getConfiguration(),
+			oCard = this.getCardInstance(),
+			oLoadingPlaceholder = this.getAggregation("_loadingPlaceholder");
 
-		if (!this.getAggregation("_loadingPlaceholder") && oCard && this.getConfiguration()) {
-			var oLoadingPlaceholder = this.getAggregation("_loadingProvider")
-				.createContentPlaceholder(this.getConfiguration(), oCard.getManifestEntry("/sap.card/type"), oCard);
-			this.setAggregation("_loadingPlaceholder", oLoadingPlaceholder);
-		}
+			if (!oLoadingPlaceholder && oConfiguration) {
+				this.setAggregation("_loadingPlaceholder", this.createLoadingPlaceholder(oConfiguration));
+				oLoadingPlaceholder = this.getAggregation("_loadingPlaceholder");
+			}
+
+			if (oLoadingPlaceholder && oCard) {
+				oLoadingPlaceholder.setRenderTooltip(oCard.getPreviewMode() !== CardPreviewMode.Abstract);
+
+				if (typeof this._getTable === "function") {
+					oLoadingPlaceholder.setHasContent((this._getTable().getColumns().length > 0));
+				}
+			}
 	};
 
 	/**
@@ -227,6 +244,15 @@ sap.ui.define([
 		this._sContentBindingPath = null;
 	};
 
+	/**
+	 * @private
+	 * @param {object} oConfiguration the content configuration
+	 * @returns {sap.f.cards.loading.BasePlaceholder} placeholder instance
+	 */
+	BaseContent.prototype.createLoadingPlaceholder = function (oConfiguration) {
+		return new GenericPlaceholder();
+	};
+
 	/**
 	 * Can be used in subclasses to load lazy dependencies.
 	 * @param {sap.ui.integration.util.Manifest} oCardManifest The card manifest.
@@ -291,6 +317,12 @@ sap.ui.define([
 		}.bind(this));
 	};
 
+	BaseContent.prototype._forceCompleteAwaitedEvents = function () {
+		this._oAwaitedEvents.forEach(function (sEvent) {
+			this.fireEvent(sEvent);
+		}.bind(this));
+	};
+
 	/**
 	 * Parses the configuration. As binding infos are modified when used once,
 	 * new object is returned every time.
@@ -351,29 +383,58 @@ sap.ui.define([
 		}
 	};
 
+	BaseContent.prototype.showBlockingMessage = function (mSettings) {
+		this.destroyAggregation("_blockingMessage");
+		this.setAggregation("_blockingMessage", BlockingMessage.create(mSettings, this.getCardInstance()));
+		this._forceCompleteAwaitedEvents();
+	};
+
+	BaseContent.prototype.hideBlockingMessage = function () {
+		this.destroyAggregation("_blockingMessage");
+	};
+
+	BaseContent.prototype.getBlockingMessage = function () {
+		var oBlockingMessage = this.getAggregation("_blockingMessage");
+
+		if (oBlockingMessage) {
+			return {
+				type: oBlockingMessage.getType(),
+				illustrationType: oBlockingMessage.getIllustrationType(),
+				illustrationSize: oBlockingMessage.getIllustrationSize(),
+				title: oBlockingMessage.getTitle(),
+				description: oBlockingMessage.getDescription(),
+				httpResponse: oBlockingMessage.getHttpResponse()
+			};
+		}
+
+		return null;
+	};
+
 	/**
+	 * Show 'No Data' blocking message in the content. If there is configuration in the manifest, it will be applied.
 	 * @protected
 	 * @param {object} oSettings 'No Data' settings
-	 * @param {sap.m.IllustratedMessageType} oSettings.type Illustration type
+	 * @param {sap.m.IllustratedMessageType} oSettings.illustrationType Illustration type
 	 * @param {sap.m.IllustratedMessageSize} [oSettings.illustrationSize=sap.m.IllustratedMessageSize.Auto] Illustration size
 	 * @param {string} oSettings.title Title
 	 * @param {string} [oSettings.description] Description
 	 */
 	BaseContent.prototype.showNoDataMessage = function (oSettings) {
-		this.destroyAggregation("_noDataMessage");
 		var oNoDataConfiguration = this.getNoDataConfiguration() || {};
 
-		var oIllustrationSettings = {
-			type: IllustratedMessageType[oNoDataConfiguration.type] || oSettings.type,
-			size: IllustratedMessageSize[oNoDataConfiguration.size] || oSettings.size,
+		var oMessageSettings = {
+			type: CardBlockingMessageType.NoData,
+			illustrationType: IllustratedMessageType[oNoDataConfiguration.type] || oSettings.illustrationType,
+			illustrationSize: IllustratedMessageSize[oNoDataConfiguration.size] || oSettings.illustrationSize,
 			title: oNoDataConfiguration.title || oSettings.title,
 			description: oNoDataConfiguration.description || oSettings.description
 		};
 
-		var oIllustratedMessage = this.getCardInstance()._oErrorHandler.getIllustratedMessage(oIllustrationSettings, true);
-		oIllustratedMessage.addStyleClass("sapFCardContentNoDataMsg");
+		this.showBlockingMessage(oMessageSettings);
+	};
 
-		this.setAggregation("_noDataMessage", oIllustratedMessage);
+	BaseContent.prototype.hideNoDataMessage = function () {
+		this.hideBlockingMessage();
 	};
 
 	/**
@@ -406,6 +467,7 @@ sap.ui.define([
 			oModel = oCard.getModel(oDataSettings.name);
 		} else if (this._oDataProvider) {
 			oModel = new ObservableModel();
+			oModel.setSizeLimit(oCard.getModelSizeLimit());
 			this.setModel(oModel);
 		}
 
@@ -510,7 +572,7 @@ sap.ui.define([
 		var oLoadingProvider = this.getAggregation("_loadingProvider"),
 			oCard = this.getCardInstance();
 
-		if (!oLoadingProvider || !oLoadingProvider.getLoading()) {
+		if (!oLoadingProvider.getLoading()) {
 			return;
 		}
 
@@ -521,15 +583,6 @@ sap.ui.define([
 		}
 	};
 
-	/**
-	 * @private
-	 * @ui5-restricted
-	 * @returns {boolean} Whether the content has no data
-	 */
-	BaseContent.prototype.hasNoData = function () {
-		return !!this.getAggregation("_noDataMessage");
-	};
-
 	/**
 	 * Called when the data for the content was changed either by the content or by the card.
 	 * Override when special behaviour has to be implemented when data is changed.
@@ -773,5 +826,14 @@ sap.ui.define([
 		return oCard.getId() + "-header-title-inner";
 	};
 
+	/**
+	 * @private
+	 * @ui5-restricted sap.ui.integration
+	 * @returns {boolean} Whether the card has attached actions that are defined at content level
+	 */
+	BaseContent.prototype.isInteractive = function () {
+		return this.hasListeners("press");
+	};
+
 	return BaseContent;
 });

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

@@ -41,7 +41,7 @@ sap.ui.define([
 			bLoading = oCardContent.isLoading(),
 			bIsAbstractPreviewMode =  oCard && oCard.getPreviewMode() === CardPreviewMode.Abstract,
 			oMessageContainer = oCardContent.getAggregation("_messageContainer"),
-			oNoDataMessage = oCardContent.getAggregation("_noDataMessage");
+			oBlockingMessage = oCardContent.getAggregation("_blockingMessage");
 
 		sClass += sType;
 
@@ -49,8 +49,8 @@ sap.ui.define([
 			.class(sClass)
 			.class("sapFCardBaseContent");
 
-		if (oCardContent.hasListeners("press")) {
-			oRm.class("sapFCardClickable");
+		if (oCardContent.isInteractive()) {
+			oRm.class("sapFCardSectionClickable");
 		}
 
 		if (oCard && oCard.getHeight() === "auto") { // if there is no height specified the default value is "auto"
@@ -72,8 +72,8 @@ sap.ui.define([
 			oRm.renderControl(oMessageContainer);
 		}
 
-		if (oNoDataMessage) {
-			oRm.renderControl(oNoDataMessage);
+		if (oBlockingMessage) {
+			oRm.renderControl(oBlockingMessage);
 		} else {
 			this.renderContent(oRm, oCardContent);
 		}

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

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.cards.BaseContent
 	 *
 	 * @author SAP SE
-	 * @version 1.113.0
+	 * @version 1.115.0
 	 *
 	 * @constructor
 	 * @private
@@ -78,10 +78,10 @@ sap.ui.define([
 
 	BaseListContent.prototype.onDataChanged = function () {
 		if (this.hasData()) {
-			this.destroyAggregation("_noDataMessage");
+			this.hideNoDataMessage();
 		} else {
 			this.showNoDataMessage({
-				type: IllustratedMessageType.NoEntries,
+				illustrationType: IllustratedMessageType.NoEntries,
 				title: this.getCardInstance().getTranslatedText("CARD_NO_ITEMS_ERROR_LISTS")
 			});
 		}