@sapui5/sap.fe.templates 1.97.0 → 1.100.0

package/src/sap/fe/templates/ListReport/overrides/Share.js

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(
 	["sap/fe/core/helpers/SemanticDateOperators", "sap/ui/core/routing/HashChanger", "sap/fe/core/CommonUtils", "sap/base/Log"],
@@ -52,11 +53,19 @@ sap.ui.define(
 		}
 
 		function getShareUrl() {
-			var sShareUrl;
-			var sHash = HashChanger.getInstance().getHash();
-			var sBasePath = HashChanger.getInstance().hrefForAppSpecificHash ? HashChanger.getInstance().hrefForAppSpecificHash("") : "";
-			sShareUrl = sHash ? sBasePath + sHash : window.location.hash;
-			return sShareUrl;
+			var oUShellContainer = sap.ushell && sap.ushell.Container;
+			if (oUShellContainer) {
+				return oUShellContainer
+					.getFLPUrlAsync(true)
+					.then(function(sFLPUrl) {
+						return sFLPUrl;
+					})
+					.catch(function(sError) {
+						Log.error("Could not retrieve cFLP URL for the sharing dialog (dialog will not be opened)", sError);
+					});
+			} else {
+				return Promise.resolve(document.URL);
+			}
 		}
 
 		function getSaveAsTileServiceUrl(oController) {
@@ -66,13 +75,14 @@ sap.ui.define(
 					.getContent()[0]
 					.data("filterBarId")
 			);
-			var oConditions = oFilterBar.getFilterConditions();
-			var bsaveAsTileServiceUrlAllowed = SemanticDateOperators.hasSemanticDateOperations(oConditions);
-			if (bsaveAsTileServiceUrlAllowed) {
-				return getCountUrl(oController);
-			} else {
-				return "";
+			if (oFilterBar) {
+				var oConditions = oFilterBar.getFilterConditions();
+				var bSaveAsTileServiceUrlAllowed = SemanticDateOperators.hasSemanticDateOperations(oConditions);
+				if (bSaveAsTileServiceUrlAllowed) {
+					return getCountUrl(oController);
+				}
 			}
+			return "";
 		}
 
 		function getJamUrl() {
@@ -99,22 +109,29 @@ sap.ui.define(
 		return {
 			adaptShareMetadata: function(oShareMetadata) {
 				var that = this;
-				return Promise.resolve(getJamUrl()).then(function(sJamUrl) {
-					var oAppComponent = CommonUtils.getAppComponent(that.base.getView());
-					var oMetadata = oAppComponent.getMetadata();
-					var oUIManifest = oMetadata.getManifestEntry("sap.ui");
-					var sIcon = (oUIManifest && oUIManifest.icons && oUIManifest.icons.icon) || "";
-					var oAppManifest = oMetadata.getManifestEntry("sap.app");
-					var sTitle = (oAppManifest && oAppManifest.title) || "";
-					// TODO: check if there is any semantic date used before adding serviceURL as BLI:FIORITECHP1-18023
-					oShareMetadata.tile = {
-						icon: sIcon,
-						title: sTitle,
-						queryUrl: getSaveAsTileServiceUrl(that.base)
-					};
-					oShareMetadata.title = document.title;
-					oShareMetadata.url = getShareUrl();
-					oShareMetadata.jam.url = sJamUrl;
+				Promise.resolve(getJamUrl())
+					.then(function(sJamUrl) {
+						var oAppComponent = CommonUtils.getAppComponent(that.base.getView());
+						var oMetadata = oAppComponent.getMetadata();
+						var oUIManifest = oMetadata.getManifestEntry("sap.ui");
+						var sIcon = (oUIManifest && oUIManifest.icons && oUIManifest.icons.icon) || "";
+						var oAppManifest = oMetadata.getManifestEntry("sap.app");
+						var sTitle = (oAppManifest && oAppManifest.title) || "";
+						// TODO: check if there is any semantic date used before adding serviceURL as BLI:FIORITECHP1-18023
+						oShareMetadata.tile = {
+							icon: sIcon,
+							title: sTitle,
+							queryUrl: getSaveAsTileServiceUrl(that.base)
+						};
+						oShareMetadata.title = document.title;
+						oShareMetadata.jam.url = sJamUrl;
+					})
+					.catch(function(error) {
+						Log.error(error);
+					});
+
+				return Promise.resolve(getShareUrl()).then(function(sFLPUrl) {
+					oShareMetadata.url = sFLPUrl;
 					return oShareMetadata;
 				});
 			}

package/src/sap/fe/templates/ListReport/overrides/ViewState.js

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(
 	[
@@ -12,9 +13,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 +41,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;
@@ -31,19 +53,33 @@ sap.ui.define(
 					oController = oView.getController(),
 					oFilterBar = oController._getFilterBarControl(),
 					aTables = oController._getControls("table");
-
-				oFilterBar.setSuspendSelection(true);
+				if (oFilterBar) {
+					oFilterBar.setSuspendSelection(true);
+					aPromises.push(oFilterBar.initialized());
+				}
 				aTables.forEach(function(oTable) {
 					aPromises.push(oTable.initialized());
 				});
-				aPromises.push(oFilterBar.initialized());
 
 				delete this._bSearchTriggered;
 			},
 			onAfterStateApplied: function() {
-				var oView = this.getView(),
-					oController = oView.getController();
-				oController._getFilterBarControl().setSuspendSelection(false);
+				var oController = this.getView().getController();
+				var oFilterBar = oController._getFilterBarControl();
+				if (oFilterBar) {
+					oFilterBar.setSuspendSelection(false);
+				} else if (oController._isFilterBarHidden()) {
+					var oInternalModelContext = oController.getView().getBindingContext("internal"),
+						aControls = oController._getControls();
+					oInternalModelContext.setProperty("hasPendingFilters", false);
+					if (oController._isMultiMode()) {
+						oController._setCountsOutDated();
+						var sDisplayedControlId = oController._getCurrentControl().getId();
+						aControls.forEach(function(oControl) {
+							oControl.data("outdatedRows", oControl.getId() !== sDisplayedControlId);
+						});
+					}
+				}
 			},
 			adaptBindingRefreshControls: function(aControls) {
 				var oView = this.getView(),
@@ -57,17 +93,15 @@ sap.ui.define(
 				var oView = this.getView(),
 					oController = oView.getController(),
 					oViewData = oView.getViewData(),
-					bControlVM = oViewData.variantManagement === VariantManagement.Control,
-					that = this;
-
-				if (oController._isMultiMode()) {
-					aStateControls.push(oController._getMultiModeControl());
-				}
+					bControlVM = oViewData.variantManagement === VariantManagement.Control;
 
 				var oFilterBarVM = this._getFilterBarVM(oView);
 				if (oFilterBarVM) {
 					aStateControls.push(oFilterBarVM);
 				}
+				if (oController._isMultiMode()) {
+					aStateControls.push(oController._getMultiModeControl());
+				}
 				oController._getControls("table").forEach(function(oTable) {
 					var oQuickFilter = oTable.getQuickFilter();
 					if (oQuickFilter) {
@@ -76,33 +110,18 @@ sap.ui.define(
 					if (bControlVM) {
 						aStateControls.push(oTable.getVariant());
 					}
-					if (that.getView().getController().bTestAppState) {
-						aStateControls.push(oTable);
-					}
+					aStateControls.push(oTable);
 				});
 
 				if (oController._hasMultiVisualizations()) {
 					aStateControls.push(oController._getSegmentedButton(TemplateContentView.Chart));
 					aStateControls.push(oController._getSegmentedButton(TemplateContentView.Table));
 				}
-				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);
-							}
-						}
-					});
+				var oFilterBar = oController._getFilterBarControl();
+				if (oFilterBar) {
+					aStateControls.push(oFilterBar);
 				}
+				aStateControls.push(oView.byId("fe::ListReport"));
 			},
 			retrieveAdditionalStates: function(mAdditionalStates) {
 				var oView = this.getView(),
@@ -124,10 +143,13 @@ sap.ui.define(
 
 				if (oAdditionalStates) {
 					// explicit check for boolean values - 'undefined' should not alter the triggered search property
-					if (oAdditionalStates.dataLoaded === false) {
+					if (oAdditionalStates.dataLoaded === false && oFilterBar) {
+						// without this, the data is loaded on navigating back
 						oFilterBar._bSearchTriggered = false;
 					} else if (oAdditionalStates.dataLoaded === true) {
-						oController._getFilterBarControl().triggerSearch();
+						if (oFilterBar) {
+							oFilterBar.triggerSearch();
+						}
 						this._bSearchTriggered = true;
 					}
 					if (oController._hasMultiVisualizations()) {
@@ -145,42 +167,44 @@ sap.ui.define(
 				var oView = this.getView(),
 					that = this,
 					oController = oView.getController(),
-					oComponent = oController.getOwnerComponent(),
-					oAppComponent = sap.ui.core.Component.getOwnerComponentFor(oComponent),
+					oAppComponent = oController.getAppComponent(oView),
 					oComponentData = oAppComponent.getComponentData(),
 					oStartupParameters = (oComponentData && oComponentData.startupParameters) || {},
 					oVariantPromise = that.handleVariantIdPassedViaURLParams(oStartupParameters),
 					bFilterVariantApplied;
-				oVariantPromise
-					.then(function(aVariants) {
-						if (aVariants && aVariants.length > 0) {
-							if (aVariants[0] === true || aVariants[1] === true) {
-								bFilterVariantApplied = true;
-							}
-						}
-						var oRes = that._applySelectionVariant(oView, oNavigationParameter, bFilterVariantApplied).then(function() {
-							var oController = oView.getController();
-							var oDynamicPage = oView.byId("fe::ListReport");
-							var bPreventInitialSearch = false;
-							var oFilterBarVM = that._getFilterBarVM(oView);
-							var oFilterBarControl = oController._getFilterBarControl();
-							if (
-								(oNavigationParameter.navigationType !== NavType.initial && oNavigationParameter.requiresStandardVariant) ||
-								(!oFilterBarVM && oView.getViewData().initialLoad === InitialLoadMode.Enabled) ||
-								oController._shouldAutoTriggerSearch(oFilterBarVM)
-							) {
-								oFilterBarControl.triggerSearch();
-							} else {
-								bPreventInitialSearch = that._preventInitialSearch(oFilterBarVM);
+				aResults.push(
+					oVariantPromise
+						.then(function(aVariants) {
+							if (aVariants && aVariants.length > 0) {
+								if (aVariants[0] === true || aVariants[1] === true) {
+									bFilterVariantApplied = true;
+								}
 							}
-							that._bSearchTriggered = !bPreventInitialSearch;
-							oDynamicPage.setHeaderExpanded(Device.system.desktop || bPreventInitialSearch);
-						});
-						aResults.push(oRes);
-					})
-					.catch(function() {
-						Log.error("Variant ID cannot be applied");
-					});
+							return that._applySelectionVariant(oView, oNavigationParameter, bFilterVariantApplied).then(function() {
+								var oDynamicPage = oView.byId("fe::ListReport");
+								var bPreventInitialSearch = false;
+								var oFilterBarVM = that._getFilterBarVM(oView);
+								var oFilterBarControl = oController._getFilterBarControl();
+								if (oFilterBarControl) {
+									if (
+										(oNavigationParameter.navigationType !== NavType.initial &&
+											oNavigationParameter.requiresStandardVariant) ||
+										(!oFilterBarVM && oView.getViewData().initialLoad === InitialLoadMode.Enabled) ||
+										oController._shouldAutoTriggerSearch(oFilterBarVM)
+									) {
+										oFilterBarControl.triggerSearch();
+									} else {
+										bPreventInitialSearch = that._preventInitialSearch(oFilterBarVM);
+									}
+									that._bSearchTriggered = !bPreventInitialSearch;
+									oDynamicPage.setHeaderExpanded(Device.system.desktop || bPreventInitialSearch);
+								}
+							});
+						})
+						.catch(function() {
+							Log.error("Variant ID cannot be applied");
+						})
+				);
 			},
 
 			handleVariantIdPassedViaURLParams: function(oUrlParams) {
@@ -213,11 +237,13 @@ sap.ui.define(
 				} else if (oVariantIDs && sVariantManagement === "Control") {
 					if (oVariantIDs.sFilterBarVariantId) {
 						var oVM = oView.byId(oView.getContent()[0].data("filterBarVariantId"));
-						oVM.getVariants().forEach(function(oVariant) {
-							if (oVariant.key === oVariantIDs.sFilterBarVariantId) {
-								aPromises.push(that._applyControlVariant(oVM, oVariantIDs.sFilterBarVariantId, true));
-							}
-						});
+						if (oVM) {
+							oVM.getVariants().forEach(function(oVariant) {
+								if (oVariant.key === oVariantIDs.sFilterBarVariantId) {
+									aPromises.push(that._applyControlVariant(oVM, oVariantIDs.sFilterBarVariantId, true));
+								}
+							});
+						}
 					}
 					if (oVariantIDs.sTableVariantId) {
 						var oController = oView.getController(),
@@ -277,17 +303,16 @@ sap.ui.define(
 			},
 
 			_applySelectionVariant: function(oView, oNavigationParameter, bFilterVariantApplied) {
-				var oSelectionVariant = oNavigationParameter.selectionVariant,
+				var oFilterBar = oView.getController()._getFilterBarControl(),
+					oSelectionVariant = oNavigationParameter.selectionVariant,
 					oSelectionVariantDefaults = oNavigationParameter.selectionVariantDefaults;
-				if (!oSelectionVariant) {
+				if (!oFilterBar || !oSelectionVariant) {
 					return Promise.resolve();
 				}
-
 				var oConditions = {},
 					oMetaModel = oView.getModel().getMetaModel(),
 					oViewData = oView.getViewData(),
 					sContextPath = oViewData.contextPath || "/" + oViewData.entitySet,
-					oFilterBar = oView.byId(oView.getContent()[0].data("filterBarId")),
 					aMandatoryFilterFields = CommonUtils.getMandatoryFilterFields(oMetaModel, sContextPath),
 					oVariant,
 					bRequiresStandardVariant = oNavigationParameter.requiresStandardVariant;
@@ -330,10 +355,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 +374,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 +425,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/ListReport/view/fragments/CollectionVisualization.fragment.xml

@@ -10,6 +10,14 @@
 					<template:repeat list="{converterContext>views}" var="view">
 						<template:with path="view>primaryVisualization" var="presentationContext">
 							<template:repeat list="{presentationContext>visualizations}" var="visualizationDefinition">
+								<m:MessageStrip
+								text="{= '{path:\'internal>controls/ignoredFields' + (${visualizationDefinition>collection}) + (${visualizationDefinition>type}) + '\', formatter: \'.formatters.setChartMessageStrip\'}'}"
+								type="Information"
+								showIcon="true"
+								showCloseButton="true"
+								class="sapUiSmallMargin"
+								visible="{= '{= (${internal>controls/ignoredFields' + (${visualizationDefinition>collection}) + (${visualizationDefinition>type}) + '} || []).length>0 &amp;&amp; ${pageInternal>alpContentView} !== \'Table\'}' }"
+							/>
 								<core:Fragment fragmentName="sap.fe.templates.controls.{visualizationDefinition>type}" type="XML" />
 							</template:repeat>
 						</template:with>

package/src/sap/fe/templates/ListReport/view/fragments/MultipleMode.fragment.xml

@@ -8,7 +8,7 @@
 	<IconTabBar
 		expandable="false"
 		headerMode="Inline"
-		id="fe::TabMultipleMode"
+		id="{converterContext>iconTabBarId}"
 		select=".handlers.onTabMultiModeChange"
 		stretchContentHeight="true"
 		customData:showCounts="{converterContext>showTabCounts}"
@@ -29,12 +29,12 @@
 									</template:then>
 									<template:else>
 										<MessageStrip
-										text="{= '{parts: [{path: \'internal>tabs/ignoredFields/' + (${view>tableControlId} || ${view>chartControlId}) + '\'}, {path: \'\', value: \'' + ${view>title} + '\' }], formatter: \'.formatters.setTabMessageStrip\'}' }"
+										text="{= '{= (${internal>tabs/ignoredFieldsTitle/' + (${view>tableControlId} || ${view>chartControlId}) + '} ) }' }"
 										type="Information"
 										showIcon="true"
 										showCloseButton="true"
 										class="sapUiSmallMargin"
-										visible="{= '{= (${internal>tabs/ignoredFields/' +(${view>tableControlId} || ${view>chartControlId}) + '} || []).length>0 }' }"
+										visible="{= '{= (${internal>tabs/ignoredFields/' + (${view>tableControlId} || ${view>chartControlId}) + '} || []).length>0 }' }"
 									>
 										</MessageStrip>
 										<core:Fragment fragmentName="sap.fe.templates.ListReport.view.fragments.CollectionVisualization" type="XML" />

package/src/sap/fe/templates/ObjectPage/AnnotationHelper.js

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 
 sap.ui.define(
@@ -48,7 +49,7 @@ sap.ui.define(
 			 */
 			getSwitchToActiveVisibility: function(oAnnotations) {
 				if (this.checkDraftState(oAnnotations)) {
-					return "{= (${ui>/editMode} === 'Editable') && !${ui>createMode} && %{DraftAdministrativeData/DraftIsCreatedByMe} }";
+					return "{= (%{DraftAdministrativeData/DraftIsCreatedByMe}) ? ( (${ui>/editMode} === 'Editable') && !${ui>createMode} && %{DraftAdministrativeData/DraftIsCreatedByMe} ) : false }";
 				} else {
 					return false;
 				}
@@ -62,7 +63,7 @@ sap.ui.define(
 			 */
 			getSwitchToDraftVisibility: function(oAnnotations) {
 				if (this.checkDraftState(oAnnotations)) {
-					return "{= !(${ui>/editMode} === 'Editable') && !${ui>createMode} && (${HasDraftEntity} && %{DraftAdministrativeData/DraftIsCreatedByMe}) }";
+					return "{= (%{DraftAdministrativeData/DraftIsCreatedByMe}) ? ( !(${ui>/editMode} === 'Editable') && !${ui>createMode} && ${HasDraftEntity} && %{DraftAdministrativeData/DraftIsCreatedByMe} ) : false }";
 				} else {
 					return false;
 				}
@@ -163,22 +164,22 @@ sap.ui.define(
 					bReadOnly = bReadOnly || oFieldControl == "com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly";
 				}
 				if (bReadOnly) {
-					return false;
-				} else {
 					return true;
+				} else {
+					return false;
 				}
 			},
-			isReadOnlyFromDynamicAnnotations: function(oFieldControl) {
+			readOnlyExpressionFromDynamicAnnotations: function(oFieldControl) {
 				var sIsFieldControlPathReadOnly;
 				if (oFieldControl) {
 					if (ManagedObject.bindingParser(oFieldControl)) {
-						sIsFieldControlPathReadOnly = "$" + oFieldControl + " === '1'";
+						sIsFieldControlPathReadOnly = "%" + oFieldControl + " === 1 ";
 					}
 				}
 				if (sIsFieldControlPathReadOnly) {
 					return "{= " + sIsFieldControlPathReadOnly + "? false : true }";
 				} else {
-					return true;
+					return;
 				}
 			},
 			/*
@@ -311,16 +312,57 @@ sap.ui.define(
 			/*
 			 * Get visiblity for editable header facet.
 			 *
+			 * If either the title or description field from the header annotations are editable, then the
+			 * editable header facet is visible.
+			 *
 			 * @function
 			 * @param {object} [oAnnotations] Annotations object for given entity set
 			 * @param {object} [oFieldControl] field control
 			 * returns {*}  binding expression or boolean value resolved form funcitons isReadOnlyFromStaticAnnotations and isReadOnlyFromDynamicAnnotations
 			 */
-			getVisiblityOfHeaderFacet: function(oAnnotations, oFieldControl) {
-				return (
-					AnnotationHelper.isReadOnlyFromStaticAnnotations(oAnnotations, oFieldControl) &&
-					AnnotationHelper.isReadOnlyFromDynamicAnnotations(oFieldControl)
+			getVisiblityOfHeaderFacet: function(
+				oTitleAnnotations,
+				oDescriptionAnnotations,
+				oFieldTitleFieldControl,
+				oFieldDescriptionFieldControl
+			) {
+				// Check Annotations for Title Field
+				var bIsTitleReadOnly = AnnotationHelper.isReadOnlyFromStaticAnnotations(oTitleAnnotations, oFieldTitleFieldControl);
+				var titleExpression = AnnotationHelper.readOnlyExpressionFromDynamicAnnotations(oFieldTitleFieldControl);
+				// There is no expression and the title is not ready only, this is sufficient for an editable header
+				if (!bIsTitleReadOnly && !titleExpression) {
+					return true;
+				}
+
+				// Check Annotations for Description Field
+				var bIsDescriptionReadOnly = AnnotationHelper.isReadOnlyFromStaticAnnotations(
+					oDescriptionAnnotations,
+					oFieldDescriptionFieldControl
 				);
+				var descriptionExpression = AnnotationHelper.readOnlyExpressionFromDynamicAnnotations(oFieldDescriptionFieldControl);
+				// There is no expression and the description is not ready only, this is sufficient for an editable header
+				if (!bIsDescriptionReadOnly && !descriptionExpression) {
+					return true;
+				}
+
+				// Both title and description are not editable and there are no dynamic annotations
+				if (bIsTitleReadOnly && bIsDescriptionReadOnly && !titleExpression && !descriptionExpression) {
+					return false;
+				}
+
+				// Now combine expressions
+				if (titleExpression && !descriptionExpression) {
+					return titleExpression;
+				} else if (!titleExpression && descriptionExpression) {
+					return descriptionExpression;
+				} else {
+					return AnnotationHelper.combineTitleAndDescriptionExpression(oFieldTitleFieldControl, oFieldDescriptionFieldControl);
+				}
+			},
+			combineTitleAndDescriptionExpression: function(oTitleFieldControl, oDescriptionFieldControl) {
+				// If both header and title field are based on dynmaic field control, the editable header
+				// is visible if at least one of these is not ready only
+				return "{= %" + oTitleFieldControl + " === 1 ? ( %" + oDescriptionFieldControl + " === 1 ? false : true ) : true }";
 			},
 			/*
 			 * Get Expression of press event of delete button.
@@ -447,6 +489,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");
+				}
 			}
 		};