@openui5/sap.ui.integration 1.103.1 → 1.106.0

package/src/sap/ui/integration/model/ContextModel.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.json.JSONModel
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.integration.model.ContextModel

package/src/sap/ui/integration/model/ObservableModel.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.json.JSONModel
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.integration.model.ObservableModel

package/src/sap/ui/integration/model/PagingModelListBinding.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.json.JSONListBinding
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 * @constructor
 	 * @private
 	 * @alias sap.ui.integration.model.PagingModelListBinding

package/src/sap/ui/integration/schemas/sap-card.json

@@ -37,7 +37,10 @@
         "1.25.0",
         "1.26.0",
         "1.27.0",
-        "1.28.0"
+        "1.28.0",
+        "1.29.0",
+        "1.30.0",
+        "1.31.0"
       ]
     },
     "designtime": {
@@ -775,6 +778,17 @@
                         "$ref": "#/definitions/simpleBinding"
                     }
                 ]
+            },
+            "visible": {
+              "description": "Visibility of the item",
+              "oneOf": [
+                {
+                 "type": "boolean"
+                },
+                {
+                  "$ref": "#/definitions/simpleBinding"
+                }
+              ]
             }
         }
     },
@@ -1219,6 +1233,10 @@
           "items": {
             "$ref": "#/definitions/action"
           }
+        },
+        "hasData": {
+          "description": "Represents flag for no data",
+          "type": "string"
         }
       }
     },
@@ -1234,6 +1252,30 @@
           "description": "Represents a title of the object group; to make this property language dependent (recommended), use a key in double curly brackets '{{key}}'",
           "type": "string"
         },
+        "titleMaxLines": {
+            "description": "[Experimental] Limits the number of lines for wrapping the group title.",
+            "oneOf": [
+                {
+                    "type": "number"
+                },
+                {
+                    "$ref": "#/definitions/simpleBinding"
+                }
+            ],
+            "default": 1
+        },
+        "labelWrapping": {
+            "description": "[Experimental] Determines whether the labels of the group items will be wrapped.",
+            "oneOf": [
+                {
+                    "type": "boolean"
+                },
+                {
+                    "$ref": "#/definitions/simpleBinding"
+                }
+            ],
+            "default": false
+        },
         "items": {
           "description": "Represents items of information",
           "type": "array",
@@ -1272,6 +1314,10 @@
           "description": "Represents the text, which is associated with the label",
           "type": "string"
         },
+        "tooltip": {
+          "description": "Defines the tooltip of the link",
+          "type": "string"
+        },
         "type": {
           "description": "Defines the type of the displayed information. Some of the types are deprecated",
           "type": "string",
@@ -1282,6 +1328,8 @@
                 "NumericData",
                 "Status",
                 "IconGroup",
+                "ComboBox",
+                "TextArea",
                 "phone",
                 "email",
                 "link",
@@ -1394,6 +1442,47 @@
         "state": {
           "description": "The state color of the item",
           "$ref": "#/definitions/state"
+        },
+        "id": {
+          "description": "ID for input fields",
+          "type": "string"
+        },
+        "selectedKey": {
+          "description": "Defines the initially selected key from the given options for ComboBox.",
+          "type": "string"
+        },
+        "placeholder": {
+          "description": "Placeholder for input fields",
+          "type": "string"
+        },
+        "rows": {
+          "description": "Property rows for TextArea",
+          "type": "number"
+        },
+        "item": {
+          "type": "object",
+          "description": "Binding info for ComboBox items",
+          "required": [
+            "template"
+          ],
+          "additionalProperties": false,
+          "properties": {
+            "template": {
+              "$ref": "#/definitions/ContentType.Object.Item.ComboBoxItemTemplate"
+            },
+            "path": {
+              "description": "Defines the path to the structure holding the data about the items",
+              "type": "string",
+              "default": "/",
+              "pattern": "^[a-zA-Z0-9_\\.\\-/|@#]*$"
+            }
+          }
+        },
+        "validations": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/ContentType.Object.Item.Validation"
+          }
         }
       }
     },
@@ -1495,6 +1584,94 @@
         }
       }
     },
+    "ContentType.Object.Item.ComboBoxItemTemplate": {
+      "description": "Template for combo box items",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "title": {
+          "description": "The title of the option",
+          "type": "string"
+        },
+        "key": {
+          "description": "The unique key of the option. Mapped to the input's value",
+          "type": "string"
+        }
+      }
+    },
+    "ContentType.Object.Item.Validation": {
+      "description": "[Experimental] Defines the user input validation",
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+         "message": {
+           "description": "Defines custom validation message text",
+           "type": "string"
+         },
+         "type": {
+           "description": "Defines the validation type",
+           "oneOf": [
+             {
+               "enum": [
+                 "Error",
+                 "Warning",
+                 "Information"
+               ],
+               "default": "Error"
+             },
+             {
+               "$ref": "#/definitions/simpleBinding"
+             }
+           ]
+         },
+         "required": {
+           "description": "Defines whether the user input is required",
+           "oneOf": [
+             {
+               "type": "boolean",
+               "default": false
+             },
+             {
+               "$ref": "#/definitions/simpleBinding"
+             }
+           ]
+         },
+         "minLength": {
+           "description": "Defines the minimum number of characters",
+           "oneOf": [
+             {
+               "type": "number"
+             },
+             {
+               "$ref": "#/definitions/simpleBinding"
+             }
+           ]
+         },
+         "maxLength": {
+           "description": "Defines the maximum number of characters",
+           "oneOf": [
+             {
+               "type": "number"
+             },
+             {
+               "$ref": "#/definitions/simpleBinding"
+             }
+           ]
+         },
+         "restrictToPredefinedOptions": {
+           "description": "Defines whether the value is restricted to predefined options",
+           "oneOf": [
+             {
+               "type": "boolean",
+               "default": false
+             },
+             {
+               "$ref": "#/definitions/simpleBinding"
+             }
+           ]
+         }
+       }
+    },
     "ContentType.Table": {
       "description": "Represents table content attributes",
       "type": "object",

package/src/sap/ui/integration/themes/base/Card.less

@@ -27,6 +27,9 @@
 	border-bottom-right-radius: 0;
 }
 
-.sapUiIntCardObjectButtonGroup {
-	margin-left: -0.5rem;
+.sapUiIntCardObjectButtonGroup,
+.sapUiIntActionsStrip {
+	.sapMBarChild:first-child {
+		margin-left: 0;
+	}
 }

package/src/sap/ui/integration/themes/base/ObjectContent.less

@@ -43,6 +43,10 @@
 		margin-top: 0.25rem;
 	}
 
+	.sapFCardObjectItemPairContainer {
+		min-width: 0; // prevent overflow of the flex container
+	}
+
 	.sapFCardObjectItemAvatar {
 		margin-right: 0.5rem;
 	}
@@ -116,4 +120,8 @@
 		cursor: default;
 		opacity: 1;
 	}
+
+	.sapUiIntCardObjectButtonGroup {
+		margin-left: -0.5rem;
+	}
 }

package/src/sap/ui/integration/util/BaseFactory.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/util/BindingHelper.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * Helper class for working with bindings.
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @private
 	 * @alias sap.ui.integration.util.BindingHelper

package/src/sap/ui/integration/util/BindingResolver.js

@@ -33,7 +33,7 @@ sap.ui.define([
 		 * Resolves a binding syntax based on a provided model and path.
 		 *
 		 * @author SAP SE
-		 * @version 1.103.1
+		 * @version 1.106.0
 		 *
 		 * @private
 		 * @alias sap.ui.integration.util.BindingResolver
@@ -108,6 +108,11 @@ sap.ui.define([
 				sPath = "/";
 			}
 
+			// clean the object
+			oSimpleControl.unbindProperty("resolved");
+			oSimpleControl.unbindObject();
+			oSimpleControl.setModel(null);
+
 			if (vModelOrObject instanceof Model) {
 				oSimpleControl.setModel(vModelOrObject);
 			} else {
@@ -119,10 +124,6 @@ sap.ui.define([
 
 			var vValue = oSimpleControl.getResolved();
 
-			oSimpleControl.unbindProperty("resolved");
-			oSimpleControl.unbindObject();
-			oSimpleControl.setModel(null);
-
 			return vValue;
 		}
 

package/src/sap/ui/integration/util/CacheAndRequestDataProvider.js

@@ -47,6 +47,8 @@ sap.ui.define([
 	 * @override
 	 */
 	CacheAndRequestDataProvider.prototype.init = function () {
+		RequestDataProvider.prototype.init.apply(this, arguments);
+
 		this._oRefreshWithoutCacheBound = this.refreshWithoutCache.bind(this);
 	};
 
@@ -87,11 +89,11 @@ sap.ui.define([
 			this._iUpdateIntervalTimeout = null;
 		}
 
-		if (!this._oSettings || !this._oSettings.updateInterval) {
+		if (!this.getSettings() || !this.getSettings().updateInterval) {
 			return;
 		}
 
-		iInterval = parseInt(this._oSettings.updateInterval);
+		iInterval = parseInt(this.getSettings().updateInterval);
 
 		if (isNaN(iInterval)) {
 			return;

package/src/sap/ui/integration/util/CardObserver.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/integration/util/ContentFactory.js

@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.ui.integration.util.BaseFactory
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @private
@@ -88,7 +88,6 @@ sap.ui.define([
 					oContent.setIconFormatter(mConfig.iconFormatter);
 					oContent.setActions(oActions);
 					oContent.setConfiguration(mConfig.contentManifest, sType);
-
 					resolve(oContent);
 				})
 				.catch(function (sError) {

package/src/sap/ui/integration/util/CsrfTokenHandler.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @param {sap.ui.integration.Host} oHost The Host which will be used for resolve CSRF tokens.

package/src/sap/ui/integration/util/DataProvider.js

@@ -3,8 +3,13 @@
  * (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/base/ManagedObject"],
-	function (ManagedObject) {
+sap.ui.define([
+	"sap/ui/base/ManagedObject",
+	"sap/ui/performance/Measurement"
+], function (
+	ManagedObject,
+	Measurement
+) {
 	"use strict";
 
 	/**
@@ -24,7 +29,7 @@ sap.ui.define(["sap/ui/base/ManagedObject"],
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.103.1
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @private
@@ -38,7 +43,14 @@ sap.ui.define(["sap/ui/base/ManagedObject"],
 			library: "sap.ui.integration",
 			properties: {
 				/**
-				 * Data settings in json format. Will override any other settings.
+				 * Data settings.
+				 */
+				settings: {
+					type: "object"
+				},
+
+				/**
+				 * Data settings in json format. Will override <code>settings</code>.
 				 */
 				settingsJson: {
 					type: "string"
@@ -87,10 +99,20 @@ sap.ui.define(["sap/ui/base/ManagedObject"],
 						message : { type : "string" }
 					}
 				}
+			},
+			associations: {
+				card: {
+					type : "sap.ui.integration.widgets.Card",
+					multiple: false
+				}
 			}
 		}
 	});
 
+	DataProvider.prototype.init = function () {
+		this._iCurrentRequestNumber = 0;
+	};
+
 	/**
 	 * Sets the destinations resolver
 	 *
@@ -124,7 +146,6 @@ sap.ui.define(["sap/ui/base/ManagedObject"],
 	 */
 	DataProvider.prototype.setSettingsJson = function (sSettingsJson) {
 		this.setProperty("settingsJson", sSettingsJson);
-
 		this.setSettings(JSON.parse(sSettingsJson));
 
 		if (this._bActive) {
@@ -146,24 +167,6 @@ sap.ui.define(["sap/ui/base/ManagedObject"],
 		return this.getBaseRuntimeUrl() + sSanitizedUrl;
 	};
 
-	/**
-	 * Sets the data settings for the <code>DataProvider</code>
-	 *
-	 * @param {Object} oSettings The data settings.
-	 */
-	DataProvider.prototype.setSettings = function (oSettings) {
-		this._oSettings = oSettings;
-	};
-
-	/**
-	 * Returns the data settings for the <code>DataProvider</code>
-	 *
-	 * @returns {Object} The data settings.
-	 */
-	DataProvider.prototype.getSettings = function () {
-		return this._oSettings;
-	};
-
 	/**
 	 * Triggers a data update which results in either "dataChanged" event or an "error" event.
 	 *
@@ -191,13 +194,30 @@ sap.ui.define(["sap/ui/base/ManagedObject"],
 
 	DataProvider.prototype._triggerDataUpdate = function () {
 		this._bActive = true;
+		this._iCurrentRequestNumber++;
+		var oGetDataMeasurement;
+
+		if (this.getCard()) {
+			oGetDataMeasurement = Measurement.start(
+				"UI5 Integration Cards - " + this.getCard() +  "-" + this.getId() + "---getData#" + this._iCurrentRequestNumber,
+				this.getDetails()
+			);
+		}
 
 		return this.getData()
 			.then(function (oData) {
+				if (oGetDataMeasurement) {
+					Measurement.end(oGetDataMeasurement.id);
+				}
+
 				this.fireDataChanged({data: oData});
 				this.onDataRequestComplete();
 			}.bind(this))
 			.catch(function (oResult) {
+				if (oGetDataMeasurement) {
+					Measurement.end(oGetDataMeasurement.id);
+				}
+
 				if (Array.isArray(oResult) && oResult.length > 0) {
 					this.fireError({message: oResult[0], jqXHR: oResult[1]});
 				} else {
@@ -235,7 +255,6 @@ sap.ui.define(["sap/ui/base/ManagedObject"],
 			this._iDataUpdateCallId = null;
 		}
 
-		this._oSettings = null;
 		ManagedObject.prototype.destroy.apply(this, arguments);
 	};
 
@@ -244,14 +263,14 @@ sap.ui.define(["sap/ui/base/ManagedObject"],
 	};
 
 	DataProvider.prototype.onDataRequestComplete = function () {
-
 		var iInterval;
+		var oSettings = this.getSettings();
 
-		if (!this._oSettings || !this._oSettings.updateInterval) {
+		if (!oSettings || !oSettings.updateInterval) {
 			return;
 		}
 
-		iInterval = parseInt(this._oSettings.updateInterval);
+		iInterval = parseInt(oSettings.updateInterval);
 
 		if (isNaN(iInterval)) {
 			return;
@@ -291,5 +310,13 @@ sap.ui.define(["sap/ui/base/ManagedObject"],
 		return Promise.all(aPromises);
 	};
 
+	/**
+	 * @protected
+	 * @returns {string} Details about the provider, to be used for logging.
+	 */
+	DataProvider.prototype.getDetails = function () {
+		return "Static JSON data provided in the manifest.";
+	};
+
 	return DataProvider;
 });