@sapui5/sap.fe.core 1.95.0 → 1.98.0

package/src/sap/fe/core/controllerextensions/SideEffects.ts

@@ -1,5 +1,7 @@
 import { ControllerExtension } from "sap/ui/core/mvc";
 import { Binding, Context } from "sap/ui/model";
+import { CheckBox } from "sap/m";
+import { FileUploader } from "sap/ui/unified";
 import { ControllerExtensionMetadata } from "sap/fe/core/controllerextensions";
 import { UI5Class, Override, Public, Final, Private } from "../helpers/ClassSupport";
 import { AppComponent, CommonUtils } from "sap/fe/core";
@@ -10,7 +12,7 @@ import {
 	ODataSideEffectsType,
 	ControlSideEffectsEntityDictionary
 } from "sap/fe/core/services/SideEffectsServiceFactory";
-import { getFieldStateOnChange } from "sap/fe/macros/field/FieldRuntime";
+import { FieldRuntime } from "sap/fe/macros/field";
 import { ConverterOutput, PropertyPath, EntityType } from "@sap-ux/vocabularies-types";
 import { Log } from "sap/base";
 
@@ -28,7 +30,7 @@ type FieldEventPropertyType = {
 type FieldSideEffectPropertyType = {
 	name: string;
 	immediate?: boolean;
-	context: Context;
+	context: Context<any>;
 	sideEffects: SideEffectsType;
 	previouslyFailed?: boolean;
 };
@@ -62,7 +64,7 @@ class SideEffectsControllerExtension extends ControllerExtension {
 	public onInit() {
 		this._oView = (this as any).base.getView();
 		this._oAppComponent = CommonUtils.getAppComponent(this._oView);
-		this._oSideEffectsService = this._oAppComponent.getSideEffectsService();
+		this._oSideEffectsService = (this._oAppComponent as any).getSideEffectsService();
 		this._mFieldGroupQueue = {};
 		this._aSourcePropertiesFailure = new Set();
 		this._mFailedSideEffects = {};
@@ -263,7 +265,7 @@ class SideEffectsControllerExtension extends ControllerExtension {
 	 */
 	@Public
 	@Final
-	public requestSideEffects(oSideEffects: SideEffectsType, oContext: Context): Promise<any> {
+	public requestSideEffects(oSideEffects: SideEffectsType, oContext: Context<any>): Promise<any> {
 		let fResolver: any, fRejector: any;
 		const oPromise = new Promise(function(resolve, reject) {
 			fResolver = resolve;
@@ -315,7 +317,7 @@ class SideEffectsControllerExtension extends ControllerExtension {
 	 */
 	@Private
 	@Final
-	private _addFailedSideEffects(oSideEffects: SideEffectsType, oContext: Context): void {
+	private _addFailedSideEffects(oSideEffects: SideEffectsType, oContext: Context<any>): void {
 		const sContextPath: string = oContext.getPath();
 		this._mFailedSideEffects[sContextPath] = this._mFailedSideEffects[sContextPath] || [];
 		const bIsNotAlreadyListed = this._mFailedSideEffects[sContextPath].every(
@@ -403,7 +405,7 @@ class SideEffectsControllerExtension extends ControllerExtension {
 	 * @param {object} oContext SAPUI5 Context
 	 * @returns {string | undefined} Index
 	 */
-	private _generateStatusIndex(mEntityType: EntityType, sPropertyPath: string, oContext: Context): string | undefined {
+	private _generateStatusIndex(mEntityType: EntityType, sPropertyPath: string, oContext: Context<any>): string | undefined {
 		const sContextPath = oContext.getPath();
 		const mProperty = mEntityType.resolvePath(sPropertyPath);
 		if (mProperty) {
@@ -426,7 +428,7 @@ class SideEffectsControllerExtension extends ControllerExtension {
 	 */
 	@Private
 	@Final
-	private _getContextForSideEffects(oSourceField: FieldControl, sSideEffectEntityType: string): Context | undefined {
+	private _getContextForSideEffects(oSourceField: FieldControl, sSideEffectEntityType: string): Context<any> | undefined {
 		const oBindingContext = oSourceField.getBindingContext();
 		let oContextForSideEffects = oBindingContext,
 			sEntityType = this._oSideEffectsService.getEntityTypeFromContext(oBindingContext);
@@ -476,7 +478,7 @@ class SideEffectsControllerExtension extends ControllerExtension {
 
 		return promise.then(() => {
 			const oPromise = new Promise(function(resolve, reject) {
-				if (!getFieldStateOnChange(oEvent).state.validity) {
+				if (!FieldRuntime.getFieldStateOnChange(oEvent).state.validity) {
 					reject();
 				} else {
 					resolve(true);
@@ -536,7 +538,7 @@ class SideEffectsControllerExtension extends ControllerExtension {
 				oSideEffect: SideEffectsType | undefined = this._oSideEffectsService.getODataEntitySideEffects(sSideEffectEntityType)?.[
 					sSideEffectPath
 				],
-				oContext: Context | undefined = this._getContextForSideEffects(oField, sSideEffectEntityType);
+				oContext: Context<any> | undefined = this._getContextForSideEffects(oField, sSideEffectEntityType);
 			if (oSideEffect && oContext) {
 				mSideEffectsMap[sName] = {
 					name: sName,
@@ -553,7 +555,7 @@ class SideEffectsControllerExtension extends ControllerExtension {
 				mFieldPath: any = (oField.getAggregation("customData") as any[]).find(oCustomData => {
 					return oCustomData.getKey() === "sourcePath";
 				}),
-				oContext: Context | undefined = this._getContextForSideEffects(oField, sViewEntityType);
+				oContext: Context<any> | undefined = this._getContextForSideEffects(oField, sViewEntityType);
 
 			if (mFieldPath && oContext) {
 				const sFieldPath = mFieldPath.getValue().replace("/" + sViewEntitySetSetName + "/", ""),
@@ -657,7 +659,7 @@ class SideEffectsControllerExtension extends ControllerExtension {
 		const mEntityType = this._getEntityTypeFromFQN(sEntityType);
 		if (mEntityType) {
 			// Retrieves all properties used by the field
-			const oFieldBinding = this._getBindingForField(oField);
+			const oFieldBinding: any = this._getBindingForField(oField);
 			const aFieldPaths = oFieldBinding.isA("sap.ui.model.CompositeBinding")
 				? ((oFieldBinding as any).getBindings() || []).map((oBinding: any) => oBinding.sPath)
 				: [oFieldBinding.getPath()];
@@ -679,13 +681,13 @@ class SideEffectsControllerExtension extends ControllerExtension {
 	 * @returns {Binding}  Binding to the value
 	 */
 	private _getBindingForField(oField: FieldControl): Binding {
-		let oBinding: Binding;
-		if (oField.isA("sap.m.CheckBox")) {
-			oBinding = oField.getBinding("selected");
-		} else {
-			oBinding = oField.getBinding("value");
+		let sBindingName = "value";
+		if (oField.isA<CheckBox>("sap.m.CheckBox")) {
+			sBindingName = "selected";
+		} else if (oField.isA<FileUploader>("sap.ui.unified.FileUploader")) {
+			sBindingName = "uploadUrl";
 		}
-		return oBinding;
+		return oField.getBinding(sBindingName);
 	}
 }
 

package/src/sap/fe/core/controllerextensions/ViewState.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[
@@ -11,9 +11,22 @@ sap.ui.define(
 		"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 		"sap/ui/mdc/p13n/StateUtil",
 		"sap/fe/navigation/library",
-		"sap/fe/core/CommonUtils"
+		"sap/fe/core/CommonUtils",
+		"sap/fe/core/helpers/KeepAliveHelper",
+		"sap/fe/core/helpers/ModelHelper"
 	],
-	function(ControllerExtension, OverrideExecution, Log, mergeObjects, ControlVariantApplyAPI, StateUtil, NavLibrary, CommonUtils) {
+	function(
+		ControllerExtension,
+		OverrideExecution,
+		Log,
+		mergeObjects,
+		ControlVariantApplyAPI,
+		StateUtil,
+		NavLibrary,
+		CommonUtils,
+		KeepAliveHelper,
+		ModelHelper
+	) {
 		"use strict";
 
 		// additionalStates are stored next to control IDs, so name clash avoidance needed. Fortunately IDs have restrictions:
@@ -30,14 +43,17 @@ sap.ui.define(
 			"sap.ui.fl.variants.VariantManagement": {
 				retrieve: function(oVM) {
 					return {
-						"variantId": oVM.getModified() ? oVM.getId() : oVM.getCurrentVariantKey()
+						"variantId": oVM.getCurrentVariantKey()
 					};
 				},
 				apply: function(oVM, oControlState) {
 					if (oControlState && oControlState.variantId !== undefined && oControlState.variantId !== oVM.getCurrentVariantKey()) {
+						var sVariantReference = this._checkIfVariantIdIsAvailable(oVM, oControlState.variantId)
+							? oControlState.variantId
+							: oVM.getStandardVariantKey();
 						return ControlVariantApplyAPI.activateVariant({
 							element: oVM,
-							variantReference: oControlState.variantId
+							variantReference: sVariantReference
 						});
 					}
 				}
@@ -127,8 +143,8 @@ sap.ui.define(
 					var oBindingContext = oOPLayout.getBindingContext();
 					var oBinding = oBindingContext && oBindingContext.getBinding();
 					if (oBinding) {
-						var sMetaPath = CommonUtils.getMetaPathForContext(oBindingContext);
-						var sStrategy = CommonUtils.getControlRefreshStrategyForContextPath(oOPLayout, sMetaPath);
+						var sMetaPath = ModelHelper.getMetaPathForContext(oBindingContext);
+						var sStrategy = KeepAliveHelper.getControlRefreshStrategyForContextPath(oOPLayout, sMetaPath);
 						if (sStrategy === "self") {
 							// Refresh main context and 1-1 navigation properties or OP
 							var oModel = oBindingContext.getModel(),
@@ -299,7 +315,9 @@ sap.ui.define(
 					},
 					applyNavigationParameters: { "public": true, "final": false, overrideExecution: OverrideExecution.After },
 					onBeforeStateApplied: { "public": true, "final": false, overrideExecution: OverrideExecution.After },
-					onAfterStateApplied: { "public": true, "final": false, overrideExecution: OverrideExecution.After }
+					onAfterStateApplied: { "public": true, "final": false, overrideExecution: OverrideExecution.After },
+					onSuspend: { "public": true, "final": false, overrideExecution: OverrideExecution.After },
+					onRestore: { "public": true, "final": false, overrideExecution: OverrideExecution.After }
 				}
 			},
 
@@ -393,13 +411,29 @@ sap.ui.define(
 			 * The override execution is: {@link sap.ui.core.mvc.OverrideExecution.After}.
 			 *
 			 * @param {sap.ui.base.ManagedObject} oControl The control for which the refresh handler is adapted.
-			 * @param {Array<object>} oControlHandler A plain object which should have one function: <code>refreshBinding</code>
+			 * @param {Array<object>} oControlHandler A plain object which can have one function: <code>refreshBinding</code>
 			 *
 			 * @alias sap.fe.core.controllerextensions.ViewState#adaptBindingRefreshHandler
 			 * @protected
 			 */
 			adaptBindingRefreshHandler: function(oControl, oControlHandler) {},
 
+			/**
+			 * Called when the application is suspended due to keep-alive mode.
+			 *
+			 * @alias sap.fe.core.controllerextensions.ViewState#onSuspend
+			 * @public
+			 */
+			onSuspend: function() {},
+
+			/**
+			 * Called when the application is restored due to keep-alive mode.
+			 *
+			 * @alias sap.fe.core.controllerextensions.ViewState#onRestore
+			 * @public
+			 */
+			onRestore: function() {},
+
 			/**
 			 * Destructor method for objects.
 			 */
@@ -662,6 +696,17 @@ sap.ui.define(
 					});
 			},
 
+			_checkIfVariantIdIsAvailable: function(oVM, sVariantId) {
+				var aVariants = oVM.getVariants(),
+					bIsControlStateVariantAvailable = false;
+				aVariants.forEach(function(oVariant) {
+					if (oVariant.key === sVariantId) {
+						bIsControlStateVariantAvailable = true;
+					}
+				});
+				return bIsControlStateVariantAvailable;
+			},
+
 			_setInitialStateApplied: function() {
 				if (this._pInitialStateAppliedResolve) {
 					var pInitialStateAppliedResolve = this._pInitialStateAppliedResolve;

package/src/sap/fe/core/controls/ActionParameterDialog.fragment.xml

@@ -35,40 +35,46 @@
                             multipleLines?
                 -->
 						<!-- TODO: use new value helper -->
-						<mdc:Field
-						delegate="{name: 'sap/ui/mdc/odata/v4/FieldBaseDelegate'}"
-						unittest:id="ActionParameterDialogFieldExpressionTest"
-						id="{= ID.generate(['APD_', ${parameter>$Name}]) }"
-						value="{parameter>@@MODEL.format}"
-						display="{actionParameter>@@FIELD.getAPDialogDisplayFormat}"
-						editMode="{actionParameter>@@COMMON.getParameterEditMode}"
-						width="100%"
-						multipleLines="{= ${actionParameter>@com.sap.vocabularies.UI.v1.MultiLineText} ? (${actionParameter>@com.sap.vocabularies.UI.v1.MultiLineText} !== false)  : undefined}"
-						required="{= FIELD.isRequired(${actionParameter>@@FIELD.fieldControl}, 'Editable')}"
-						change="{= '.handleChange($event, \'' + ${parameter>$Name} + '\')' }"
-						fieldHelp="{= FIELD.getActionParameterDialogFieldHelp(${actionParameter>@}, ${actionName>@sapui.name}, ${parameter>$Name}) }"
-						visible="{actionParameter>@@COMMON.isVisible}"
-					>
-							<template:if test="{= FIELD.hasValueHelpAnnotation(${actionParameter>@}) }">
-								<mdc:dependents>
-									<mdcField:FieldValueHelp
-									unittest:id="ActionParameterDialogValuehelpExpressionTest"
-									id="{= ID.generate([${actionName>@sapui.name},${parameter>$Name}]) }"
-									delegate="{= FIELD.getFieldValueHelpDelegate(${action>$IsBound}, ${entitySet>@@COMMON.getContextPath}, ${actionName>@sapui.name}, ${parameter>$Name}) }"
-									noDialog="{= ${actionParameter>@com.sap.vocabularies.Common.v1.ValueListWithFixedValues} ? (${actionParameter>@com.sap.vocabularies.Common.v1.ValueListWithFixedValues} !== false) : false}"
-									validateInput="{= ValueHelpTemplating.requiresValidation(${actionParameter>@@Property.getProperty})}"
-									caseSensitive="{= ValueHelpTemplating.useCaseSensitiveFilterRequests(${actionParameter>@@Property.getPropertyObjectPath}, ${actionParameter>/@Org.OData.Capabilities.V1.FilterFunctions})}"
-								>
-										<mdcField:dialogContent>
-											<mdcField:FieldValueHelpMdcTableWrapper />
-										</mdcField:dialogContent>
-										<mdcField:suggestContent>
-											<mdcField:FieldValueHelpMTableWrapper />
-										</mdcField:suggestContent>
-									</mdcField:FieldValueHelp>
-								</mdc:dependents>
-							</template:if>
-						</mdc:Field>
+
+						<template:if test="{=  !${parameter>$isCollection} }">
+						<template:then>
+						<!--The payload of FieldBaseDelegate is used to control the fallback feature 'retrieveTextFromValueList' -->
+							<mdc:Field
+								delegate="{name:'sap/fe/macros/FieldBaseDelegate', payload:{retrieveTextFromValueList:true}}"
+								unittest:id="ActionParameterDialogFieldExpressionTest"
+								id="{= ID.generate(['APD_', ${parameter>$Name}]) }"
+								value="{parameter>@@MODEL.format}"
+								display="{actionParameter>@@FIELD.getAPDialogDisplayFormat}"
+								editMode="{actionParameter>@@COMMON.getParameterEditMode}"
+								width="100%"
+								multipleLines="{= ${actionParameter>@com.sap.vocabularies.UI.v1.MultiLineText} ? (${actionParameter>@com.sap.vocabularies.UI.v1.MultiLineText} !== false)  : undefined}"
+								required="{= FIELD.isRequired(${actionParameter>@@FIELD.fieldControl}, 'Editable')}"
+								change="{= '.handleChange($event, \'' + ${parameter>$Name} + '\')' }"
+								fieldHelp="{= FIELD.getActionParameterDialogFieldHelp(${actionParameter>@}, ${actionName>@sapui.name}, ${parameter>$Name}) }"
+								visible="{actionParameter>@@COMMON.isVisible}"
+							>
+							<core:Fragment fragmentName="sap.fe.core.controls.ActionParameterDialogValueHelp" type="XML" />
+							</mdc:Field>
+						</template:then>
+						<template:else>
+							<mdc:MultiValueField
+								id="{= ID.generate(['APD_', ${parameter>$Name}]) }"
+								items="{actionParameter>@@FE_MODEL.getActionParameterItemsModelPath}"
+								delegate="{name: 'sap/fe/core/controls/MultiValueParameterDelegate'}"
+								unittest:id="ActionParameterDialogMultiValueFieldExpressionTest"
+								display="{actionParameter>@@FIELD.getAPDialogDisplayFormat}"
+								editMode="{actionParameter>@@COMMON.getParameterEditMode}"
+								width="100%"
+								multipleLines="{= ${actionParameter>@com.sap.vocabularies.UI.v1.MultiLineText} ? (${actionParameter>@com.sap.vocabularies.UI.v1.MultiLineText} !== false)  : undefined}"
+								required="{= FIELD.isRequired(${actionParameter>@@FIELD.fieldControl}, 'Editable')}"
+								fieldHelp="{= FIELD.getActionParameterDialogFieldHelp(${actionParameter>@}, ${actionName>@sapui.name}, ${parameter>$Name}) }"
+								visible="{actionParameter>@@COMMON.isVisible}"
+							>
+							<mdcField:MultiValueFieldItem key="{path: 'mvfview>Key', type:'sap.ui.model.type.String'}" description="{mvfview>Desc}" />
+							<core:Fragment fragmentName="sap.fe.core.controls.ActionParameterDialogValueHelp" type="XML" />
+							</mdc:MultiValueField>
+						</template:else>
+						</template:if>
 					</template:if>
 				</template:with>
 			</template:repeat>

package/src/sap/fe/core/controls/ActionParameterDialogValueHelp.fragment.xml

@@ -0,0 +1,35 @@
+<core:FragmentDefinition
+	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
+	xmlns="sap.m"
+	xmlns:core="sap.ui.core"
+	xmlns:mdc="sap.ui.mdc"
+	xmlns:mdcField="sap.ui.mdc.field"
+	xmlns:unittest="http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1"
+	template:require="{
+		COMMON: 'sap/fe/macros/CommonHelper',
+		FIELD: 'sap/fe/macros/field/FieldHelper',
+		ID: 'sap/fe/core/helpers/StableIdHelper',
+		ValueHelpTemplating: 'sap/fe/macros/internal/valuehelp/ValueHelpTemplating',
+		Property: 'sap/fe/core/templating/PropertyFormatters'
+	}"
+>
+    <template:if test="{= FIELD.hasValueHelpAnnotation(${actionParameter>@}) }">
+        <mdc:dependents>
+            <mdcField:FieldValueHelp
+				unittest:id="ActionParameterDialogValuehelpExpressionTest"
+				id="{= ID.generate([${actionName>@sapui.name},${parameter>$Name}]) }"
+				delegate="{= FIELD.getFieldValueHelpDelegate(${action>$IsBound}, ${entitySet>@@COMMON.getContextPath}, ${actionName>@sapui.name}, ${parameter>$Name}) }"
+				noDialog="{= ${actionParameter>@com.sap.vocabularies.Common.v1.ValueListWithFixedValues} ? (${actionParameter>@com.sap.vocabularies.Common.v1.ValueListWithFixedValues} !== false) : false}"
+				validateInput="{= ValueHelpTemplating.requiresValidation(${actionParameter>@@Property.getProperty})}"
+				caseSensitive="{= ValueHelpTemplating.useCaseSensitiveFilterRequests(${actionParameter>@@Property.getPropertyObjectPath}, ${actionParameter>/@Org.OData.Capabilities.V1.FilterFunctions})}"
+			>
+                <mdcField:dialogContent>
+                    <mdcField:FieldValueHelpMdcTableWrapper />
+                </mdcField:dialogContent>
+                <mdcField:suggestContent>
+                    <mdcField:FieldValueHelpMTableWrapper />
+                </mdcField:suggestContent>
+            </mdcField:FieldValueHelp>
+        </mdc:dependents>
+    </template:if>
+</core:FragmentDefinition>

package/src/sap/fe/core/controls/CommandExecution.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["sap/ui/core/CommandExecution", "sap/base/Log", "sap/ui/core/Element", "sap/ui/core/Shortcut"], function(
 	CommandExecution,

package/src/sap/fe/core/controls/ConditionalWrapper.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["sap/ui/core/Control"], function(Control) {
 	"use strict";

package/src/sap/fe/core/controls/CustomQuickViewPage.js

@@ -1,126 +1,127 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
-sap.ui.define(["sap/m/QuickViewPage", "sap/m/Button", "sap/fe/core/CommonUtils", "sap/fe/macros/DelegateUtil"], function(
-	QuickViewPage,
-	Button,
-	CommonUtils,
-	DelegateUtil
-) {
-	"use strict";
+sap.ui.define(
+	["sap/m/QuickViewPage", "sap/m/Button", "sap/fe/core/CommonUtils", "sap/fe/macros/DelegateUtil", "sap/fe/core/helpers/KeepAliveHelper"],
+	function(QuickViewPage, Button, CommonUtils, DelegateUtil, KeepAliveHelper) {
+		"use strict";
 
-	return QuickViewPage.extend("sap.fe.core.controls.CustomQuickViewPage", {
-		metadata: {
-			defaultAggregation: "groups",
-			aggregations: {
-				customContent: {
-					type: "sap.ui.core.Control",
-					multiple: true,
-					bindable: "bindable"
+		return QuickViewPage.extend("sap.fe.core.controls.CustomQuickViewPage", {
+			metadata: {
+				defaultAggregation: "groups",
+				aggregations: {
+					customContent: {
+						type: "sap.ui.core.Control",
+						multiple: true,
+						bindable: "bindable"
+					},
+					groups: { type: "sap.m.QuickViewGroup", multiple: true, singularName: "group", bindable: "bindable" }
 				},
-				groups: { type: "sap.m.QuickViewGroup", multiple: true, singularName: "group", bindable: "bindable" }
+				publicMethods: []
 			},
-			publicMethods: []
-		},
-		renderer: {},
-		onAfterRendering: function() {
-			QuickViewPage.prototype.onAfterRendering.apply(this, arguments);
-		},
-		onBeforeRendering: function() {
-			if (
-				this.getParent() &&
-				this.getParent().isA("sap.fe.core.controls.ConditionalWrapper") &&
-				this.getParent().getProperty("condition") === true
-			) {
-				this.setCrossAppNavCallback(
-					function() {
-						var sQuickViewPageTitleLinkHref = DelegateUtil.getCustomData(this, "titleLink");
-						var oView = sap.ui.fl.Utils.getViewForControl(this);
-						var oAppComponent = CommonUtils.getAppComponent(oView);
-						var oShellServiceHelper = oAppComponent.getShellServices();
-						var oShellHash = oShellServiceHelper.parseShellHash(sQuickViewPageTitleLinkHref);
-						var oNavArgs = {
-							target: {
-								semanticObject: oShellHash.semanticObject,
-								action: oShellHash.action
-							},
-							params: oShellHash.params
-						};
-						var sQuickViewPageTitleLinkIntent = oNavArgs.target.semanticObject + "-" + oNavArgs.target.action;
+			renderer: {},
+			onAfterRendering: function() {
+				QuickViewPage.prototype.onAfterRendering.apply(this, arguments);
+			},
+			onBeforeRendering: function() {
+				if (
+					this.getParent() &&
+					this.getParent().isA("sap.fe.core.controls.ConditionalWrapper") &&
+					this.getParent().getProperty("condition") === true
+				) {
+					this.setCrossAppNavCallback(
+						function() {
+							var sQuickViewPageTitleLinkHref = DelegateUtil.getCustomData(this, "titleLink");
+							var oView = sap.ui.fl.Utils.getViewForControl(this);
+							var oAppComponent = CommonUtils.getAppComponent(oView);
+							var oShellServiceHelper = oAppComponent.getShellServices();
+							var oShellHash = oShellServiceHelper.parseShellHash(sQuickViewPageTitleLinkHref);
+							var oNavArgs = {
+								target: {
+									semanticObject: oShellHash.semanticObject,
+									action: oShellHash.action
+								},
+								params: oShellHash.params
+							};
+							var sQuickViewPageTitleLinkIntent = oNavArgs.target.semanticObject + "-" + oNavArgs.target.action;
 
-						if (
-							sQuickViewPageTitleLinkIntent &&
-							this.oCrossAppNavigator &&
-							this.oCrossAppNavigator.isNavigationSupported([sQuickViewPageTitleLinkIntent])
-						) {
-							if (sQuickViewPageTitleLinkIntent && sQuickViewPageTitleLinkIntent !== "") {
-								if (typeof sQuickViewPageTitleLinkIntent === "string" && sQuickViewPageTitleLinkIntent !== "") {
-									var sTargetHref;
-									var oLinkControl = this.getParent();
-									while (oLinkControl && !oLinkControl.isA("sap.ui.mdc.Link")) {
-										oLinkControl = oLinkControl.getParent();
-									}
-									var _aLinks = oLinkControl.getModel("$sapuimdcLink").getProperty("/linkItems");
-									if (_aLinks) {
-										if (_aLinks.length > 0) {
-											for (var i = 0; i < _aLinks.length; i++) {
-												if (_aLinks[i].key === sQuickViewPageTitleLinkIntent) {
-													sTargetHref = _aLinks[i].href;
-													break;
+							if (
+								sQuickViewPageTitleLinkIntent &&
+								this.oCrossAppNavigator &&
+								this.oCrossAppNavigator.isNavigationSupported([sQuickViewPageTitleLinkIntent])
+							) {
+								if (sQuickViewPageTitleLinkIntent && sQuickViewPageTitleLinkIntent !== "") {
+									if (typeof sQuickViewPageTitleLinkIntent === "string" && sQuickViewPageTitleLinkIntent !== "") {
+										var sTargetHref;
+										var oLinkControl = this.getParent();
+										while (oLinkControl && !oLinkControl.isA("sap.ui.mdc.Link")) {
+											oLinkControl = oLinkControl.getParent();
+										}
+										var _aLinks = oLinkControl.getModel("$sapuimdcLink").getProperty("/linkItems");
+										if (_aLinks) {
+											if (_aLinks.length > 0) {
+												for (var i = 0; i < _aLinks.length; i++) {
+													if (_aLinks[i].key === sQuickViewPageTitleLinkIntent) {
+														sTargetHref = _aLinks[i].href;
+														break;
+													}
+												}
+												if (sTargetHref) {
+													oShellHash = oShellServiceHelper.parseShellHash(sTargetHref);
+												} else {
+													oShellHash = oShellServiceHelper.parseShellHash(sQuickViewPageTitleLinkIntent);
 												}
 											}
-											if (sTargetHref) {
-												oShellHash = oShellServiceHelper.parseShellHash(sTargetHref);
-											} else {
-												oShellHash = oShellServiceHelper.parseShellHash(sQuickViewPageTitleLinkIntent);
-											}
+										} else {
+											oShellHash = oShellServiceHelper.parseShellHash(sQuickViewPageTitleLinkIntent);
 										}
-									} else {
-										oShellHash = oShellServiceHelper.parseShellHash(sQuickViewPageTitleLinkIntent);
+										KeepAliveHelper.storeControlRefreshStrategyForHash(oView, oShellHash);
+										return {
+											target: {
+												semanticObject: oShellHash.semanticObject,
+												action: oShellHash.action
+											},
+											params: oShellHash.params
+										};
 									}
-									return {
-										target: {
-											semanticObject: oShellHash.semanticObject,
-											action: oShellHash.action
-										},
-										params: oShellHash.params
-									};
 								}
+							} else {
+								var oCurrentShellHash = oShellServiceHelper.parseShellHash(window.location.hash);
+								KeepAliveHelper.storeControlRefreshStrategyForHash(oView, oCurrentShellHash);
+
+								return {
+									target: {
+										semanticObject: oCurrentShellHash.semanticObject,
+										action: oCurrentShellHash.action,
+										appSpecificRoute: oCurrentShellHash.appSpecificRoute
+									},
+									params: oCurrentShellHash.params
+								};
 							}
-						} else {
-							var oCurrentShellHash = oShellServiceHelper.parseShellHash(window.location.hash);
-							return {
-								target: {
-									semanticObject: oCurrentShellHash.semanticObject,
-									action: oCurrentShellHash.action,
-									appSpecificRoute: oCurrentShellHash.appSpecificRoute
-								},
-								params: oCurrentShellHash.params
-							};
-						}
-					}.bind(this)
-				);
-			}
-			QuickViewPage.prototype.onBeforeRendering.apply(this, arguments);
-			var oPageContent = this.getPageContent();
-			var oForm = oPageContent.form;
-			if (oForm) {
-				var _aContent = this.getAggregation("customContent");
-				if (_aContent && _aContent.length > 0) {
-					_aContent.forEach(
-						function(_oContent) {
-							var _oContentClone = _oContent.clone();
-							_oContentClone.setModel(this.getModel());
-							_oContentClone.setBindingContext(this.getBindingContext());
-							oForm.addContent(_oContentClone);
 						}.bind(this)
 					);
-					setTimeout(function() {
-						oForm.rerender();
-					}, 0);
+				}
+				QuickViewPage.prototype.onBeforeRendering.apply(this, arguments);
+				var oPageContent = this.getPageContent();
+				var oForm = oPageContent.form;
+				if (oForm) {
+					var _aContent = this.getAggregation("customContent");
+					if (_aContent && _aContent.length > 0) {
+						_aContent.forEach(
+							function(_oContent) {
+								var _oContentClone = _oContent.clone();
+								_oContentClone.setModel(this.getModel());
+								_oContentClone.setBindingContext(this.getBindingContext());
+								oForm.addContent(_oContentClone);
+							}.bind(this)
+						);
+						setTimeout(function() {
+							oForm.rerender();
+						}, 0);
+					}
 				}
 			}
-		}
-	});
-});
+		});
+	}
+);

package/src/sap/fe/core/controls/DataLossOrDraftDiscard/DataLossOrDraftDiscardHandler.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(
 	[
@@ -110,9 +110,12 @@ sap.ui.define(
 
 		DataLossOrDraftDiscardHandler.discardDraft = function(oController, bSkipBindingToView) {
 			var oParamsContext = oController.getView().getBindingContext();
-			var mParams = {};
-			mParams.bSkipDiscardPopover = true;
-			mParams.bSkipBindingToView = bSkipBindingToView !== undefined ? bSkipBindingToView : true;
+			var mParams = {
+				skipBackNavigation: true,
+				skipDiscardPopover: true,
+				skipBindingToView: bSkipBindingToView !== undefined ? bSkipBindingToView : true
+			};
+
 			return oController.editFlow.cancelDocument(oParamsContext, mParams);
 		};