@sapui5/sap.fe.core 1.93.3 → 1.96.2

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

@@ -10,9 +10,10 @@ sap.ui.define(
 		"sap/base/util/merge",
 		"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 		"sap/ui/mdc/p13n/StateUtil",
-		"sap/fe/navigation/library"
+		"sap/fe/navigation/library",
+		"sap/fe/core/CommonUtils"
 	],
-	function(ControllerExtension, OverrideExecution, Log, mergeObjects, ControlVariantApplyAPI, StateUtil, NavLibrary) {
+	function(ControllerExtension, OverrideExecution, Log, mergeObjects, ControlVariantApplyAPI, StateUtil, NavLibrary, CommonUtils) {
 		"use strict";
 
 		// additionalStates are stored next to control IDs, so name clash avoidance needed. Fortunately IDs have restrictions:
@@ -91,6 +92,26 @@ sap.ui.define(
 					if (oControlState) {
 						return StateUtil.applyExternalState(oTable, oControlState);
 					}
+				},
+				refreshBinding: function(oTable) {
+					var oTableBinding = oTable.getRowBinding();
+					if (oTableBinding) {
+						var oRootBinding = oTableBinding.getRootBinding();
+						if (oRootBinding === oTableBinding) {
+							// absolute binding
+							oTableBinding.refresh();
+						} else {
+							// relative binding
+							var oHeaderContext = oTableBinding.getHeaderContext();
+							var sGroupId = oTableBinding.getGroupId();
+
+							if (oHeaderContext) {
+								oHeaderContext.requestSideEffects([{ $NavigationPropertyPath: "" }], sGroupId);
+							}
+						}
+					} else {
+						Log.info("Table: " + oTable.getId() + " was not refreshed. No binding found!");
+					}
 				}
 			},
 			"sap.uxap.ObjectPageLayout": {
@@ -101,6 +122,38 @@ sap.ui.define(
 				},
 				apply: function(oOPLayout, oControlState) {
 					oControlState && oOPLayout.setSelectedSection(oControlState.selectedSection);
+				},
+				refreshBinding: function(oOPLayout) {
+					var oBindingContext = oOPLayout.getBindingContext();
+					var oBinding = oBindingContext && oBindingContext.getBinding();
+					if (oBinding) {
+						var sMetaPath = CommonUtils.getMetaPathForContext(oBindingContext);
+						var sStrategy = CommonUtils.getControlRefreshStrategyForContextPath(oOPLayout, sMetaPath);
+						if (sStrategy === "self") {
+							// Refresh main context and 1-1 navigation properties or OP
+							var oModel = oBindingContext.getModel(),
+								oMetaModel = oModel.getMetaModel(),
+								oNavigationProperties =
+									CommonUtils.getContextPathProperties(oMetaModel, sMetaPath, {
+										$kind: "NavigationProperty"
+									}) || {},
+								aNavPropertiesToRequest = Object.keys(oNavigationProperties).reduce(function(aPrev, sNavProp) {
+									if (oNavigationProperties[sNavProp].$isCollection !== true) {
+										aPrev.push({ $NavigationPropertyPath: sNavProp });
+									}
+									return aPrev;
+								}, []),
+								aProperties = [{ $PropertyPath: "*" }],
+								sGroupId = oBinding.getGroupId();
+
+							oBindingContext.requestSideEffects(aProperties.concat(aNavPropertiesToRequest), sGroupId);
+						} else if (sStrategy === "includingDependents") {
+							// Complete refresh
+							oBinding.refresh();
+						}
+					} else {
+						Log.info("ObjectPage: " + oOPLayout.getId() + " was not refreshed. No binding found!");
+					}
 				}
 			},
 			"sap.fe.macros.table.QuickFilterContainer": {
@@ -156,6 +209,12 @@ sap.ui.define(
 					if (oController && oController.viewState) {
 						return oController.viewState.applyViewState(oControlState, oNavParameters);
 					}
+				},
+				refreshBinding: function(oView) {
+					var oController = oView.getController();
+					if (oController && oController.viewState) {
+						return oController.viewState.refreshViewBindings();
+					}
 				}
 			},
 			"sap.ui.core.ComponentContainer": {
@@ -188,6 +247,25 @@ sap.ui.define(
 		var ViewState = ControllerExtension.extend("sap.fe.core.controllerextensions.ViewState", {
 			metadata: {
 				methods: {
+					refreshViewBindings: { "public": true, "final": true },
+					adaptBindingRefreshControls: {
+						"public": true,
+						"final": false,
+						overrideExecution: OverrideExecution.After
+					},
+					getControlRefreshBindingHandler: {
+						"public": false,
+						"final": true
+					},
+					refreshControlBinding: {
+						"public": false,
+						"final": true
+					},
+					adaptBindingRefreshHandler: {
+						"public": true,
+						"final": false,
+						overrideExecution: OverrideExecution.After
+					},
 					collectResults: { "public": false, "final": true },
 					adaptControlStateHandler: {
 						"public": true,
@@ -221,7 +299,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 }
 				}
 			},
 
@@ -248,6 +328,96 @@ sap.ui.define(
 			 * @function
 			 */
 
+			refreshViewBindings: function() {
+				var that = this;
+				return that.collectResults(that.base.viewState.adaptBindingRefreshControls).then(function(aControls) {
+					var oPromiseChain = Promise.resolve();
+					aControls
+						.filter(function(oControl) {
+							return oControl && oControl.isA && oControl.isA("sap.ui.base.ManagedObject");
+						})
+						.forEach(function(oControl) {
+							oPromiseChain = oPromiseChain.then(that.refreshControlBinding.bind(that, oControl));
+						});
+					return oPromiseChain;
+				});
+			},
+			/**
+			 * This function should add all controls relevant for refreshing to the provided control array.
+			 *
+			 * This function is meant to be individually overridden by consuming controllers, but not to be called directly.
+			 * The override execution is: {@link sap.ui.core.mvc.OverrideExecution.After}.
+			 * @param {Array<sap.ui.base.ManagedObject>} aCollectedControls The collected controls
+			 * @alias sap.fe.core.controllerextensions.ViewState#adaptBindingRefreshControls
+			 * @protected
+			 */
+			adaptBindingRefreshControls: function(aCollectedControls) {},
+
+			refreshControlBinding: function(oControl) {
+				var oControlRefreshBindingHandler = this.getControlRefreshBindingHandler(oControl),
+					oPromiseChain = Promise.resolve(),
+					that = this;
+				if (typeof oControlRefreshBindingHandler.refreshBinding !== "function") {
+					Log.info("refreshBinding handler for control: " + oControl.getMetadata().getName() + " is not provided");
+				} else {
+					oPromiseChain = oPromiseChain.then(oControlRefreshBindingHandler.refreshBinding.bind(that, oControl));
+				}
+				return oPromiseChain;
+			},
+
+			/**
+			 * Returns a map of <code>refreshBinding</code> function for a certain control.
+			 *
+			 * @param {sap.ui.base.ManagedObject} oControl The control to get state handler for
+			 * @returns {object} A plain object with one function: <code>refreshBinding</code>
+			 */
+
+			getControlRefreshBindingHandler: function(oControl) {
+				var oRefreshBindingHandler = {};
+				if (oControl) {
+					for (var sType in _mControlStateHandlerMap) {
+						if (oControl.isA(sType)) {
+							// pass only the refreshBinding handler in an object so that :
+							// 1. Application has access only to refreshBinding and not apply and reterive at this stage
+							// 2. Application modifications to the object will be reflected here (as we pass by reference)
+							oRefreshBindingHandler["refreshBinding"] = _mControlStateHandlerMap[sType].refreshBinding || {};
+							break;
+						}
+					}
+				}
+				this.base.viewState.adaptBindingRefreshHandler(oControl, oRefreshBindingHandler);
+				return oRefreshBindingHandler;
+			},
+			/**
+			 * Customize the <code>refreshBinding</code> function for a certain control.
+			 *
+			 * This function is meant to be individually overridden by consuming controllers, but not to be called directly.
+			 * 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 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.
 			 */
@@ -316,9 +486,7 @@ sap.ui.define(
 			 *
 			 * This function is meant to be individually overridden by consuming controllers, but not to be called directly.
 			 * The override execution is: {@link sap.ui.core.mvc.OverrideExecution.After}.
-			 *
 			 * @param {Array<sap.ui.base.ManagedObject>} aCollectedControls The collected controls
-			 *
 			 * @alias sap.fe.core.controllerextensions.ViewState#adaptStateControls
 			 * @protected
 			 */
@@ -459,7 +627,6 @@ sap.ui.define(
 			applyInitialStateOnly: function() {
 				return true;
 			},
-
 			/**
 			 * Applies the given view state to this extensions view.
 			 *

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

@@ -35,40 +35,45 @@
                             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>
+							<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}"
+							>
+							<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/ActionPartial.fragment.xml

@@ -17,7 +17,7 @@
 		verticalScrolling="true"
 		horizontalScrolling="true"
 		class="sapUiContentPadding"
-		title="{totals>/label}"
+		title="{label>title}"
 	>
     <!--The list of items that cannot be actioned is based on the Header Info, which is mandatory -->
     <template:if test="{= ${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo}}">

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

@@ -79,6 +79,7 @@ sap.ui.define(["sap/m/QuickViewPage", "sap/m/Button", "sap/fe/core/CommonUtils",
 									} else {
 										oShellHash = oShellServiceHelper.parseShellHash(sQuickViewPageTitleLinkIntent);
 									}
+									CommonUtils.storeControlRefreshStrategyForHash(oView, oShellHash);
 									return {
 										target: {
 											semanticObject: oShellHash.semanticObject,
@@ -90,6 +91,8 @@ sap.ui.define(["sap/m/QuickViewPage", "sap/m/Button", "sap/fe/core/CommonUtils",
 							}
 						} else {
 							var oCurrentShellHash = oShellServiceHelper.parseShellHash(window.location.hash);
+							CommonUtils.storeControlRefreshStrategyForHash(oView, oCurrentShellHash);
+
 							return {
 								target: {
 									semanticObject: oCurrentShellHash.semanticObject,

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

@@ -0,0 +1,45 @@
+/*!
+ * SAPUI5
+ * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ */
+// ---------------------------------------------------------------------------------------
+// Helper class used to help create content in the multi value field
+// ---------------------------------------------------------------------------------------
+// ---------------------------------------------------------------------------------------
+/* eslint-disable no-console */
+sap.ui.define(
+	["sap/ui/mdc/field/MultiValueFieldDelegate"],
+	function(MultiValueFieldDelegate) {
+		"use strict";
+		var oMultiValueFieldDelegate = Object.assign({}, MultiValueFieldDelegate, {
+			_transformConditions: function(aConditions, sKeyPath, sDescriptionPath) {
+				var aTransformedItems = [];
+				for (var i = 0; i < aConditions.length; i++) {
+					var oItem = {};
+					var oCondition = aConditions[i];
+					oItem[sKeyPath] = oCondition.values[0];
+					if (sDescriptionPath) {
+						oItem[sDescriptionPath] = oCondition.values[1];
+					}
+					aTransformedItems.push(oItem);
+				}
+				return aTransformedItems;
+			},
+			updateItems: function(oPayload, aConditions, oMultiValueField) {
+				var oListBinding = oMultiValueField.getBinding("items");
+				var oBindingInfo = oMultiValueField.getBindingInfo("items");
+				var sItemPath = oBindingInfo.path;
+				var oTemplate = oBindingInfo.template;
+				var oKeyBindingInfo = oTemplate.getBindingInfo("key");
+				var sKeyPath = oKeyBindingInfo && oKeyBindingInfo.parts[0].path;
+				var oDescriptionBindingInfo = oTemplate.getBindingInfo("description");
+				var sDescriptionPath = oDescriptionBindingInfo && oDescriptionBindingInfo.parts[0].path;
+				var oModel = oListBinding.getModel();
+
+				oModel.setProperty(sItemPath, this._transformConditions(aConditions, sKeyPath, sDescriptionPath));
+			}
+		});
+		return oMultiValueFieldDelegate;
+	},
+	/* bExport= */ false
+);

package/src/sap/fe/core/controls/filterbar/FilterContainer.js

@@ -52,12 +52,11 @@ sap.ui.define(["sap/ui/mdc/filterbar/aligned/FilterContainer"], function(MdcFilt
 		// hence find the filter field from the layout and remove it's content aggregation
 		var that = this;
 		oControl.getContent().forEach(function(oInnerControl) {
-			if (oInnerControl.isA("sap.ui.mdc.FilterField") && oInnerControl.data("hasVisualFilter") === "true") {
+			var oContent = oInnerControl.getContent && oInnerControl.getContent();
+			if (oInnerControl.isA("sap.ui.mdc.FilterField") && oContent && oContent.isA("sap.fe.core.controls.filterbar.VisualFilter")) {
 				// store the visual filter for later use.
 				var oVFId = oInnerControl.getId();
-				if (!that.aAllVisualFilters[oVFId]) {
-					that.aAllVisualFilters[oVFId] = oInnerControl.getContent();
-				}
+				that.aAllVisualFilters[oVFId] = oContent;
 				// remove the content aggregation to render internal content of the field
 				oInnerControl.setContent(null);
 			}
@@ -73,6 +72,18 @@ sap.ui.define(["sap/ui/mdc/filterbar/aligned/FilterContainer"], function(MdcFilt
 		var oFilterFieldIndex = this.aAllFilterFields.findIndex(function(oFilterField) {
 			return oFilterField.getId() === oControl.getId();
 		});
+
+		var that = this;
+		// Setting VF content for Fillterfield before removing
+		oControl.getContent().forEach(function(oInnerControl) {
+			if (oInnerControl.isA("sap.ui.mdc.FilterField") && !oInnerControl.getContent()) {
+				var oVFId = oInnerControl.getId();
+				if (that.aAllVisualFilters[oVFId]) {
+					oInnerControl.setContent(that.aAllVisualFilters[oVFId]);
+				}
+			}
+		});
+
 		this.aAllFilterFields.splice(oFilterFieldIndex, 1);
 
 		MdcFilterContainer.prototype.removeFilterField.apply(this, arguments);