@sapui5/sap.fe.navigation 1.148.0 → 1.149.0

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

@@ -1964,6 +1964,23 @@ 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;
+						}
+					}
 				}
 
 				// resolve is called on passed Deferred object to trigger a call of the done method, if implemented
@@ -1979,6 +1996,47 @@ export class NavigationHandler extends BaseObject {
 		return oDeferred;
 	}
 
+	/**
+	 * Fetches the original FLP default values from the xAppState and enriches oAppData with oDefaultedSelectionVariant.
+	 * @param oAppData The app data object to enrich.
+	 * @param sDefaultedParametersJson The raw JSON string of defaulted parameter names from FLP.
+	 * @param oDeferred The deferred to resolve after enrichment.
+	 * @param navType The navigation type.
+	 * @private
+	 */
+	async _enrichDefaultedSelectionVariant(
+		oAppData: any,
+		sDefaultedParametersJson: string,
+		oDeferred: JQuery.Deferred<unknown>,
+		navType: string
+	): Promise<void> {
+		try {
+			const aDefaultedParameters: string[] = JSON.parse(sDefaultedParametersJson);
+			const oCrossAppNavService: any = await this._getAppNavigationServiceAsync();
+			const oXAppState: any = await oCrossAppNavService.getStartupAppState(this.oComponent);
+			const oXAppStateData = oXAppState.getData();
+			if (oXAppStateData?.selectionVariant) {
+				const oXAppSelVar = new SelectionVariant(oXAppStateData.selectionVariant);
+				const oDefaultedSelVar = new SelectionVariant();
+				for (const sParamName of aDefaultedParameters) {
+					if (this._isTechnicalParameter(sParamName)) {
+						continue;
+					}
+					const aRanges = oXAppSelVar.getSelectOption(sParamName);
+					if (aRanges) {
+						oDefaultedSelVar.massAddSelectOption(sParamName, aRanges);
+					}
+				}
+				if (!oDefaultedSelVar.isEmpty()) {
+					oAppData.oDefaultedSelectionVariant = oDefaultedSelVar;
+				}
+			}
+		} catch (oError) {
+			Log.error("NavigationHandler: Failed to enrich defaulted selection variant.", oError as string);
+		}
+		oDeferred.resolve(oAppData, {}, navType);
+	}
+
 	/**
 	 * Retrieves the parameter value of the sap-iapp-state (the internal apps) from the AppHash string. It automatically takes care about
 	 * compatibility between the old and the new approach of the sap-iapp-state. Precedence is that the new approach is favoured against the old

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.148.0",
+    version: "1.149.0",
     dependencies: ["sap.ui.core"],
     types: ["sap.fe.navigation.NavType", "sap.fe.navigation.ParamHandlingMode", "sap.fe.navigation.SuppressionBehavior"],
     interfaces: [],