@sapui5/sap.fe.templates 1.97.0 → 1.98.0

package/src/sap/fe/templates/ListReport/overrides/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(
 	[
@@ -12,9 +12,27 @@ sap.ui.define(
 		"sap/ui/mdc/p13n/StateUtil",
 		"sap/ui/Device",
 		"sap/ui/mdc/enum/ConditionValidated",
+		"sap/fe/macros/DelegateUtil",
+		"sap/fe/core/helpers/ModelHelper",
+		"sap/fe/macros/filter/FilterUtils",
+		"sap/fe/core/templating/PropertyFormatters",
 		"sap/base/Log"
 	],
-	function(CoreLibrary, NavLibrary, CommonUtils, KeepAliveHelper, ControlVariantApplyAPI, StateUtil, Device, ConditionValidated, Log) {
+	function(
+		CoreLibrary,
+		NavLibrary,
+		CommonUtils,
+		KeepAliveHelper,
+		ControlVariantApplyAPI,
+		StateUtil,
+		Device,
+		ConditionValidated,
+		DelegateUtil,
+		ModelHelper,
+		FilterUtils,
+		PropertyFormatters,
+		Log
+	) {
 		"use strict";
 
 		var NavType = NavLibrary.NavType,
@@ -22,6 +40,9 @@ sap.ui.define(
 			TemplateContentView = CoreLibrary.TemplateContentView,
 			InitialLoadMode = CoreLibrary.InitialLoadMode;
 
+		var FilterRestrictions = CommonUtils.FilterRestrictions,
+			CONDITION_PATH_TO_PROPERTY_PATH_REGEX = /\+|\*/g;
+
 		return {
 			applyInitialStateOnly: function() {
 				return true;
@@ -57,8 +78,7 @@ sap.ui.define(
 				var oView = this.getView(),
 					oController = oView.getController(),
 					oViewData = oView.getViewData(),
-					bControlVM = oViewData.variantManagement === VariantManagement.Control,
-					that = this;
+					bControlVM = oViewData.variantManagement === VariantManagement.Control;
 
 				if (oController._isMultiMode()) {
 					aStateControls.push(oController._getMultiModeControl());
@@ -76,9 +96,7 @@ sap.ui.define(
 					if (bControlVM) {
 						aStateControls.push(oTable.getVariant());
 					}
-					if (that.getView().getController().bTestAppState) {
-						aStateControls.push(oTable);
-					}
+					aStateControls.push(oTable);
 				});
 
 				if (oController._hasMultiVisualizations()) {
@@ -88,22 +106,6 @@ sap.ui.define(
 				aStateControls.push(oController._getFilterBarControl());
 				aStateControls.push(oView.byId("fe::ListReport"));
 			},
-			adaptControlStateHandler: function(oControl, aControlHandler) {
-				if (oControl.isA("sap.ui.fl.variants.VariantManagement")) {
-					aControlHandler.push({
-						retrieve: function(oVM) {
-							return {
-								"variantId": oVM.getCurrentVariantKey()
-							};
-						},
-						apply: function(oVM, oControlState) {
-							if (oControlState && oControlState.variantId !== undefined) {
-								oVM.setModified(true);
-							}
-						}
-					});
-				}
-			},
 			retrieveAdditionalStates: function(mAdditionalStates) {
 				var oView = this.getView(),
 					oController = oView.getController(),
@@ -330,10 +332,7 @@ sap.ui.define(
 				}
 				return oPromise.then(function(bClearFilterAndReplaceWithAppState) {
 					if (bClearFilterAndReplaceWithAppState) {
-						if (that.getView().getController().bTestAppState) {
-							return that._fnApplyConditions(oFilterBar, oConditions);
-						}
-						return that._fnClearFilterAndReplaceWithAppState(oFilterBar, oConditions);
+						return that._fnApplyConditions(oFilterBar, oConditions);
 					}
 				});
 			},
@@ -352,9 +351,35 @@ sap.ui.define(
 						}
 						delete oCondition.isEmpty;
 					};
+				var fnGetPropertyInfo = function(oFilterControl, sEntityTypePath) {
+					var sEntitySetPath = ModelHelper.getEntitySetPath(sEntityTypePath),
+						oMetaModel = oFilterControl.getModel().getMetaModel(),
+						oFR = CommonUtils.getFilterRestrictionsByPath(sEntitySetPath, oMetaModel),
+						aNonFilterableProps = oFR[FilterRestrictions.NON_FILTERABLE_PROPERTIES],
+						mFilterFields = FilterUtils.getConvertedFilterFields(oFilterControl, sEntityTypePath),
+						aPropertyInfo = [];
+					Object.keys(mFilterFields).forEach(function(sFilterFieldKey) {
+						var oConvertedProperty = mFilterFields[sFilterFieldKey];
+						var sPropertyPath = oConvertedProperty.conditionPath.replace(CONDITION_PATH_TO_PROPERTY_PATH_REGEX, "");
+						if (aNonFilterableProps.indexOf(sPropertyPath) === -1) {
+							var sAnnotationPath = oConvertedProperty.annotationPath;
+							var oPropertyContext = oMetaModel.createBindingContext(sAnnotationPath);
+							aPropertyInfo.push({
+								path: oConvertedProperty.conditionPath,
+								hiddenFilter: oConvertedProperty.availability === "Hidden",
+								hasValueHelp: !sAnnotationPath
+									? false
+									: PropertyFormatters.hasValueHelp(oPropertyContext.getObject(), { context: oPropertyContext })
+							});
+							return;
+						}
+					});
+					return aPropertyInfo;
+				};
 				return oFilterBar.initialized().then(function() {
-					oFilterBar
-						.getPropertyInfoSet()
+					var sEntityTypePath = DelegateUtil.getCustomData(oFilterBar, "entityType");
+					var aPropertyInfo = fnGetPropertyInfo(oFilterBar, sEntityTypePath);
+					aPropertyInfo
 						.filter(function(oPropertyInfo) {
 							return oPropertyInfo.path !== "$editState" && oPropertyInfo.path !== "$search";
 						})
@@ -377,9 +402,6 @@ sap.ui.define(
 						});
 					return StateUtil.applyExternalState(oFilterBar, { filter: mFilter, items: aItems });
 				});
-			},
-			_fnClearFilterAndReplaceWithAppState: function(oFilterBar, oConditions) {
-				return this._fnApplyConditions(oFilterBar, {}).then(this._fnApplyConditions.bind(this, oFilterBar, oConditions));
 			}
 		};
 	}

package/src/sap/fe/templates/ObjectPage/AnnotationHelper.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(
@@ -447,6 +447,26 @@ sap.ui.define(
 						return undefined;
 					}
 				}
+			},
+			isSubSectionTitleVisible: function(sSubSectionvisible, sSubSectiontitle, sSubSectionshowTitle) {
+				if (sSubSectionvisible.indexOf("{=") === 0) {
+					// Dynamic expression
+					var sExpressionResult = sSubSectionvisible.substring(
+						sSubSectionvisible.indexOf("{=") + 2,
+						sSubSectionvisible.lastIndexOf("}")
+					);
+					return (
+						"{= (" +
+						sExpressionResult +
+						") && ('" +
+						sSubSectiontitle +
+						"' !=='undefined') && (" +
+						sSubSectionshowTitle +
+						" ? true : false) }"
+					);
+				} else {
+					return sSubSectionvisible && sSubSectiontitle !== "undefined" && (sSubSectionshowTitle ? true : false);
+				}
 			}
 		};
 

package/src/sap/fe/templates/ObjectPage/Component.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(
 	[
@@ -15,6 +15,7 @@ sap.ui.define(
 		"use strict";
 
 		var VariantManagement = CoreLibrary.VariantManagement,
+			CreationMode = CoreLibrary.CreationMode,
 			ObjectPageComponent = TemplateComponent.extend("sap.fe.templates.ObjectPage.Component", {
 				metadata: {
 					properties: {
@@ -86,25 +87,26 @@ sap.ui.define(
 
 				// TODO: this should be ideally be handled by the editflow/routing without the need to have this method in the
 				// object page - for now keep it here
-				createDeferredContext: function(sPath, bActionCreate) {
+				createDeferredContext: function(sPath, oListBinding, bActionCreate) {
 					if (!this.DeferredContextCreated) {
 						this.DeferredContextCreated = true;
-						var oListBinding,
-							that = this,
+						var that = this,
 							oParamters = {
 								"$$groupId": "$auto.Heroes",
 								"$$updateGroupId": "$auto"
 							};
-
-						oListBinding = new ODataListBinding(
-							this.getModel(),
-							sPath.replace("(...)", ""),
-							undefined,
-							undefined,
-							undefined,
-							oParamters
-						);
-
+						if (!oListBinding || oListBinding.isRelative() === false) {
+							oListBinding = new ODataListBinding(
+								this.getModel(),
+								sPath.replace("(...)", ""),
+								undefined,
+								undefined,
+								undefined,
+								oParamters
+							);
+						} else {
+							oListBinding.mParameters = oParamters;
+						}
 						var oStartUpParams =
 								this.oAppComponent &&
 								this.oAppComponent.getComponentData() &&
@@ -119,7 +121,7 @@ sap.ui.define(
 						that.getRootControl()
 							.getController()
 							.editFlow.createDocument(oListBinding, {
-								creationMode: "Sync",
+								creationMode: CreationMode.Sync,
 								createAction: bActionCreate,
 								data: createParams
 							})

package/src/sap/fe/templates/ObjectPage/ExtensionAPI.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/fe/core/ExtensionAPI", "sap/fe/core/CommonUtils", "sap/fe/core/converters/helpers/ID"], function(
 	ExtensionAPI,
@@ -105,6 +105,9 @@ sap.ui.define(["sap/fe/core/ExtensionAPI", "sap/fe/core/CommonUtils", "sap/fe/co
 		 */
 		getSelectedContexts: function(sTableId) {
 			var oTable = this._view.byId(sTableId);
+			if (oTable && oTable.isA("sap.fe.macros.TableAPI")) {
+				oTable = oTable.getContent();
+			}
 			return (oTable && oTable.isA("sap.ui.mdc.Table") && oTable.getSelectedContexts()) || [];
 		},
 
@@ -122,6 +125,18 @@ sap.ui.define(["sap/fe/core/ExtensionAPI", "sap/fe/core/CommonUtils", "sap/fe/co
 				oBlock = this._view.byId(sBlockID),
 				bBlockState = bShow === undefined ? !oBlock.getShowSideContent() : bShow;
 			oBlock.setShowSideContent(bBlockState);
+		},
+
+		/**
+		 * Gets the bound context of the current object page.
+		 *
+		 * @alias sap.fe.templates.ObjectPage.ExtensionAPI#getBindingContext
+		 * @returns {sap.ui.model.odata.v4.Context} Context bound to the object page
+		 *
+		 * @public
+		 */
+		getBindingContext: function() {
+			return this._view.getBindingContext();
 		}
 	});
 

package/src/sap/fe/templates/ObjectPage/ObjectPage.view.xml

@@ -79,93 +79,108 @@
 					/>
 				</uxap:dependents>
 				<template:if test="{converterContext>header/visible}">
-					<uxap:headerTitle>
-						<uxap:ObjectPageDynamicHeaderTitle primaryArea="Begin">
-							<uxap:expandedHeading>
-								<FlexBox>
-									<FlexBox visible="{converterContext>header/title/expandedImageVisible}">
-										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderImage" type="XML" />
+					<template:with path="converterContext>header/avatar" var="avatar">
+						<uxap:headerTitle>
+							<uxap:ObjectPageDynamicHeaderTitle primaryArea="Begin">
+								<uxap:expandedHeading>
+									<FlexBox>
+										<FlexBox visible="{converterContext>header/title/expandedImageVisible}">
+										<Avatar
+												class="sapUiSmallMarginEnd"
+												src="{avatar>src}"
+												initials="{avatar>initials}"
+												fallbackIcon="{avatar>fallbackIcon}"
+												displayShape="{avatar>displayShape}"
+												displaySize="S"
+											/>
+										</FlexBox>
+										<template:with path="entityType>@com.sap.vocabularies.UI.v1.HeaderInfo" var="headerInfo">
+											<Title
+												text="{= OPTemplating.getExpressionForTitle(${headerInfo>@@UI.getConverterContext}, ${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath}, ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot})}"
+												wrapping="true"
+											/>
+										</template:with>
 									</FlexBox>
-									<template:with path="entityType>@com.sap.vocabularies.UI.v1.HeaderInfo" var="headerInfo">
-										<Title
-											text="{= OPTemplating.getExpressionForTitle(${headerInfo>@@UI.getConverterContext}, ${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath}, ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot})}"
-											wrapping="true"
+								</uxap:expandedHeading>
+								<uxap:snappedHeading>
+									<FlexBox>
+											<Avatar
+											class="sapUiSmallMarginEnd"
+											src="{avatar>src}"
+											initials="{avatar>initials}"
+											fallbackIcon="{avatar>fallbackIcon}"
+											displayShape="{avatar>displayShape}"
+											displaySize="S"
 										/>
-									</template:with>
-								</FlexBox>
-							</uxap:expandedHeading>
-							<uxap:snappedHeading>
+										<template:with path="entityType>@com.sap.vocabularies.UI.v1.HeaderInfo" var="headerInfo">
+											<Title
+												text="{= OPTemplating.getExpressionForTitle(${headerInfo>@@UI.getConverterContext}, ${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath}, ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot})}"
+												wrapping="true"
+											/>
+										</template:with>
+									</FlexBox>
+								</uxap:snappedHeading>
+								<uxap:expandedContent>
 								<FlexBox>
-									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderImage" type="XML" />
-									<template:with path="entityType>@com.sap.vocabularies.UI.v1.HeaderInfo" var="headerInfo">
-										<Title
-											text="{= OPTemplating.getExpressionForTitle(${headerInfo>@@UI.getConverterContext}, ${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath}, ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot})}"
-											wrapping="true"
-										/>
-									</template:with>
+									<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description}">
+									<Label
+												text="{= OPTemplating.getExpressionForDescription(${headerInfo>@@UI.getConverterContext}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
+												wrapping="true"
+											/>
+									</template:if>
 								</FlexBox>
-							</uxap:snappedHeading>
-							<uxap:expandedContent>
-							 <FlexBox>
-                            	<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description}">
-              					  <Label
-											text="{= OPTemplating.getExpressionForDescription(${headerInfo>@@UI.getConverterContext}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
-											wrapping="true"
-										/>
-            					  </template:if>
-			    			 </FlexBox>
-							</uxap:expandedContent>
-							<uxap:snappedContent>
-								<FlexBox>
-                            		<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description}">
-                						<Label
-											text="{= OPTemplating.getExpressionForDescription(${headerInfo>@@UI.getConverterContext}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
-											wrapping="true"
-										/>
-            						</template:if>
-			    				</FlexBox>
-							</uxap:snappedContent>
-							<uxap:content>
-								<template:if test="{entitySet>@com.sap.vocabularies.Common.v1.DraftRoot}">
-									<macro:DraftIndicator DraftIndicatorType="IconOnly" class="sapUiTinyMarginBegin sapMTB sapMTBNewFlex" entitySet="{entitySet>}" />
-								</template:if>
-							</uxap:content>
-							<uxap:navigationActions>
-								<template:if test="{= ${viewData>/viewLevel} > 1}">
-									<macro:Paginator id="fe::Paginator" />
-								</template:if>
-								<!-- Flexible column layout menu-->
-								<template:if test="{= ${viewData>/fclEnabled} }">
-									<macro:FlexibleColumnLayoutActions />
-								</template:if>
-							</uxap:navigationActions>
-							<uxap:actions>
-								<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.Actions" type="XML" />
-							</uxap:actions>
-							<uxap:breadcrumbs>
-								<Breadcrumbs
-									unittest:id="BreadcrumbsTest"
-									visible="{= OP.getVisibleExpressionForBreadcrumbs(${viewData>/}) }"
-									modelContextChange="._setBreadcrumbLinks(${$source>/})"
-									id="fe::Breadcrumbs"
+								</uxap:expandedContent>
+								<uxap:snappedContent>
+									<FlexBox>
+										<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description}">
+											<Label
+												text="{= OPTemplating.getExpressionForDescription(${headerInfo>@@UI.getConverterContext}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
+												wrapping="true"
+											/>
+										</template:if>
+									</FlexBox>
+								</uxap:snappedContent>
+								<uxap:content>
+									<template:if test="{entitySet>@com.sap.vocabularies.Common.v1.DraftRoot}">
+										<macro:DraftIndicator DraftIndicatorType="IconOnly" class="sapUiTinyMarginBegin sapMTB sapMTBNewFlex" entitySet="{entitySet>}" />
+									</template:if>
+									<internal:SituationsIndicator xmlns:internal="sap.fe.macros.internal" entitySet="{entitySet>}" />
+								</uxap:content>
+								<uxap:navigationActions>
+									<template:if test="{= ${viewData>/viewLevel} > 1}">
+										<macro:Paginator id="fe::Paginator" />
+									</template:if>
+									<!-- Flexible column layout menu-->
+									<template:if test="{= ${viewData>/fclEnabled} }">
+										<macro:FlexibleColumnLayoutActions />
+									</template:if>
+								</uxap:navigationActions>
+								<uxap:actions>
+									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.Actions" type="XML" />
+								</uxap:actions>
+								<uxap:breadcrumbs>
+									<Breadcrumbs
+										unittest:id="BreadcrumbsTest"
+										visible="{= OP.getVisibleExpressionForBreadcrumbs(${viewData>/}) }"
+										modelContextChange="._setBreadcrumbLinks(${$source>/})"
+										id="fe::Breadcrumbs"
+									>
+									</Breadcrumbs>
+								</uxap:breadcrumbs>
+							</uxap:ObjectPageDynamicHeaderTitle>
+						</uxap:headerTitle>
+						<template:if test="{converterContext>header/hasContent}">
+							<uxap:headerContent>
+								<FlexBox
+									id="fe::HeaderContentContainer"
+									unittest:id="FlexBoxTest"
+									dt:designtime="sap/fe/templates/ObjectPage/designtime/FlexBox.designtime"
+									wrap="Wrap"
+									fitContainer="true"
+									alignItems="Stretch"
 								>
-								</Breadcrumbs>
-							</uxap:breadcrumbs>
-						</uxap:ObjectPageDynamicHeaderTitle>
-					</uxap:headerTitle>
-					<template:if test="{converterContext>header/hasContent}">
-						<uxap:headerContent>
-							<FlexBox
-								id="fe::HeaderContentContainer"
-								unittest:id="FlexBoxTest"
-								dt:designtime="sap/fe/templates/ObjectPage/designtime/FlexBox.designtime"
-								wrap="Wrap"
-								fitContainer="true"
-								alignItems="Stretch"
-							>
-								<template:if test="{converterContext>header/avatar}">
-									<template:with path="converterContext>header/avatar" var="avatar">
-									<Avatar
+									<template:if test="{converterContext>header/avatar}">
+										<Avatar
 											unittest:id="AvatarOPHeaderContent"
 											class="sapUiSmallMarginEnd sapUiSmallMarginBottom"
 											src="{avatar>src}"
@@ -174,12 +189,12 @@
 											displayShape="{avatar>displayShape}"
 											displaySize="XL"
 										/>
-									</template:with>
-								</template:if>
-								<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderContent" type="XML" />
-							</FlexBox>
-						</uxap:headerContent>
-					</template:if>
+									</template:if>
+									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderContent" type="XML" />
+								</FlexBox>
+							</uxap:headerContent>
+						</template:if>
+					</template:with>
 				</template:if>
 				<uxap:sections>
 					<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.Section" type="XML" />