@sapui5/sap.suite.ui.generic.template 1.142.7 → 1.142.8

package/package.json

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

package/src/sap/suite/ui/generic/template/AnalyticalListPage/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.142.7"
+			"version": "1.142.8"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/Canvas/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.142.7"
+			"version": "1.142.8"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

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

@@ -223,7 +223,8 @@ sap.ui.define([
 		var oSmartVariantManagement = oState.oSmartFilterbar.getSmartVariant();
 		if (oSmartVariantManagement){
 			var oSmartVariantManagementWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapper(oSmartVariantManagement, {
-				managedControlWrappers: aPageVariantControlStateWrappers.concat([oSmartFilterBarWrapper])
+				managedControlWrappers: aPageVariantControlStateWrappers.concat([oSmartFilterBarWrapper]),
+				smartFilterBarWrapper: oSmartFilterBarWrapper
 			});
 			aControlStateWrappers.push(oSmartVariantManagementWrapper);
 		} else {

package/src/sap/suite/ui/generic/template/ListReport/manifest.json

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.142.7"
+			"version": "1.142.8"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ObjectPage/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.142.7"
+			"version": "1.142.8"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickCreate/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.142.7"
+			"version": "1.142.8"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickView/manifest.json

@@ -6,7 +6,7 @@
 	"type": "component",
 	"i18n": "i18n/i18n.properties",
 	"applicationVersion": {
-		"version": "1.142.7"
+		"version": "1.142.8"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/genericUtilities/ControlStateWrapperFactory.js

@@ -93,15 +93,16 @@ sap.ui.define([
 		}
 
 		/**
-		 * Private helper function to create the real wrapper based on control and type.
+		 * Private helper function to create the real wrapper based on type and control.
 		 * This function is injected into PreliminaryWrapper and not exposed in the factory's public API.
+		 * Parameters are ordered to allow using .bind() for partial application.
 		 *
-		 * @param {sap.ui.core.Control} oControl - The control instance
 		 * @param {string} sType - The type of control (e.g., "SmartTable", "SmartChart")
 		 * @param {object} [mParams] - Additional parameters passed to constructor of wrapper
+		 * @param {sap.ui.core.Control} oControl - The control instance (last to enable .bind())
 		 * @return {object} The real wrapper object for the control with helper methods attached
 		 */
-		function fnCreateRealWrapper(oControl, sType, mParams) {
+		function fnCreateRealWrapper(sType, mParams, oControl) {
 			var oWrapper;
 			switch (sType) {
 				case "SmartFilterBar":
@@ -190,8 +191,11 @@ sap.ui.define([
 							return oDummyWrapper;
 					}
 
+					// Create bound function with type and params, leaving oControl to be provided later
+					var fnBoundCreator = fnCreateRealWrapper.bind(null, sType, mParams);
+
 					// Always create a PreliminaryWrapper
-					var oPreliminaryWrapper = new PreliminaryWrapper(sId, sType, fnCreateRealWrapper, oController, mParams);
+					var oPreliminaryWrapper = new PreliminaryWrapper(sId, fnBoundCreator);
 
 					// Since control is available, immediately set it
 					oPreliminaryWrapper.setControl(oControl);
@@ -225,8 +229,11 @@ sap.ui.define([
 				}
 				var sId = oController.getView().getLocalId(sControlId);
 				if (!mWrappers[sId]) {
+					// Create bound function with type and params, leaving oControl to be provided later
+					var fnBoundCreator = fnCreateRealWrapper.bind(null, sControlType, mParams);
+
 					// Create a PreliminaryWrapper (control will be set later)
-					var oPreliminaryWrapper = new PreliminaryWrapper(sId, sControlType, fnCreateRealWrapper, oController, mParams);
+					var oPreliminaryWrapper = new PreliminaryWrapper(sId, fnBoundCreator);
 
 					mWrappers[sId] = oPreliminaryWrapper;
 				}

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

@@ -1,5 +1,6 @@
 sap.ui.define([
-], function() {
+	"sap/base/util/extend"
+], function(extend) {
 	"use strict";
 
 	/**
@@ -11,13 +12,10 @@ sap.ui.define([
 	 * real wrapper once the control is assigned via setControl().
 	 *
 	 * @param {string} sId - The local ID of the control
-	 * @param {string} sType - The type of the control (e.g., "SmartTable", "SmartChart")
-	 * @param {function} fnCreateRealWrapper - Function to create the real wrapper, injected by factory
-	 * @param {object} oController - The controller instance
-	 * @param {object} mParams - Additional parameters to pass to the real wrapper constructor
+	 * @param {function} fnCreateRealWrapper - Function to create the real wrapper, bound with type and params
 	 * @returns {object} Preliminary wrapper object that will delegate to real wrapper once control is set
 	 */
-	function PreliminaryWrapper(sId, sType, fnCreateRealWrapper, oController, mParams) {
+	function PreliminaryWrapper(sId, fnCreateRealWrapper) {
 		var oLatestState;
 		var oRealWrapper;
 		var fnResolveRealWrapperReady;
@@ -25,7 +23,7 @@ sap.ui.define([
 			fnResolveRealWrapperReady = resolve;
 		});
 
-		return {
+		var oPublicInterface = {
 			/**
 			 * Get the current state. Returns stored state before control is set,
 			 * delegates to real wrapper afterwards.
@@ -48,55 +46,62 @@ sap.ui.define([
 				}
 			},
 
-		/**
-		 * Assign the actual control and create the real wrapper.
-		 * This triggers the creation of the real wrapper, applies any stored state,
-		 * and resolves the promise that queues event handler attachments.
-		 * @param {sap.ui.core.Control} oControl - The control instance
-		 */
-		setControl: function(oControl) {
-			// Create the real wrapper using injected function
-			var oCreatedWrapper = fnCreateRealWrapper(oControl, sType, mParams);
-
-			// Check if wrapper needs time to initialize
-			var oWrapperReadyPromise = oCreatedWrapper.oReadyPromise || Promise.resolve();
-
-			// Wait for wrapper to be ready before setting oRealWrapper
-			oWrapperReadyPromise.then(function() {
-				oRealWrapper = oCreatedWrapper;
-
-				// Apply stored state if any
-				if (oLatestState !== undefined) {
-					oRealWrapper.setState(oLatestState);
-				}
+			/**
+			 * Assign the actual control and create the real wrapper.
+			 * This triggers the creation of the real wrapper, applies any stored state,
+			 * extends the preliminary wrapper with all methods from the real wrapper,
+			 * and resolves the promise that queues event handler attachments.
+			 * @param {sap.ui.core.Control} oControl - The control instance
+			 */
+			setControl: function(oControl) {
+				// Create the real wrapper using bound function (already has type and params bound)
+				var oCreatedWrapper = fnCreateRealWrapper(oControl);
+
+				// Check if wrapper needs time to initialize
+				var oWrapperReadyPromise = oCreatedWrapper.oReadyPromise || Promise.resolve();
+
+				// Wait for wrapper to be ready before setting oRealWrapper
+				oWrapperReadyPromise.then(function() {
+					oRealWrapper = oCreatedWrapper;
+
+					// Apply stored state if any
+					if (oLatestState !== undefined) {
+						oRealWrapper.setState(oLatestState);
+					}
+
+					// Extend the preliminary wrapper with all properties from the real wrapper
+					// This makes any additional methods (like setSVMWrapperCallbacks) available
+					// The nested extend ensures we keep our proxy methods (getState, setState, etc.)
+					// while adding new methods from the real wrapper
+					extend(oPublicInterface, extend({}, oRealWrapper, oPublicInterface));
+
+					// Resolve the promise - this triggers all queued attachStateChanged calls
+					fnResolveRealWrapperReady(oRealWrapper);
+				});
+			},
+
+			/**
+			 * Attach a state change handler. Uses promise to queue attachment
+			 * until the real wrapper is available and ready.
+			 * @param {function} fnHandler - The event handler function
+			 */
+			attachStateChanged: function(fnHandler) {
+				// Use promise to defer attachment until real wrapper is available and ready
+				oRealWrapperReadyPromise.then(function(oWrapper) {
+					oWrapper.attachStateChanged(fnHandler);
+				});
+			},
 
-				// Resolve the promise - this triggers all queued attachStateChanged calls
-				fnResolveRealWrapperReady(oRealWrapper);
-			});
-		},
-
-		/**
-		 * Attach a state change handler. Uses promise to queue attachment
-		 * until the real wrapper is available and ready.
-		 * @param {function} fnHandler - The event handler function
-		 */
-		attachStateChanged: function(fnHandler) {
-			// Use promise to defer attachment until real wrapper is available and ready
-			oRealWrapperReadyPromise.then(function(oWrapper) {
-				oWrapper.attachStateChanged(fnHandler);
-			});
-		},
-
-		/**
-		 * Detach a state change handler. Forwards to real wrapper once available and ready.
-		 * @param {function} fnHandler - The event handler function to detach
-		 */
-		detachStateChanged: function(fnHandler) {
-			// Forward to real wrapper once available and ready
-			oRealWrapperReadyPromise.then(function(oWrapper) {
-				oWrapper.detachStateChanged(fnHandler);
-			});
-		},
+			/**
+			 * Detach a state change handler. Forwards to real wrapper once available and ready.
+			 * @param {function} fnHandler - The event handler function to detach
+			 */
+			detachStateChanged: function(fnHandler) {
+				// Forward to real wrapper once available and ready
+				oRealWrapperReadyPromise.then(function(oWrapper) {
+					oWrapper.detachStateChanged(fnHandler);
+				});
+			},
 
 			/**
 			 * Get the local ID of the control.
@@ -116,28 +121,30 @@ sap.ui.define([
 					JSON.stringify(oState) === JSON.stringify(oLatestState);
 			},
 
-		/**
-		 * Called after variant is initialized (for SmartTable/SmartChart wrappers).
-		 * Delegates to real wrapper once control is set and ready.
-		 * Note: When this is called, the control always exists (event fired by control),
-		 * so the promise will already be resolved.
-		 */
-		onAfterVariantInitialise: function() {
-			oRealWrapperReadyPromise.then(function(oWrapper) {
-				if (oWrapper.onAfterVariantInitialise) {
-					oWrapper.onAfterVariantInitialise();
-				}
-			});
-		},
-
-		/**
-		 * Promise that resolves to the bVMConnection flag value once the real wrapper is ready.
-		 * This indicates whether the control is connected to page-wide variant management.
-		 */
-		oVMConnectionPromise: oRealWrapperReadyPromise.then(function(oWrapper) {
-			return oWrapper.bVMConnection;
-		})
+			/**
+			 * Called after variant is initialized (for SmartTable/SmartChart wrappers).
+			 * Delegates to real wrapper once control is set and ready.
+			 * Note: When this is called, the control always exists (event fired by control),
+			 * so the promise will already be resolved.
+			 */
+			onAfterVariantInitialise: function() {
+				oRealWrapperReadyPromise.then(function(oWrapper) {
+					if (oWrapper.onAfterVariantInitialise) {
+						oWrapper.onAfterVariantInitialise();
+					}
+				});
+			},
+
+			/**
+			 * Promise that resolves to the bVMConnection flag value once the real wrapper is ready.
+			 * This indicates whether the control is connected to page-wide variant management.
+			 */
+			oVMConnectionPromise: oRealWrapperReadyPromise.then(function(oWrapper) {
+				return oWrapper.bVMConnection;
+			})
 		};
+
+		return oPublicInterface;
 	}
 
 	return PreliminaryWrapper;

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

@@ -9,7 +9,7 @@ sap.ui.define([
 	 * @param {object} oFactory - the controlStateWrapperFactory
 	 * @param {object} mParams
 	 * @param {array} mParams.managedControlWrappers - array of controlStateWrappers for controls handled by the SVM
-	 * (currently also including SFB wrapper - to be removed)
+	 * @param {object} mParams.smartFilterBarWrapper - explicit reference to SmartFilterBarWrapper for special handling
 	 * @returns {object}
 	 */
 
@@ -53,13 +53,15 @@ sap.ui.define([
 			});
 		});
 
+		// Get SmartFilterBarWrapper explicitly from params.
+		// This connection is needed because SmartFilterBar provides special callbacks to store/restore state
+		// for controls that don't have a direct variant management connection (bVMConnection = false), such as:
+		// - Extension filters (custom filters added via app or adaptation extensions)
+		// - Multiple views state (selected tab in multi-table/chart scenarios)
+		// These controls need their state saved/restored with variants via the SFB's beforeVariantFetch/afterVariantLoad events.
+		var oSmartFilterBarWrapper = mParams.smartFilterBarWrapper;
 
-
-		var oSmartFilterBarWrapper = mParams.managedControlWrappers.find(function(oWrapper){
-			return oWrapper.setSVMWrapperCallbacks;
-		});
-
-		// provide callbacks needed for SFB wrapper to store/restore extension state with variant
+		// Provide callbacks needed for SFB wrapper to store/restore extension state with variant
 		if (oSmartFilterBarWrapper){
 			// Build array with wrapper + bVMConnection info once all wrappers are ready
 			Promise.all(mParams.managedControlWrappers.map(function(oWrapper){

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

@@ -959,7 +959,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.142.7
+	 * @version 1.142.8
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {

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

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

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

@@ -66,7 +66,7 @@ sap.ui.define([
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.142.7",
+		version: "1.142.8",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {