@openui5/sap.ui.integration 1.120.6 → 1.121.0

package/src/sap/ui/integration/widgets/Card.js

@@ -9,9 +9,9 @@ sap.ui.define([
 	"../controls/ActionsToolbar",
 	"../controls/BlockingMessage",
 	"sap/ui/base/Interface",
+	"sap/ui/core/Element",
+	"sap/ui/core/Lib",
 	"sap/ui/thirdparty/jquery",
-	"sap/ui/core/Core",
-	"sap/ui/core/library",
 	"sap/ui/integration/util/Manifest",
 	"sap/ui/integration/util/ServiceManager",
 	"sap/base/Log",
@@ -40,15 +40,15 @@ sap.ui.define([
 	"sap/ui/integration/util/Utils",
 	"sap/ui/integration/util/ParameterMap",
 	"sap/ui/integration/util/Measurement"
-], function (
+], function(
 	CardRenderer,
 	Footer,
 	ActionsToolbar,
 	BlockingMessage,
 	Interface,
+	Element,
+	Library,
 	jQuery,
-	Core,
-	coreLibrary,
 	CardManifest,
 	ServiceManager,
 	Log,
@@ -117,8 +117,6 @@ sap.ui.define([
 
 	var MODULE_PREFIX = "module:";
 
-	var MessageType = coreLibrary.MessageType;
-
 	var DEFAULT_MODEL_SIZE_LIMIT = 1000;
 
 	/**
@@ -178,7 +176,7 @@ sap.ui.define([
 	 * @extends sap.f.CardBase
 	 *
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @public
 	 * @constructor
 	 * @see {@link topic:5b46b03f024542ba802d99d67bc1a3f4 Cards}
@@ -525,7 +523,7 @@ sap.ui.define([
 
 		this.setAggregation("_loadingProvider", new LoadingProvider());
 
-		this._oIntegrationRb = Core.getLibraryResourceBundle("sap.ui.integration");
+		this._oIntegrationRb = Library.getResourceBundleFor("sap.ui.integration");
 		this._iModelSizeLimit = DEFAULT_MODEL_SIZE_LIMIT;
 		this._initModels();
 		this._oContentFactory = new ContentFactory(this);
@@ -546,7 +544,7 @@ sap.ui.define([
 		 * @experimental since 1.79
 		 * @public
 		 * @author SAP SE
-		 * @version 1.120.6
+		 * @version 1.121.0
 		 * @borrows sap.ui.integration.widgets.Card#getDomRef as getDomRef
 		 * @borrows sap.ui.integration.widgets.Card#setVisible as setVisible
 		 * @borrows sap.ui.integration.widgets.Card#getParameters as getParameters
@@ -631,10 +629,12 @@ sap.ui.define([
 			},
 			paginator: {
 				init: () => this.setModel(new JSONModel({
-					skip: 0
+					skip: 0,
+					pageIndex: 0
 				}),  "paginator"),
 				reset: () => this.getModel("paginator").setData({
-					skip: 0
+					skip: 0,
+					pageIndex: 0
 				})
 			},
 			form: {
@@ -683,7 +683,7 @@ sap.ui.define([
 	 */
 	Card.prototype._initReadyState = function () {
 		this._aReadyPromises = [];
-
+		const aReadyPromises = this._aReadyPromises;
 		this._awaitEvent("_dataReady");
 		this._awaitEvent("_dataPassedToContent");
 		this._awaitEvent("_headerReady");
@@ -691,7 +691,9 @@ sap.ui.define([
 		this._awaitEvent("_contentReady");
 
 		Promise.all(this._aReadyPromises).then(function () {
-			this._onReady();
+			if ( aReadyPromises === this._aReadyPromises ) {
+				this._onReady();
+			}
 		}.bind(this));
 
 		this.attachEventOnce("_dataReady", this._fnOnDataReady);
@@ -809,7 +811,7 @@ sap.ui.define([
 		return this;
 	};
 
-	/**
+	/*
 	 * @override
 	 */
 	Card.prototype.setParameters = function (vValue) {
@@ -1292,6 +1294,9 @@ sap.ui.define([
 			aActions = aActions.concat(oHost.getActions() || []);
 		}
 
+		/**
+		 * @deprecated As of version 1.85
+		 */
 		if (oExtension) {
 			aActions = aActions.concat(oExtension.getActions() || []);
 		}
@@ -1312,7 +1317,6 @@ sap.ui.define([
 		this._oContentFactory = null;
 		this._oIntegrationRb = null;
 		this._aActiveLoadingProviders = null;
-		this._oContentMessage = null;
 		this._oMessage = null;
 		clearTimeout(this._iFireStateChangedCallId);
 
@@ -1362,7 +1366,6 @@ sap.ui.define([
 	 * Cleans up internal models and other before new manifest processing.
 	 */
 	Card.prototype._cleanupOldManifest = function() {
-		this._aReadyPromises = null;
 
 		if (this._fnOnModelChange) {
 			this.getModel().detachEvent("change", this._fnOnModelChange, this);
@@ -1580,6 +1583,7 @@ sap.ui.define([
 	 * @property {string} title Title
 	 * @property {string} [description] Description
 	 * @property {Response} [httpResponse] Response object in case of a network error
+	 * @property {array} [additionalContent] A list of buttons placed below the description as additional content. Experimental since 1.121
 	 * @public
 	 * @experimental As of version 1.114
 	 */
@@ -1849,6 +1853,10 @@ sap.ui.define([
 				oCardContent.onCardDataChanged();
 			}
 
+			if (this.getCardFooter()) {
+				this.getCardFooter().onDataChanged();
+			}
+
 			this.fireEvent("_dataPassedToContent");
 			this.onDataRequestComplete();
 		};
@@ -2045,7 +2053,7 @@ sap.ui.define([
 			return null;
 		}
 
-		return Core.byId(sHost);
+		return Element.getElementById(sHost);
 	};
 
 	/**
@@ -2081,7 +2089,8 @@ sap.ui.define([
 				illustrationType: IllustratedMessageType.ErrorScreen,
 				title: this.getTranslatedText("CARD_ERROR_CONFIGURATION_TITLE"),
 				description: this.getTranslatedText("CARD_ERROR_CONFIGURATION_DESCRIPTION"),
-				details: e.message
+				details: e.message,
+				originalError: e
 			});
 			return;
 		}
@@ -2115,7 +2124,12 @@ sap.ui.define([
 		var mFiltersConfig = this._oCardManifest.get(MANIFEST_PATHS.FILTERS),
 			oFactory = new FilterBarFactory(this);
 
-		return oFactory.create(mFiltersConfig, this.getModel("filters"));
+		return oFactory.create(mFiltersConfig, this.getModel("filters"), (oEvent) => {
+			this._fireConfigurationChange({
+				[`/sap.card/configuration/filters/${oEvent.getParameter("key")}/value`]: oEvent.getParameter("value")
+			});
+			this.resetPaginator();
+		});
 	};
 
 	Card.prototype.createFooter = function () {
@@ -2188,13 +2202,13 @@ sap.ui.define([
 	 * @private
 	 */
 	Card.prototype._handleError = function (mErrorInfo) {
-		var sLogMessage = mErrorInfo.requestErrorParams ? mErrorInfo.requestErrorParams.message : mErrorInfo.description,
+		var sLogMessage = mErrorInfo.requestErrorParams ? mErrorInfo.requestErrorParams.message : mErrorInfo.title,
 			oContentSection = this._oCardManifest.get(MANIFEST_PATHS.CONTENT),
 			bIsComponentCard = this._oCardManifest.get(MANIFEST_PATHS.TYPE) === "Component",
 			oContent = this.getCardContent(),
 			mMessageSettings;
 
-		Log.error(sLogMessage, null, "sap.ui.integration.widgets.Card");
+		Log.error(sLogMessage, mErrorInfo.originalError, "sap.ui.integration.widgets.Card");
 		this.fireEvent("_error", { message: sLogMessage });
 
 		if (mErrorInfo.requestErrorParams) {
@@ -2222,7 +2236,7 @@ sap.ui.define([
 	 * @returns {object} The content message if any.
 	 */
 	Card.prototype.getContentMessage = function () {
-		return this._oContentMessage;
+		return this.getCardContent()?.getBlockingMessageStaticConfiguration();
 	};
 
 	/**
@@ -2455,12 +2469,16 @@ sap.ui.define([
 	 * @returns {Promise<any>} Resolves when the request is successful, rejects otherwise.
 	 */
 	Card.prototype.request = function (oConfiguration) {
-		return this.processDestinations(oConfiguration).then(function (oResult) {
-			return this._oDataProviderFactory
+		return this.processDestinations(oConfiguration).then((oResult) => {
+			return new Promise((resolve, reject) => {
+				this._oDataProviderFactory
 				.create({ request: oResult })
 				.setAllowCustomDataType(true)
-				.getData();
-		}.bind(this));
+				.attachDataChanged((e) => { resolve(e.getParameter("data")); })
+				.attachError((e) => { reject([e.getParameter("message"), e.getParameter("response"), e.getParameter("responseText"), e.getParameter("settings")]); })
+				.triggerDataUpdate();
+			});
+		});
 	};
 
 	/**
@@ -2909,7 +2927,7 @@ sap.ui.define([
 	 * @returns {sap.ui.integration.widgets.Card} The card which opened the current one.
 	 */
 	Card.prototype.getOpener = function () {
-		var oOpener = Core.byId(this.getAssociation("openerReference"));
+		var oOpener = Element.getElementById(this.getAssociation("openerReference"));
 
 		if (!oOpener) {
 			return null;
@@ -3002,12 +3020,8 @@ sap.ui.define([
 		});
 
 		if (bHasMissingMockData) {
-			Log.warning("'mockData' configuration is missing, but the card 'previewMode' is 'MockData'. Abstract mode will be used instead.", this);
+			Log.info("'mockData' configuration is missing, but the card 'previewMode' is 'MockData'. Abstract mode will be used instead.", this);
 			this.setProperty("previewMode", CardPreviewMode.Abstract);
-
-			this.attachEventOnce("manifestApplied", function () {
-				this.showMessage(this._oIntegrationRb.getText("CARD_MISSING_PREVIEW_CONFIGURATION"), MessageType.Information);
-			}.bind(this));
 		}
 	};
 

package/src/sap/ui/integration/widgets/CardRenderer.js

@@ -11,7 +11,8 @@ sap.ui.define([
 	"use strict";
 
 	var MANIFEST_PATHS = {
-		TYPE: "/sap.card/type"
+		TYPE: "/sap.card/type",
+		APP_ID: "/sap.app/id"
 	};
 	var CardDesign = library.CardDesign;
 	var CardPreviewMode = library.CardPreviewMode;
@@ -46,6 +47,10 @@ sap.ui.define([
 			}
 
 			oRm.class("sapUiIntCard" + oCard.getDisplayVariant());
+
+			if (oCardManifest && oCardManifest.get(MANIFEST_PATHS.APP_ID)) {
+				oRm.attr("data-sap-ui-card-id", oCardManifest.get(MANIFEST_PATHS.APP_ID));
+			}
 		},
 
 		/**

package/src/sap-ui-integration.js

@@ -34,7 +34,8 @@
 
 	//extract base URL from script tag
 	var oScriptTag, mMatch, sBaseUrl;
-	var coreInstance;
+	var Core;
+	var Lib;
 	//identify the own script include
 	oScriptTag = document.getElementById("sap-ui-bootstrap");
 
@@ -96,22 +97,24 @@
 
 	//initialize the loader
 	function boot() {
-		if (window.sap && window.sap.ui && window.sap.ui.getCore) {
-			coreInstance = window.sap.ui.getCore();
-			return initTags();
+		if (window.sap.ui.require("sap/ui/core/Core") && window.sap.ui.require("sap/ui/core/Lib")) {
+			Core = window.sap.ui.require("sap/ui/core/Core");
+			Lib = window.sap.ui.require("sap/ui/core/Lib");
+			initTags();
+			return;
 		}
-		window.sap.ui.require(['/ui5loader-autoconfig', 'sap/ui/core/Core'],
-			function (config, Core) {
+
+		window.sap.ui.require(["/ui5loader-autoconfig", "sap/ui/core/Core", "sap/ui/core/Lib"],
+			function (config, _Core, _Lib) {
+				Core = _Core;
+				Lib = _Lib;
 				Core.boot();
-				coreInstance = Core;
 				initTags();
 			});
-
 	}
 
-	function registerLibraryTags(sLibrary) {
-		var oLibrary = coreInstance.getLoadedLibraries()[sLibrary],
-			mCustomElements = oLibrary.extensions["sap.ui.integration"].customElements,
+	function registerLibraryTags(oIntegrationLib) {
+		var mCustomElements = oIntegrationLib.extensions["sap.ui.integration"].customElements,
 			aTags = Object.keys(mCustomElements);
 
 		//collect all the implementation classes and require them
@@ -125,11 +128,10 @@
 	}
 
 	function initTags() {
-		coreInstance.loadLibrary("sap.ui.integration", {
-			async: true
-		}).then(function () {
-			//register the tags for this library
-			registerLibraryTags("sap.ui.integration");
-		});
+		Lib.load({ name: "sap.ui.integration"})
+			.then(function (oIntegrationLib) {
+				//register the tags for this library
+				registerLibraryTags(oIntegrationLib);
+			});
 	}
 })(window);

package/ui5.yaml

@@ -69,11 +69,13 @@ builder:
                - sap/ui/integration/
                - "!sap/ui/integration/editor/"
                - "!sap/ui/integration/thirdparty/"
+               - "!sap/ui/fl/"
                - sap/m/
                - sap/f/
                - sap/ui/layout/
                - sap/ui/unified/
                - "!**/designtime/"
+               - "!**/library-preload-lazy.js"
                - "!**/*.support.js"
                - "!**/*.flexibility.js"
             resolve: true
@@ -129,11 +131,13 @@ builder:
               - sap/ui/integration/
               - "!sap/ui/integration/editor/"
               - "!sap/ui/integration/thirdparty/"
+              - "!sap/ui/fl/"
               - sap/m/
               - sap/f/
               - sap/ui/layout/
               - sap/ui/unified/
               - "!**/designtime/"
+              - "!**/library-preload-lazy.js"
               - "!**/*.support.js"
               - "!**/*.flexibility.js"
             resolve: true

package/LICENSES/BSD-2-Clause.txt

@@ -1,22 +0,0 @@
-Copyright (c) <year> <owner>. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.