@sapui5/sap.suite.ui.generic.template 1.105.0 → 1.105.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.105.0",
+  "version": "1.105.2",
   "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.105.0</version>
+	<version>1.105.2</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/Component.js

@@ -137,12 +137,12 @@ sap.ui.define(["sap/ui/core/mvc/OverrideExecution",
 
 				// handle keyboard shortcut related manifest settings for actions defined via annotations e.g. DataFieldForAction and DataFieldForIBN
 				function fnGetAnnotatedActionsCommandDetails(sTabIdentifier) {
-					function fnGetCommandDetails(oControlAnnotations, bIsChart) {
+					function fnGetCommandDetails(aControlAnnotations, bIsChart) {
 						var oCommands = {
 							mAnnotatedActionsWithCommand: Object.create(null),
 							mOutboundActionsWithCommand: Object.create(null)
 						};
-						oControlAnnotations.forEach(function (oDataField) {
+						aControlAnnotations.forEach(function (oDataField) {
 							switch (oDataField.RecordType) {
 								case "com.sap.vocabularies.UI.v1.DataFieldForAction":
 									var oCommandDetails = oComponentUtils.getToolbarDataFieldForActionCommandDetails(oDataField, oAlpSettings, oAlpSettings.quickVariantSelectionX ? oAlpSettings.quickVariantSelectionX.variants[sTabIdentifier] : undefined, undefined, bIsChart);
@@ -166,7 +166,11 @@ sap.ui.define(["sap/ui/core/mvc/OverrideExecution",
 					var oQualifiers = fnGetQualifiers(sTabIdentifier);
 					var oLineItemCommands = fnGetCommandDetails(oEntityType["com.sap.vocabularies.UI.v1.LineItem" + (oQualifiers.sLineItemQualifier ? "#" + oQualifiers.sLineItemQualifier : "")] || [], false);
 					var oChartAnnotations = oEntityType["com.sap.vocabularies.UI.v1.Chart" + (oQualifiers.sChartQualifier ? "#" + oQualifiers.sChartQualifier : "")];
-					var oChartCommands = fnGetCommandDetails((oChartAnnotations && oChartAnnotations.Actions) || [], true);
+					/* Chart's actions object in the metamodel could be:
+					   an empty object,  if empty Actions property has been defined
+					   an array with objects, if atleast one action has been defined under Actions property
+					   an empty array, if Actions property has been defined with an empty collection */
+					var oChartCommands = fnGetCommandDetails(oChartAnnotations && !isEmptyObject(oChartAnnotations.Actions) ? oChartAnnotations.Actions : [], true);
 
 					return {
 						tableSettings: {

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

@@ -204,7 +204,11 @@ sap.ui.define([
 		// (which is used to get and set the state if variant is saved/loaded)
 		// However, for iAppState case, SVM wrapper also needs to contain SFB wrapper (and not oCustomFiltersWrapper directly)
 
-
+		// DynamicPage state: header pinned
+		var oDynamicPage = oController.byId(StableIdHelper.getStableId({type: "ListReportPage", subType: "DynamicPage"}));
+		// TODO: Discuss: should this state (header pinned) be part of variant (only page variant or SFB variant)? Assumption: no
+		var oDynamicPageWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapper(oDynamicPage);
+		aControlStateWrappers.push(oDynamicPageWrapper);
 
 		// SmartVariantManagement state: Selected Variant and whether it's dirty, including wrappers for managed controls (all controls, for which the corresponding state
 		// information should be part of the variant)
@@ -215,18 +219,14 @@ sap.ui.define([
 		var oSmartVariantManagement = oState.oSmartFilterbar.getSmartVariant();
 		if (oSmartVariantManagement){
 			var oSmartVariantManagementWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapper(oSmartVariantManagement, {
-				managedControlWrappers: aPageVariantControlStateWrappers.concat([oSmartFilterBarWrapper])
+				managedControlWrappers: aPageVariantControlStateWrappers.concat([oSmartFilterBarWrapper]),
+				dynamicPageWrapper: oDynamicPageWrapper
 			});
 			aControlStateWrappers.push(oSmartVariantManagementWrapper);
 		} else {
 			aControlStateWrappers.push(oSmartFilterBarWrapper);
 		}
 
-		// DynamicPage state: header pinned
-		var oDynamicPage = oController.byId(StableIdHelper.getStableId({type: "ListReportPage", subType: "DynamicPage"}));
-		// TODO: Discuss: should this state (header pinned) be part of variant (only page variant or SFB variant)? Assumption: no
-		aControlStateWrappers.push(oTemplateUtils.oCommonUtils.getControlStateWrapper(oDynamicPage));
-
 		// Wrapper to control whether data is loaded
 		
 		function fnGetDataLoadedWrapper(){

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

@@ -25,10 +25,15 @@ sap.ui.define([
             oDynamicPage.attachPinnedStateChange(fnHandler);
         }
 
+        function fnSetHeaderState(oController, bHeaderToBeExpanded) {
+            oController.getOwnerComponent().getModel("_templPriv").setProperty("/listReport/isHeaderExpanded", bHeaderToBeExpanded);
+        }
+
         return {
             getState: fnGetDynamicPageState,
             setState: fnSetDynamicPageState,
-            attachStateChanged: fnAttachStateChanged
+            attachStateChanged: fnAttachStateChanged,
+            setHeaderState: fnSetHeaderState
         };
     }
 

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

@@ -51,7 +51,7 @@ sap.ui.define([
 			// in SFB instead of SVM where it would make more sense.
 			// Here the event is afterVariantLoad, as the variant content known to SVM/SFB has first to be applied to the SFB, which will also pass the custom data accordingly. Only
 			// after this has happened, we can get the custom data from SFB. 
-			oSmartFilterBar.attachAfterVariantLoad(function(){
+			oSmartFilterBar.attachAfterVariantLoad(function(oEvent){
 				var oCustomData = oSmartFilterBar.getCustomFilterData();
 				// variant stored with 1.103 or later: all customFilter data stored in property customFilters 
 				// legacy variant stored with 1.102 or earlier: customFilters (from storing point of view) separated according to their origin
@@ -63,6 +63,9 @@ sap.ui.define([
 
 				mParams.oCustomFiltersWrapper.setState(oCustomFiltersState);
 				oSVMWrapperCallbacks.setManagedControlStates(oCustomData[dataPropertyNameGeneric]);
+				/* SFB header state of a variant (standard or custom) gets determined by the Apply Automatically checkbox's value of the corresponding
+				   variant i.e. if the checkbox is checked, then the header should be collapsed and vice versa. */
+				oSVMWrapperCallbacks.setHeaderState(!oEvent.getParameter("executeOnSelect"));
 			});
 
 		}

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

@@ -8,6 +8,7 @@ sap.ui.define([], function() {
 	 * @param {object} oFactory - the controlStateWrapperFactory
 	 * @param {object} mParams 
 	 * @param mParams.managedControlWrappers - array of controlStateWrappers for controls handled by the SVM (currently also including SFB wrapper - to be removed) 
+	 * @param mParams.dynamicPageWrapper - dynamicPageWrapper instance handled by SVM
 	 * @returns
 	 */
 	
@@ -48,6 +49,8 @@ sap.ui.define([], function() {
 		});
 		
 		// provide callbacks needed for SFB wrapper to store/restore extnesion state with variant
+
+
 		if (oSmartFilterBarWrapper){
 			oSmartFilterBarWrapper.setSVMWrapperCallbacks({
 				getManagedControlStates: function(){
@@ -65,6 +68,9 @@ sap.ui.define([], function() {
 							oWrapper.setState(oState[oWrapper.getLocalId()]);
 						}
 					});
+				},
+				setHeaderState: function(bHeaderToBeExpanded) {
+					mParams.dynamicPageWrapper.setHeaderState(oController, bHeaderToBeExpanded);
 				}
 			});
 		}

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

@@ -2934,7 +2934,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.105.0
+	 * @version 1.105.2
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

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

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