@sapui5/sap.suite.ui.generic.template 1.108.48 → 1.108.49

package/package.json

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

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

@@ -51,7 +51,7 @@ sap.ui.define([
 
 			function onSmartFilterBarInitialise(oEvent) {
 				var oSmartFilterbar = oEvent.getSource();
-				// Apply filter defaults from the Selection Variant Annotation. 
+				// Apply filter defaults from the Selection Variant Annotation.
 				var sAnnotationPath = oController.getOwnerComponent().getAnnotationPath();
 				if (sAnnotationPath !== undefined) {
 					fnApplyFilterDefaultsFromSV(oSmartFilterbar, sAnnotationPath);
@@ -137,7 +137,7 @@ sap.ui.define([
 				}
 				oTemplateUtils.oCommonEventHandlers.onSemanticObjectLinkNavigationTargetObtained(oState.oPresentationControlHandler.getEntitySet(), {}, oEventParameters, oState, sTitle);
 			}
-			
+
 			function getItemInTable(sContextPath) {
 				var aItems = oViewProxy.getItems();
 				for (var i = 0; i < aItems.length; i++) {
@@ -321,7 +321,7 @@ sap.ui.define([
 					shareTilePressed: function() {
 						ShareUtils.fireBookMarkPress();
 					},
-					
+
 					getDownloadUrl: function () {
 						var oBinding = oState.oPresentationControlHandler.getBinding(oState);
 						return oBinding && oBinding.getDownloadUrl() || "";
@@ -346,7 +346,7 @@ sap.ui.define([
 						var oMetadata = oController.getOwnerComponent().getAppComponent().getMetadata();
 						var oUIManifest = oMetadata.getManifestEntry("sap.ui");
 						var oAppManifest = oMetadata.getManifestEntry("sap.app");
-						
+
 						return oFragmentController.getServiceUrl().then(function(sServiceUrl) {
                             return ShareUtils.getCurrentUrl().then(function (sCurrentUrl) {
 								return {
@@ -473,6 +473,9 @@ sap.ui.define([
 				});
 			}
 
+			// Expose selected private functions to unit tests
+			/* eslint-enable */
+
 			// Generation of Event Handlers
 			return {
 				onInit: function () {
@@ -488,10 +491,10 @@ sap.ui.define([
 					var oMultipleViewsHandler = new MultipleViewsHandler(oState, oController, oTemplateUtils);
 					oState.oMultipleViewsHandler = oMultipleViewsHandler;
 					oState.oMessageStripHelper = new MessageStripHelper(oState.oPresentationControlHandler, oMultipleViewsHandler, oController, oTemplateUtils, "listReport");
-					// proxy for oCommonUtils.refreshModel that ensures that also the other SmartTable instances 
-					// pointing to the same entity set will be refreshed 
+					// proxy for oCommonUtils.refreshModel that ensures that also the other SmartTable instances
+					// pointing to the same entity set will be refreshed
 					oState.refreshModel = function () {
-						/* getEntitySet should not be a method of PresentationControlHandler. For more details, refer to the comment 
+						/* getEntitySet should not be a method of PresentationControlHandler. For more details, refer to the comment
 			   	   		   mentioned before the method's definition in the class */
 						var bIsInvalidating = oTemplateUtils.oCommonUtils.refreshModel(oState.oPresentationControlHandler.getEntitySet());
 						if (bIsInvalidating) {
@@ -502,7 +505,7 @@ sap.ui.define([
 					oState.oWorklistHandler = new WorklistHandler(oState, oController, oTemplateUtils);
 					oState.oIappStateHandler = new IappStateHandler(oState, oController, oTemplateUtils);
 					oState.oMultiEditHandler = new MultiEditHandler(oState, oController, oTemplateUtils);
-					
+
 
 					var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
 					oTemplatePrivateModel.setProperty("/generic/bDataAreShownInTable", false);
@@ -525,7 +528,7 @@ sap.ui.define([
 
 					// initialise the message trip in LR to be hidden on load
 					oTemplatePrivateModel.setProperty("/listReport/multipleViews/msgVisibility", false);
-					
+
 					oViewProxy.adaptToChildContext = function(sCurrentChildContext) {
 						oState.oPresentationControlHandler.scrollToSelectedItemAsPerChildContext(sCurrentChildContext);
 					};
@@ -597,6 +600,9 @@ sap.ui.define([
 				},
 
 				handlers: {
+					onAfterVariantInitialise: function(oEvent) {
+						oTemplateUtils.oCommonUtils.getControlStateWrapper(oEvent.getSource()).onAfterVariantInitialise();
+					},
 					addEntry: addEntry,
 					addEntryWithFilters: addEntryWithFilters,
 					deleteEntries: fnDeleteEntries,

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

@@ -209,12 +209,6 @@ sap.ui.define([
 		// 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)
 		// Due to direct connection between SVM and SFB, also their wrappers need to each other directly. Remarks:
@@ -224,14 +218,19 @@ sap.ui.define([
 		var oSmartVariantManagement = oState.oSmartFilterbar.getSmartVariant();
 		if (oSmartVariantManagement){
 			var oSmartVariantManagementWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapper(oSmartVariantManagement, {
-				managedControlWrappers: aPageVariantControlStateWrappers.concat([oSmartFilterBarWrapper]),
-				dynamicPageWrapper: oDynamicPageWrapper
+				managedControlWrappers: aPageVariantControlStateWrappers.concat([oSmartFilterBarWrapper])
 			});
 			aControlStateWrappers.push(oSmartVariantManagementWrapper);
 		} else {
 			aControlStateWrappers.push(oSmartFilterBarWrapper);
 		}
 
+		// DynamicPage state: header pinned
+		var oDynamicPage = oController.byId(StableIdHelper.getStableId({type: "ListReportPage", subType: "DynamicPage"}));
+		// The DynamicPage state (header pinned) is intentionally stored only in iAppState and not included in any variant (neither page variant nor SFB variant).
+		var oDynamicPageWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapper(oDynamicPage);
+		aControlStateWrappers.push(oDynamicPageWrapper);
+
 
 		// Wrapper to control whether data is loaded
 
@@ -778,7 +777,8 @@ sap.ui.define([
 				// For desktop devices, expand the header for Standard and Custom variants and for tablet and mobile devices,
 				// collapse the header only if search is triggered.
 				if (Device.system.desktop) {
-					oTemplateUtils.oCommonUtils.getControlStateWrapper(oController.byId(StableIdHelper.getStableId({type: "ListReportPage", subType: "DynamicPage"}))).setHeaderState(oController, true);
+					var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
+					oTemplatePrivateModel.setProperty("/listReport/isHeaderExpanded", true);
 				} else {
 					collapseHeader();
 				}
@@ -891,6 +891,15 @@ sap.ui.define([
 			// regarding a), while SFB takes care to set the data for standard filters (created via annotation), for others (extension filters, edit state filter, anything else that
 			// should be controlled by VM (currently anything else we add to iAppState, but maybe that's only correct in case of page variant management)) we have to set it
 			// (independent of the context).
+			// Restore header collapse logic (originally removed in change 5641712)
+			// Collapse header when user manually selects a variant (context === undefined) that has executeOnSelect set to true
+			var oContext = oEvent.getParameter("context");
+			var bExecuteOnSelect = oEvent.getParameter("executeOnSelect");
+
+			if (oContext === undefined && bExecuteOnSelect) {
+				collapseHeader();
+			}
+
 			fnRestoreExtendedFilterDataOnAfterSFBVariantLoad(oEvent);
 		}
 

package/src/sap/suite/ui/generic/template/ListReport/view/fragments/SmartChart.fragment.xml

@@ -9,8 +9,9 @@
 	xmlns:smartChart="sap.ui.comp.smartchart">
 	<template:with path="entityType>com.sap.vocabularies.UI.v1.HeaderInfo" var="header">
 		<smartChart:SmartChart
-			id="listReport{= ${parameter>/settings/quickVariantSelectionX} ? ${path: 'tabItem>', formatter: 'sap.suite.ui.generic.template.js.AnnotationHelper.getSuffixFromIconTabFilterKey'} : ''}" 
-			visible="{path: 'tabItem>', formatter: 'sap.suite.ui.generic.template.js.AnnotationHelperMultipleViews.getVisibleForTableTabs'}"
+			id="listReport{= ${parameter>/settings/quickVariantSelectionX} ? ${path: 'tabItem>', formatter: 'sap.suite.ui.generic.template.js.AnnotationHelper.getSuffixFromIconTabFilterKey'} : ''}"
+			afterVariantInitialise="._templateEventHandlers.onAfterVariantInitialise"
+			visible="{path: 'tabItem>', formatter: 'AHMultipleViews.getVisibleForTableTabs'}"
 			smartFilterId=""
 			persistencyKey="listReportChart{= ${parameter>/settings/quickVariantSelectionX} ? ${path: 'tabItem>', formatter: 'sap.suite.ui.generic.template.js.AnnotationHelper.getSuffixFromIconTabFilterKey'} : ''}"
 			header="{path: 'header>TypeNamePlural', formatter: 'sap.ui.model.odata.AnnotationHelper.format'}"

package/src/sap/suite/ui/generic/template/ListReport/view/fragments/SmartTable.fragment.xml

@@ -10,6 +10,7 @@
 				<template:with path="parameter>/" helper="sap.suite.ui.generic.template.js.StableIdHelper.preparePathForStableId" var="smartTableId">
 					<template:if test="{= ${smartTableId>}.buildStableId({type: 'ListReportTable', subType: 'SmartTable', sQuickVariantKey: ${tabItem>key}})}" />
 					<smarttable:SmartTable id="{smartTableId>id}"
+						afterVariantInitialise="._templateEventHandlers.onAfterVariantInitialise"
 						smartFilterId="{= ${parameter>/settings/quickVariantSelectionX} ? '' : 'listReportFilter'}"
 						visible="{path: 'tabItem>', formatter: 'sap.suite.ui.generic.template.js.AnnotationHelperMultipleViews.getVisibleForTableTabs'}"
 						initialise="._templateEventHandlers.onTableInit"
@@ -204,7 +205,7 @@
 							<template:else >
 								<Table id="{:= ${parameter>/stableId}.getStableId({type: 'ListReportTable', subType: 'ResponsiveTable', sQuickVariantKey: ${tabItem>key}})}"
 									showOverlay="{= ${_templPriv>/listReport/firstSelection} &amp;&amp; !${_templPriv>/generic/bDataAreShownInTable}}"
-									fixedLayout="{= !${appSettings>/enableAutoColumnWidthForSmartTable} ? (${parameter>/settings/isWorklist} ? true : false) : undefined}" 
+									fixedLayout="{= !${appSettings>/enableAutoColumnWidthForSmartTable} ? (${parameter>/settings/isWorklist} ? true : false) : undefined}"
 									growing="true" growingScrollToLoad="true"
 									sticky="ColumnHeaders,HeaderToolbar"
 									mode="{tableSettings>mode}"

package/src/sap/suite/ui/generic/template/ObjectPage/controller/ControllerImplementation.js

@@ -2271,7 +2271,10 @@ sap.ui.define([
 					}
 				},
 				handlers: {
-					onEditAndActiveToggle: function () {
+					onAfterVariantInitialise: function(oEvent) {
+						oTemplateUtils.oCommonUtils.getControlStateWrapper(oEvent.getSource()).onAfterVariantInitialise();
+					},
+					onEditAndActiveToggle: function () { // Implementation of draft toggle for static header
 						var oUIModel = oObjectPage.getModel("ui");
 						var bIsEditable = oUIModel.getProperty("/editable");
 						oTemplateUtils.oServices.oApplication.performAfterSideEffectExecution(function () {

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_pt.properties

@@ -17,7 +17,7 @@ SAVED_VERSION=Vers\u00E3o gravada
 
 DRAFT_VERSION=Esbo\u00E7o
 
-SAVE=Gravar
+SAVE=Salvar
 
 SAVE_AND_EDIT=Salvar e editar
 

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_sh.properties

@@ -21,7 +21,7 @@ SAVE=Sa\u010Duvaj
 
 SAVE_AND_EDIT=Sa\u010Duvaj i uredi
 
-SAVE_AND_NEXT=Sa\u010Duvaj i slede\u0107e
+SAVE_AND_NEXT=Sa\u010Duvaj i idi na slede\u0107e
 
 CREATE=Kreiraj
 

package/src/sap/suite/ui/generic/template/ObjectPage/i18n/i18n_sr.properties

@@ -21,7 +21,7 @@ SAVE=\u0421\u0430\u0447\u0443\u0432\u0430\u0458
 
 SAVE_AND_EDIT=\u0421\u0430\u0447\u0443\u0432\u0430\u0458 \u0438 \u0443\u0440\u0435\u0434\u0438
 
-SAVE_AND_NEXT=\u0421\u0430\u0447\u0443\u0432\u0430\u0458 \u0438 \u0441\u043B\u0435\u0434\u0435\u045B\u0435
+SAVE_AND_NEXT=\u0421\u0430\u0447\u0443\u0432\u0430\u0458 \u0438 \u0438\u0434\u0438 \u043D\u0430 \u0441\u043B\u0435\u0434\u0435\u045B\u0435
 
 CREATE=\u041A\u0440\u0435\u0438\u0440\u0430\u0458
 

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/SmartChart.fragment.xml

@@ -17,6 +17,7 @@
 					<template:if test="{:= ${smartChartId>}.set(AH.getStableIdPartFromFacet(${facet>}) + '::Chart') }"/>
 					<smartChart:SmartChart
 						id="{smartChartId>value}"
+						afterVariantInitialise="._templateEventHandlers.onAfterVariantInitialise"
 						header="{chartAnnotation>Title/String}"
 						initialized="._templateEventHandlers.onChartInit"
 						requestAtLeastFields="{parts: [{path: 'chartAnnotation>'}, {path: 'entitySet>entityType'}], formatter: 'sap.suite.ui.generic.template.js.AnnotationHelper.getApplicablePathForChartToolbarActions'}"

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/SmartTable.fragment.xml

@@ -16,6 +16,7 @@
 								<template:if test="{= ${facetId>}.buildStableId({type: 'ObjectPage', subType: 'Facet', sRecordType: ${facet>RecordType}, sAnnotationPath: ${facet>Target/AnnotationPath}, sAnnotationId: ${facet>ID/String}, bIsHeaderFacet: ${isHeaderFacet>value}})}"/>
 								<template:if test="{= ${smartTableId>}.buildStableId({type: 'ObjectPageTable', subType: 'SmartTable', sFacet: ${facetId>id}})}" />
 								<st:SmartTable id="{smartTableId>id}"
+									afterVariantInitialise="._templateEventHandlers.onAfterVariantInitialise"
 									initialise="._templateEventHandlers.onTableInit($event, '{facetId>id}')"
 									persistencyKey="{parts: [{path: 'smartTableId>id'}, {path: 'objectPageTableSettings>value/persistencyKeyState'}], formatter: 'sap.suite.ui.generic.template.js.AnnotationHelper.getPersistencyKey'}"
 									tableBindingPath="{= ${path: 'target>AnnotationPath'}.slice(0, ${path: 'target>AnnotationPath'}.lastIndexOf('/')) }"
@@ -117,7 +118,7 @@
 											<st:customData>
 												<core:CustomData key="inlineCreate" value="{parts: [{path: 'facet>'}, {path: 'parameter>/settings/sections'}, {value: 'inline'}], formatter: 'sap.suite.ui.generic.template.js.AnnotationHelper.isInlineMode'}" />
 												<core:CustomData key="disableInlineCreateSort" value="{parts: [{path: 'facet>'}, {path: 'parameter>/settings/sections'}], formatter: 'sap.suite.ui.generic.template.js.AnnotationHelper.isInlineCreateSorting'}" />
-												<core:CustomData key="inlineCreationRows" value="{parts: [{path: 'facet>'}, {path: 'parameter>/settings/sections'}, {value: 'creationRows'}], formatter: 'sap.suite.ui.generic.template.js.AnnotationHelper.isInlineMode'}" />												
+												<core:CustomData key="inlineCreationRows" value="{parts: [{path: 'facet>'}, {path: 'parameter>/settings/sections'}, {value: 'creationRows'}], formatter: 'sap.suite.ui.generic.template.js.AnnotationHelper.isInlineMode'}" />
 												<core:CustomData key="isEntityCreatableUsingBooleanRestrictions" value="{= ${parts: [{path: 'listEntitySet>Org.OData.Capabilities.V1.InsertRestrictions'}, {path: 'listEntitySet>'}, {value: 'Insertable'}, {path: 'entitySet>name'}], formatter: 'sap.suite.ui.generic.template.js.AnnotationHelper.areBooleanRestrictionsValidAndPossible'}}"/>
 												<core:CustomData key="isEntityCreatableUsingPathRestrictions" value="{= ${parts: [{path: 'entitySet>'}, {path: 'listEntitySet>'}, {path: 'parameter>/settings/subPages/'}, {path: 'facet>'}, {path: 'parameter>/settings/sections'}, {path: 'parameter>/isDraftEnabled'}, {path: 'objectPageTableSettings>value/createWithParameterDialog'}], formatter: 'sap.suite.ui.generic.template.js.AnnotationHelper.isRelatedEntityCreatable'}}"/>
 											</st:customData>

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

@@ -8,18 +8,19 @@ sap.ui.define([
 	"sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/DynamicPageWrapper",
 	"sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartVariantManagementWrapper",
 	"sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/ObjectPageLayoutWrapper",
-	"sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SearchFieldWrapper"
+	"sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SearchFieldWrapper",
+	"sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/PreliminaryWrapper"
 ], function (BaseObject, extend, controlHelper, SmartFilterBarWrapper, SmartTableWrapper, SmartChartWrapper,
-	DynamicPageWrapper, SmartVariantManagementWrapper, ObjectPageLayoutWrapper, SearchFieldWrapper) {
+	DynamicPageWrapper, SmartVariantManagementWrapper, ObjectPageLayoutWrapper, SearchFieldWrapper, PreliminaryWrapper) {
 	"use strict";
-	
+
 	/**
 	 * Dummy wrapper for not existing or not (yet) supported controls (either not carrying a state or to be added in future). Also used as interface description for wrapper classes.
 	 */
 	 var oDummyWrapper = {
 		/**
 		 * Retrieve the current state of the control
-		 * 
+		 *
 		 * @return {object} serializable json object describing the current state of the control. Will be provided to setState exactly the same when restoring the state. Note: Structure of this object
 		 *         is up to the wrapper, no one outside will rely on it - with one exception: legacyStateHandler translates legacy states (without clear separation per control) to this format. Open:
 		 *         Should legacyStateHandler be responsible for providing most current version, or only first control specific version (i.e. first version using wrapper), and wrapper should be
@@ -28,7 +29,7 @@ sap.ui.define([
 		getState: Function.prototype,
 		/**
 		 * Restore the control to the given state
-		 * 
+		 *
 		 * @param {object} oState json object describing the state as provided by getState. Note: can also be undefined, if an old state is restored (from a release where the state of this control was
 		 *           not stored), if a state is provided in the URL that cannot be read (anymore), or on OP in discovery mode, if the user navigates to a new object instance - in these cases, the
 		 *           control has to be brought (back) into its initial state. Currently, expectation is the state to be restored synchronously. Planned:
@@ -40,13 +41,13 @@ sap.ui.define([
 		 * wrapper must provide an event to indicate a state change. Must be called whenever a user interacts with the control to change its state, but not when state is changed programmatically (e.g.
 		 * from setState, or when user interacts with a different control causing also this one to change (in that case, the event from the other control should be called) Function to register for that
 		 * event
-		 * 
+		 *
 		 * @param {function} fnHandler event handler function being attached
 		 */
 		attachStateChanged: Function.prototype,
 		/**
 		 * Function to deregister from event. Currently not used, but should be provided for symmetry reasons.
-		 * 
+		 *
 		 * @param {function} fnHandler event handler function being attached. Should only be deregistered, if provided exactly like in registration
 		 */
 		detachStateChanged: Function.prototype,
@@ -57,7 +58,7 @@ sap.ui.define([
 
 		/**
 		 * Returns true if the state provided as argument is same as the state applied.
-		 * @param {Object} oState State object which needs to be checked against the current 
+		 * @param {Object} oState State object which needs to be checked against the current
 		 * state of the wrapper.
 		 * @returns {boolean} True in case State object passed as argument match with current state else false.
 		 */
@@ -90,15 +91,65 @@ sap.ui.define([
 			};
 			return extend({}, oWrapper, oOverride);
 		}
-		
+
+		/**
+		 * Private helper function to create the real wrapper based on control and type.
+		 * This function is injected into PreliminaryWrapper and not exposed in the factory's public API.
+		 *
+		 * @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
+		 * @return {object} The real wrapper object for the control with helper methods attached
+		 */
+		function fnCreateRealWrapper(oControl, sType, mParams) {
+			var oWrapper;
+			switch (sType) {
+				case "SmartFilterBar":
+					oWrapper = new SmartFilterBarWrapper(oControl, oFactory, mParams);
+					break;
+				case "SmartTable":
+					oWrapper = new SmartTableWrapper(oControl, oController, oFactory);
+					break;
+				case "SmartChart":
+					oWrapper = new SmartChartWrapper(oControl, oController, oFactory);
+					break;
+				case "DynamicPage":
+					oWrapper = new DynamicPageWrapper(oControl);
+					break;
+				case "SmartVariantManagement":
+					oWrapper = new SmartVariantManagementWrapper(oControl, oController, oFactory, mParams);
+					break;
+				case "ObjectPageLayout":
+					oWrapper = new ObjectPageLayoutWrapper(oControl);
+					break;
+				case "SearchField":
+					oWrapper = new SearchFieldWrapper(oControl);
+					break;
+				default:
+					// control not carrying a state or no wrapper built yet
+					oWrapper = oDummyWrapper;
+			}
+
+			// Add helper methods to the real wrapper
+			var sId = oController.getView().getLocalId(oControl.getId());
+			oWrapper.getLocalId = function() { return sId; };
+			oWrapper.isCurrentState = oWrapper.isCurrentState || function (oState) {
+				return JSON.stringify(oState) === JSON.stringify(oWrapper.getState());
+			};
+
+			return oWrapper;
+		}
+
 		var oFactory = {
 			getSuppressChangeEventWhenApplyingWrapper: getSuppressChangeEventWhenApplyingWrapper,
+
 			/**
-			 * Factory function to generate control wrapper object based on control type
-			 * 
-			 * @param {sap.ui.core.control} oControl - control a wrapper should be provided for
+			 * Factory function to generate control wrapper object based on control type.
+			 * Always returns a PreliminaryWrapper, which delegates to the real wrapper internally.
+			 *
+			 * @param {sap.ui.core.Control} oControl - control a wrapper should be provided for
 			 * @param {object} [mParams] - map with any additional parameters passed to constructor of wrapper
-			 * @return {object} wrapper object for the control
+			 * @return {object} wrapper object for the control (always a PreliminaryWrapper)
 			 */
 			getControlStateWrapper: function (oControl, mParams) {
 				// checking for control here (instead of at all callers) allows simple use for optional controls
@@ -107,52 +158,63 @@ sap.ui.define([
 					// no need to add the dummy to the map
 					return oDummyWrapper;
 				}
-				var sId =  oController.getView().getLocalId(oControl.getId());
+				var sId = oController.getView().getLocalId(oControl.getId());
+
 				if (!mWrappers[sId]) {
-					var oWrapper;
+					// Determine control type
+					var sType;
 					switch (true) {
 						case controlHelper.isSmartFilterBar(oControl):
-							oWrapper = new SmartFilterBarWrapper(oControl, oFactory, mParams);
+							sType = "SmartFilterBar";
 							break;
 						case controlHelper.isSmartTable(oControl):
-							oWrapper = new SmartTableWrapper(oControl, oController, oFactory);
+							sType = "SmartTable";
 							break;
 						case controlHelper.isSmartChart(oControl):
-							oWrapper = new SmartChartWrapper(oControl, oController, oFactory);
+							sType = "SmartChart";
 							break;
 						case controlHelper.isDynamicPage(oControl):
-							oWrapper = new DynamicPageWrapper(oControl);
+							sType = "DynamicPage";
 							break;
 						case controlHelper.isSmartVariantManagement(oControl):
-							oWrapper = new SmartVariantManagementWrapper(oControl, oController, oFactory, mParams);
+							sType = "SmartVariantManagement";
 							break;
 						case controlHelper.isObjectObjectPageLayout(oControl):
-							oWrapper = new ObjectPageLayoutWrapper(oControl);
+							sType = "ObjectPageLayout";
 							break;
 						case controlHelper.isSearchField(oControl):
-							oWrapper = new SearchFieldWrapper(oControl);
+							sType = "SearchField";
 							break;
 						default:
-							// control not carrying a state or no wrapper build yet
-							oWrapper = oDummyWrapper;
+							// control not carrying a state or no wrapper built yet
+							return oDummyWrapper;
 					}
-					oWrapper.getLocalId = function() { return sId; };
-					oWrapper.isCurrentState = oWrapper.isCurrentState || function (oState) {
-						return JSON.stringify(oState) === JSON.stringify(oWrapper.getState());
-					};
-					
-					mWrappers[sId] = oWrapper;
+
+					// Always create a PreliminaryWrapper
+					var oPreliminaryWrapper = new PreliminaryWrapper(sId, sType, fnCreateRealWrapper, oController, mParams);
+
+					// Since control is available, immediately set it
+					oPreliminaryWrapper.setControl(oControl);
+
+					// Store the PreliminaryWrapper in map (not the real wrapper)
+					mWrappers[sId] = oPreliminaryWrapper;
+				} else if (mWrappers[sId].setControl) {
+					// PreliminaryWrapper already exists but control wasn't set yet - set it now
+					mWrappers[sId].setControl(oControl);
 				}
+
 				return mWrappers[sId];
 			},
 
 			/**
-			 * Factory function to generate control wrapper object based on control type
-			 * 
-			 * @param {string} sId - Id of the control for which wrapper needs to be initiated
+			 * Factory function to generate control wrapper object based on control ID and type.
+			 * Creates a PreliminaryWrapper when the control doesn't exist yet (e.g., lazy loading).
+			 * Always returns a PreliminaryWrapper, which delegates to the real wrapper internally.
+			 *
+			 * @param {string} sControlId - ID of the control for which wrapper needs to be initiated
 			 * @param {string} sControlType - Type of the control for which wrapper needs to be initiated
 			 * @param {object} [mParams] - map with any additional parameters passed to constructor of wrapper
-			 * @return {object} wrapper object for the control
+			 * @return {object} wrapper object for the control (always a PreliminaryWrapper)
 			 */
 			getControlStateWrapperById: function (sControlId, sControlType, mParams) {
 				// checking for control here (instead of at all callers) allows simple use for optional controls
@@ -161,40 +223,12 @@ sap.ui.define([
 					// no need to add the dummy to the map
 					return oDummyWrapper;
 				}
-				var sId =  oController.getView().getLocalId(sControlId);
+				var sId = oController.getView().getLocalId(sControlId);
 				if (!mWrappers[sId]) {
-					var oWrapper;
-					switch (sControlType) {
-						case "SmartFilterBar":
-							oWrapper = new SmartFilterBarWrapper(sControlId, oFactory, mParams);
-							break;
-						case "SmartTable":
-							oWrapper = new SmartTableWrapper(sControlId, oController, oFactory);
-							break;
-						case "SmartChart":
-							oWrapper = new SmartChartWrapper(sControlId, oController, oFactory);
-							break;
-						case "DynamicPage":
-							oWrapper = new DynamicPageWrapper();
-							break;
-						case "SmartVariantManagement":
-							oWrapper = new SmartVariantManagementWrapper(sControlId, oController, oFactory, mParams);
-							break;
-						case "ObjectPageLayout":
-							oWrapper = new ObjectPageLayoutWrapper(sControlId);
-							break;
-						case "SearchField":
-							oWrapper = new SearchFieldWrapper(sControlId);
-							break;
-						default:
-							// control not carrying a state or no wrapper build yet
-							oWrapper = oDummyWrapper;
-					}
-					oWrapper.getLocalId = function() { return sId; };
-					oWrapper.isCurrentState = oWrapper.isCurrentState || function (oState) {
-						return JSON.stringify(oState) === JSON.stringify(oWrapper.getState());
-					};
-					mWrappers[sId] = oWrapper;
+					// Create a PreliminaryWrapper (control will be set later)
+					var oPreliminaryWrapper = new PreliminaryWrapper(sId, sControlType, fnCreateRealWrapper, oController, mParams);
+
+					mWrappers[sId] = oPreliminaryWrapper;
 				}
 				return mWrappers[sId];
 			}
@@ -207,4 +241,4 @@ sap.ui.define([
 			extend(this, getMethods(oController));
 		}
 	});
-});
+});

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

@@ -2,67 +2,35 @@ sap.ui.define([
 ], function() {
 	"use strict";
 
-    function DynamicPageWrapper(vTarget) {
-        var oDynamicPage;
-        var oPreliminaryState;
-        var oControlAssignedResolve;
-        var oControlAssignedPromise = new Promise(function(resolve) {
-            oControlAssignedResolve = resolve;
-        });
-
-        if (typeof vTarget !== "string") {
-            fnSetControl(vTarget);
-        }
-        
+    function DynamicPageWrapper(oDynamicPage) {
         // Returns the state of the dynamic page
-        // Right now we only consider the pinned status of the dynamic page header 
+        // Right now we only consider the pinned status of the dynamic page header
         function fnGetState() {
-            if (oDynamicPage) {
-                var oControlState = {};
-                oControlState.headerPinned = oDynamicPage.getHeaderPinned();
-                return oControlState;
-            }
-
-            return oPreliminaryState;
+            var oControlState = {};
+            oControlState.headerPinned = oDynamicPage.getHeaderPinned();
+            return oControlState;
         }
 
         function fnSetState(oState) {
-            // Store the state till the control is initialized
-            oPreliminaryState = oState;
-            oControlAssignedPromise.then(function() {
-                if (oPreliminaryState && oPreliminaryState.headerPinned) {
-                    // There is a possibility that the header is collapsed at this point. Make sure it is expanded if we know the header is to be pinned.
-                    oDynamicPage.setHeaderExpanded(true);
-                    oDynamicPage.setHeaderPinned(true);
-                } else {
-                    oDynamicPage.setHeaderPinned(false);
-                }
-            });
+            if (oState && oState.headerPinned) {
+                // There is a possibility that the header is collapsed at this point. Make sure it is expanded if we know the header is to be pinned.
+                oDynamicPage.setHeaderExpanded(true);
+                oDynamicPage.setHeaderPinned(true);
+            } else {
+                oDynamicPage.setHeaderPinned(false);
+            }
         }
 
         function fnAttachStateChanged(fnHandler) {
-            oControlAssignedPromise.then(function() {
-                oDynamicPage.attachPinnedStateChange(fnHandler);
-            });
-        }
-
-        function fnSetControl(oControl) {
-            oDynamicPage = oControl;
-            oControlAssignedResolve(oDynamicPage);
-        }
-
-        function fnSetHeaderState(oController, bHeaderToBeExpanded) {
-            oController.getOwnerComponent().getModel("_templPriv").setProperty("/listReport/isHeaderExpanded", bHeaderToBeExpanded);
+            oDynamicPage.attachPinnedStateChange(fnHandler);
         }
 
-        return {
-            getState: fnGetState,
-            setState: fnSetState,
-            setControl: fnSetControl,
-            attachStateChanged: fnAttachStateChanged,
-            setHeaderState: fnSetHeaderState
-        };
+		return {
+			getState: fnGetState,
+			setState: fnSetState,
+			attachStateChanged: fnAttachStateChanged
+		};
     }
 
     return DynamicPageWrapper;
-});
+});