@sapui5/sap.zen.dsh 1.110.1 → 1.112.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.zen.dsh",
-  "version": "1.110.1",
+  "version": "1.112.0",
   "description": "SAPUI5 Library sap.zen.dsh",
   "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
   "author": "SAP SE (https://www.sap.com)",

package/src/sap/zen/dsh/.library

@@ -4,7 +4,7 @@
   <vendor>SAP SE</vendor>
   <copyright>SAPUI5
   (c) Copyright 2009-2021 SAP SE. All rights reserved</copyright>
-  <version>1.110.1</version>
+  <version>1.112.0</version>
   <documentation>Design Studio Runtime Library.  Intended only to be used within S/4 HANA Fiori applications.</documentation>
   <appData>
     <jsdoc xmlns="http://www.sap.com/ui5/buildext/jsdoc" >

package/src/sap/zen/dsh/firefly/ff8310.zen.buddha.js

@@ -12227,6 +12227,8 @@ sap.zen.CharacteristicWrapper.prototype.setFilterRangesForField = function(oQuer
 	var loInternalDimension = loDimension.getInternalObject();
 	var loInternalField = oInternalField;
 	var loCartesianList = this.getSelectionState1(oQueryModel);
+	var loCartesianListOriginalField = loCartesianList.getField();
+	var lCartesianListOriginalSize = loCartesianList.size();
 	var lFullRangesProvidedSize = tFullRanges.size();
 	var lFullRangesIndex = 0;
 	var loRange = null;
@@ -12243,7 +12245,7 @@ sap.zen.CharacteristicWrapper.prototype.setFilterRangesForField = function(oQuer
 			{
 				continue;
 			}
-			loRange = this.createRangeForFilterOperation(loFilterOperation, loDimension, loCartesianList.getField());
+			loRange = this.createRangeForFilterOperation(loFilterOperation, loDimension, loCartesianListOriginalField);
 			if (oFF.notNull(loRange))
 			{
 				tFullRanges.insert(lCartesianListIndex, loRange);
@@ -12268,13 +12270,13 @@ sap.zen.CharacteristicWrapper.prototype.setFilterRangesForField = function(oQuer
 			{
 				if (loRange.getFrom().getKey() !== null)
 				{
-					if (lFullRangesIndex < lFullRangesProvidedSize)
+					if (lFullRangesIndex < lCartesianListOriginalSize)
 					{
-						ltKeysForProvidedField.add(loRange.getFrom().getKey());
+						ltKeysForCartesianListField.add(loRange.getFrom().getKey());
 					}
 					else
 					{
-						ltKeysForCartesianListField.add(loRange.getFrom().getKey());
+						ltKeysForProvidedField.add(loRange.getFrom().getKey());
 					}
 				}
 			}
@@ -12282,19 +12284,19 @@ sap.zen.CharacteristicWrapper.prototype.setFilterRangesForField = function(oQuer
 			{
 				if (loRange.getTo().getKey() !== null)
 				{
-					if (lFullRangesIndex < lFullRangesProvidedSize)
+					if (lFullRangesIndex < lCartesianListOriginalSize)
 					{
-						ltKeysForProvidedField.add(loRange.getTo().getKey());
+						ltKeysForCartesianListField.add(loRange.getFrom().getKey());
 					}
 					else
 					{
-						ltKeysForCartesianListField.add(loRange.getFrom().getKey());
+						ltKeysForProvidedField.add(loRange.getTo().getKey());
 					}
 				}
 			}
 		}
 		ltInternalDimensionMembers.addAll(this.getMembersByField(ltKeysForProvidedField, oInternalField));
-		ltInternalDimensionMembers.addAll(this.getMembersByField(ltKeysForCartesianListField, loCartesianList.getField()));
+		ltInternalDimensionMembers.addAll(this.getMembersByField(ltKeysForCartesianListField, loCartesianListOriginalField));
 	}
 	loCartesianList.setField(loInternalField);
 	for (lFullRangesIndex = 0; lFullRangesIndex < tFullRanges.size(); lFullRangesIndex++)
@@ -12307,13 +12309,13 @@ sap.zen.CharacteristicWrapper.prototype.setFilterRangesForField = function(oQuer
 		var loLookupField = null;
 		if (oFF.notNull(ltInternalDimensionMembers) && !ltInternalDimensionMembers.isEmpty())
 		{
-			if (lFullRangesIndex < lFullRangesProvidedSize)
+			if (lFullRangesIndex < lCartesianListOriginalSize)
 			{
-				loLookupField = oInternalField;
+				loLookupField = loCartesianListOriginalField;
 			}
 			else
 			{
-				loLookupField = loCartesianList.getField();
+				loLookupField = oInternalField;
 			}
 		}
 		var lStringValueFrom = null;
@@ -34099,7 +34101,7 @@ sap.zen.Page.prototype.setNavigationParameterValue = function(navParamName, data
 						{
 							loInternalDimensionMemberVariable = loInternalVariable;
 						}
-						if (oFF.XString.isEqual(loInternalVariable.getNameExternal(), lInternalName) || oFF.notNull(loInternalDimensionMemberVariable) && oFF.XString.isEqual(loInternalDimensionMemberVariable.getDimension().getName(), lInternalName))
+						if (oFF.XString.isEqual(loInternalVariable.getNameExternal(), lNavParamName) || oFF.XString.isEqual(loInternalVariable.getNameExternal(), lInternalName) || oFF.notNull(loInternalDimensionMemberVariable) && oFF.XString.isEqual(loInternalDimensionMemberVariable.getDimension().getName(), lInternalName))
 						{
 							var lJsonObjectValue = this.getNavigationParameterValue(lNavParamName);
 							var lNavigationParamRule = this.getNavigationParameterRule(lNavParamName);
@@ -40873,6 +40875,7 @@ sap.zen.FioriHelperControl.prototype.renderControlContent = function(oRenderMana
 {
 	var loRenderSerializer = oRenderManager.getRenderSerializer();
 	loRenderSerializer.addAttribute("fiorihelperid", this.getId());
+	loRenderSerializer.addAttribute("onSetShellUrlCommand", this.createOnSetShellUrlCommand());
 	var lDshControlId = this.getPage().getDshControlId();
 	if (oFF.XStringUtils.isNotNullAndNotEmpty(lDshControlId))
 	{
@@ -40891,11 +40894,7 @@ sap.zen.FioriHelperControl.prototype.renderControlContent = function(oRenderMana
 	{
 		this.renderContext(loRenderSerializer);
 	}
-	if (oFF.XString.isEqual(this.mClientAction, sap.zen.FioriHelperControl.ACTION_GET_SHELL_URL))
-	{
-		loRenderSerializer.addAttribute("onSetShellUrlCommand", this.createOnSetShellUrlCommand());
-	}
-	else if (oFF.XString.isEqual(this.mClientAction, sap.zen.FioriHelperControl.ACTION_SAVE_TILE))
+	if (oFF.XString.isEqual(this.mClientAction, sap.zen.FioriHelperControl.ACTION_SAVE_TILE))
 	{
 		this.moTileObject.renderTileSettings(loRenderSerializer);
 	}

package/src/sap/zen/dsh/library.js

@@ -31,7 +31,7 @@ sap.ui.define(
      * @alias sap.zen.dsh
      * @public
      * @author SAP SE
-     * @version 1.110.1
+     * @version 1.112.0
      */
     var thisLib = sap.ui.getCore().initLibrary(
       {
@@ -56,7 +56,7 @@ sap.ui.define(
         ],
         elements: [],
         noLibraryCSS: true,
-        version: "1.110.1"
+        version: "1.112.0"
       }
     );
    

package/src/sap/zen/dsh/widgets/fiorihelper_handler.js

@@ -401,9 +401,12 @@ sap.ui.define(
        * Jump to Target
        */
       this.jumpToTarget = function (oControlProperties) {
+        if (!oControlProperties.navigation) {
+          return;
+        }
+        
+        var lJumpTarget = oControlProperties.navigation.jumpTarget;
         var loCrossAppNav = getCrossAppNav();
-        var lJumpTarget = oControlProperties.jumpTarget;
-
         if (loCrossAppNav && lJumpTarget && lJumpTarget.length > 0) {
           if (oControlProperties.navigation && oControlProperties.navigation.navigateInPlace) {
             loCrossAppNav.toExternal({