@sapui5/sap.fe.navigation 1.150.0 → 1.152.0

package/src/sap/fe/navigation/NavigationHandler.ts

@@ -31,7 +31,7 @@ type ShellAppState = {
 	getKey(): string;
 	setData(obj: object): void;
 	getData(): InnerAppData;
-	save(): JQuery.Promise<string>;
+	save(): Promise<undefined>;
 };
 /**
  * Structure of stored app state.
@@ -560,7 +560,8 @@ export class NavigationHandler extends BaseObject {
 	 *          <li><code>oAppData.customData</code></li>
 	 *          </ul>
 	 *          which return the inner app data as stored in {@link #.navigate navigate} or {@link #.storeInnerAppStateAsync storeInnerAppStateAsync}.
-	 *          <code>oAppData.oDefaultedSelectionVariant</code> is an empty selection variant and
+	 *          <code>oAppData.oDefaultedSelectionVariant</code> is populated with the user default values when they are
+	 *          available (fetched from the cross-app state), otherwise it is an empty selection variant, and
 	 *          <code>oAppData.bNavSelVarHasDefaultsOnly</code> is <code>false</code> in this case.<br>
 	 *          <b>Note:</b> If the navigation type is {@link sap.fe.navigation.NavType.initial} oAppData is an empty object!<br>
 	 *          If an error occurs, an error object of type {@link sap.fe.navigation.NavError}, URL parameters (if available)
@@ -1097,7 +1098,10 @@ export class NavigationHandler extends BaseObject {
 			this._oLastSavedInnerAppData.iCacheHit++;
 
 			// replace inner app hash with cached appStateKey in url (just in case the app has changed the hash in meantime)
-			fnReplaceHash(sAppStateKeyCached);
+			// bSkipHashReplace must be checked here too, same as in the cache-miss paths below
+			if (!bSkipHashReplace) {
+				fnReplaceHash(sAppStateKeyCached);
+			}
 			oMyDeferred.resolve(sAppStateKeyCached);
 			return oMyDeferred.promise();
 		}
@@ -1796,17 +1800,26 @@ export class NavigationHandler extends BaseObject {
 		oAppState: ShellAppState,
 		fnOnError?: Function
 	): { appStateKey: string; promise: JQuery.Promise<string> } | undefined {
+		const oAppStatePromise = jQuery.Deferred();
 		const sAppStateKey = oAppState.getKey();
 		const oAppDataForSave = this._fetchAppDataForSave(oAppData, fnOnError);
 		if (!oAppDataForSave) {
 			return undefined;
 		}
 		oAppState.setData(oAppDataForSave);
-		const oSavePromise = oAppState.save();
+		oAppState
+			.save()
+			.then(function () {
+				oAppStatePromise.resolve();
+				return;
+			})
+			.catch(function (oError) {
+				oAppStatePromise.reject(oError);
+			});
 
 		return {
 			appStateKey: sAppStateKey,
-			promise: oSavePromise.promise()
+			promise: oAppStatePromise.promise()
 		};
 	}
 
@@ -1915,6 +1928,7 @@ export class NavigationHandler extends BaseObject {
 				if (typeof oAppDataLoaded === "undefined") {
 					const oError = oNavHandler._createTechnicalError("NavigationHandler.getDataFromAppState.failed");
 					oDeferred.reject(oError, {}, navType);
+					return;
 				} else if (oNavHandler._sMode === Mode.ODataV2) {
 					oAppData = {
 						selectionVariant: "{}",
@@ -1964,22 +1978,26 @@ export class NavigationHandler extends BaseObject {
 						oAppData.selectionVariant = oNavHandler._ensureSelectionVariantFormatString(oAppDataLoaded.selectionVariant);
 						oAppData.oSelectionVariant = new SelectionVariant(oAppData.selectionVariant);
 					}
+				}
 
-					if (navType === NavType.iAppState) {
-						const oComponentData = oNavHandler.oComponent.getComponentData() as Record<string, any>;
-						const oStartupParameters = oComponentData?.startupParameters as Record<string, any>;
-						const bHasDefaultedParams = oStartupParameters?.[DEFAULTED_PARAMETER_PROPERTY]?.length > 0;
-						const bHasXAppState = oComponentData?.["sap-xapp-state"] !== undefined;
-
-						if (bHasDefaultedParams && bHasXAppState) {
-							oNavHandler._enrichDefaultedSelectionVariant(
-								oAppData,
-								oStartupParameters[DEFAULTED_PARAMETER_PROPERTY][0],
-								oDeferred,
-								navType
-							);
-							return;
-						}
+				// On an iAppState reload (F5), FLP still passes the defaulted parameter names but not their
+				// values, so oDefaultedSelectionVariant would be empty. Re-fetch the original defaults from the
+				// xAppState. This runs after the V2/V4 if/else so it applies to both ODataV2 (FEv2) and V4 apps
+				// (it was previously inside the V4 branch only, which missed the ODataV2 path).
+				if (navType === NavType.iAppState) {
+					const oComponentData = oNavHandler.oComponent.getComponentData() as Record<string, any>;
+					const oStartupParameters = oComponentData?.startupParameters as Record<string, any>;
+					const bHasDefaultedParams = oStartupParameters?.[DEFAULTED_PARAMETER_PROPERTY]?.length > 0;
+					const bHasXAppState = oComponentData?.["sap-xapp-state"] !== undefined;
+
+					if (bHasDefaultedParams && bHasXAppState) {
+						oNavHandler._enrichDefaultedSelectionVariant(
+							oAppData,
+							oStartupParameters[DEFAULTED_PARAMETER_PROPERTY][0],
+							oDeferred,
+							navType
+						);
+						return;
 					}
 				}
 

package/src/sap/fe/navigation/library.js

@@ -147,7 +147,7 @@ sap.ui.define(["sap/ui/core/Lib", "sap/ui/core/library"], function (Library, _li
     name: "sap.fe.navigation",
     apiVersion: 2,
     // eslint-disable-next-line no-template-curly-in-string
-    version: "1.150.0",
+    version: "1.152.0",
     dependencies: ["sap.ui.core"],
     types: ["sap.fe.navigation.NavType", "sap.fe.navigation.ParamHandlingMode", "sap.fe.navigation.SuppressionBehavior"],
     interfaces: [],