@sapui5/sap.suite.ui.generic.template 1.108.54 → 1.108.55

package/package.json

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

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n_zh_CN.properties

@@ -63,7 +63,7 @@ SHOW_ACTIVE_ITEMS=\u9690\u85CF\u8349\u7A3F\u503C
 
 SHOW_ALL_ITEMS=\u663E\u793A\u8349\u7A3F\u503C
 
-MESSAGE_SINGLE_VALUE_L_FORM=\u8FC7\u6EE4\u5668 "{0}" \u4E0E\u6807\u7B7E "{1}" \u65E0\u5173\u3002\u8BBE\u7F6E\u6B64\u8FC7\u6EE4\u5668\u5BF9\u7ED3\u679C\u6CA1\u6709\u5F71\u54CD\u3002
+MESSAGE_SINGLE_VALUE_L_FORM=\u8FC7\u6EE4\u5668\u201C{0}\u201D\u4E0E\u6807\u7B7E\u201C{1}\u201D\u65E0\u5173\u3002\u8BBE\u7F6E\u6B64\u8FC7\u6EE4\u5668\u5BF9\u7ED3\u679C\u6CA1\u6709\u5F71\u54CD\u3002
 
 MESSAGE_SINGLE_VALUE_S_FORM=\u65E0\u6CD5\u5728 "{1}" \u6807\u7B7E\u4E0A\u6309 "{0}" \u8FDB\u884C\u8FC7\u6EE4\u3002
 
@@ -79,7 +79,7 @@ EDIT_REMAINING={1} \u4E2A\u5BF9\u8C61\u4E2D\u6709 {0} \u4E2A\u65E0\u6CD5\u8FDB\u
 
 EDIT_REMAINING_PLURAL={1} \u4E2A\u5BF9\u8C61\u4E2D\u6709 {0} \u4E2A\u65E0\u6CD5\u8FDB\u884C\u7F16\u8F91\u3002\u5982\u679C\u6709\u4EBA\u6B63\u5728\u5904\u7406\u8BE5\u5BF9\u8C61\u6216\u4E0D\u5141\u8BB8\u7F16\u8F91\uFF0C\u5C31\u53EF\u80FD\u4F1A\u53D1\u751F\u8FD9\u79CD\u60C5\u51B5\u3002\n\n \u662F\u5426\u8981\u7F16\u8F91\u5176\u4F59 {2} \u4E2A\u5BF9\u8C61\uFF1F
 
-MESSAGE_MULTIPLE_VALUES_L_FORM=\u67D0\u4E9B\u8FC7\u6EE4\u5668\u4E0E\u6807\u7B7E "{1}" \u65E0\u5173 ({0})\u3002\u8BBE\u7F6E\u8FD9\u4E9B\u8FC7\u6EE4\u5668\u5BF9\u7ED3\u679C\u6CA1\u6709\u5F71\u54CD\u3002
+MESSAGE_MULTIPLE_VALUES_L_FORM=\u67D0\u4E9B\u8FC7\u6EE4\u5668\u4E0E\u6807\u7B7E\u201C{1}\u201D\u65E0\u5173 ({0})\u3002\u8BBE\u7F6E\u8FD9\u4E9B\u8FC7\u6EE4\u5668\u5BF9\u7ED3\u679C\u6CA1\u6709\u5F71\u54CD\u3002
 
 MESSAGE_MULTIPLE_VALUES_S_FORM=\u65E0\u6CD5\u5728 "{1}" \u6807\u7B7E\u4E0A\u4F7F\u7528\u4EE5\u4E0B\u8FC7\u6EE4\u5668\uFF1A"{0}"\u3002
 

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

@@ -36,6 +36,12 @@ sap.ui.define([
 		var bIsApplying = false;
 		var aBasicFilters = [];
 		var oSmartFilterBar = oControl;
+		// Holds SVM callbacks once setSVMWrapperCallbacks is called. The afterVariantLoad handler
+		// is attached eagerly (in fnInitialize) so it fires even when setSVMWrapperCallbacks has
+		// not yet been called (race condition on second navigation: bAllControlsInitialized=true
+		// causes fnApplyVariantState to run synchronously, triggering afterVariantLoad before the
+		// Promise.all in SmartVariantManagementWrapper resolves and calls setSVMWrapperCallbacks).
+		var oSVMWrapperCallbacks = null;
 
 		var oVariantManagementInitializedPromise;
 
@@ -50,29 +56,11 @@ sap.ui.define([
 
 			// Initialize variant management promise
 			oVariantManagementInitializedPromise = oSmartFilterBar.getInitializedPromise();
-		}
-
-		// Attach to variantFetch and variantLoad events to be able to store and restore also custom filters and state of other controls (in case of page VM) with variant.
-		// Events for storing/restoring are provided by SFB, data to be stored/restored can come from 3 sources:
-		// - standard filters: handled directly by SFB
-		// - extension filters: provided from mParams.oCustomFiltersWrapper
-		// - other controls being part of VM: provided by oSVMWrapperCallbacks (controls with direct connection to VM are skipped in SVM wrapper)
-		function setSVMWrapperCallbacks(oSVMWrapperCallbacks){
-			// Before saving the current state as a new variant, we need to provide all state data of controls controlled by VM, but not known to it with setCustomFilterData. From a
-			// logical point of view, the event (beforeVariantFetch) as well as the method to store the extension data (setCustomFilterData) belong to SVM, but both are implemented
-			// in SFB. Additionally, beforeVariantSave would actually be the name more logical to the consumer, however that name had been used earlier and was deprecated and
-			// replaced by the given one. Fetch actually does not mean to fetch variant content from the place variants are stored, but to get the current state from the controls!
-			oSmartFilterBar.attachBeforeVariantFetch(function(){
-				var oCustomData = Object.create(null);
-				oCustomData[dataPropertyNameGeneric] = oSVMWrapperCallbacks.getManagedControlStates();
-				oCustomData[dataPropertyNameGeneric].customFilters = mParams.oCustomFiltersWrapper.getState();
-				oSmartFilterBar.setCustomFilterData(oCustomData);
-			});
 
-			// When a variant is loaded, correspondingly we have to get the customData and apply the states to the controls not known to SVM. Again, event and method are implemented
-			// 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.
+			// Attach afterVariantLoad eagerly so custom filter state is restored regardless of
+			// when setSVMWrapperCallbacks is called. setManagedControlStates is only called if
+			// SVM callbacks are already available; otherwise those controls are restored via the
+			// iAppState path (SmartVariantManagementWrapper.fnSetManagedControlStates).
 			oSmartFilterBar.attachAfterVariantLoad(function(){
 				// Suppress state change events while restoring extension filter values from variant.
 				// Without this, restoring custom filters (e.g. DynamicDateRange, MultiComboBox) triggers
@@ -91,10 +79,34 @@ sap.ui.define([
 					};
 				aBasicFilters = oSmartFilterBar.getAllFilterItems(true);
 				mParams.oCustomFiltersWrapper.setState(oCustomFiltersState);
-				oSVMWrapperCallbacks.setManagedControlStates(oCustomData[dataPropertyNameGeneric]);
+				if (oSVMWrapperCallbacks) {
+					oSVMWrapperCallbacks.setManagedControlStates(oCustomData[dataPropertyNameGeneric]);
+				}
 				bIsApplying = false;
 			});
+		}
 
+		// When a variant is loaded, correspondingly we have to get the customData and apply the states to the controls not known to SVM. Again, event and method are implemented
+		// 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.
+		// Attach to variantFetch and variantLoad events to be able to store and restore also custom filters and state of other controls (in case of page VM) with variant.
+		// Events for storing/restoring are provided by SFB, data to be stored/restored can come from 3 sources:
+		// - standard filters: handled directly by SFB
+		// - extension filters: provided from mParams.oCustomFiltersWrapper
+		// - other controls being part of VM: provided by oSVMWrapperCallbacks (controls with direct connection to VM are skipped in SVM wrapper)
+		function setSVMWrapperCallbacks(oCallbacks){
+			oSVMWrapperCallbacks = oCallbacks;
+			// Before saving the current state as a new variant, we need to provide all state data of controls controlled by VM, but not known to it with setCustomFilterData. From a
+			// logical point of view, the event (beforeVariantFetch) as well as the method to store the extension data (setCustomFilterData) belong to SVM, but both are implemented
+			// in SFB. Additionally, beforeVariantSave would actually be the name more logical to the consumer, however that name had been used earlier and was deprecated and
+			// replaced by the given one. Fetch actually does not mean to fetch variant content from the place variants are stored, but to get the current state from the controls!
+			oSmartFilterBar.attachBeforeVariantFetch(function(){
+				var oCustomData = Object.create(null);
+				oCustomData[dataPropertyNameGeneric] = oSVMWrapperCallbacks.getManagedControlStates();
+				oCustomData[dataPropertyNameGeneric].customFilters = mParams.oCustomFiltersWrapper.getState();
+				oSmartFilterBar.setCustomFilterData(oCustomData);
+			});
 		}
 		function fnGetState() {
 			var oUiState = oSmartFilterBar.getUiState();

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.54
+	 * @version 1.108.55
 	 * @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/ComponentUtils.js

@@ -755,8 +755,14 @@ sap.ui.define(["sap/ui/base/Object",
 		function setPaginatorInfo(oPaginatorInfo){
 			var iViewLevel = getViewLevel();
 			// The listBinding which shall be passed to the paginatorInfo might already been marked for refresh. In this case the paginator info is invalidated for the paginator buttons but still may be used for the 'Save and next'.
-			if (oPaginatorInfo && !oPaginatorInfo.suppressButtons && oPaginatorInfo.objectPageNavigationContexts.length > 0){
-				var oSampleContext = oPaginatorInfo.objectPageNavigationContexts[0];
+			// The following code is used to find out whether we need to suppress the buttons (if this is not already known).
+			// To this end we first need to find out which entity set the paginatorInfo points to (relevant in multi entity set scenarios).
+			// This is derived from one of the contexts in oPaginatorInfo.objectPageNavigationContexts.
+			// Note that this list may contain undefined entries in case of tree table.
+			var oSampleContext = oPaginatorInfo && !oPaginatorInfo.suppressButtons && oPaginatorInfo.objectPageNavigationContexts.find(function(oContext){
+				return oContext;
+			});
+			if (oSampleContext){
 				var oContextInfo = oDataModelHelper.analyseContext(oSampleContext);
 				var sEntitySet = oContextInfo.entitySet;                         
 				oPaginatorInfo.suppressButtons = oComponentRegistryEntry.mRefreshInfos[sEntitySet] || oComponent.getIsRefreshRequired();

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

@@ -2981,7 +2981,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.54
+	 * @version 1.108.55
 	 * @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.54",
+		version: "1.108.55",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {