@sapui5/sap.suite.ui.generic.template 1.108.28 → 1.108.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.108.28",
+  "version": "1.108.30",
   "description": "SAPUI5 Library sap.suite.ui.generic.template",
   "keywords": [
     "sapui5",

package/src/sap/suite/ui/generic/template/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.108.28</version>
+	<version>1.108.30</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartFilterBarWrapper.js

@@ -146,7 +146,10 @@ sap.ui.define([
 			oControlAssignedPromise.then(function() {
 				// SFB expects a UIState object - not serializable, but a managed object, actually containing also information not belonging to SFBs state
 				// => get current UIState object from SFB, replace only relevant information, and set it again
-				var oUiState = oSmartFilterBar.getUiState();
+				var oUiState = oSmartFilterBar.getUiState(),
+					oSmartVariant = oSmartFilterBar.getSmartVariant(),
+					bIsCurrentVariantModifiedBeforeSetState = oSmartVariant.currentVariantGetModified();
+
 				oUiState.getSelectionVariant().SelectOptions = oPreliminaryState && oPreliminaryState.selectOptions;
 				oUiState.getSelectionVariant().Parameters = oPreliminaryState && oPreliminaryState.parameters;
 				oUiState.setSemanticDates(oPreliminaryState && oPreliminaryState.semanticDates);
@@ -170,6 +173,9 @@ sap.ui.define([
 						oFilterItem.setVisibleInFilterBar(false);
 					}
 				});
+
+				// Retaining the old value of "modified" flag in the smart variant
+				oSmartVariant.currentVariantSetModified(bIsCurrentVariantModifiedBeforeSetState);
 			});
 
 			// Apparently, SFB does not always correctly adapt the adapt filters count automatically. The following method has been provided espacially to trigger the same.

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartTableChartCommon.js

@@ -53,9 +53,11 @@ sap.ui.define([
                     // don't create UiState (managed object) from scratch, but fetch it from control and only apply known properties from state - thus, if any other properties would be added, we don't
                     // interfere with them
                     var oUiState = oControl.getUiState();
-                    oUiState.setPresentationVariant(oState.oUiState.oPresentationVariant);
-                    oUiState.setSelectionVariant(oState.oUiState.oSelectionVariant);
-                    oControl.setUiState(oUiState);
+                    if (!oUiState.getProperty("variantName")){
+                        oUiState.setPresentationVariant(oState.oUiState.oPresentationVariant);
+                        oUiState.setSelectionVariant(oState.oUiState.oSelectionVariant);
+                        oControl.setUiState(oUiState);
+                    }
                     bIsApplying = false;
                 } else {
                     // set standard variant to overcome "implicit personalization" (esp. for OP when navigating to different object in discovery mode)
@@ -198,7 +200,7 @@ sap.ui.define([
             setState: fnSetState,
             setControl: fnSetControl,
             attachStateChanged: fnAttachStateChanged,
-            bVMConnection: bVariantManagementActive
+            bVMConnection: oSmartControl && oSmartControl.getSmartVariant && !!oSmartControl.getSmartVariant()
         };
     }
 

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartVariantManagementWrapper.js

@@ -166,6 +166,10 @@ sap.ui.define([
 					// if managedControlStates is not provided (legacy or maybe broken state), applying VM state should not break
 					// don't apply undefined to managedControlWrappers, but just leave them untouched
 					if (oPreliminaryState.managedControlStates){
+						if (oSmartFilterBarWrapper) {
+							// SmartFilterBarWrapper.setState is invoked to apply the state changes modified by "modifyStartupExtension"
+							oSmartFilterBarWrapper.setState(oPreliminaryState.managedControlStates[oSmartFilterBarWrapper.getLocalId()]);
+						}
 						if (oPreliminaryState.variantId !== oSmartVariantManagement.getCurrentVariantId()){
 							// variant could not be set because it is not known, i.e. it could be private and URL was shared, or could be deleted after page was bookmarked. In this case, 
 							// standard variant is set (by VM). Additionally, it should be marked as modified.

package/src/sap/suite/ui/generic/template/lib/AppComponent.js

@@ -856,7 +856,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.UIComponent
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.108.28
+	 * @version 1.108.30
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	return UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {

package/src/sap/suite/ui/generic/template/lib/navigation/NavigationController.js

@@ -2943,7 +2943,7 @@ sap.ui.define(["sap/ui/base/Object",
 	 * @param {sap.suite.ui.generic.template.lib.AppComponent} oAppComponent The AppComponent instance
 	 * @public
 	 * @extends sap.ui.base.Object
-	 * @version 1.108.28
+	 * @version 1.108.30
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

package/src/sap/suite/ui/generic/template/library.js

@@ -38,7 +38,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/core/library','sap/fe/placeholder/lib
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.108.28",
+		version: "1.108.30",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {

package/src/sap/suite/ui/generic/template/listTemplates/controller/DetailController.js

@@ -785,7 +785,7 @@ sap.ui.define([
 			 */
 			_getSelParamsFromChart: function(chart) {
 				var dpList = [];
-				dpList = chart.getSelectedDataPoints().dataPoints;
+				dpList = this.oState.oTemplateUtils.oCommonUtils.getSelectionPoints(chart).dataPoints;
 				return this._getSelParamsFromDPList(dpList);
 			},
 			/**

package/src/sap/suite/ui/generic/template/listTemplates/controller/IappStateHandler.js

@@ -376,6 +376,11 @@ sap.ui.define(["sap/ui/base/Object",
 				// Smart filter bar all the filters will be replaced by the one which are coming from oUiState build base of oSelectionVariant where the Semantic Date Default Values
 				// is missing and because of that the values are replaced. Hence adding the semantic Dates to oSelectionVariant as mentioned by the Smart Control Colleague in the BCP - 2180400040
 				oStartupObject.semanticDates.Dates.forEach(function(oSelectDateOption){
+					var oSelectionDateOption = oStartupObject.selectionVariant.getSelectOption(oSelectDateOption.PropertyName);
+					//If startup object contains date range with the oSelectionDateOption PropertyName no need to override
+					if (oSelectionDateOption && oSelectionDateOption.length != 0) {
+						return;
+					}
 					oStartupObject.selectionVariant.addSelectOption(oSelectDateOption.PropertyName, "I", "EQ", "");
 				});
 

package/src/sap/suite/ui/generic/template/listTemplates/controller/SmartChartController.js

@@ -284,7 +284,7 @@ sap.ui.define(["sap/ui/core/mvc/Controller",
 				var oEvent = deepExtend({}, ev);
 				setTimeout(function() { // due to the selection data points not being updated during the deselectData event, must check again asynchronously
 					var chart = me.oChart;
-					if (chart.getSelectedDataPoints().count == 0) {// Clear the filter if no selections remain.  If a selection exists it would have come through the SelectData event
+					if (me.oState.oTemplateUtils.oCommonUtils.getSelectionPoints(chart).count == 0) {// Clear the filter if no selections remain.  If a selection exists it would have come through the SelectData event
 						me._updateTable();
 					} else if (chart.getSelectionMode() == "MULTIPLE") {// Treat an unselect with remaining selection points as a select
 						me._onChartSelectData(oEvent);