@openui5/sap.ui.core 1.117.3 → 1.117.4

package/src/sap/ui/model/type/Integer.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.117.3
+	 * @version 1.117.4
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/String.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.117.3
+	 * @version 1.117.4
 	 *
 	 * @alias sap.ui.model.type.String
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Time.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.117.3
+	 * @version 1.117.4
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.

package/src/sap/ui/model/type/TimeInterval.js

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.117.3
+	 * @version 1.117.4
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.

package/src/sap/ui/model/type/Unit.js

@@ -48,7 +48,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @author SAP SE
-	 * @version 1.117.3
+	 * @version 1.117.4
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/xml/XMLModel.js

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.ClientModel
 	 *
 	 * @author SAP SE
-	 * @version 1.117.3
+	 * @version 1.117.4
 	 *
 	 * @param {XMLDocument|string} oData
 	 *   Either the URL where to load the XML from or an XML document

package/src/sap/ui/qunit/utils/ControlIterator.js

@@ -53,7 +53,7 @@ sap.ui.define(['sap/ui/core/Core', "sap/ui/VersionInfo"],
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.117.3
+	 * @version 1.117.4
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/qunit/utils/MemoryLeakCheck.js

@@ -27,7 +27,7 @@ sap.ui.define([ 'sap/ui/core/Element', 'sap/ui/core/Control', 'sap/ui/core/Core'
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.117.3
+	 * @version 1.117.4
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/test/generic/TestBase.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.117.3
+	 * @version 1.117.4
 	 * @since 1.100
 	 */
 	return BaseObject.extend("sap.ui.test.generic.TestBase", {

package/src/sap/ui/util/Storage.js

@@ -277,7 +277,7 @@ sap.ui.define(["sap/base/assert"], function (assert) {
 	 *
 	 * @enum {string}
 	 * @public
-	 * @version 1.117.3
+	 * @version 1.117.4
 	 */
 	Storage.Type = {
 		/**

package/test/sap/ui/core/qunit/Shortcut.qunit.js

@@ -82,7 +82,7 @@ sap.ui.define([
 	});
 
 	QUnit.test("fnWrapper trigger", function(assert) {
-		assert.expect(4);
+		assert.expect(6);
 		var done = assert.async();
 		var oHTMLElementFocusSpy = sinon.spy(HTMLElement.prototype, "focus");
 		var oInput = new Input();
@@ -100,7 +100,15 @@ sap.ui.define([
 		oInput.placeAt("qunit-fixture");
 		oInput.addEventDelegate({"onAfterRendering": function() {
 			oInput.focus();
+
+			// wrap the assertion in a 0 timeout to make sure that the shift of focus to the internal "span"
+			// is done by using a 0 timeout
+			setTimeout(function() {
+				assert.ok(oInput.getDomRef().contains(document.activeElement), "Focus should be within the input after a 0 timeout");
+			});
+
 			QUtils.triggerKeydown(oInput.getDomRef(), "s", true, false, false);
+			assert.ok(oInput.getDomRef().contains(document.activeElement), "Focus should be within the input directly after triggering the shortcut");
 		}});
 	});
 });

package/test/sap/ui/core/qunit/analytics/odata4analytics.qunit.js

@@ -1720,6 +1720,47 @@ sap.ui.define([
 		oMeasureMock.verify();
 	});
 
+	//*********************************************************************************************
+	// BCP: 985176/2023
+	QUnit.test("renderUI5FilterArray", function (assert) {
+		const aFilterArray = [
+			{sPath: 'Material'},
+			{aFilters: [/*Multi Filter*/]},
+			{sPath: 'MaterialDocument', sOperator: 'EQ', oValue1: '4900005860'},
+			{sPath: 'MaterialDocument', sOperator: 'EQ', oValue1: "4900005859"},
+			{sPath: 'MaterialDocument', sOperator: 'EQ', oValue1: '4900005915'},
+			{sPath: 'MaterialDocument', sOperator: 'EQ', oValue1: '4900005916'},
+			{sPath: 'MaterialGroup'},
+			{sPath: 'MaterialType'},
+			{sPath: 'Plant'},
+			{sPath: 'ReversalMovementIsSelected'},
+			{sPath: 'StockLevelIsValuated'},
+			{sPath: 'StorageLocation'}
+		];
+		const oFilterExpression = new odata4analytics.FilterExpression();
+		const oFilterExpressionMock = this.mock(oFilterExpression);
+		oFilterExpressionMock.expects("renderUI5Filter").withExactArgs(aFilterArray[0]).returns("~Material");
+		oFilterExpressionMock.expects("renderUI5Filter").withExactArgs(aFilterArray[2]).returns("~MaterialDocument0");
+		oFilterExpressionMock.expects("renderUI5Filter").withExactArgs(aFilterArray[3]).returns("~MaterialDocument1");
+		oFilterExpressionMock.expects("renderUI5Filter").withExactArgs(aFilterArray[4]).returns("~MaterialDocument2");
+		oFilterExpressionMock.expects("renderUI5Filter").withExactArgs(aFilterArray[5]).returns("~MaterialDocument3");
+		oFilterExpressionMock.expects("renderUI5Filter").withExactArgs(aFilterArray[6]).returns("~MaterialGroup");
+		oFilterExpressionMock.expects("renderUI5Filter").withExactArgs(aFilterArray[7]).returns("~MaterialType");
+		oFilterExpressionMock.expects("renderUI5Filter").withExactArgs(aFilterArray[8]).returns("~Plant");
+		oFilterExpressionMock.expects("renderUI5Filter").withExactArgs(aFilterArray[9])
+			.returns("~ReversalMovementIsSelected");
+		oFilterExpressionMock.expects("renderUI5Filter").withExactArgs(aFilterArray[10])
+			.returns("~StockLevelIsValuated");
+		oFilterExpressionMock.expects("renderUI5Filter").withExactArgs(aFilterArray[11]).returns("~StorageLocation");
+		oFilterExpressionMock.expects("renderUI5MultiFilter").withExactArgs(aFilterArray[1]).returns("~MultiFilter");
+
+		// code under test
+		assert.strictEqual(oFilterExpression.renderUI5FilterArray(aFilterArray.slice()),
+			"(~Material) and (~MaterialDocument0 or ~MaterialDocument1 or ~MaterialDocument2 or ~MaterialDocument3)"
+			+ " and (~MaterialGroup) and (~MaterialType) and (~Plant) and (~ReversalMovementIsSelected)"
+			+ " and (~StockLevelIsValuated) and (~StorageLocation) and (~MultiFilter)");
+	});
+
 	//*********************************************************************************************
 	QUnit.test("deepEqual", function (assert) {
 		var aColumns = [];

package/test/sap/ui/core/relnotes/changes-1.117.json

@@ -210,5 +210,32 @@
         ]
       }
     ]
+  },
+  "1.117.4": {
+    "date": "November 2023",
+    "notes": [
+      {
+        "id": "7e11cdc0a84f046bf2b35559c7f6336bb8007f59",
+        "type": "FIX",
+        "text": " sap.ui.model.analytics.odata4analytics.FilterExpression#renderUI5FilterArray: fix sorting of filters",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "002075129500009851762023"
+          }
+        ]
+      },
+      {
+        "id": "421e77f0b6c51d9fbee9fbc6977bbfab53bbaacf",
+        "type": "FIX",
+        "text": " core/Shortcut: trigger \"blur\" within a timeout",
+        "references": [
+          {
+            "type": "BCP",
+            "reference": "002075129500007245922023"
+          }
+        ]
+      }
+    ]
   }
 }