@sapui5/sap.zen.dsh 1.108.0 → 1.110.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.zen.dsh",
-  "version": "1.108.0",
+  "version": "1.110.1",
   "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.108.0</version>
+  <version>1.110.1</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

@@ -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()
 {
@@ -8495,7 +8498,7 @@ sap.zen.DataSourceInfo.prototype.initMe = function(oDataSource)
 		return;
 	}
 	var systemName = loQueryManager.getSystemDescription().getName();
-	var systemConnect = loQueryManager.getApplication().getSystemConnect(systemName);
+	var systemConnect = loQueryManager.getApplication().getConnectionPool().getSystemConnect(systemName);
 	if (oFF.notNull(systemConnect))
 	{
 		var loServerMetadata = systemConnect.getServerMetadata();
@@ -8524,7 +8527,7 @@ sap.zen.DataSourceInfo.prototype.initMe = function(oDataSource)
 	}
 	var loCubeInfo = loQueryModel.getCubeInfo();
 	this.mLastDataUpdate = null;
-	if (loCubeInfo.getDataRollUpMin() !== null)
+	if (loCubeInfo.getDataRollUpMin() !== null && loCubeInfo.getDataRollUpMin().getYear() > 0 && loCubeInfo.getDataRollUpMin().getMilliseconds() > 0)
 	{
 		this.mLastDataUpdate = loCubeInfo.getDataRollUpMin().toSAPFormat();
 	}
@@ -8533,7 +8536,7 @@ sap.zen.DataSourceInfo.prototype.initMe = function(oDataSource)
 		this.mLastDataUpdate = "";
 	}
 	this.mLastDataUpdateMaximum = null;
-	if (loCubeInfo.getDataRollUpMax() !== null)
+	if (loCubeInfo.getDataRollUpMax() !== null && loCubeInfo.getDataRollUpMax().getYear() > 0 && loCubeInfo.getDataRollUpMax().getMilliseconds() > 0)
 	{
 		this.mLastDataUpdateMaximum = loCubeInfo.getDataRollUpMax().toSAPFormat();
 	}
@@ -8542,7 +8545,7 @@ sap.zen.DataSourceInfo.prototype.initMe = function(oDataSource)
 		this.mLastDataUpdateMaximum = "";
 	}
 	this.mKeyDate = null;
-	if (loCubeInfo.getDueDate() !== null)
+	if (loCubeInfo.getDueDate() !== null && loCubeInfo.getDueDate().getYear() > 0 && loCubeInfo.getDueDate().getMilliseconds() > 0)
 	{
 		this.mKeyDate = loCubeInfo.getDueDate().toSAPFormat();
 	}
@@ -8556,7 +8559,7 @@ sap.zen.DataSourceInfo.prototype.initMe = function(oDataSource)
 		this.mCreatedBy = "";
 	}
 	this.mCreatedAt = null;
-	if (loCubeInfo.getCreatedOn() !== null)
+	if (loCubeInfo.getCreatedOn() !== null && loCubeInfo.getCreatedOn().getYear() > 0 && loCubeInfo.getCreatedOn().getMilliseconds() > 0)
 	{
 		this.mCreatedAt = loCubeInfo.getCreatedOn().toSAPFormat();
 	}
@@ -8570,7 +8573,7 @@ sap.zen.DataSourceInfo.prototype.initMe = function(oDataSource)
 		this.mLastChangedBy = "";
 	}
 	this.mLastChangedAt = null;
-	if (loCubeInfo.getUpdatedOn() !== null)
+	if (loCubeInfo.getUpdatedOn() !== null && loCubeInfo.getUpdatedOn().getYear() > 0 && loCubeInfo.getUpdatedOn().getMilliseconds() > 0)
 	{
 		this.mLastChangedAt = loCubeInfo.getUpdatedOn().toSAPFormat();
 	}
@@ -8584,7 +8587,7 @@ sap.zen.DataSourceInfo.prototype.initMe = function(oDataSource)
 		this.mLastRefreshedBy = "";
 	}
 	this.mLastRefreshedAt = null;
-	if (loCubeInfo.getUpdatedOn() !== null)
+	if (loCubeInfo.getUpdatedOn() !== null && loCubeInfo.getUpdatedOn().getYear() > 0 && loCubeInfo.getUpdatedOn().getMilliseconds() > 0)
 	{
 		this.mLastRefreshedAt = loCubeInfo.getUpdatedOn().toSAPFormat();
 	}
@@ -12223,22 +12226,37 @@ sap.zen.CharacteristicWrapper.prototype.setFilterRangesForField = function(oQuer
 	var loDimension = this.getDimension();
 	var loInternalDimension = loDimension.getInternalObject();
 	var loInternalField = oInternalField;
+	var loCartesianList = this.getSelectionState1(oQueryModel);
+	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, loCartesianList.getField());
+			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);
@@ -12250,18 +12268,33 @@ sap.zen.CharacteristicWrapper.prototype.setFilterRangesForField = function(oQuer
 			{
 				if (loRange.getFrom().getKey() !== null)
 				{
-					ltKeys.add(loRange.getFrom().getKey());
+					if (lFullRangesIndex < lFullRangesProvidedSize)
+					{
+						ltKeysForProvidedField.add(loRange.getFrom().getKey());
+					}
+					else
+					{
+						ltKeysForCartesianListField.add(loRange.getFrom().getKey());
+					}
 				}
 			}
 			if (loRange.getTo() !== null)
 			{
 				if (loRange.getTo().getKey() !== null)
 				{
-					ltKeys.add(loRange.getTo().getKey());
+					if (lFullRangesIndex < lFullRangesProvidedSize)
+					{
+						ltKeysForProvidedField.add(loRange.getTo().getKey());
+					}
+					else
+					{
+						ltKeysForCartesianListField.add(loRange.getFrom().getKey());
+					}
 				}
 			}
 		}
-		ltInternalDimensionMembers = this.getMembersByField(ltKeys, oInternalField);
+		ltInternalDimensionMembers.addAll(this.getMembersByField(ltKeysForProvidedField, oInternalField));
+		ltInternalDimensionMembers.addAll(this.getMembersByField(ltKeysForCartesianListField, loCartesianList.getField()));
 	}
 	loCartesianList.setField(loInternalField);
 	for (lFullRangesIndex = 0; lFullRangesIndex < tFullRanges.size(); lFullRangesIndex++)
@@ -12271,6 +12304,18 @@ sap.zen.CharacteristicWrapper.prototype.setFilterRangesForField = function(oQuer
 		{
 			continue;
 		}
+		var loLookupField = null;
+		if (oFF.notNull(ltInternalDimensionMembers) && !ltInternalDimensionMembers.isEmpty())
+		{
+			if (lFullRangesIndex < lFullRangesProvidedSize)
+			{
+				loLookupField = oInternalField;
+			}
+			else
+			{
+				loLookupField = loCartesianList.getField();
+			}
+		}
 		var lStringValueFrom = null;
 		if (loRange.getFrom() !== null)
 		{
@@ -12285,9 +12330,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)
@@ -12305,9 +12350,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)
@@ -31261,11 +31306,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)
 	{
@@ -37126,6 +37166,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);
@@ -37133,7 +37174,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());

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/library.js

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

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/filterbar_handler.js

@@ -465,7 +465,8 @@ sap.ui.define(
         var ltFilterGroupItems = oFilterBar.getFilterGroupItems();
         for (var i = 0; i < ltFilterGroupItems.length; i++) {
           var loFilterControl = oFilterBar.determineControlByFilterItem(ltFilterGroupItems[i]);
-          if (loFilterControl && loFilterControl.ZEN_multiInput && loFilterControl.ZEN_multiInput[0] && loFilterControl.ZEN_multiInput[0].getTokens().length) {
+          if ((loFilterControl && loFilterControl.ZEN_multiInput && loFilterControl.ZEN_multiInput[0] && loFilterControl.ZEN_multiInput[0].getTokens().length) || 
+              (loFilterControl && Object.values(loFilterControl.getModel().getProperty("/filters"))[0].ranges.length > 0)) {
             ltFiltersWithValue.push(ltFilterGroupItems[i]);
           }
         }

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);

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

@@ -19,198 +19,10 @@ sap.ui.define(
       var oJqCurrentDraggable;
       var oJqCurrentSortable;
       BaseHandler.apply(this, arguments);
-      this.createSplitter = function(oConfig) {
-        // create the UI5 splitter control
-        var oSplitter = new sap.ui.layout.Splitter();
-        oSplitter.onAfterRendering= function(){
-          jQuery(oSplitter.getDomRef()).find("[tabIndex='-1']").attr("tabIndex","0");
-        };
-        oSplitter.oSplitterConfig = oConfig;
-        if (oConfig.splitterOrientation === "Horizontal") {
-          oSplitter.setOrientation(sap.ui.core.Orientation.Vertical);
-        }
-        //wrap methods for adding content areas to the splitter control
-        oSplitter.addFirstPaneContent = function(oControl) {
-          oSplitter.addContentArea(oControl);
-          // set initial default width
-          oControl.getLayoutData().setMinSize(oSplitter.oSplitterConfig.minSizeFirstPane);
-          oControl.getLayoutData().setSize(oSplitter.oSplitterConfig.splitterPosition);
-        };
-        oSplitter.addSecondPaneContent = function(oControl) {
-          oSplitter.addContentArea(oControl);
-          // set initial default width
-          oControl.getLayoutData().setMinSize(oSplitter.oSplitterConfig.minSizeSecondPane);
-          oControl.getLayoutData().setSize("auto"); // depends on splitterPosition valid for 1st content area
-        };
-        return oSplitter;
-      };
-      this.updateSplitter = function(oSplitter) {
-        if (!oSplitter) {
-          return;
-        }
-        // determine size
-        var lSplitterSize = 0;
-        if (oSplitter.getOrientation() === "Horizontal") {
-          lSplitterSize = oSplitter.getDomRef().offsetWidth;
-        } else {
-          lSplitterSize = oSplitter.getDomRef().offsetHeight;
-        }
-        // check if size has changed: calculate new size if necessary
-        if (oSplitter.splitterSize && oSplitter.splitterSize != lSplitterSize){
-          // calculate total size of content areas and determine if recalculation is required
-          var lRecalculate = 0;
-          var lTotalSize = 0;
-          oSplitter.getContentAreas().forEach(
-            function(oContentArea){
-              // determine size of content area
-              var lSize = 0;
-              if (oSplitter.getOrientation() === "Horizontal") {
-                lSize = oContentArea.getDomRef().offsetWidth;
-              } else {
-                lSize = oContentArea.getDomRef().offsetHeight;
-              }
-              // add to total size of content areas
-              lTotalSize += lSize;
-              // check if size needs to be recalculated: this is the case if size is not percentage or auto)
-              if (oContentArea.getLayoutData().getSize().endsWith("px")) {
-                lRecalculate += 1;
-              }
-            }
-          );
-          // perform recalculation if required (new size is set in percentage)
-          if (lRecalculate > 1) {
-            oSplitter.getContentAreas().forEach(function(oContentArea){
-              // determine size of content area
-              var lSize = 0;
-              if (oSplitter.getOrientation() === "Horizontal") {
-                lSize = oContentArea.getDomRef().offsetWidth;
-              } else {
-                lSize = oContentArea.getDomRef().offsetHeight;
-              }
-              // calculate new size
-              var lNewSize = (lSize * 100) / lTotalSize;
-              // apply new size to content area
-              oContentArea.getLayoutData().setSize(lNewSize + "%");
-            });
-          }
-        }
-        // set the new splitter size
-        oSplitter.splitterSize = lSplitterSize;
-      };
-      this.createMainPanel = function(sId) {
-        var oMainPanel = new sap.m.NavContainer(sId, {autoFocus: false}).addStyleClass("zenNavigationPanelM").addStyleClass("sapContrastPlus");
-        var oPage = this.createPanel({});
-        oMainPanel.addPage(oPage);
-        oMainPanel.setTop = function(oControl) {
-          oPage.setTop(oControl);
-        };
-        oMainPanel.setCenter = function(oControl) {
-          oPage.setCenter(oControl);
-        };
-        oMainPanel.destroyTop = function() {
-          oMainPanel.getPages()[0].destroySubHeader();
-        };
-        oMainPanel.destroyCenter = function() {
-          oMainPanel.getPages()[0].destroyContent();
-        };
-        return oMainPanel;
-      };
-      this.createPanel = function(oConfig) {
-        var oPanel = null;
-        if (jQuery.type(oConfig) === "string") {
-          oPanel = new sap.m.Page(oConfig);
-        } else {
-          oPanel = new sap.m.Page();
-        }
-        oPanel.setShowHeader(false);
-        oPanel.setTop = function(oControl) {
-          oPanel.setSubHeader(oControl);
-        };
-        oPanel.setCenter = function(oControl) {
-          var aContent = oControl.content;
-          if (aContent) {
-            for (var i = 0; i < aContent.length; i++) {
-              oPanel.addContent(aContent[i]);
-            }
-          }
-        };
-        if (oConfig.top) {
-          oPanel.setTop(oConfig.top);
-        }
-        if (oConfig.center) {
-          oPanel.setCenter(oConfig.center);
-        }
-        oPanel.addEventDelegate({
-          onAfterRendering:function() {
-            var jqPanel = oPanel.$();
-            if (jqPanel.closest(".sapUiSizeCompact").length === 0 && jqPanel.children("header").length > 0) { // check if runs not in Compact mode
-              jqPanel.children("section").css("top", "3rem");
-            }
-          }
-        });
-        oPanel.onAfterRendering= function(){
-          jQuery(oPanel.getDomRef()).find("[tabIndex='-1']").attr("tabIndex","0");
-        };
-        return oPanel;
-      };
-      this.createTopArea = function(oConfig) {
-        var oTop = new sap.m.Toolbar();
-        var aContent = oConfig.content;
-        if (oConfig.contentAlign === "right") {
-          oTop.addContent(new sap.m.ToolbarSpacer());
-        }
-        if (aContent) {
-          for (var i = 0; i < aContent.length; i++) {
-            oTop.addContent(aContent[i]);
-          }
-        }
-        return oTop;
-      };
-      this.createCenterArea = function(oConfig) {
-        var oCenter = {
-          content: oConfig.content ? oConfig.content : [],
-          addContent: function(oContent) {
-            this.content.push(oContent);
-          }
-        };
-        return oCenter;
-      };
-      this.createSearchField = function(oConfig) {
-        var oSearchField = new sap.m.SearchField();
-        oSearchField.setWidth(oConfig.width);
-        oSearchField.attachLiveChange(oConfig.suggest);
-        return oSearchField;
-      };
-      this.createText = function(oConfig, id) {
-        if (oConfig && oConfig.design) {
-          delete oConfig.design;
-        }
-        return new sap.m.Title(id, oConfig);
-      };
-      this.createLabel = function(oConfig, id) {
-        var oLabel;
-        if (oConfig && oConfig.design === "Bold") {
-          delete oConfig.design;
-          delete oConfig.labelFor;
-          oLabel = new sap.m.Title(id, oConfig);
-        } else {
-          oLabel = new sap.m.Label(id, oConfig);
-        }
-        return oLabel;
-      };
-      this.createRowRepeater = function() {
-        var oRowRepeater = new sap.m.List({
-          noDataText: " "
-        });
-        return oRowRepeater;
-      };
-      this.cloneRowRepeater = function(oOldRowRepeater) {
-        var oRowRepeater = oOldRowRepeater.clone();
-        return oRowRepeater;
-      };
-      this.getRowRepeaterAggregation = function() {
-        return "items";
-      };
+
+      /**
+       * Create the Control
+       */
       this.create = function(oChainedControl, oControlProperties) {
         var oControl, sNavigationPanelMode = oControlProperties.property.navigationpanelmode;
         var cssClassSuffix = "M";
@@ -494,6 +306,263 @@ sap.ui.define(
         };
         return oControl;
       };
+
+      /**
+       * Update the Control
+       */
+      this.update = function(oControl, oControlProperties, oComponentProperties) {
+        if (oControl && oControlProperties) {
+          var oModel = oControl.getModel();
+          if (this.isDesignModeD4LIncluded() ||
+                  (oControlProperties.newds && oControlProperties.property && oModel.getProperty("/property/navigationpanelmode") !== oControlProperties.property.navigationpanelmode)) {
+            return this.create(oControl, oControlProperties, oComponentProperties);
+          }
+          if (oControlProperties.newds || !oModel.getProperty("/navigationpanel/apply/ready")) {
+            if (oControlProperties.charnames) {
+              oModel.setProperty("/charnames", oControlProperties.charnames);
+            }
+            if (oControlProperties.characteristics) {
+              this.rewriteMeasuresPosition(oControlProperties, oModel.getProperty("/property/showmeasuresseparately"));
+              oModel.setProperty("/characteristics", oControlProperties.characteristics);
+              oModel.setProperty("/measures", oControlProperties.measures);
+            }
+            if (oControlProperties.axis && this.axisArraysNotSame(oControlProperties.axis, oModel.getProperty("/axis"))) {
+              oModel.setProperty("/axis", oControlProperties.axis);
+            }
+          }
+          if (oControlProperties.filters) {
+            oModel.setProperty("/filters", oControlProperties.filters);
+          }
+          if (oControlProperties.changeVisibility) {
+            if (oControlProperties.visible) {
+              oControl.removeStyleClass("zenHideFilterPanel");
+            } else {
+              oControl.addStyleClass("zenHideFilterPanel");
+            }
+          }
+          if(typeof (sap.zen.dsh.DSH_deployment) !== "undefined") {
+            if (!oControlProperties.pauserefresh && oControl.getModel().getProperty("/property/pauserefresh")) {
+              oControl.ZEN_submit();
+            }
+            oControl.getModel().setProperty("/property/pauserefresh", oControlProperties.pauserefresh);
+          }
+          oControl.getModel().setProperty("/dsName", oControlProperties.dsName);
+        }
+        that.clearDragGhosts();     // clear all dragGhost DIVs that might still be hanging around
+        if (oControl)  {
+          this.updateSplitter(oControl.oHorizontalSplitter);
+        }
+        return oControl;
+      };
+
+      this.createSplitter = function(oConfig) {
+        // create the UI5 splitter control
+        var oSplitter = new sap.ui.layout.Splitter();
+        oSplitter.mFnOrigOnAfterRendering = oSplitter.onAfterRendering;
+        oSplitter.onAfterRendering = function(){
+          if (oSplitter.mFnOrigOnAfterRendering) {
+            oSplitter.mFnOrigOnAfterRendering();
+          }
+          jQuery(oSplitter.getDomRef()).find("[tabIndex='-1']").attr("tabIndex","0");
+        };
+        oSplitter.oSplitterConfig = oConfig;
+        if (oConfig.splitterOrientation === "Horizontal") {
+          oSplitter.setOrientation(sap.ui.core.Orientation.Vertical);
+        }
+        //wrap methods for adding content areas to the splitter control
+        oSplitter.addFirstPaneContent = function(oControl) {
+          oSplitter.addContentArea(oControl);
+          // set initial default width
+          oControl.getLayoutData().setMinSize(oSplitter.oSplitterConfig.minSizeFirstPane);
+          oControl.getLayoutData().setSize(oSplitter.oSplitterConfig.splitterPosition);
+        };
+        oSplitter.addSecondPaneContent = function(oControl) {
+          oSplitter.addContentArea(oControl);
+          // set initial default width
+          oControl.getLayoutData().setMinSize(oSplitter.oSplitterConfig.minSizeSecondPane);
+          oControl.getLayoutData().setSize("auto"); // depends on splitterPosition valid for 1st content area
+        };
+        return oSplitter;
+      };
+
+      this.updateSplitter = function(oSplitter) {
+        if (!oSplitter) {
+          return;
+        }
+        // determine size
+        var lSplitterSize = 0;
+        if (oSplitter.getOrientation() === "Horizontal") {
+          lSplitterSize = oSplitter.getDomRef().offsetWidth;
+        } else {
+          lSplitterSize = oSplitter.getDomRef().offsetHeight;
+        }
+        // check if size has changed: calculate new size if necessary
+        if (oSplitter.splitterSize && oSplitter.splitterSize != lSplitterSize){
+          // calculate total size of content areas and determine if recalculation is required
+          var lRecalculate = 0;
+          var lTotalSize = 0;
+          oSplitter.getContentAreas().forEach(
+            function(oContentArea){
+              // determine size of content area
+              var lSize = 0;
+              if (oSplitter.getOrientation() === "Horizontal") {
+                lSize = oContentArea.getDomRef().offsetWidth;
+              } else {
+                lSize = oContentArea.getDomRef().offsetHeight;
+              }
+              // add to total size of content areas
+              lTotalSize += lSize;
+              // check if size needs to be recalculated: this is the case if size is not percentage or auto)
+              if (oContentArea.getLayoutData().getSize().endsWith("px")) {
+                lRecalculate += 1;
+              }
+            }
+          );
+          // perform recalculation if required (new size is set in percentage)
+          if (lRecalculate > 1) {
+            oSplitter.getContentAreas().forEach(function(oContentArea){
+              // determine size of content area
+              var lSize = 0;
+              if (oSplitter.getOrientation() === "Horizontal") {
+                lSize = oContentArea.getDomRef().offsetWidth;
+              } else {
+                lSize = oContentArea.getDomRef().offsetHeight;
+              }
+              // calculate new size
+              var lNewSize = (lSize * 100) / lTotalSize;
+              // apply new size to content area
+              oContentArea.getLayoutData().setSize(lNewSize + "%");
+            });
+          }
+        }
+        // set the new splitter size
+        oSplitter.splitterSize = lSplitterSize;
+      };
+
+      this.createMainPanel = function(sId) {
+        var oMainPanel = new sap.m.NavContainer(sId, {autoFocus: false}).addStyleClass("zenNavigationPanelM").addStyleClass("sapContrastPlus");
+        var oPage = this.createPanel({});
+        oMainPanel.addPage(oPage);
+        oMainPanel.setTop = function(oControl) {
+          oPage.setTop(oControl);
+        };
+        oMainPanel.setCenter = function(oControl) {
+          oPage.setCenter(oControl);
+        };
+        oMainPanel.destroyTop = function() {
+          oMainPanel.getPages()[0].destroySubHeader();
+        };
+        oMainPanel.destroyCenter = function() {
+          oMainPanel.getPages()[0].destroyContent();
+        };
+        return oMainPanel;
+      };
+
+      this.createPanel = function(oConfig) {
+        var oPanel = null;
+        if (jQuery.type(oConfig) === "string") {
+          oPanel = new sap.m.Page(oConfig);
+        } else {
+          oPanel = new sap.m.Page();
+        }
+        oPanel.setShowHeader(false);
+        oPanel.setTop = function(oControl) {
+          oPanel.setSubHeader(oControl);
+        };
+        oPanel.setCenter = function(oControl) {
+          var aContent = oControl.content;
+          if (aContent) {
+            for (var i = 0; i < aContent.length; i++) {
+              oPanel.addContent(aContent[i]);
+            }
+          }
+        };
+        if (oConfig.top) {
+          oPanel.setTop(oConfig.top);
+        }
+        if (oConfig.center) {
+          oPanel.setCenter(oConfig.center);
+        }
+        oPanel.addEventDelegate({
+          onAfterRendering:function() {
+            var jqPanel = oPanel.$();
+            if (jqPanel.closest(".sapUiSizeCompact").length === 0 && jqPanel.children("header").length > 0) { // check if runs not in Compact mode
+              jqPanel.children("section").css("top", "3rem");
+            }
+          }
+        });
+        oPanel.onAfterRendering= function(){
+          jQuery(oPanel.getDomRef()).find("[tabIndex='-1']").attr("tabIndex","0");
+        };
+        return oPanel;
+      };
+
+      this.createTopArea = function(oConfig) {
+        var oTop = new sap.m.Toolbar();
+        var aContent = oConfig.content;
+        if (oConfig.contentAlign === "right") {
+          oTop.addContent(new sap.m.ToolbarSpacer());
+        }
+        if (aContent) {
+          for (var i = 0; i < aContent.length; i++) {
+            oTop.addContent(aContent[i]);
+          }
+        }
+        return oTop;
+      };
+
+      this.createCenterArea = function(oConfig) {
+        var oCenter = {
+          content: oConfig.content ? oConfig.content : [],
+          addContent: function(oContent) {
+            this.content.push(oContent);
+          }
+        };
+        return oCenter;
+      };
+
+      this.createSearchField = function(oConfig) {
+        var oSearchField = new sap.m.SearchField();
+        oSearchField.setWidth(oConfig.width);
+        oSearchField.attachLiveChange(oConfig.suggest);
+        return oSearchField;
+      };
+
+      this.createText = function(oConfig, id) {
+        if (oConfig && oConfig.design) {
+          delete oConfig.design;
+        }
+        return new sap.m.Title(id, oConfig);
+      };
+
+      this.createLabel = function(oConfig, id) {
+        var oLabel;
+        if (oConfig && oConfig.design === "Bold") {
+          delete oConfig.design;
+          delete oConfig.labelFor;
+          oLabel = new sap.m.Title(id, oConfig);
+        } else {
+          oLabel = new sap.m.Label(id, oConfig);
+        }
+        return oLabel;
+      };
+
+      this.createRowRepeater = function() {
+        var oRowRepeater = new sap.m.List({
+          noDataText: " "
+        });
+        return oRowRepeater;
+      };
+
+      this.cloneRowRepeater = function(oOldRowRepeater) {
+        var oRowRepeater = oOldRowRepeater.clone();
+        return oRowRepeater;
+      };
+
+      this.getRowRepeaterAggregation = function() {
+        return "items";
+      };
+
       this.rewriteMeasuresPosition = function(oControlProperties, bShowMeasuresSeparately) {
         if (oControlProperties && oControlProperties.characteristics && (bShowMeasuresSeparately || (oControlProperties.property && oControlProperties.property.showmeasuresseparately))) {
           for (var i = 0, l=oControlProperties.characteristics.length; i < l; i++) {
@@ -506,6 +575,7 @@ sap.ui.define(
           }
         }
       };
+
       this.getRowFactory = function(oControl, sKeyPath, sTextPath, fTextFormatter, bMarker, fCallback) {
         return function(sRowId, oContext) {
           //create the template control that will be repeated and will display the data
@@ -617,6 +687,7 @@ sap.ui.define(
           return oCLM;
         };
       };
+
       this.changeTemplate = function(oControl, oRowTemplate, oContext, bExpand) {
         var oModel = oContext.oModel;
         if (bExpand || oModel.getProperty("/navigationpanel/measures/expanded")) {
@@ -657,6 +728,7 @@ sap.ui.define(
           oRowTemplate.setWidths(["20px", "auto"]);
         }
       };
+
       this.getFilterFormatter = function(sMeasureKey, sCharAxis, aParents) {
         return function(oFilters) {
           var i, j, l;
@@ -706,12 +778,14 @@ sap.ui.define(
           return "inherit";
         };
       };
+
       this.isDropInPanel = function(e, sId) {
         Log.error("isDropInPanel");
         Log.error(e);
         var oRect = document.getElementById(sId).getBoundingClientRect();
         return (e.clientX >= oRect.left && e.clientX <= oRect.right && e.clientY >= oRect.top && e.clientY <= oRect.bottom);
       };
+
       this.onUnhandledDrop = function(e) {
         Log.error("onUnhandledDrop");
         Log.error(e);
@@ -719,6 +793,7 @@ sap.ui.define(
           BaseHandler.dispatcher.setDragDropCanceled(true);
         }
       };
+
       this.onEscKeyPressed = function() {
         Log.error("onEscKeyPressed");
         BaseHandler.dispatcher.setDragDropCanceled(true);
@@ -729,6 +804,7 @@ sap.ui.define(
           oJqCurrentSortable.sortable().trigger("mouseup");
         }
       };
+
       this.getDimensionsOnAfterRendering = function(oControl, sRowRepeaterId, sRowRepeaterRowsId, sRowRepeaterColumnsId) {
         return function() {
           var jqRepeaterElements = jQuery(document.getElementById(sRowRepeaterId)).children("ul").children("li");
@@ -845,6 +921,7 @@ sap.ui.define(
           }
         };
       };
+
       this.isOverParent = function(ui) {
         var x = ui.offset.left;
         var y = ui.offset.top;
@@ -866,6 +943,7 @@ sap.ui.define(
         }
         return true;
       };
+
       this.getAxisOnAfterRendering = function(sAxis, sConnectWith, oControl, fApply) {
         return function() {
           var sRowRepeaterId = this.getId();
@@ -1018,6 +1096,7 @@ sap.ui.define(
           }
         };
       };
+
       if (sap.ui.Device.support.touch) {
         this.getTouchToMouse = function(sMouseEvent) {
           return function(e) {
@@ -1034,50 +1113,7 @@ sap.ui.define(
           touchend: that.getTouchToMouse("mouseup")
         };
       }
-      this.update = function(oControl, oControlProperties, oComponentProperties) {
-        if (oControl && oControlProperties) {
-          var oModel = oControl.getModel();
-          if (this.isDesignModeD4LIncluded() ||
-                  (oControlProperties.newds && oControlProperties.property && oModel.getProperty("/property/navigationpanelmode") !== oControlProperties.property.navigationpanelmode)) {
-            return this.create(oControl, oControlProperties, oComponentProperties);
-          }
-          if (oControlProperties.newds || !oModel.getProperty("/navigationpanel/apply/ready")) {
-            if (oControlProperties.charnames) {
-              oModel.setProperty("/charnames", oControlProperties.charnames);
-            }
-            if (oControlProperties.characteristics) {
-              this.rewriteMeasuresPosition(oControlProperties, oModel.getProperty("/property/showmeasuresseparately"));
-              oModel.setProperty("/characteristics", oControlProperties.characteristics);
-              oModel.setProperty("/measures", oControlProperties.measures);
-            }
-            if (oControlProperties.axis && this.axisArraysNotSame(oControlProperties.axis, oModel.getProperty("/axis"))) {
-              oModel.setProperty("/axis", oControlProperties.axis);
-            }
-          }
-          if (oControlProperties.filters) {
-            oModel.setProperty("/filters", oControlProperties.filters);
-          }
-          if (oControlProperties.changeVisibility) {
-            if (oControlProperties.visible) {
-              oControl.removeStyleClass("zenHideFilterPanel");
-            } else {
-              oControl.addStyleClass("zenHideFilterPanel");
-            }
-          }
-          if(typeof (sap.zen.dsh.DSH_deployment) !== "undefined") {
-            if (!oControlProperties.pauserefresh && oControl.getModel().getProperty("/property/pauserefresh")) {
-              oControl.ZEN_submit();
-            }
-            oControl.getModel().setProperty("/property/pauserefresh", oControlProperties.pauserefresh);
-          }
-          oControl.getModel().setProperty("/dsName", oControlProperties.dsName);
-        }
-        that.clearDragGhosts();     // clear all dragGhost DIVs that might still be hanging around
-        if (oControl)  {
-          this.updateSplitter(oControl.oHorizontalSplitter);
-        }
-        return oControl;
-      };
+
       this.axisArraysNotSame = function(aAxis1, aAxis2) {
         var aAxisNames = ["rows", "columns"];
         if (aAxis1 && aAxis2) {
@@ -1097,6 +1133,7 @@ sap.ui.define(
         }
         return true;
       };
+
       this.getContextMenuAction = function(sContextMenuComponentId, oClickedUI5Component, oDomClickedElement) {
         var sCommand = oClickedUI5Component.getModel().getProperty("/command/createcontextmenu");
         if (sCommand) {
@@ -1121,15 +1158,19 @@ sap.ui.define(
         }
         return null;
       };
+
       this.isDesignModeD4LIncluded = function(){
         return sap.zen.designmode;
       };
+
       this.getType = function() {
         return "navigationpanel";
       };
+
       this.getDecorator = function() {
         return "DataSourceControlDecorator";
       };
+
       // clear all DragGhosts that are still around. In some cases the draggable.stop() function
       // is not called and so the DragGhost is not cleared. This happens usually when the user
       // is dragging quickly one after another. In that case the drag is disrupted by a loading of
@@ -1137,6 +1178,7 @@ sap.ui.define(
       this.clearDragGhosts = function() {
         jQuery("div.zenDnDHelper").remove();
       };
+
       this.getDimensionNameAndIdForJQElement = function (jqElement, bMember, bSibling) {
         var dimIdElem = bSibling ? jqElement.siblings(bMember ? ".zenMemberId" : ".zenDimensionId") : jqElement.find(bMember ? ".zenMemberId" : ".zenDimensionId");
         var control = dimIdElem.control(0);
@@ -1145,10 +1187,12 @@ sap.ui.define(
           id: dimIdElem.attr("id")
         };
       };
+
       this.getType = function(){
         return "navigationpanel";
       };
     };
+
     var instance = new NavigationPanelHandler();
     BaseHandler.dispatcher.addHandlers(instance.getType(), instance);
     return instance;