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

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

@@ -4,18 +4,24 @@ sap.ui.define([
 
 	/**
 	 * Constructor for SmartVariantManagementWrapper
-	 * @param {sap.ui.comp.smartvariants.SmartVariantManagement} vTarget - The SmartVariantManagement control
-	 * or the Id of control for which this wrapper is created
+	 * @param {sap.ui.comp.smartvariants.SmartVariantManagement} oControl - The SmartVariantManagement control
 	 * @param {object} oController - the controller of the current component
 	 * @param {object} oFactory - the controlStateWrapperFactory
 	 * @param {object} mParams
+<<<<<<< HEAD   (274a590a8af0bd77d9f27bbcd5f549d902fa60a9 Merge "[INTERNAL] Translation delivery: commit by LX Lab" in)
 	 * @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
+||||||| BASE   (38a1067f0575c68f4f40a7766314c763b315cee1 [INTERNAL] Translation delivery: commit by LX Lab)
+	 * @param {array} mParams.managedControlWrappers - array of controlStateWrappers for controls handled by the SVM
+	 * (currently also including SFB wrapper - to be removed)
+=======
+	 * @param {array} mParams.managedControlWrappers - array of controlStateWrappers for controls handled by the SVM
+	 * @param {object} mParams.smartFilterBarWrapper - explicit reference to SmartFilterBarWrapper for special handling
+>>>>>>> CHANGE (61636f588a5388c738612b2d57855c25f45efd46 [FIX] LR: Extension filter values now stored/restored in var)
+	 * @returns {object}
 	 */
 
-	function SmartVariantManagementWrapper(vTarget, oController, oFactory, mParams) {
+	function SmartVariantManagementWrapper(oControl, oController, oFactory, mParams) {
 		// Special handling of SmartFilterBarWrapper for several reasons:
 		// - Suppress selection when restoring a variant. Selection is solely triggered according to information in appState. Otherwise, erroneous selection could be triggered in
 		//		a few situations:
@@ -26,14 +32,10 @@ sap.ui.define([
 		//	- Store and restore extension state (extension implemented in SFB instead of SVM, which would be more appropriate from architectural point of view)
 		// flag to control whether we are currently in the process of applying a state to suppress the event to inform about a new state´
 		// only needed when setting the variant itself - for managed controls, their wrappers should avoid firing the event themselves
-		var oSmartVariantManagement, fnResolveControlAssigned, oPreliminaryState;
-		var oControlAssignedPromise = new Promise(function (resolve) {
-			fnResolveControlAssigned = resolve;
-		});
-
-		if (typeof vTarget !== "string") {
-            fnSetControl(vTarget);
-        }
+		var oSmartVariantManagement = oControl;
+		var oPreliminaryState;
+		var bIsApplyingVariant = false;
+		var bAllControlsInitialized = false;
 
 		// Handles the state of the variant management itself (i.e. which variant is selected and whether it's dirty), including the state of the managed controls.
 		// Is responsible esp. to restore this state with correct dependency resp. in correct order
@@ -50,69 +52,74 @@ sap.ui.define([
 		// For these controls, a real user changes are already handled by the direct connection. On the other hand, these controls also fire their change events, if their state is
 		// changed from SVM (by the same connection) - setting variant dirty here would be wrong.
 		mParams.managedControlWrappers.forEach(function(oWrapper){
-			if (!oWrapper.bVMConnection){
-				oWrapper.attachStateChanged(function(){
-					oSmartVariantManagement.currentVariantSetModified(true);
-				});
-			}
+			(oWrapper.oVMConnectionPromise || Promise.resolve(oWrapper.bVMConnection)).then(function(bVMConnection) {
+				if (!bVMConnection) {
+					oWrapper.attachStateChanged(function(){
+						oSmartVariantManagement.currentVariantSetModified(true);
+					});
+				}
+			});
 		});
 
+		// 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;
 
-
-		function fnSetControl(oControl) {
-			oSmartVariantManagement = oControl;
-			fnResolveControlAssigned(oSmartVariantManagement);
-		}
-
-		var oSmartFilterBarWrapper = mParams.managedControlWrappers.find(function(oWrapper){
-			return oWrapper.setSVMWrapperCallbacks;
-		});
-
-		// provide callbacks needed for SFB wrapper to store/restore extnesion state with variant
+		// Provide callbacks needed for SFB wrapper to store/restore extension state with variant
 		if (oSmartFilterBarWrapper){
-			oSmartFilterBarWrapper.setSVMWrapperCallbacks({
-				getManagedControlStates: function(){
-					var mManagedControlStates = Object.create(null);
-					mParams.managedControlWrappers.forEach(function(oWrapper){
-						if (!oWrapper.bVMConnection){
-							mManagedControlStates[oWrapper.getLocalId()] = oWrapper.getState();
-						}
-					});
-					return mManagedControlStates;
-				},
-				setManagedControlStates: function(oState){
-					mParams.managedControlWrappers.forEach(function(oWrapper){
-						if (!oWrapper.bVMConnection){
-							oWrapper.setState(oState[oWrapper.getLocalId()]);
-						}
-					});
-				},
-				setHeaderState: function(bHeaderToBeExpanded) {
-					mParams.dynamicPageWrapper.setHeaderState(oController, bHeaderToBeExpanded);
-				}
+			// Build array with wrapper + bVMConnection info once all wrappers are ready
+			Promise.all(mParams.managedControlWrappers.map(function(oWrapper){
+				return (oWrapper.oVMConnectionPromise || Promise.resolve(oWrapper.bVMConnection)).then(function(bVMConnection){
+					return {
+						wrapper: oWrapper,
+						bVMConnection: bVMConnection
+					};
+				});
+			})).then(function(aWrapperInfo) {
+				oSmartFilterBarWrapper.setSVMWrapperCallbacks({
+					getManagedControlStates: function(){
+						var mManagedControlStates = Object.create(null);
+						aWrapperInfo.forEach(function(oInfo){
+							if (!oInfo.bVMConnection) {
+								mManagedControlStates[oInfo.wrapper.getLocalId()] = oInfo.wrapper.getState();
+							}
+						});
+						return mManagedControlStates;
+					},
+					setManagedControlStates: function(oState){
+						aWrapperInfo.forEach(function(oInfo){
+							if (!oInfo.bVMConnection) {
+								oInfo.wrapper.setState(oState[oInfo.wrapper.getLocalId()]);
+							}
+						});
+					}
+				});
 			});
 		}
 
+		// Create promise that resolves when all managed controls' variant management is ready
+		// This ensures getState() can query controls even if setState() is never called (e.g., app starts from scratch)
+		var oAllControlsInitializedPromise = Promise.all(
+			mParams.managedControlWrappers.map(function(oWrapper){
+				return oWrapper.oVariantManagementInitializedPromise || Promise.resolve();
+			})
+		);
+
+		// Set flag when all controls are initialized
+		oAllControlsInitializedPromise.then(function() {
+			bAllControlsInitialized = true;
+		});
+
 		// Wrapper is intended to set a state to the ui, but not to trigger a selection (which should happen only after all (relevant) parts of ui state is set to the correct state
 		// are set correct. Therefore, setting variant from here should never trigger a selection.
 		function fnSetVariant(sVariantId){
 			if (oSmartFilterBarWrapper){
 				oSmartFilterBarWrapper.suppressSelection(true);
 			}
-			var sId = mParams.managedControlWrappers[0].getLocalId();
-			var oControl = oController.getView().byId(sId);
-			if (oControl && oControl.isA("sap.ui.comp.smarttable.SmartTable")) {
-				oControl.attachAfterVariantInitialise(function() {
-					//set currentVariantId only when sVariantId is not standard (as it might be overriding existing
-					//different currentVariantId) or smartTable's (oControl) currentVariantId is not equal to sVariantId.
-					if (sVariantId !== '*standard*' && sVariantId !== '') {
-						if (oControl.getCurrentVariantId && oControl.getCurrentVariantId() !== sVariantId) {
-							oControl.setCurrentVariantId(sVariantId);
-						}
-						oSmartVariantManagement.setModified(false);
-					}
-				});
-			}
 			oSmartVariantManagement.setCurrentVariantId(sVariantId);
 			if (oSmartFilterBarWrapper){
 				oSmartFilterBarWrapper.suppressSelection(false);
@@ -133,7 +140,11 @@ sap.ui.define([
 		}
 
 		function getState() {
-			if (!oSmartVariantManagement) {
+			// Return preliminary state if managed controls not fully initialized
+			// Note: If early getState() calls become an issue (controls not initialized yet), we could enhance this to:
+			// - Store only SVM-specific data (variantId, modified) in oPreliminaryState
+			// - Always query managed control wrappers directly (they handle their own preliminary state via PreliminaryWrapper)
+			if (!bAllControlsInitialized) {
 				return oPreliminaryState;
 			}
 
@@ -150,22 +161,23 @@ sap.ui.define([
 
 		function setState(oState) {
 			oPreliminaryState = oState;
-			oControlAssignedPromise.then(function() {
+
+			// Wait for all managed controls to be initialized before applying state
+			oAllControlsInitializedPromise.then(function() {
+				bIsApplyingVariant = true;
 				if (!oPreliminaryState) {
 					// if no state is provided set default variant (not modified)
 					// use cases:
 					// - LR: if appStateKey in the URL that cannot be read
 					// - OP: if switching to different object instance (in discovery mode always, in persistency mode when page was not shown)
 					fnSetVariant(oSmartVariantManagement.getDefaultVariantId());
-					return;
-				}
-				if (oPreliminaryState.modified) {
+				} else if (oPreliminaryState.modified) {
 					// Special logic according to UX: If variant was modified anyway, there's no benefit for the user to see the name (but it could be confusing), so standard variant (not default!) should be
 					// set (which is achieved by empty string)
 					fnSetVariant("");
+					oSmartVariantManagement.currentVariantSetModified(true);
 					// Usually restoring the state of any of the managed controls should mark the variant as dirty, but there might be edge cases (state from an old release not containing information for any
 					// managed control now relevant), so to be on the safe side, we set modified=true explicitly.
-					oSmartVariantManagement.currentVariantSetModified(true);
 					fnSetManagedControlStates(oPreliminaryState);
 				} else {
 					fnSetVariant(oPreliminaryState.variantId);
@@ -183,6 +195,7 @@ sap.ui.define([
 						}
 					}
 				}
+				bIsApplyingVariant = false;
 			});
 		}
 
@@ -190,26 +203,30 @@ sap.ui.define([
 			// state of variant management itself can be changed directly (user selects a different variant or stores current state as (new) variant), or indirectly (user changes some
 			// data of a control managed by VM, e.g. some filter values in SFB)
 
-			oControlAssignedPromise.then(function() {
-				// state change when user selects a different variant
-				oSmartVariantManagement.attachSelect(fnHandler);
+			// Wrap the handler to suppress events when applying a variant
+			var fnSuppressibleHandler = function() {
+				if (!bIsApplyingVariant) {
+					fnHandler();
+				}
+			};
 
-				// when user saves current state as a new variant, this is also a state change (as the variant id is part of the state)
-				// note: Even if new (SFB) variant is marked as execute on select, and currently no data is selected, no need to select data here (and thus also not to collapse header).
-				// This is one of the possible ways to get into a state with a clean variant with execute on select, but no data loaded - see also comment to identify SFB wrapper.
-				oSmartVariantManagement.attachAfterSave(fnHandler);
+			// state change when user selects a different variant
+			oSmartVariantManagement.attachSelect(fnSuppressibleHandler);
 
-				// any change of a managed control is state change
-				mParams.managedControlWrappers.forEach(function(oWrapper){
-					oWrapper.attachStateChanged(fnHandler);
-				});
+			// when user saves current state as a new variant, this is also a state change (as the variant id is part of the state)
+			// note: Even if new (SFB) variant is marked as execute on select, and currently no data is selected, no need to select data here (and thus also not to collapse header).
+			// This is one of the possible ways to get into a state with a clean variant with execute on select, but no data loaded - see also comment to identify SFB wrapper.
+			oSmartVariantManagement.attachAfterSave(fnSuppressibleHandler);
+
+			// any change of a managed control is state change
+			mParams.managedControlWrappers.forEach(function(oWrapper){
+				oWrapper.attachStateChanged(fnSuppressibleHandler);
 			});
 		}
 
 		return {
 			getState : getState,
 			setState : setState,
-			setControl: fnSetControl,
 			attachStateChanged : attachStateChanged
 		};
 	}

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

@@ -126,17 +126,36 @@ sap.ui.define([
 			return sAcceptableMimeType.slice(0, -1);
 		},
 
-		getDeleteStreamVisibility: function(oInterface, oMediaType, bIsDraftEnabled, oEntitySet){
+		// funtion return the controlling binding path form by annotation/metadata/fieldcontrol path
+        getControlPath: function(oEntitySet, oFieldControl) {
+            var sPath = "";
+            var sAnnotationUpdatablePath = oEntitySet && oEntitySet["Org.OData.Capabilities.V1.UpdateRestrictions"] && oEntitySet["Org.OData.Capabilities.V1.UpdateRestrictions"]["Updatable"] && oEntitySet["Org.OData.Capabilities.V1.UpdateRestrictions"]["Updatable"].Path;
+            var sMetadataUpdatable = oEntitySet && (oEntitySet["sap:updatable"] || oEntitySet["sap:updatable-path"]);
+            if (sAnnotationUpdatablePath || sMetadataUpdatable) {
+                sPath = '${' + (sAnnotationUpdatablePath || sMetadataUpdatable) + '} !== false';
+            }
+            if (oFieldControl) {
+                var sFCPath = oFieldControl && oFieldControl.Path;
+                sPath += ' && ${' + sFCPath + '} > "1"';
+            }
+            return sPath;
+        },
+
+		getDeleteStreamVisibility: function (oInterface, oMediaType, bIsDraftEnabled, oEntitySet) {
 			var oEntityType = oEntitySet && oInterface.getModel(0).getODataEntityType(oEntitySet.entityType);
-			var sFCPath = oEntityType && oEntityType["com.sap.vocabularies.Common.v1.FieldControl"] && oEntityType["com.sap.vocabularies.Common.v1.FieldControl"].Path;
+			var oFieldControl = oEntityType && oEntityType["com.sap.vocabularies.Common.v1.FieldControl"];
+			if (oFieldControl && oFieldControl.EnumMember === "com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly") {
+				return false;
+			}
+			var sPath = oAnnotationHelperStreamSupport.getControlPath(oEntitySet, oFieldControl);
 			if (bIsDraftEnabled) {
-				return sFCPath ? '{= ${' + oMediaType + '} !== "" && ${ui>/editable} && ${' + sFCPath + '} > "1"}' : '{= ${' + oMediaType + '} !== "" && ${ui>/editable}}';
+				return sPath ? '{= ${' + oMediaType + '} !== "" && ${ui>/editable} && ' + sPath + '}' : '{= ${' + oMediaType + '} !== "" && ${ui>/editable}}';
 			} else {
-				return sFCPath ? '{= ${' + oMediaType + '} !== "" && !${ui>/editable} && ${' + sFCPath + '} > "1"}' : '{= ${' + oMediaType + '} !== "" && !${ui>/editable}}';
+				return sPath ? '{= ${' + oMediaType + '} !== "" && !${ui>/editable} && ' + sPath + '}' : '{= ${' + oMediaType + '} !== "" && !${ui>/editable}}';
 			}
 		},
 
-		getFileUploaderVisibility: function(oInterface, bIsDraftEnabled, oEntitySet){
+		getFileUploaderVisibility: function (oInterface, bIsDraftEnabled, oEntitySet) {
 			var oEntityType = oEntitySet && oInterface.getModel(1).getODataEntityType(oEntitySet.entityType);
 			var sFCPath = oEntityType && oEntityType["com.sap.vocabularies.Common.v1.FieldControl"] && oEntityType["com.sap.vocabularies.Common.v1.FieldControl"].Path;
 			var bRestrictions = AnnotationHelper.getUpdateRestrictions(oEntitySet);
@@ -157,7 +176,7 @@ sap.ui.define([
 				}
 			}
 		}
-    };
+	};
 
 		oAnnotationHelperStreamSupport.checkIfEntityOrAssociationHasStreamEnabled.requiresIContext = true;
 		oAnnotationHelperStreamSupport.getFileName.requiresIContext = true;

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.48
+	 * @version 1.108.50
 	 * @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/CommonUtils.js

@@ -1336,16 +1336,16 @@ sap.ui.define(["sap/ui/base/Object",
 
 		function setStreamData(oStreamData, sNavigationProperty){
 			if (oStreamData && oStreamData.__metadata){
-				var edit_media = oStreamData.__metadata.edit_media;
+				var media_url = oStreamData.__metadata.edit_media || oStreamData.__metadata.media_src;
 				var content_type = oStreamData.__metadata.content_type;
 				var urlPath = "";
-				if (edit_media) {
-					if (edit_media.startsWith("http:") || edit_media.startsWith("https:")) {
+				if (media_url) {
+					if (media_url.startsWith("http:") || media_url.startsWith("https:")) {
 						//To ensure code is backward compatible with older versions of SAP Gateway
-						var url = edit_media && new URL(edit_media);
+						var url = media_url && new URL(media_url);
 						urlPath = url && url.pathname;
 					} else {
-						urlPath = edit_media;
+						urlPath = media_url;
 					}
 				}
 				var bIcon = IconPool.getIconForMimeType(content_type);

package/src/sap/suite/ui/generic/template/lib/i18n/i18n_fi.properties

@@ -283,9 +283,9 @@ NOITEMS_SMARTTABLE_WITH_FILTER_FOR_SEGMENTEDBUTTON=EiRivej\u00E4ValSuodPerJaTaul
 
 NOITEMS_SMARTCHART=Tietoja ei l\u00F6ytynyt.
 
-NOITEMS_LR_SMARTCHART=EiTietValSuodPerJaKaavN\u00E4kVart
+NOITEMS_LR_SMARTCHART=Ei tietoja valitulla suodatinperusteella ja kaavion\u00E4kym\u00E4ll\u00E4.
 
-NOITEMS_SMARTCHART_WITH_FILTER=TietEiL\u00F6ydy. YrS\u00E4\u00E4tSuodParam.
+NOITEMS_SMARTCHART_WITH_FILTER=Tietoja ei l\u00F6ytynyt. Yrit\u00E4 s\u00E4\u00E4t\u00E4\u00E4 suodatusperusteita. 
 
 SMARTCHART_INITIAL_NODATA=Aseta suodattimet ja aloita.
 

package/src/sap/suite/ui/generic/template/lib/i18n/i18n_fr.properties

@@ -47,13 +47,13 @@ ST_STREAM_OPEN_FILE=Ouvrir fichier
 
 ST_DRAFT_OWNER=par {0}
 
-ST_DRAFT_ANOTHER_USER=d'un autre utilisateur
+ST_DRAFT_ANOTHER_USER=par un autre utilisateur
 
 DATA_PASTE_ERROR_MESSAGE=Impossible de coller. {0} \u00E9l\u00E9ments contiennent des donn\u00E9es non valides.
 
 DATA_PASTE_ERROR_CORRECTION_MESSAGE=Corrigez les valeurs indiqu\u00E9es ci-dessous dans votre fichier source.
 
-DATA_PASTE_ERROR_CORRECTION_NOTE=(Note \: ligne/colonne indique la position dans l'ensemble des donn\u00E9es qu vous avez copi\u00E9.)
+DATA_PASTE_ERROR_CORRECTION_NOTE=(Note \: La ligne/colonne indique la position dans l'ensemble des donn\u00E9es que vous avez copi\u00E9.)
 
 DATA_PASTE_UNSUPPORTED_FORMAT_MESSAGE=Coller indisponible pour cette table.
 

package/src/sap/suite/ui/generic/template/lib/i18n/i18n_ru.properties

@@ -11,7 +11,7 @@ ST_GENERIC_ERROR_LOAD_DATA_TEXT=\u0417\u0430\u043F\u0440\u043E\u0448\u0435\u043D
 
 ST_GENERIC_NO_ITEM_SELECTED=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u044D\u043B\u0435\u043C\u0435\u043D\u0442.
 
-ST_GENERIC_MULTIPLE_ITEMS_SELECTED=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0442\u043E\u043B\u044C\u043A\u043E \u043E\u0434\u0438\u043D \u044D\u043B\u0435\u043C\u0435\u043D\u0442.
+ST_GENERIC_MULTIPLE_ITEMS_SELECTED=\u0412\u044B\u0431\u0435\u0440\u0438\u0442\u0435 \u0442\u043E\u043B\u044C\u043A\u043E \u043E\u0434\u043D\u0443 \u043F\u043E\u0437\u0438\u0446\u0438\u044E.
 
 ST_DATA_LOSS_TECHNICAL_ERROR_DISCARD=\u0418\u0437-\u0437\u0430 \u0442\u0435\u0445\u043D\u0438\u0447\u0435\u0441\u043A\u043E\u0439 \u043E\u0448\u0438\u0431\u043A\u0438 \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F \u043D\u0435 \u0431\u044B\u043B\u0438 \u043F\u0440\u0438\u043C\u0435\u043D\u0435\u043D\u044B. \u0421\u0431\u0440\u043E\u0441\u0438\u0442\u044C \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F \u0438 \u0432\u0435\u0440\u043D\u0443\u0442\u044C\u0441\u044F \u043D\u0430 \u043F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0443\u044E \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0443?
 
@@ -275,11 +275,11 @@ ST_NAV_ERROR_MODEL_READ_FAILED=\u041D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441
 
 NEW_OBJECT=\u041E\u0431\u044A\u0435\u043A\u0442 \u0431\u0435\u0437 \u0438\u043C\u0435\u043D\u0438
 
-NOITEMS_SMARTTABLE=\u042D\u043B\u0435\u043C\u0435\u043D\u0442\u044B \u043D\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u043D\u044B.
+NOITEMS_SMARTTABLE=\u041F\u043E\u0437\u0438\u0446\u0438\u0438 \u043D\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u043D\u044B.
 
-NOITEMS_SMARTTABLE_WITH_FILTER=\u042D\u043B\u0435\u043C\u0435\u043D\u0442\u044B \u043D\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u043D\u044B. \u041F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u0438\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u043F\u043E\u0438\u0441\u043A\u0430 \u0438\u043B\u0438 \u0444\u0438\u043B\u044C\u0442\u0440\u0430.
+NOITEMS_SMARTTABLE_WITH_FILTER=\u041F\u043E\u0437\u0438\u0446\u0438\u0438 \u043D\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u043D\u044B. \u041F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u0438\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u043F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u043F\u043E\u0438\u0441\u043A\u0430 \u0438\u043B\u0438 \u0444\u0438\u043B\u044C\u0442\u0440\u0430.
 
-NOITEMS_SMARTTABLE_WITH_FILTER_FOR_SEGMENTEDBUTTON=\u041D\u0435\u0442 \u044D\u043B\u0435\u043C\u0435\u043D\u0442\u043E\u0432 \u0434\u043B\u044F \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0445 \u043A\u0440\u0438\u0442\u0435\u0440\u0438\u0435\u0432 \u0444\u0438\u043B\u044C\u0442\u0440\u0430 \u0438 \u0440\u0430\u043A\u0443\u0440\u0441\u0430 \u0442\u0430\u0431\u043B\u0438\u0446\u044B.
+NOITEMS_SMARTTABLE_WITH_FILTER_FOR_SEGMENTEDBUTTON=\u041D\u0435\u0442 \u043F\u043E\u0437\u0438\u0446\u0438\u0439 \u0434\u043B\u044F \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0445 \u043A\u0440\u0438\u0442\u0435\u0440\u0438\u0435\u0432 \u0444\u0438\u043B\u044C\u0442\u0440\u0430 \u0438 \u0440\u0430\u043A\u0443\u0440\u0441\u0430 \u0442\u0430\u0431\u043B\u0438\u0446\u044B.
 
 NOITEMS_SMARTCHART=\u0414\u0430\u043D\u043D\u044B\u0435 \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D\u044B.
 
@@ -307,7 +307,7 @@ ST_GENERIC_DELETE_WITH_WARNING_SUGGESTION_PLURAL=\u041F\u043E\u0434\u0441\u043A\
 
 ST_GENERIC_NOT_DELETED_RECORDS=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0443\u0434\u0430\u043B\u0438\u0442\u044C {0} \u0438\u0437 {1} \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432.
 
-ST_GENERIC_DELETE_ERROR_PLURAL=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0435 \u044D\u043B\u0435\u043C\u0435\u043D\u0442\u044B. \u041F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u0438\u0445 \u043A\u0430\u0436\u0434\u044B\u0439 \u043F\u043E \u043E\u0442\u0434\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u0438.
+ST_GENERIC_DELETE_ERROR_PLURAL=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u043D\u0435\u043A\u043E\u0442\u043E\u0440\u044B\u0435 \u0432\u044B\u0431\u0440\u0430\u043D\u043D\u044B\u0435 \u043F\u043E\u0437\u0438\u0446\u0438\u0438. \u041F\u043E\u043F\u0440\u043E\u0431\u0443\u0439\u0442\u0435 \u0443\u0434\u0430\u043B\u0438\u0442\u044C \u0438\u0445 \u043F\u043E \u043E\u0442\u0434\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u0438.
 
 ST_GENERIC_NOT_PROCESSED_RECORDS=\u041D\u0435\u0432\u043E\u0437\u043C\u043E\u0436\u043D\u043E \u043E\u0431\u0440\u0430\u0431\u043E\u0442\u0430\u0442\u044C {0} \u0438\u0437 {1} \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432.
 

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

@@ -97,7 +97,7 @@ ST_GENERIC_DELETE_SUCCESS=\u6240\u9009\u5BF9\u8C61\u5DF2\u5220\u9664\u3002
 
 ST_GENERIC_LIST_TITLE=\u9879\u76EE
 
-ST_GENERIC_WARNING_TEXT=\u5C06\u4E0D\u4F1A\u5904\u7406\u6240\u9009\u9879\u76EE\u4E2D\u7684 {0} \u4E2A\u9879\u76EE\u3002
+ST_GENERIC_WARNING_TEXT=\u6240\u9009\u9879\u76EE\u4E2D\u7684 {0} \u4E2A\u9879\u76EE\u5C06\u4E0D\u4F1A\u5904\u7406\u3002
 
 ST_GENERIC_DIALOG_CONTINUE_BUT=\u4ECD\u7136\u7EE7\u7EED
 

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

@@ -387,7 +387,7 @@ sap.ui.define(["sap/ui/base/Object",
 		}
 		
 		function fnStoreFocusAndGetHistoryObject(sControlId){
-			var oHistoryObject = oHistoryState.getData();
+			var oHistoryObject = oHistoryState.getData() || {};
 			if (oHistoryObject.focus){ // focus already set
 				return oHistoryObject;
 			}
@@ -398,18 +398,18 @@ sap.ui.define(["sap/ui/base/Object",
 			if (sControlId){
 				oHistoryObject.focus = sControlId;
 				oHistoryState.setData(oHistoryObject);
-				oHistoryState.save();				
-			} 
+				oHistoryState.save();
+			}
 			return oHistoryObject;
 		}
 		
-		function fnInitializeHistory(){
+		function fnInitializeHistory(bKeepCurrentIdentity){
 			oCurrentHash = { // The initial instance represents the time before the app was started.
 				iHashChangeCount: 0,
 				backTarget: 0,
 				componentsDisplayed: Object.create(null)
 			};
-			oCurrentIdentity = null;
+			oCurrentIdentity = bKeepCurrentIdentity ? oCurrentIdentity : null;
 			aPreviousHashes = [];
 			if (!bIsRestoring){
 				oRoutingOptions = null;
@@ -2873,7 +2873,7 @@ sap.ui.define(["sap/ui/base/Object",
 		fnMakeNavigationFunction("navigationContextNotFound", fnNavigationContextNotFound);
 		fnMakeNavigationFunction("navigateToMessageTarget", fnNavigateToMessageTarget);
 
-		oNavigationControllerProxy.clearHistory = oNavigationQueue.makeQueuable(fnInitializeHistory);
+		oNavigationControllerProxy.clearHistory = oNavigationQueue.makeQueuable(fnInitializeHistory.bind(null, true));
 		oNavigationControllerProxy.suspend = fnSuspend;
 		oNavigationControllerProxy.restore = fnInitSession.bind(null, false);
 		oNavigationControllerProxy.leave = fnStoreFocusAndGetHistoryObject;
@@ -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.48
+	 * @version 1.108.50
 	 * @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.48",
+		version: "1.108.50",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {