@sap/open.fe 1.97.0 → 1.98.0

package/packages/sap.fe.macros/test/sap/fe/macros/qunit/macros/ValueListHelper.qunit.js

@@ -3,7 +3,9 @@
 sap.ui.define(["sap/fe/macros/internal/valuehelp/ValueListHelper", "sap/ui/dom/units/Rem"], function(ValueListHelper, Rem) {
 	"use strict";
 
-	QUnit.module("Unit Tests for _redundantDescription, getColumnVisibility, hasImportance, getMinScreenWidth, getTableItemsParameters");
+	QUnit.module(
+		"Unit Tests for _redundantDescription, getColumnVisibility, hasImportance, getMinScreenWidth, getTableItemsParameters, _getDefaultSortPropertyName"
+	);
 	QUnit.test("Unit test to check redundant column of DropDownList (ValueHelp with No-Dialog)", function(assert) {
 		[
 			// Drop-Down-List (ValueHelp with No-Dialog)
@@ -371,8 +373,7 @@ sap.ui.define(["sap/fe/macros/internal/valuehelp/ValueListHelper", "sap/ui/dom/u
 					},
 					vExpectedValue: "Importance/High",
 					sExpectedMinScreenWidth: "{= ${_VHUI>/minScreenWidth}}",
-					sExpectedTableItemsParameters:
-						'{path: \'/Customer\', suspended : false, length: 10, {"sorters":[{"name":"Customer","ascending":true}]}}',
+					sExpectedTableItemsParameters: "{path: '/Customer', suspended : false, length: 10}",
 					sExpectedTableItemsParametersSuggestion:
 						"{path: '/Customer', suspended : true, length: 10, sorter: {path: 'Customer', ascending: true}}"
 				}
@@ -440,8 +441,7 @@ sap.ui.define(["sap/fe/macros/internal/valuehelp/ValueListHelper", "sap/ui/dom/u
 					},
 					vExpectedValue: "None",
 					sExpectedMinScreenWidth: "416px",
-					sExpectedTableItemsParameters:
-						'{path: \'/Customer\', suspended : false, length: 10, {"sorters":[{"name":"Customer","ascending":true}]}}',
+					sExpectedTableItemsParameters: "{path: '/Customer', suspended : false, length: 10}",
 					sExpectedTableItemsParametersSuggestion:
 						"{path: '/Customer', suspended : true, length: 10, sorter: {path: 'Customer', ascending: true}}"
 				}
@@ -509,8 +509,7 @@ sap.ui.define(["sap/fe/macros/internal/valuehelp/ValueListHelper", "sap/ui/dom/u
 					},
 					vExpectedValue: "None",
 					sExpectedMinScreenWidth: "416px",
-					sExpectedTableItemsParameters:
-						'{path: \'/Customer\', suspended : false, length: 10, {"sorters":[{"name":"Customer","ascending":true}]}}',
+					sExpectedTableItemsParameters: "{path: '/Customer', suspended : false, length: 10}",
 					sExpectedTableItemsParametersSuggestion:
 						"{path: '/Customer', suspended : true, length: 10, sorter: {path: 'Customer', ascending: true}}"
 				}
@@ -579,8 +578,7 @@ sap.ui.define(["sap/fe/macros/internal/valuehelp/ValueListHelper", "sap/ui/dom/u
 					},
 					vExpectedValue: "None",
 					sExpectedMinScreenWidth: "416px",
-					sExpectedTableItemsParameters:
-						'{path: \'/Customer\', suspended : false, length: 10, {"sorters":[{"name":"Customer","ascending":true}]}}',
+					sExpectedTableItemsParameters: "{path: '/Customer', suspended : false, length: 10}",
 					sExpectedTableItemsParametersSuggestion: "{path: '/Customer', suspended : true, length: 10}"
 				}
 			},
@@ -648,8 +646,7 @@ sap.ui.define(["sap/fe/macros/internal/valuehelp/ValueListHelper", "sap/ui/dom/u
 					},
 					vExpectedValue: "None",
 					sExpectedMinScreenWidth: "416px",
-					sExpectedTableItemsParameters:
-						'{path: \'/Customer\', suspended : false, length: 10, {"sorters":[{"name":"Customer","ascending":true}]}}',
+					sExpectedTableItemsParameters: "{path: '/Customer', suspended : false, length: 10}",
 					sExpectedTableItemsParametersSuggestion:
 						"{path: '/Customer', suspended : true, length: 10, sorter: {path: 'Customer', ascending: true}}"
 				}
@@ -718,8 +715,7 @@ sap.ui.define(["sap/fe/macros/internal/valuehelp/ValueListHelper", "sap/ui/dom/u
 					},
 					vExpectedValue: "None",
 					sExpectedMinScreenWidth: "416px",
-					sExpectedTableItemsParameters:
-						'{path: \'/Customer\', suspended : false, length: 10, {"sorters":[{"name":"Customer","ascending":true}]}}',
+					sExpectedTableItemsParameters: "{path: '/Customer', suspended : false, length: 10}",
 					sExpectedTableItemsParametersSuggestion:
 						"{path: '/Customer', suspended : true, length: 10, sorter: {path: 'Customer', ascending: true}}"
 				}
@@ -797,8 +793,7 @@ sap.ui.define(["sap/fe/macros/internal/valuehelp/ValueListHelper", "sap/ui/dom/u
 					},
 					vExpectedValue: "None",
 					sExpectedMinScreenWidth: "416px",
-					sExpectedTableItemsParameters:
-						'{path: \'/Customer\', suspended : true, length: 10, {"sorters":[{"name":"Customer","ascending":true}]}}',
+					sExpectedTableItemsParameters: "{path: '/Customer', suspended : true, length: 10}",
 					sExpectedTableItemsParametersSuggestion:
 						"{path: '/Customer', suspended : false, length: 10, sorter: {path: 'Customer', ascending: true}}"
 				}
@@ -1023,6 +1018,109 @@ sap.ui.define(["sap/fe/macros/internal/valuehelp/ValueListHelper", "sap/ui/dom/u
 					sExpectedSortConditions: JSON.stringify({ "sorters": [{ "name": "IncotermsVersion", "descending": true }] })
 				}
 			},
+			{
+				oValueList: {
+					$model: {
+						id: "id-4711-07",
+						getMetaModel: function() {
+							return {
+								getObject: function(sPresentationVariantPath) {
+									if (
+										sPresentationVariantPath ===
+										"/IncotermsVersion/@com.sap.vocabularies.UI.v1.PresentationVariant#IncotermsVersionDescending"
+									) {
+										return {
+											$Type: "com.sap.vocabularies.UI.v1.PresentationVariantType",
+											SortOrder: [
+												{
+													$Type: "com.sap.vocabularies.Common.v1.SortOrderType",
+													Property: {
+														$PropertyPath: "IncotermsVersion"
+													},
+													Descending: true
+												}
+											]
+										};
+									}
+								}
+							};
+						}
+					},
+					bSuggested: true,
+					$Type: "com.sap.vocabularies.Common.v1.ValueListType",
+					Label: "Incoterms Version",
+					CollectionPath: "IncotermsVersion",
+					PresentationVariantQualifier: "IncotermsVersionDescending",
+					Parameters: [
+						{
+							$Type: "com.sap.vocabularies.Common.v1.ValueListParameterInOut",
+							LocalDataProperty: {
+								$PropertyPath: "IncotermsVersion"
+							},
+							ValueListProperty: "IncotermsVersion"
+						},
+						{
+							$Type: "com.sap.vocabularies.Common.v1.ValueListParameterDisplayOnly",
+							ValueListProperty: "IncotermsVersion_Text"
+						}
+					],
+					getObject: function() {
+						return this;
+					},
+					sExpectedSortConditions: JSON.stringify({ "sorters": [{ "name": "IncotermsVersion", "descending": true }] })
+				}
+			},
+			{
+				oValueList: {
+					$model: {
+						id: "id-4711-07",
+						getMetaModel: function() {
+							return {
+								getObject: function(sPresentationVariantPath) {
+									if (
+										sPresentationVariantPath ===
+										"/IncotermsVersion/@com.sap.vocabularies.UI.v1.PresentationVariant#IncotermsVersionTextDescending"
+									) {
+										return {
+											$Type: "com.sap.vocabularies.UI.v1.PresentationVariantType",
+											SortOrder: [
+												{
+													$Type: "com.sap.vocabularies.Common.v1.SortOrderType",
+													Property: {
+														$PropertyPath: "IncotermsVersion_Text"
+													},
+													Descending: true
+												}
+											]
+										};
+									}
+								}
+							};
+						}
+					},
+					bSuggested: true,
+					$Type: "com.sap.vocabularies.Common.v1.ValueListType",
+					Label: "Incoterms Version",
+					CollectionPath: "IncotermsVersion",
+					Parameters: [
+						{
+							$Type: "com.sap.vocabularies.Common.v1.ValueListParameterInOut",
+							LocalDataProperty: {
+								$PropertyPath: "IncotermsVersion"
+							},
+							ValueListProperty: "IncotermsVersion"
+						},
+						{
+							$Type: "com.sap.vocabularies.Common.v1.ValueListParameterDisplayOnly",
+							ValueListProperty: "IncotermsVersion_Text"
+						}
+					],
+					getObject: function() {
+						return this;
+					},
+					sExpectedSortConditions: undefined
+				}
+			},
 			{
 				oValueList: {
 					$model: {
@@ -1073,11 +1171,11 @@ sap.ui.define(["sap/fe/macros/internal/valuehelp/ValueListHelper", "sap/ui/dom/u
 				}
 			}
 		].forEach(function(oProperty) {
-			var actualValue = ValueListHelper.getValueHelpTableSortConditions(oProperty.oValueList);
+			var actualValue = ValueListHelper.getSortConditionsFromPresentationVariant(oProperty.oValueList);
 			assert.equal(
 				actualValue,
 				oProperty.oValueList.sExpectedSortConditions,
-				"Unit test to check getValueHelpTableSortConditions returning '" + actualValue + "': ok"
+				"Unit test to check getSortConditionsFromPresentationVariant returning '" + actualValue + "': ok"
 			);
 		});
 	});
@@ -1124,7 +1222,293 @@ sap.ui.define(["sap/fe/macros/internal/valuehelp/ValueListHelper", "sap/ui/dom/u
 				assert.equal(
 					actualValue,
 					oProperty.oValueList.bExpectedValue,
-					"Unit test to check getValueHelpTableSortConditions returning '" + actualValue + "': ok"
+					"Unit test to check getSortConditionsFromPresentationVariant returning '" + actualValue + "': ok"
+				);
+			});
+		}
+	);
+	QUnit.test(
+		"Unit test to for checking the determination of the default sorting property",
+		{
+			"references": [
+				{
+					"type": "JIRA",
+					"ID": "FIORITECHP1-21867"
+				}
+			]
+		},
+		function(assert) {
+			[
+				{
+					oValueList: {
+						$model: {
+							id: "42",
+							getMetaModel: function() {
+								return {
+									getObject: function(sPath) {
+										if (sPath === "/VLCollection@") {
+											return {};
+										}
+										if (
+											sPath ===
+											"/VLCollection/VLProperty@com.sap.vocabularies.Common.v1.Text@com.sap.vocabularies.UI.v1.TextArrangement/$EnumMember"
+										) {
+											return "com.sap.vocabularies.UI.v1.TextArrangementType/TextOnly";
+										}
+										if (sPath === "/VLCollection/VLProperty@com.sap.vocabularies.Common.v1.Text/$Path") {
+											return "SortPropertyFromText";
+										}
+									}
+								};
+							}
+						},
+						$Type: "com.sap.vocabularies.Common.v1.ValueListType",
+						CollectionPath: "VLCollection",
+						Parameters: [
+							{
+								$Type: "com.sap.vocabularies.Common.v1.ValueListParameterInOut",
+								ValueListProperty: "VLProperty"
+							}
+						],
+						bExpectedValue:
+							"{name: 'sap/fe/macros/internal/valuehelp/TableDelegate', payload: {collectionName: 'VLCollection', defaultSortPropertyName: 'SortPropertyFromText'}}"
+					}
+				},
+				{
+					oValueList: {
+						$model: {
+							id: "42",
+							getMetaModel: function() {
+								return {
+									getObject: function(sPath) {
+										if (sPath === "/VLCollection@") {
+											return {};
+										}
+										if (sPath === "/VLCollection/VLPropertyHidden@com.sap.vocabularies.UI.v1.Hidden") {
+											return true;
+										}
+										if (sPath === "/VLCollection/VLProperty@com.sap.vocabularies.UI.v1.Hidden") {
+											return false;
+										}
+									}
+								};
+							}
+						},
+						$Type: "com.sap.vocabularies.Common.v1.ValueListType",
+						CollectionPath: "VLCollection",
+						Parameters: [
+							{
+								$Type: "com.sap.vocabularies.Common.v1.ValueListParameterOut",
+								ValueListProperty: "VLPropertyHidden"
+							},
+							{
+								$Type: "com.sap.vocabularies.Common.v1.ValueListParameterDisplayOnly",
+								ValueListProperty: "VLProperty"
+							}
+						],
+						bExpectedValue:
+							"{name: 'sap/fe/macros/internal/valuehelp/TableDelegate', payload: {collectionName: 'VLCollection', defaultSortPropertyName: 'VLProperty'}}"
+					}
+				},
+				{
+					oValueList: {
+						$model: {
+							id: "42",
+							getMetaModel: function() {
+								return {
+									getObject: function(sPath) {
+										if (sPath === "/VLCollection@") {
+											return {};
+										}
+										if (sPath === "/VLCollection/VLPropertyHidden@com.sap.vocabularies.UI.v1.Hidden") {
+											return true;
+										}
+									}
+								};
+							}
+						},
+						$Type: "com.sap.vocabularies.Common.v1.ValueListType",
+						CollectionPath: "VLCollection",
+						Parameters: [
+							{
+								$Type: "com.sap.vocabularies.Common.v1.ValueListParameterIn",
+								ValueListProperty: "VLPropertyHidden"
+							}
+						],
+						bExpectedValue:
+							"{name: 'sap/fe/macros/internal/valuehelp/TableDelegate', payload: {collectionName: 'VLCollection', defaultSortPropertyName: undefined}}"
+					}
+				},
+				{
+					oValueList: {
+						$model: {
+							id: "42",
+							getMetaModel: function() {
+								return {
+									getObject: function(sPath) {
+										if (sPath === "/VLCollection@") {
+											return {
+												"@Org.OData.Capabilities.V1.SortRestrictions": {
+													"NonSortableProperties": [{ "$PropertyPath": "VLProperty" }]
+												}
+											};
+										}
+										if (sPath === "/VLCollection/VLProperty@com.sap.vocabularies.UI.v1.Hidden") {
+											return false;
+										}
+									}
+								};
+							}
+						},
+						$Type: "com.sap.vocabularies.Common.v1.ValueListType",
+						CollectionPath: "VLCollection",
+						Parameters: [
+							{
+								$Type: "com.sap.vocabularies.Common.v1.ValueListParameterInOut",
+								ValueListProperty: "VLProperty"
+							}
+						],
+						bExpectedValue:
+							"{name: 'sap/fe/macros/internal/valuehelp/TableDelegate', payload: {collectionName: 'VLCollection', defaultSortPropertyName: undefined}}"
+					}
+				},
+				{
+					oValueList: {
+						$model: {
+							id: "42",
+							getMetaModel: function() {
+								return {
+									getObject: function(sPath) {
+										return {};
+									}
+								};
+							}
+						},
+						$Type: "com.sap.vocabularies.Common.v1.ValueListType",
+						CollectionPath: "VLCollection",
+						Parameters: [
+							{
+								$Type: "com.sap.vocabularies.Common.v1.SomeNonApplicableType",
+								ValueListProperty: "VLProperty"
+							}
+						],
+						bExpectedValue:
+							"{name: 'sap/fe/macros/internal/valuehelp/TableDelegate', payload: {collectionName: 'VLCollection', defaultSortPropertyName: undefined}}"
+					}
+				}
+			].forEach(function(oProperty) {
+				var actualValue = ValueListHelper.getTableDelegate(oProperty.oValueList);
+				assert.equal(
+					actualValue,
+					oProperty.oValueList.bExpectedValue,
+					"Unit test to check getTableDelegate returning '" + actualValue + "': ok"
+				);
+			});
+		}
+	);
+
+	QUnit.test(
+		"Unit test for checking the exclusion of InOut Parameters in filter bar Value Help",
+		{
+			"references": [
+				{
+					"type": "BCP",
+					"ID": "2170260063"
+				}
+			]
+		},
+		function(assert) {
+			[
+				{
+					oFVH: {
+						// parent is a Filter Bar
+						getParent: function() {
+							return {
+								isA: function(path) {
+									return true;
+								}
+							};
+						}
+					},
+					// there is InOut Property with navigation path
+					aValueListInfoParameters: [
+						{
+							"$Type": "com.sap.vocabularies.Common.v1.ValueListParameterInOut",
+							"LocalDataProperty": { $PropertyPath: "owner/DistributionChannel" },
+							"ValueListProperty": "DistributionChannel"
+						}
+					],
+					bExpectedValue: false
+				},
+				{
+					oFVH: {
+						// parent is a Filter Bar
+						getParent: function() {
+							return {
+								isA: function() {
+									return true;
+								}
+							};
+						}
+					},
+					// there is no InOut Property with navigation path
+					aValueListInfoParameters: [
+						{
+							"$Type": "com.sap.vocabularies.Common.v1.ValueListParameterInOut",
+							"LocalDataProperty": { $PropertyPath: "DistributionChannel" },
+							"ValueListProperty": "DistributionChannel"
+						}
+					],
+					bExpectedValue: true
+				},
+				{
+					oFVH: {
+						// parent is not in Filter Bar
+						getParent: function() {
+							return {
+								isA: function() {
+									return false;
+								}
+							};
+						}
+					},
+					// there is InOut Property with navigation path
+					aValueListInfoParameters: [
+						{
+							"$Type": "com.sap.vocabularies.Common.v1.ValueListParameterInOut",
+							"LocalDataProperty": { $PropertyPath: "owner/DistributionChannel" },
+							"ValueListProperty": "DistributionChannel"
+						}
+					],
+					bExpectedValue: true
+				},
+				{
+					oFVH: {
+						// parent is not in Filter Bar
+						getParent: function() {
+							return {
+								isA: function() {
+									return false;
+								}
+							};
+						}
+					},
+					// there is no InOut Property with navigation path
+					aValueListInfoParameters: [
+						{
+							"$Type": "com.sap.vocabularies.Common.v1.ValueListParameterInOut",
+							"LocalDataProperty": { $PropertyPath: "DistributionChannel" },
+							"ValueListProperty": "DistributionChannel"
+						}
+					],
+					bExpectedValue: true
+				}
+			].forEach(function(oProperty) {
+				var actualValue = ValueListHelper.considerInOutParameter(oProperty.oFVH, oProperty.aValueListInfoParameters);
+				assert.equal(
+					actualValue,
+					oProperty.bExpectedValue,
+					"Unit test for checking the exclusion of InOut Parameters in filter bar Value Help '" + actualValue + "': ok"
 				);
 			});
 		}

package/packages/sap.fe.macros/test/sap/fe/macros/qunit/macros/fragments/FilterFieldMacro.fragment.xml

@@ -1,7 +1,7 @@
 <core:FragmentDefinition
 	xmlns:core="sap.ui.core"
 	xmlns="sap.m"
-	xmlns:macro="sap.fe.macros"
+	xmlns:macro="sap.fe.macros.internal"
 	xmlns:log="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
 	xmlns:unittest="http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1"
 >

package/packages/sap.fe.macros/test/sap/fe/macros/qunit/macros/fragments/FilterFieldMacroMissingID.fragment.xml

@@ -1,7 +1,7 @@
 <core:FragmentDefinition
 	xmlns:core="sap.ui.core"
 	xmlns="sap.m"
-	xmlns:macro="sap.fe.macros"
+	xmlns:macro="sap.fe.macros.internal"
 	xmlns:log="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
 	xmlns:unittest="http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1"
 >

package/packages/sap.fe.macros/test/sap/fe/macros/qunit/macros/fragments/TableMacro.fragment.xml

@@ -10,8 +10,6 @@
 		collection="{collection>}"
 		parentEntitySet="{setup>/parentEntitySet}"
 		id="{setup>/id}"
-		create="{setup>/create}"
-		showDelete="{setup>/showDelete}"
 		actions="{setup>/actions}"
 		creationMode="{setup>/creationMode}"
 		onPatchSent="{setup>/onPatchSent}"