@sapui5/sap.zen.dsh 1.102.3 → 1.102.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.zen.dsh",
-  "version": "1.102.3",
+  "version": "1.102.5",
   "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.102.3</version>
+  <version>1.102.5</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/AnalyticGrid.js

@@ -2,7 +2,7 @@
  * SAPUI5
   (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-/*global sap, window, setTimeout*/
+/*global sap */
 sap.ui.define(
   "sap/zen/dsh/AnalyticGrid",
   [
@@ -10,9 +10,10 @@ sap.ui.define(
     "sap/base/Log",
     "sap/ui/core/Control",
     "sap/ui/thirdparty/URI",
+    "sap/zen/dsh/AnalyticGridRenderer",
     "sap/zen/dsh/library"
   ],
-  function (jQuery, Log, Control, URI ) {
+  function (jQuery, Log, Control, URI, AnalyticGridRenderer ) {
     // Provides control sap.zen.dsh.AnalyticGrid.
     /**
      * Constructor for a new AnalyticGrid.
@@ -30,10 +31,9 @@ sap.ui.define(
      * @deprecated since 1.89.0
      * @experimental Since version 1.46.
      * API is incomplete and may change incompatibly
-     * @name sap.zen.dsh.AnalyticGrid
-
+     * @alias sap.zen.dsh.AnalyticGrid
      */
-    Control.extend(
+    var AnalyticGrid = Control.extend(
       "sap.zen.dsh.AnalyticGrid", /** @lends sap.zen.dsh.AnalyticGrid.prototype */
       {
         metadata : {
@@ -88,7 +88,8 @@ sap.ui.define(
               }
             }
           }
-        }
+        },
+        renderer: AnalyticGridRenderer
       }
     );
     /**
@@ -100,13 +101,13 @@ sap.ui.define(
     sap.zen.dsh.sapbi_page.getParameter = sap.zen.dsh.sapbi_page.getParameter || function(){return "";};
     sap.zen.dsh.sapbi_MIMES_PIXEL = sap.zen.dsh.sapbi_MIMES_PIXEL || "";
     sap.zen.dsh.doReplaceDots = true;
-    sap.zen.dsh.AnalyticGrid.prototype.init = function() {
+    AnalyticGrid.prototype.init = function() {
       this.parameters = {};
       this.dshBaseUrl = URI(sap.ui.resource("sap.zen.dsh","rt/")).absoluteTo(window.location.pathname).toString();
       sap.zen.dsh.sapbi_page.staticMimeUrlPrefix = this.dshBaseUrl;
       this.repositoryUrl = URI(sap.ui.resource("sap.zen.dsh","applications/")).absoluteTo(window.location.pathname).toString();
     };
-    sap.zen.dsh.AnalyticGrid.prototype._initializeInternal = function() {
+    AnalyticGrid.prototype._initializeInternal = function() {
       if(this.initialized) {
         this.page.forceFullNonDeltaRender();
         return;
@@ -123,7 +124,7 @@ sap.ui.define(
         that._createPage();
       }, 0);
     };
-    sap.zen.dsh.AnalyticGrid.prototype._createPage = function() {
+    AnalyticGrid.prototype._createPage = function() {
       sap.zen.dsh.scriptLoaded= true;
       var that = this;
       var oConfig = sap.ui.getCore().getConfiguration();
@@ -163,7 +164,7 @@ sap.ui.define(
       designStudio.setNewBW(true);
       this.page = designStudio.createPage();
       if(!sap.zen.dsh.wnd){
-          sap.zen.dsh.wnd = {};
+        sap.zen.dsh.wnd = {};
       }
       sap.zen.dsh.wnd[that.getId()+"Buddha"] = this.page;
       sap.zen.dsh.sapbi_page = sap.zen.dsh.sapbi_page || {};
@@ -171,32 +172,32 @@ sap.ui.define(
       sap.zen.dsh.sapbi_page.getParameter = function(){return "";};
       sap.zen.dsh.sapbi_MIMES_PIXEL = "";
     };
-    sap.zen.dsh.AnalyticGrid.prototype.onAfterRendering = function(){
+    AnalyticGrid.prototype.onAfterRendering = function(){
       this._initializeInternal();
     };
-    sap.zen.dsh.AnalyticGrid.prototype._logoff = function(){
+    AnalyticGrid.prototype._logoff = function(){
       if (!this.loggedOff) {
         this.loggedOff = true;
         this._executeScript("APPLICATION.logoff();");
       }
     };
-    sap.zen.dsh.AnalyticGrid.prototype.exit = function(){
+    AnalyticGrid.prototype.exit = function(){
       this._logoff();
       var oRootAbsLayout = sap.ui.getCore().byId(this.sId + "ROOT_absolutelayout");
       if (oRootAbsLayout) {
         oRootAbsLayout.destroy();
       }
     };
-    sap.zen.dsh.AnalyticGrid.prototype._addParameter = function(name, value) {
+    AnalyticGrid.prototype._addParameter = function(name, value) {
       this.parameters[name] = value;
     };
-    sap.zen.dsh.AnalyticGrid.prototype._executeScript = function(script){
+    AnalyticGrid.prototype._executeScript = function(script){
       if (this.page) {
         this.page.getWindow().increaseLock();
         this.page.exec && this.page.exec(script);
       }
     };
-    sap.zen.dsh.AnalyticGrid.prototype.setSelection = function(oSelectionVariant) {
+    AnalyticGrid.prototype.setSelection = function(oSelectionVariant) {
       this.setProperty("selection", oSelectionVariant, true);
       if (this.initialized) {
         var oNavParams = this._buildNavParamObject(oSelectionVariant);
@@ -205,11 +206,11 @@ sap.ui.define(
       }
       return this;
     };
-    sap.zen.dsh.AnalyticGrid.prototype.fireSelectionChange = function(mParameters) {
+    AnalyticGrid.prototype.fireSelectionChange = function(mParameters) {
       this.setProperty("selection", mParameters.selection, true);
       return this.fireEvent("selectionChange", mParameters);
     };
-    sap.zen.dsh.AnalyticGrid.prototype._buildNavParamObject = function(oSelectionVariant) {
+    AnalyticGrid.prototype._buildNavParamObject = function(oSelectionVariant) {
       function addValuesToObject(sObject, oValueHolder, sValue) {
         if (!Object.prototype.hasOwnProperty.call(oValueHolder, sObject)) {
           oValueHolder[sObject] = sValue;
@@ -259,18 +260,18 @@ sap.ui.define(
       }
       return oNavParams;
     };
-    sap.zen.dsh.AnalyticGrid.prototype._initializeSelectionVariant = function(oSelectionVariant) {
+    AnalyticGrid.prototype._initializeSelectionVariant = function(oSelectionVariant) {
       var oNavParams = this._buildNavParamObject(oSelectionVariant);
       if (!jQuery.isEmptyObject(oNavParams)) {
         this._addParameter("NAV_PARAMS", JSON.stringify(oNavParams));
       }
     };
-    sap.zen.dsh.AnalyticGrid.prototype._initializeInnerAppState = function(sState) {
+    AnalyticGrid.prototype._initializeInnerAppState = function(sState) {
       if (sState) {
         this._addParameter("NAV_INITIAL_STATE", sState);
       }
     };
-    sap.zen.dsh.AnalyticGrid.prototype.setState = function (sState) {
+    AnalyticGrid.prototype.setState = function (sState) {
       this.setProperty("state", sState, true);
       if (this.initialized) {
         this.page.getWindow().getContext("BookmarkInternal").applyApplicationState(sState, true);
@@ -278,9 +279,11 @@ sap.ui.define(
       }
       return this;
     };
-    sap.zen.dsh.AnalyticGrid.prototype.fireStateChange = function(mParameters) {
+    AnalyticGrid.prototype.fireStateChange = function(mParameters) {
       this.setProperty("state", mParameters.state, true);
       return this.fireEvent("stateChange", mParameters);
     };
+
+    return AnalyticGrid;
   }
 );

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

@@ -9,9 +9,11 @@ sap.ui.define(
     "sap/base/Log",
     "sap/zen/dsh/DshRenderer"
   ],
-  function(jQuery,Log){
+  function(jQuery,Log, DshRenderer){
     Log.info("Loading Analytic Grid Renderer");
     jQuery.sap.declare("sap.zen.dsh.AnalyticGridRenderer");
-    sap.zen.dsh.AnalyticGridRenderer = sap.zen.dsh.DshRenderer;
+    sap.zen.dsh.AnalyticGridRenderer = DshRenderer;
+    
+    return DshRenderer;
   }
 );

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

@@ -2,16 +2,16 @@
  * SAPUI5
   (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-/*global sap, window, setTimeout*/
-sap.ui.define(
-    "sap/zen/dsh/Dsh",
+/*global sap*/
+sap.ui.define( "sap/zen/dsh/Dsh",
   [
     "jquery.sap.global",
     "sap/zen/dsh/library",
     "sap/ui/thirdparty/URI",
     "sap/ui/core/Control",
+    "sap/zen/dsh/DshRenderer",
     "sap/viz/library"
-  ],function(jQuery, dshLib, URI, Control){
+  ],function(jQuery, dshLib, URI, Control, DshRenderer){
     "use strict";
     /**
      *
@@ -109,75 +109,77 @@ sap.ui.define(
      * @since 1.44
      * @name sap.zen.dsh.Dsh
      */
-    var Dsh = Control.extend("sap.zen.dsh.Dsh", /** @lends sap.zen.dsh.Dsh.prototype */ { metadata : {
-
-      library : "sap.zen.dsh",
-      properties : {
-
-        /**
-         * Name of the Design Studio application to be opened.
-         */
-        dshAppName : {
-          type : "string",
-          group : "Misc",
-          defaultValue : "0ANALYSIS"
-        },
-        /**
-         * Path to application specified by dshAppName
-         */
-        repoPath : {type : "string", group : "Misc", defaultValue : null},
-
-        /**
-         * Desired width of the Design Studio Control
-         */
-        width : {type : "sap.ui.core.CSSSize", group : "Misc", defaultValue : null},
-
-        /**
-         * Desired height of the Design Studio Control
-         */
-        height : {type : "sap.ui.core.CSSSize", group : "Misc", defaultValue : null},
-
-        /**
-         * the type of deployment
-         */
-        deployment : {type : "string", group : "Misc", defaultValue : "bw"},
-
-        /**
-         * the protocol
-         */
-        protocol : {type : "string", group : "Misc", defaultValue : null},
-
-        /**
-        * the client
-         */
-        client : {type : "string", group : "Misc", defaultValue : null},
-
-        /**
-        * the language
-         */
-        language : {type : "string", group : "Misc", defaultValue : null},
-
-        /**
-        * the semantic mappings
-         */
-        semanticMappings : {type : "object", group : "Misc", defaultValue : null},
-
-        /**
-        * the application component
-         */
-        appComponent : {type : "object", group : "Misc", defaultValue : null},
-
-        /**
-        * whether to defer the creation
-         */
-        deferCreation : {type : "boolean", group : "Misc", defaultValue : false},
-
-        /**
-         * the system alias
-         */
-        systemAlias : {type : "string", group : "Misc", defaultValue : null}
-      }
-    }});
+    var Dsh = Control.extend("sap.zen.dsh.Dsh", /** @lends sap.zen.dsh.Dsh.prototype */ {
+      metadata : {
+        library : "sap.zen.dsh",
+        properties : {
+
+          /**
+           * Name of the Design Studio application to be opened.
+           */
+          dshAppName : {
+            type : "string",
+            group : "Misc",
+            defaultValue : "0ANALYSIS"
+          },
+          /**
+           * Path to application specified by dshAppName
+           */
+          repoPath : {type : "string", group : "Misc", defaultValue : null},
+
+          /**
+           * Desired width of the Design Studio Control
+           */
+          width : {type : "sap.ui.core.CSSSize", group : "Misc", defaultValue : null},
+
+          /**
+           * Desired height of the Design Studio Control
+           */
+          height : {type : "sap.ui.core.CSSSize", group : "Misc", defaultValue : null},
+
+          /**
+           * the type of deployment
+           */
+          deployment : {type : "string", group : "Misc", defaultValue : "bw"},
+
+          /**
+           * the protocol
+           */
+          protocol : {type : "string", group : "Misc", defaultValue : null},
+
+          /**
+           * the client
+           */
+          client : {type : "string", group : "Misc", defaultValue : null},
+
+          /**
+           * the language
+           */
+          language : {type : "string", group : "Misc", defaultValue : null},
+
+          /**
+           * the semantic mappings
+           */
+          semanticMappings : {type : "object", group : "Misc", defaultValue : null},
+
+          /**
+           * the application component
+           */
+          appComponent : {type : "object", group : "Misc", defaultValue : null},
+
+          /**
+           * whether to defer the creation
+           */
+          deferCreation : {type : "boolean", group : "Misc", defaultValue : false},
+
+          /**
+           * the system alias
+           */
+          systemAlias : {type : "string", group : "Misc", defaultValue : null}
+        }
+      },
+      renderer: DshRenderer
+    });
 
 
     /**

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

@@ -13,36 +13,35 @@ sap.ui.define(
      * @class dsh renderer.
      * @static
      */
-    sap.zen.dsh.DshRenderer = {
+    var DshRenderer =  sap.zen.dsh.DshRenderer = {
+      apiVersion: 2
     };
     /**
      * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
      *
      * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the render output buffer
-     * @param {sap.ui.core.Control} oControl an object representation of the control that should be rendered
+     * @param {sap.zen.dsh.Dsh} oControl an object representation of the control that should be rendered
      */
-    sap.zen.dsh.DshRenderer.render = function(oRm, oControl){
+    DshRenderer.render = function(oRm, oControl){
       // write the HTML into the render manager
-      oRm.write("<div");
-      oRm.writeControlData(oControl);
+      oRm.openStart("div", oControl);
 
-      oRm.addStyle("width", oControl.getWidth());
-      oRm.addStyle("height", oControl.getHeight());
+      oRm.style("width", oControl.getWidth());
+      oRm.style("height", oControl.getHeight());
 
-      oRm.addClass("sapZenDshDsh");
-      oRm.addClass("sapUiBody");
-      oRm.writeStyles();
-      oRm.writeClasses();
-      oRm.write(">"); //
-      oRm.write("<div id=\"" + oControl.getId() + "sapbi_snippet_ROOT\" ");
-      oRm.writeAttribute("class", "sapbi_snippet_ROOT");
-      oRm.addClass("sapUiBody");
-      oRm.write("style=\"");
-      oRm.write("width:100%;");
-      oRm.write("height:100%;");
-      oRm.write("\">");
-      oRm.write("</div>");
-      oRm.write("</div>");
+      oRm.class("sapZenDshDsh");
+      oRm.class("sapUiBody");
+      oRm.openEnd();
+      oRm.openStart("div", oControl.getId() + "sapbi_snippet_ROOT");
+      oRm.class("sapbi_snippet_ROOT");
+      oRm.class("sapUiBody");
+      oRm.style("width", "100%");
+      oRm.style("height", "100%");
+      oRm.openEnd();
+      oRm.close("div");
+      oRm.close("div");
     };
+    
+    return DshRenderer;
   }
 );

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

@@ -2107,7 +2107,10 @@ sap.zen.FioriNavigationObject.prototype.renderNavigationInformation = function(o
 };
 sap.zen.FioriNavigationObject.prototype.renderJumpTarget = function(oRenderSerializer)
 {
+	oRenderSerializer.openTag("navigation");
+	oRenderSerializer.addBooleanAttribute("navigateInPlace", this.moFioriHelperControl.isNavigateInPlace());
 	oRenderSerializer.addAttribute("jumpTarget", this.mJumpTarget);
+	oRenderSerializer.closeTag();
 };
 sap.zen.FioriNavigationObject.prototype.releaseObject = function()
 {
@@ -8494,10 +8497,11 @@ sap.zen.DataSourceInfo.prototype.initMe = function(oDataSource)
 	{
 		return;
 	}
-	var loConnection = loQueryManager.getApplication().getConnectionPool().getConnection(loQueryManager.getSystemDescription().getName());
-	if (oFF.notNull(loConnection))
+	var systemName = loQueryManager.getSystemDescription().getName();
+	var systemConnect = loQueryManager.getApplication().getConnectionPool().getSystemConnect(systemName);
+	if (oFF.notNull(systemConnect))
 	{
-		var loServerMetadata = loConnection.getServerMetadata();
+		var loServerMetadata = systemConnect.getServerMetadata();
 		if (oFF.notNull(loServerMetadata))
 		{
 			this.mSystem = loServerMetadata.getId();
@@ -12222,22 +12226,39 @@ sap.zen.CharacteristicWrapper.prototype.setFilterRangesForField = function(oQuer
 	var loDimension = this.getDimension();
 	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;
-	var ltInternalDimensionMembers = null;
+	var ltInternalDimensionMembers = oFF.XList.create();
 	var loInternalDimensionMember = null;
-	var loCartesianList = this.getSelectionState1(oQueryModel);
+	var ltKeysForProvidedField = oFF.XListOfString.create();
+	var ltKeysForCartesianListField = oFF.XListOfString.create();
 	if (loCartesianList.size() > 0 && loCartesianList.getField().getPresentationType() !== oInternalField.getPresentationType() && oInternalField.getPresentationType().isTypeOf(oFF.PresentationType.DISPLAY_KEY))
 	{
-		loInternalField = loCartesianList.getField();
+		for (var lCartesianListIndex = 0; lCartesianListIndex < loCartesianList.size(); lCartesianListIndex++)
+		{
+			var loFilterOperation = loCartesianList.getOp(lCartesianListIndex);
+			if (oFF.isNull(loFilterOperation))
+			{
+				continue;
+			}
+			loRange = this.createRangeForFilterOperation(loFilterOperation, loDimension, loCartesianListOriginalField);
+			if (oFF.notNull(loRange))
+			{
+				tFullRanges.insert(lCartesianListIndex, loRange);
+			}
+		}
+		loCartesianList.clear();
 	}
 	if (this.mVariableMode && this.getVariable().getVariableType() === oFF.VariableType.HIERARCHY_NODE_VARIABLE && this.isCompound() && oInternalField.getPresentationType().isTypeOf(oFF.PresentationType.DISPLAY_KEY))
 	{
 		loInternalField = loInternalDimension.getFlatKeyField();
 	}
-	if (oInternalField !== loInternalField)
+	if (oInternalField !== loInternalField || tFullRanges.size() !== lFullRangesProvidedSize)
 	{
-		var ltKeys = oFF.XListOfString.create();
 		for (lFullRangesIndex = 0; lFullRangesIndex < tFullRanges.size(); lFullRangesIndex++)
 		{
 			loRange = tFullRanges.get(lFullRangesIndex);
@@ -12249,18 +12270,33 @@ sap.zen.CharacteristicWrapper.prototype.setFilterRangesForField = function(oQuer
 			{
 				if (loRange.getFrom().getKey() !== null)
 				{
-					ltKeys.add(loRange.getFrom().getKey());
+					if (lFullRangesIndex < lCartesianListOriginalSize)
+					{
+						ltKeysForCartesianListField.add(loRange.getFrom().getKey());
+					}
+					else
+					{
+						ltKeysForProvidedField.add(loRange.getFrom().getKey());
+					}
 				}
 			}
 			if (loRange.getTo() !== null)
 			{
 				if (loRange.getTo().getKey() !== null)
 				{
-					ltKeys.add(loRange.getTo().getKey());
+					if (lFullRangesIndex < lCartesianListOriginalSize)
+					{
+						ltKeysForCartesianListField.add(loRange.getFrom().getKey());
+					}
+					else
+					{
+						ltKeysForProvidedField.add(loRange.getTo().getKey());
+					}
 				}
 			}
 		}
-		ltInternalDimensionMembers = this.getMembersByField(ltKeys, oInternalField);
+		ltInternalDimensionMembers.addAll(this.getMembersByField(ltKeysForProvidedField, oInternalField));
+		ltInternalDimensionMembers.addAll(this.getMembersByField(ltKeysForCartesianListField, loCartesianListOriginalField));
 	}
 	loCartesianList.setField(loInternalField);
 	for (lFullRangesIndex = 0; lFullRangesIndex < tFullRanges.size(); lFullRangesIndex++)
@@ -12270,6 +12306,18 @@ sap.zen.CharacteristicWrapper.prototype.setFilterRangesForField = function(oQuer
 		{
 			continue;
 		}
+		var loLookupField = null;
+		if (oFF.notNull(ltInternalDimensionMembers) && !ltInternalDimensionMembers.isEmpty())
+		{
+			if (lFullRangesIndex < lCartesianListOriginalSize)
+			{
+				loLookupField = loCartesianListOriginalField;
+			}
+			else
+			{
+				loLookupField = oInternalField;
+			}
+		}
 		var lStringValueFrom = null;
 		if (loRange.getFrom() !== null)
 		{
@@ -12284,9 +12332,9 @@ sap.zen.CharacteristicWrapper.prototype.setFilterRangesForField = function(oQuer
 		var lValueFrom = null;
 		if (oFF.notNull(lStringValueFrom))
 		{
-			if (oFF.notNull(ltInternalDimensionMembers))
+			if (oFF.notNull(ltInternalDimensionMembers) && !ltInternalDimensionMembers.isEmpty())
 			{
-				loInternalDimensionMember = this.getMemberFromListByFieldValue(ltInternalDimensionMembers, oInternalField, lStringValueFrom.getString(), false);
+				loInternalDimensionMember = this.getMemberFromListByFieldValue(ltInternalDimensionMembers, loLookupField, lStringValueFrom.getString(), false);
 				if (oFF.notNull(loInternalDimensionMember))
 				{
 					if (loInternalDimensionMember.getFieldValue(loInternalField) !== null)
@@ -12304,9 +12352,9 @@ sap.zen.CharacteristicWrapper.prototype.setFilterRangesForField = function(oQuer
 		var lValueTo = null;
 		if (loRange.getOperation() === sap.zen.Operation.BT && oFF.notNull(lStringValueTo))
 		{
-			if (oFF.notNull(ltInternalDimensionMembers))
+			if (oFF.notNull(ltInternalDimensionMembers) && !ltInternalDimensionMembers.isEmpty())
 			{
-				loInternalDimensionMember = this.getMemberFromListByFieldValue(ltInternalDimensionMembers, oInternalField, lStringValueTo.getString(), false);
+				loInternalDimensionMember = this.getMemberFromListByFieldValue(ltInternalDimensionMembers, loLookupField, lStringValueTo.getString(), false);
 				if (oFF.notNull(loInternalDimensionMember))
 				{
 					if (loInternalDimensionMember.getFieldValue(loInternalField) !== null)
@@ -31260,11 +31308,6 @@ sap.zen.DataSource.prototype.setTemplateNodeProperty = function(oNode, propertyN
 };
 sap.zen.DataSource.prototype.setDataSourceChanged = function(value)
 {
-	if (value && !this.mDataSourceChanged && this.getPage().isAsyncResultSetAlreadyFetched())
-	{
-		this.getPage().getWindow().showImmediatelyLoadingIndicator();
-		this.getPage().getWindow().setExecuteShowHideLoadingIndicator(false);
-	}
 	this.mDataSourceChanged = value;
 	if (this.mDataSourceChanged)
 	{
@@ -34058,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);
@@ -37125,6 +37168,7 @@ sap.zen.ActionSheetControl.prototype.getDefaultHeightAsString = function()
 };
 sap.zen.ActionSheetControl.prototype.onClick = function(value)
 {
+	var lValue = oFF.XHttpUtils.decodeURIComponent(value);
 	for (var lItemIndex = 0; lItemIndex < this.mtItems.size(); lItemIndex++)
 	{
 		var loListItem = this.mtItems.get(lItemIndex);
@@ -37132,7 +37176,7 @@ sap.zen.ActionSheetControl.prototype.onClick = function(value)
 		{
 			continue;
 		}
-		if (oFF.XString.compare(loListItem.getValue(), value) === 0)
+		if (oFF.XString.compare(loListItem.getValue(), lValue) === 0)
 		{
 			this.setSelectedText(loListItem.getText());
 			this.setSelectedValue(loListItem.getValue());
@@ -40166,7 +40210,7 @@ sap.zen.ContextMenuControl.prototype.buildSetHierarchyDrillLevelAction = functio
 	var lScriptAction = oFF.XStringUtils.concatenate2(oDimension.getDataSource().getName(), ".setRootExpandingLevel(");
 	lScriptAction = oFF.XStringUtils.concatenate4(lScriptAction, "'", oDimension.getName(), "'");
 	lScriptAction = oFF.XStringUtils.concatenate2(lScriptAction, ",");
-	lScriptAction = oFF.XStringUtils.concatenate2(lScriptAction, level);
+	lScriptAction = oFF.XStringUtils.concatenateWithInt(lScriptAction, level);
 	lScriptAction = oFF.XStringUtils.concatenate2(lScriptAction, ");");
 	lScriptAction = this.createScript(lScriptAction);
 	return lScriptAction;
@@ -40831,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))
 	{
@@ -40849,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/i18n/localization/localization_de.properties

@@ -338,7 +338,7 @@ com.sap.ip.bi.zen.rt.components.contextmenu.impl.ok=OK
 com.sap.ip.bi.zen.rt.framework.impl.services.command.resolver.REVERSE_SIGN_TWO_STRUC=Umgekehrtes Vorzeichen wird f\u00FCr Datenquellen mit zwei Strukturen ignoriert
 com.sap.ip.bi.zen.rt.components.dialog.variable.dlgtitle=Abfragen
 com.sap.ip.bi.zen.rt.components.contextmenu.impl.no_display=Nicht anzeigen
-com.sap.ip.bi.zen.rt.components.filterpanel.impl.dimensions=Abmessungen
+com.sap.ip.bi.zen.rt.components.filterpanel.impl.dimensions=Dimensionen
 com.sap.zen.firefly.impl.pause=Pausieren
 com.sap.ip.bi.zen.rt.components.filterpanel.impl.clearfilter=Filter zur\u00FCcksetzen
 com.sap.ip.bi.zen.rt.components.contextmenu.impl.expand_level=Expandieren bis Stufe
@@ -382,7 +382,7 @@ com.sap.ip.bi.zen.rt.components.ds.impl.GET_DATA_SELECTION_WRONG_VALUE=Sie haben
 com.sap.ip.bi.zen.rt.components.contextmenu.impl.edit_name=Name bearbeiten
 com.sap.ip.bi.zen.rt.components.contextmenu.impl.filter=Filtern
 com.sap.ip.bi.zen.rt.components.contextmenu.impl.operator_percent=Prozentualer Unterschied
-com.sap.zen.firefly.impl.dimensions=Abmessungen
+com.sap.zen.firefly.impl.dimensions=Dimensionen
 com.sap.ip.bi.ui.nonur.zen.table.Row=Zeile
 com.sap.ip.bi.zen.rt.components.contextmenu.impl.jump=Springen zu
 com.sap.ip.bi.zen.rt.components.splitter.impl.invalid_contentarea_index=Ung\u00FCltiger Inhaltsbereichs-Index

package/src/sap/zen/dsh/i18n/localization/localization_ko.properties

@@ -91,7 +91,7 @@ com.sap.ip.bi.zen.rt.components.contextmenu.impl.keep_filter=\uCC28\uC6D0 \uD544
 com.sap.ip.bi.zen.rt.components.messageview.impl.COLLAPSE=\uC811\uAE30
 com.sap.zen.firefly.impl.UNSORTED=\uC815\uB82C\uB418\uC9C0 \uC54A\uC558\uC2B5\uB2C8\uB2E4. \uC624\uB984\uCC28\uC21C \uC815\uB82C\uC744 \uC120\uD0DD\uD558\uC2ED\uC2DC\uC624.
 com.sap.ip.bi.zen.rt.components.contextmenu.impl.totals=\uCD1D\uACC4
-com.sap.ip.bi.zen.rt.components.contextmenu.impl.compact_display_rows=\uB2E8\uC77C \uD589\uC73C\uB85C \uD45C\uC2DC
+com.sap.ip.bi.zen.rt.components.contextmenu.impl.compact_display_rows=\uD589\uC73C\uB85C \uAC04\uB2E8\uD788 \uD45C\uC2DC
 com.sap.ip.bi.zen.rt.components.contextmenu.impl.hierarchies=\uACC4\uCE35\uAD6C\uC870
 com.sap.ip.bi.webapplications.ui.items.analysis.control.script_duration=\uC2A4\uD06C\uB9BD\uD2B8 \uB7F0\uD0C0\uC784\: {0} \uBC00\uB9AC\uCD08
 com.sap.ip.bi.zen.rt.components.filterpanel.impl.columns=\uC5F4
@@ -271,13 +271,13 @@ com.sap.ip.bi.zen.rt.framework.impl.services.command.resolver.factory.BookmarkCo
 com.sap.ip.bi.zen.rt.framework.impl.services.command.resolver.factory.BookmarkCommandFactory_0001=\uC870\uAC01 \uCC45\uAC08\uD53C\uB97C \uC800\uC7A5\uD558\uB294 \uB3D9\uC548 \uC624\uB958\uAC00 \uBC1C\uC0DD\uD588\uC2B5\uB2C8\uB2E4. \uC774\uB3D9\uC2DD \uC870\uAC01 \uCC45\uAC08\uD53C\uC5D0 \uBD84\uD560 \uC140 \uAD6C\uC131 \uC694\uC18C\uB97C \uC0AC\uC6A9\uD560 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.
 com.sap.ip.bi.zen.rt.components.filterpanel.impl.cancel=\uCDE8\uC18C
 com.sap.ip.bi.zen.rt.components.filterpanel.impl.membersexcludedtit={0} \uBA64\uBC84\uAC00 \uC81C\uC678\uB428
-com.sap.ip.bi.zen.rt.components.contextmenu.impl.compact_display_columns=\uB2E8\uC77C \uC5F4\uB85C \uD45C\uC2DC
+com.sap.ip.bi.zen.rt.components.contextmenu.impl.compact_display_columns=\uC5F4\uB85C \uAC04\uB2E8\uD788 \uD45C\uC2DC
 com.sap.ip.bi.zen.rt.components.ds.impl.WARNING_PROJECTION_IS_RECTANGLE=\uC120\uD0DD \u201C{0}"\uC740(\uB294) \uB108\uBB34 \uAD11\uBC94\uC704\uD569\uB2C8\uB2E4. \uD589\uC774\uB098 \uC5F4\uC744 \uD558\uB098\uB9CC \uC120\uD0DD\uD574\uC57C \uD569\uB2C8\uB2E4. \uC120\uD0DD\uC758 \uD589\uACFC \uC5F4 \uBAA8\uB450\uC5D0 \uC9C0\uC815\uB418\uC9C0 \uC54A\uC740 \uBCC0\uC218 \uCC28\uC6D0\uC774 \uC788\uC2B5\uB2C8\uB2E4.
 com.sap.ip.bi.zen.rt.components.contextmenu.impl.delete=\uC0AD\uC81C
 com.sap.zen.firefly.impl.refresh=\uC0C8\uB85C \uACE0\uCE68
 com.sap.ip.bi.zen.rt.components.filterpanel.impl.to=\uC885\uB8CC \uC2DC\uAC04
 com.sap.ip.bi.ui.nonur.zen.table.CROSSTAB_EMPTY_TITLE=\uD45C\uC2DC\uD560 \uB370\uC774\uD130\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4.
-com.sap.zen.firefly.impl.CONTEXTMENU_compact_display_in_columns=\uB2E8\uC77C \uC5F4\uB85C \uD45C\uC2DC
+com.sap.zen.firefly.impl.CONTEXTMENU_compact_display_in_columns=\uC5F4\uB85C \uAC04\uB2E8\uD788 \uD45C\uC2DC
 com.sap.zen.firefly.impl.CONTEXTMENU_id_desc=\uD0A4 \uB0B4\uB9BC\uCC28\uC21C
 com.sap.ip.bi.zen.rt.components.messageview.impl.NOTIFICATION_HEADER=\uBA54\uC2DC\uC9C0
 com.sap.zen.firefly.impl.CONTEXTMENU_long_text=\uC790\uC138\uD55C \uC124\uBA85
@@ -372,7 +372,7 @@ com.sap.ip.bi.zen.rt.components.filterpanel.impl.ok=\uD655\uC778
 com.sap.ip.bi.zen.rt.components.ds.impl.UNSUPPORTED_INITIAL_VIEW_PROPERTY=\uAC12\uC774 {1}\uC778 \uCD08\uAE30 \uBDF0 \uC18D\uC131 {0}\uC740(\uB294) \uD604\uC7AC \uC9C0\uC6D0\uB418\uC9C0 \uC54A\uC2B5\uB2C8\uB2E4.
 com.sap.ip.bi.zen.rt.framework.jsengine.PENDING_SCRIPT=\uBCF4\uB958 \uC911\uC778 \uC2A4\uD06C\uB9BD\uD2B8\uAC00 \uC774\uBBF8 \uB2E4\uC2DC \uC2DC\uC791\uB418\uC5C8\uC2B5\uB2C8\uB2E4.
 com.sap.ip.bi.zen.rt.framework.impl.services.command.resolver.created_by=\uC0DD\uC131\uC790
-com.sap.zen.firefly.impl.CONTEXTMENU_compact_display_in_rows=\uB2E8\uC77C \uD589\uC73C\uB85C \uD45C\uC2DC
+com.sap.zen.firefly.impl.CONTEXTMENU_compact_display_in_rows=\uD589\uC73C\uB85C \uAC04\uB2E8\uD788 \uD45C\uC2DC
 com.sap.zen.firefly.impl.CONTEXTMENU_key=\uD0A4
 com.sap.ip.bi.zen.rt.components.filterpanel.impl.from=\uC2DC\uC791 \uC2DC\uAC04
 com.sap.ip.bi.zen.rt.framework.impl.services.command.resolver.REVERSE_SIGN=\uC774 \uACC4\uC0B0\uC5D0\uC11C\uB294 \uBC18\uC804 \uBD80\uD638\uB97C \uACE0\uB824\uD569\uB2C8\uB2E4.

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

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

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

@@ -1687,6 +1687,8 @@ sap.ui.define(
       if (this._oColSearchBox) {
         this._oColSearchBox = loDestroyObject(this._oColSearchBox);
       }
+      Dialog.prototype.exit.apply(this);
+  
     };
 
     /**

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

@@ -6,9 +6,10 @@
 sap.ui.define(
   [
     "jquery.sap.global",
-    "sap/zen/dsh/utils/BaseHandler"
+    "sap/zen/dsh/utils/BaseHandler",
+    "sap/base/security/encodeURL"
   ],
-  function(jQuery, BaseHandler) {
+  function(jQuery, BaseHandler, EncodeURL) {
     "use strict";
     var ActionSheetHandler = function() {
       BaseHandler.apply(this, arguments);
@@ -76,7 +77,8 @@ sap.ui.define(
               if (loItem.icon){
                 loButton.setIcon(loItem.icon);
               }
-              var lButtonOnClickCommand = lOnClickCommand.replace("__VALUE__", loItem.value);
+
+              var lButtonOnClickCommand = lOnClickCommand.replace("__VALUE__", EncodeURL(loItem.value));
               loButton.data("onClickCommand", {value: lButtonOnClickCommand});
               /**
                * ATTENTION:

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

@@ -52,7 +52,7 @@ sap.ui.define(
               var iLength = oControlProperties.navigation.allowedSemanticSources.length;
               if (iLength && iLength > 0) {
                 for (i = 0; i < iLength; i++) {
-                  this.aAllowedSemanticSources.push(oControlProperties.navigation.allowedSemanticSources[i].entry.semanticname);
+                  this.aAllowedSemanticSources.push(oControlProperties.navigation.allowedSemanticSources[i].entry.semanticName);
                 }
               }
             }

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

@@ -8,9 +8,10 @@ sap.ui.define(
   [
     "sap/base/Log",
     "jquery.sap.global",
-    "sap/zen/dsh/utils/BaseHandler"
+    "sap/zen/dsh/utils/BaseHandler",
+    "sap/base/security/encodeURL"
   ],
-  function (Log, jQuery, BaseHandler) {
+  function (Log, jQuery, BaseHandler, EncodeURL) {
     "use strict";
     var FioriHelperHandler = function () {
       BaseHandler.apply(this, arguments);
@@ -386,7 +387,7 @@ sap.ui.define(
 
             if (oControlProperties.navigation && oControlProperties.navigation.onJumpTargetsFetchedCommand && oControlProperties.navigation.onJumpTargetsFetchedCommand.length > 0) {
               var lResultJSON = JSON.stringify(this.aValidJumpTargets);
-              lResultJSON = encodeURI(lResultJSON);
+              lResultJSON = EncodeURL(lResultJSON);
 
               var lMethod = that.prepareCommand(oControlProperties.navigation.onJumpTargetsFetchedCommand, "__JUMPTARGETS__", lResultJSON);
               var loFuncAction = new Function(lMethod);
@@ -400,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({

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

@@ -121,7 +121,7 @@ sap.ui.define(
 
         renderer : {},
         setHtmlText :  function(sHTMLGiven){
-          this.setContent("");
+          this.setContent("", true);
 
           var sHTML = "<div>"+ sHTMLGiven + "</div>";
           var sSanitizedText = "";
@@ -139,7 +139,14 @@ sap.ui.define(
           }
 
           //                      this.setProperty("htmlText", sSanitizedText);
-          this.setContent(sSanitizedText);
+          this.setContent(sSanitizedText, true);
+        },
+        setContent :  function(sContent, bFromHtml){
+          var sanitizePrev = this.getSanitizeContent();
+          this.setSanitizeContent(!bFromHtml && sanitizePrev);
+  
+          HTML.prototype.setContent.call(this, sContent);
+          this.setSanitizeContent(sanitizePrev);
         },
         getHtmlText : function(){
           //Remove the surrounding DIV