@sapui5/sap.fe.templates 1.99.0 → 1.100.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.templates",
-	"version": "1.99.0",
+	"version": "1.100.0",
 	"description": "SAPUI5 Library sap.fe.templates",
 	"license": "SEE LICENSE IN LICENSE.txt",
 	"author": "SAP SE (https://www.sap.com)",
@@ -8,16 +8,18 @@
 	"scripts": {
 		"build": "tsc -v && tsc --project tsconfig-build.json",
 		"prepare-npm-sources": "babel target/npm-sources/src --out-dir target/npm-sources/src --extensions \".ts\" --config-file ../../.babelrc",
+		"prepare-ts-class-doc": "ts-node ../../docbuilder/prepareTSClassDoc sap.fe.templates",
 		"prepare-ui5-build-sources": "mkdirp target/ui5-build-tmp/src && babel src --out-dir target/ui5-build-tmp/src --extensions \".ts\" --config-file ../../.babelrc && babel test --out-dir target/ui5-build-tmp/test --extensions \".ts\" --config-file ../../.babelrc",
 		"test": "jest --maxWorkers=4",
 		"test-refs": "jest --runInBand --config jest.config-refs.js",
-		"test-updateSnapshots": "jest --runInBand -u"
+		"test-updateSnapshots": "jest --maxWorkers=4 -u"
 	},
 	"keywords": [
 		"sapui5",
 		"ui5"
 	],
 	"devDependencies": {
+		"@sap-ux/jest-mock-ui5": "2.0.5",
 		"ts-node": "^9.1.1",
 		"@babel/cli": "^7.14.8",
 		"@ui5/cli": "^2.14.0",

package/src/sap/fe/templates/.library

@@ -6,7 +6,7 @@
     <copyright>SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     </copyright>
-    <version>1.99.0</version>
+    <version>1.100.0</version>
 
     <documentation>UI5 library: sap.fe.templates</documentation>
 

package/src/sap/fe/templates/ListReport/Component.js

@@ -24,7 +24,13 @@ sap.ui.define(
 					views: {
 						type: "object"
 					},
-
+					/**
+					 *  Flag to determine whether the iconTabBar is in sticky mode
+					 */
+					stickyMultiTabHeader: {
+						type: "boolean",
+						defaultValue: true
+					},
 					/**
 					 * KPIs to display
 					 */

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

@@ -24,6 +24,7 @@
 			<f:DynamicPage
 				id="fe::ListReport"
 				unittest:id="listReportFooterTest"
+				stickySubheaderProvider="{converterContext>stickySubheaderProvider}"
 				customData:singleTableId="{converterContext>singleTableId}"
 				customData:singleChartId="{converterContext>singleChartId}"
 				customData:filterBarId="{converterContext>filterBarId}"
@@ -157,26 +158,26 @@
 							<f:DynamicPageHeader pinnable="{converterContext>showPinnableToggle}">
 							<VBox>
 								<macroInternal:FilterBar
-									unittest:id="listReportFilterBarTest"
-									id="{converterContext>filterBarId}"
-									_applyIdToContent="true"
-									contextPath="{entityType>}"
-									variantBackreference="{= CORE.getVariantBackReference(${viewData>}, ${converterContext>} )}"
-									selectionFields="{filterBarContext>selectionFields}"
-									propertyInfo="{filterBarContext>propertyInfo}"
-									filterChanged=".handlers.onFiltersChanged"
-									filterConditions="{parts:[{path:'converterContext>filterConditions'}, {path:'entitySet>'}], formatter: 'FILTER.getFilterConditions'}"
-									search=".handlers.onSearch"
-									hideBasicSearch="{filterBarContext>hideBasicSearch}"
-									liveMode="{viewData>/liveMode}"
-									showAdaptFiltersButton="true"
-									p13nMode="Item,Value"
-									useSemanticDateRange="{converterContext>useSemanticDateRange}"
-									suspendSelection="true"
-									toggleControlId="{= ${converterContext>/filterLayout} === 'compactvisual' ? ID.generate([ ${converterContext>filterBarId}, 'LayoutToggle']) : undefined }"
-									initialLayout="{= ${converterContext>/filterLayout} === 'compactvisual' ? ${converterContext>/filterInitialLayout} : undefined }"
-									stateChanged=".handlers.onStateChanged"
-								/>
+											unittest:id="listReportFilterBarTest"
+											id="{converterContext>filterBarId}"
+											_applyIdToContent="true"
+											contextPath="{entityType>}"
+											variantBackreference="{= CORE.getVariantBackReference(${viewData>}, ${converterContext>} )}"
+											selectionFields="{filterBarContext>selectionFields}"
+											propertyInfo="{filterBarContext>propertyInfo}"
+											filterChanged=".handlers.onFiltersChanged"
+											filterConditions="{parts:[{path:'converterContext>filterConditions'}, {path:'entitySet>'}], formatter: 'FILTER.getFilterConditions'}"
+											search=".handlers.onSearch"
+											hideBasicSearch="{filterBarContext>hideBasicSearch}"
+											liveMode="{viewData>/liveMode}"
+											showAdaptFiltersButton="true"
+											p13nMode="Item,Value"
+											useSemanticDateRange="{converterContext>useSemanticDateRange}"
+											suspendSelection="true"
+											toggleControlId="{= ${converterContext>/filterLayout} === 'compactvisual' ? ID.generate([ ${converterContext>filterBarId}, 'LayoutToggle']) : undefined }"
+											initialLayout="{= ${converterContext>/filterLayout} === 'compactvisual' ? ${converterContext>/filterInitialLayout} : undefined }"
+											stateChanged=".handlers.onStateChanged"
+										/>
 							</VBox>
 						</f:DynamicPageHeader>
 						</template:with>
@@ -185,7 +186,7 @@
 				</f:header>
 				<f:content>
 					<template:if test="{= ${converterContext>views}.length > 0}">
-						<template:if test="{= ${converterContext>views}.length > 1 &amp;&amp; !${converterContext>hasMultiVisualizations} }">
+						<template:if test="{converterContext>displayMultiVisualizations}">
 							<template:then>
 								<core:Fragment fragmentName="sap.fe.templates.ListReport.view.fragments.MultipleMode" type="XML" />
 							</template:then>

package/src/sap/fe/templates/ListReport/ListReportController.controller.js

@@ -556,8 +556,10 @@ sap.ui.define(
 			 * @param {sap.ui.mdc.FilterBar} oFilterBar MDC filter bar
 			 */
 			_updateMultiTabNotApplicableFields: function(oInternalModelContext, oFilterBar) {
+				var that = this;
 				var mCache = {};
 				var ignoredFields = {},
+					ignoredFieldsTitle = {},
 					aTables = this._getControls("table"),
 					aCharts = this._getControls("Chart");
 				aTables.forEach(function(oTable) {
@@ -567,11 +569,16 @@ sap.ui.define(
 							.getParent()
 							.getParent()
 							.getKey(),
+						sTabTitle = oTable
+							.getParent()
+							.getParent()
+							.getText(),
 						sCacheKey = sTableEntitySet + (oTable.data("enableAnalytics") === "true" ? "Analytical" : "Regular");
 					if (!mCache[sCacheKey]) {
 						mCache[sCacheKey] = FilterUtils.getNotApplicableFilters(oFilterBar, oTable);
 					}
 					ignoredFields[sTabId] = mCache[sCacheKey];
+					ignoredFieldsTitle[sTabId] = that.formatters.setTabMessageStrip.call(that, mCache[sCacheKey], sTabTitle);
 				});
 				aCharts.forEach(function(oChart) {
 					var sChartEntityPath = oChart.data("targetCollectionPath"),
@@ -580,13 +587,19 @@ sap.ui.define(
 							.getParent()
 							.getParent()
 							.getKey(),
+						sTabTitle = oChart
+							.getParent()
+							.getParent()
+							.getText(),
 						sCacheKey = sChartEntitySet + "Chart";
 					if (!mCache[sCacheKey]) {
 						mCache[sCacheKey] = FilterUtils.getNotApplicableFilters(oFilterBar, oChart);
 					}
 					ignoredFields[sTabId] = mCache[sCacheKey];
+					ignoredFieldsTitle[sTabId] = that.formatters.setTabMessageStrip.call(that, mCache[sCacheKey], sTabTitle);
 				});
 				oInternalModelContext.setProperty("tabs/ignoredFields", ignoredFields);
+				oInternalModelContext.setProperty("tabs/ignoredFieldsTitle", ignoredFieldsTitle);
 			},
 			/**
 			 * Method to update the local UI model of the page with the fields that are not applicable to the filter bar (this is specific to the ALP scenario).
@@ -992,24 +1005,6 @@ sap.ui.define(
 				}
 			},
 			formatters: {
-				isDraftIndicatorVisible: function(
-					sPropertyPath,
-					sSemanticKeyHasDraftIndicator,
-					HasDraftEntity,
-					IsActiveEntity,
-					hideDraftInfo
-				) {
-					if (
-						IsActiveEntity !== undefined &&
-						HasDraftEntity !== undefined &&
-						(!IsActiveEntity || HasDraftEntity) &&
-						!hideDraftInfo
-					) {
-						return sPropertyPath === sSemanticKeyHasDraftIndicator;
-					} else {
-						return false;
-					}
-				},
 				/**
 				 * Method to set the message text for the multiple entity sets when fields in the FilterBar need to be ignored.
 				 *

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

@@ -164,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;
 				}
 			},
 			/*
@@ -312,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.

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

@@ -64,13 +64,6 @@ sap.ui.define(
 							type: "boolean",
 							defaultValue: true
 						},
-						/**
-						 * Calls draftPrepare on draftEdit
-						 */
-						prepareOnEdit: {
-							type: "boolean",
-							defaultValue: false
-						},
 						/**
 						 * Defines the properties which can be used for inbound Navigation
 						 */
@@ -129,11 +122,7 @@ sap.ui.define(
 							.finally(function() {
 								that.DeferredContextCreated = false;
 							})
-							.catch(function() {
-								// the creation failed or was aborted by the user - showing the object page doesn't make any sense
-								// now - for now just use window.history.back to navigate back
-								window.history.back();
-							});
+							.catch(function() {});
 					}
 				},
 

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

@@ -91,6 +91,7 @@
 												wrapping="true"
 											/>
 									</template:if>
+									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.CollaborationDraft" type="XML" />
 								</FlexBox>
 								</uxap:expandedContent>
 								<uxap:snappedContent>
@@ -101,13 +102,16 @@
 												wrapping="true"
 											/>
 										</template:if>
+										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.CollaborationDraft" type="XML" />
 									</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>}" />
+									<template:if test="{header>situations}">
+										<internal:SituationsIndicator xmlns:internal="sap.fe.macros.internal" entitySet="{entitySet>}" />
+									</template:if>
 								</uxap:content>
 								<uxap:navigationActions>
 									<template:if test="{= ${viewData>/viewLevel} > 1}">

package/src/sap/fe/templates/ObjectPage/ObjectPageController.controller.js

@@ -43,7 +43,9 @@ sap.ui.define(
 		"./overrides/Paginator",
 		"sap/fe/core/controllerextensions/Placeholder",
 		"sap/base/util/UriParameters",
-		"sap/fe/core/controllerextensions/MassEdit"
+		"sap/fe/core/controllerextensions/MassEdit",
+		"sap/fe/core/actions/collaboration/ActivitySync",
+		"sap/fe/core/actions/collaboration/Manage"
 	],
 	function(
 		PageController,
@@ -84,7 +86,9 @@ sap.ui.define(
 		PaginatorOverride,
 		Placeholder,
 		UriParameters,
-		MassEdit
+		MassEdit,
+		collaborationActivitySync,
+		collaborationManage
 	) {
 		"use strict";
 
@@ -559,6 +563,23 @@ sap.ui.define(
 					// Compute Edit Mode
 					oFinalUIState = this._editFlow.computeEditMode(oBindingContext);
 
+					if (ModelHelper.isCollaborationDraftSupported(oModel.getMetaModel())) {
+						oFinalUIState
+							.then(function() {
+								if (
+									that
+										.getView()
+										.getModel("ui")
+										.getProperty("/isEditable")
+								) {
+									collaborationActivitySync.connect(that.getView());
+								}
+							})
+							.catch(function(oError) {
+								Log.error("Error while waiting for the final UI State", oError);
+							});
+					}
+
 					// update related apps once Data is received in case of binding cache is not available
 					// TODO: this is only a temp solution since we need to call _updateRelatedApps method only after data for Object Page is received (if there is no binding)
 					if (oBindingContext.getBinding().oCache) {
@@ -750,27 +771,31 @@ sap.ui.define(
 					Log.error(err);
 				}
 				var that = this;
-				var oMessageButton = that.getView().byId("fe::FooterBar::MessageButton"),
-					oMessagePopover = oMessageButton.oMessagePopover,
-					oItemBinding = oMessagePopover.getBinding("items");
-
-				if (oItemBinding.getLength() > 0 && !oMessagePopover.isOpen()) {
-					oMessageButton.setVisible(true);
-					// workaround to ensure that oMessageButton is rendered when openBy is called
-					setTimeout(function() {
-						oMessagePopover.openBy(oMessageButton);
-					}, 0);
+				if (
+					!this.getAppComponent()
+						.getRootContainer()
+						.getCurrentPage()
+						.isA("sap.m.MessagePage")
+				) {
+					var oMessageButton = that.getView().byId("fe::FooterBar::MessageButton"),
+						oMessagePopover = oMessageButton.oMessagePopover,
+						oItemBinding = oMessagePopover.getBinding("items");
+
+					if (oItemBinding.getLength() > 0 && !oMessagePopover.isOpen()) {
+						oMessageButton.setVisible(true);
+						// workaround to ensure that oMessageButton is rendered when openBy is called
+						setTimeout(function() {
+							oMessagePopover.openBy(oMessageButton);
+						}, 0);
+					}
 				}
 				return oRet;
 			},
 
 			_editDocument: function(oContext) {
-				var oModel = this.getView().getModel("ui"),
-					mParameters = {
-						prepareOnEdit: this.getView().getViewData().prepareOnEdit
-					};
+				var oModel = this.getView().getModel("ui");
 				BusyLocker.lock(oModel);
-				return this.editFlow.editDocument.apply(this.editFlow, [oContext, mParameters]).finally(function() {
+				return this.editFlow.editDocument.apply(this.editFlow, [oContext]).finally(function() {
 					BusyLocker.unlock(oModel);
 				});
 			},
@@ -820,6 +845,14 @@ sap.ui.define(
 					});
 			},
 
+			_manageCollaboration: function() {
+				collaborationManage.openManageDialog(this.getView());
+			},
+
+			_showCollaborationUserDetails: function(event) {
+				collaborationManage.showUserDetails(event, this.getView());
+			},
+
 			_cancelDocument: function(oContext, mParameters) {
 				mParameters.cancelButton = this.getView().byId(mParameters.cancelButton); //to get the reference of the cancel button from command execution
 				return this.editFlow.cancelDocument(oContext, mParameters);

package/src/sap/fe/templates/ObjectPage/controls/StashableHBox.js

@@ -17,6 +17,12 @@ sap.ui.define(
 					 */
 					title: {
 						type: "string"
+					},
+					/*
+					 * Fallback title to be displayed if no title is available (only needed for displaying stashed header facets in Flex dialog)
+					 */
+					fallbackTitle: {
+						type: "string"
 					}
 				},
 				designtime: "sap/fe/templates/ObjectPage/designtime/StashableHBox.designtime"
@@ -45,7 +51,7 @@ sap.ui.define(
 		 * Return the title property.
 		 */
 		StashableHBox.prototype.getTitle = function() {
-			return this.title;
+			return this.title || this.getFallbackTitle();
 		};
 
 		/*

package/src/sap/fe/templates/ObjectPage/designtime/FlexBox.designtime.js

@@ -7,6 +7,9 @@
 sap.ui.define([], function() {
 	"use strict";
 	return {
+		actions: {
+			remove: null
+		},
 		aggregations: {
 			items: {
 				domRef: ":sap-domref",

package/src/sap/fe/templates/ObjectPage/view/fragments/CollaborationDraft.fragment.xml

@@ -0,0 +1,36 @@
+<core:FragmentDefinition
+	xmlns:f="sap.f"
+	xmlns="sap.m"
+	xmlns:core="sap.ui.core"
+	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
+	template:require="{
+		FE_MODEL: 'sap/fe/core/helpers/ModelHelper'
+	}"
+>
+	<template:if test="{entitySet>@@FE_MODEL.isCollaborationDraftSupported}">
+		<!-- issues with rendering therefore using HBox for now
+		<AvatarGroup avatarDisplaySize="XS" groupType="Individual" visible="{ui>/isEditable}" items="{ui>/collaboration/activeUsers}">
+			<AvatarGroupItem initials="{ui>initials}" />
+		</AvatarGroup>
+	-->
+		<HBox
+			class="sapUiTinyMarginBegin"
+			items="{internal>/collaboration/activeUsers}"
+			visible="{= ${ui>/isEditable} &amp;&amp; ${internal>/collaboration/connected} }"
+		>
+			<f:Avatar initials="{internal>initials}" backgroundColor="Accent{internal>color}" displaySize="XS" press="._showCollaborationUserDetails" />
+		</HBox>
+
+		<template:if test="{entitySet>@com.sap.vocabularies.Common.v1.DraftRoot/ShareAction}">
+			<!-- For now the invite action is only shown on the root. we might provide it on all levels later as well -->
+			<!-- Button class="sapUiTinyMarginBegin" visible="{ui>/isEditable}" text="Invite" press="._manageCollaboration" / -->
+			<Avatar
+				visible="{ui>/isEditable}"
+				backgroundColor="TileIcon"
+				src="sap-icon://add-employee"
+				displaySize="XS"
+				press="._manageCollaboration"
+			/>
+		</template:if>
+	</template:if>
+</core:FragmentDefinition>

package/src/sap/fe/templates/ObjectPage/view/fragments/EditableHeaderFacet.fragment.xml

@@ -38,7 +38,7 @@
 				unittest:id="HeaderInfoFormContainerTest"
 				id="fe::EditableHeaderForm::EditableHeaderInfo"
 				title="{sap.fe.i18n>T_COMMON_OBJECT_PAGE_OBJECT_INFO}"
-				visible="{= OP.getVisiblityOfHeaderFacet(${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Title/Value/$Path@},${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Title/Value/$Path@@FIELD.fieldControl}) }"
+				visible="{= OP.getVisiblityOfHeaderFacet(${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Title/Value/$Path@},${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description/Value/$Path@},${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Title/Value/$Path@@FIELD.fieldControl},${entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description/Value/$Path@@FIELD.fieldControl}) }"
 			>
 				<f:dependents>
 					<macro:ValueHelp

package/src/sap/fe/templates/ObjectPage/view/fragments/HeaderFacet.fragment.xml

@@ -23,6 +23,7 @@
 		unittest:id="headerFacetContent"
 		class="sapUiMediumMarginEnd sapUiSmallMarginBottom"
 		visible="{converterHeaderFacet>visible}"
+		fallbackTitle="{headerFacet>@@MODEL.label}"
 		binding="{= OP.getStashableHBoxBinding(${viewData>/controlConfiguration}, { Facet: ${converterHeaderFacet>} })}"
 		stashed="{converterHeaderFacet>stashed}"
 	>

package/src/sap/fe/templates/ObjectPage/view/fragments/HeaderFacetCustomContainer.fragment.xml

@@ -20,6 +20,7 @@
 		unittest:id="headerFacetContent"
 		class="sapUiMediumMarginEnd sapUiSmallMarginBottom"
 		visible="{converterHeaderFacet>visible}"
+		fallbackTitle="{converterHeaderFacet>title}"
 		binding="{converterHeaderFacet>binding}"
 		stashed="{converterHeaderFacet>stashed}"
 	>

package/src/sap/fe/templates/RootContainer/controller/Fcl.controller.js

@@ -92,12 +92,14 @@ sap.ui.define(
 				onRestore: function() {
 					var oView = this.getView(),
 						oNavContainer = oView.byId("appContent");
+					var oFCLController = this.getView().getController();
 					var oInternalModel = oNavContainer.getModel("internal");
 					var oPages = oInternalModel.getProperty("/pages");
 
 					for (var sComponentId in oPages) {
 						oInternalModel.setProperty("/pages/" + sComponentId + "/restoreStatus", "pending");
 					}
+					oFCLController.onContainerReady();
 				},
 				onSuspend: function() {
 					var oFCLController = this.getView().getController();
@@ -763,7 +765,7 @@ sap.ui.define(
 				}, aRestorePromises);
 				return Promise.all(aRestorePromises);
 			},
-			
+
 			getRightmostContext: function() {
 				var oContext;
 				switch (this.getFclControl().getLayout()) {

package/src/sap/fe/templates/RootContainer/controller/NavContainer.controller.js

@@ -45,13 +45,15 @@ sap.ui.define(
 				},
 				onRestore: function() {
 					var oView = this.getView(),
-						oNavContainer = oView.byId("appContent");
+						oNavContainer = oView.byId("appContent"),
+						oController = oView.getController();
 					var oInternalModel = oNavContainer.getModel("internal");
 					var oPages = oInternalModel.getProperty("/pages");
 
 					for (var sComponentId in oPages) {
 						oInternalModel.setProperty("/pages/" + sComponentId + "/restoreStatus", "pending");
 					}
+					oController.onContainerReady();
 				},
 				onSuspend: function() {
 					var oView = this.getView(),

package/src/sap/fe/templates/library.js

@@ -47,7 +47,7 @@ sap.ui.define(
 			interfaces: [],
 			controls: [],
 			elements: [],
-			version: "1.99.0",
+			version: "1.100.0",
 			noLibraryCSS: true
 		});
 		if (!sap.fe.templates.ObjectPage) {

package/src/sap/fe/templates/messagebundle_ar.properties

@@ -136,18 +136,3 @@ T_OP_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER=\u0644\u0645 \u064A\u062A\u0645 \u
 T_SEGMENTED_BUTTON_TOOLTIP_VISUAL=\u0639\u0648\u0627\u0645\u0644 \u062A\u0635\u0641\u064A\u0629 \u0645\u0631\u0626\u064A\u0629
 
 T_SEGMENTED_BUTTON_TOOLTIP_COMPACT=\u0639\u0648\u0627\u0645\u0644 \u062A\u0635\u0641\u064A\u0629 \u0645\u0635\u063A\u0651\u064E\u0631\u0629
-
-
-T_MASS_EDIT_CONFIRM_MESSAGE=\u0644\u0627 \u064A\u0645\u0643\u0646 \u062A\u062D\u0631\u064A\u0631 {0} \u0645\u0646 {1} \u0645\u0646 \u0627\u0644\u0645\u0646\u062A\u062C\u0627\u062A.\n \u0647\u0644 \u062A\u0631\u064A\u062F \u062A\u062D\u0631\u064A\u0631 {2} \u0645\u0646 \u0627\u0644\u0645\u0646\u062A\u062C\u0627\u062A \u0627\u0644\u0645\u062A\u0628\u0642\u064A\u0629\u061F
-
-T_MASS_EDIT_CONFIRM_MESSAGE_DETAIL_HEADER=\u0627\u0644\u0623\u0633\u0628\u0627\u0628 \u0627\u0644\u0645\u062D\u062A\u0645\u0644\u0629
-
-T_MASS_EDIT_CONFIRM_MESSAGE_DETAIL_REASON=\u064A\u062A\u0645 \u0627\u0633\u062A\u0628\u0639\u0627\u062F \u0627\u0644\u0645\u0646\u062A\u062C\u0627\u062A \u0627\u0644\u0645\u062D\u062F\u062F\u0629 \u0625\u0630\u0627\:
-
-T_MASS_EDIT_CONFIRM_MESSAGE_DETAIL_REASON_DRAFT=\u0634\u062E\u0635 \u0645\u0627 \u064A\u0639\u0645\u0644 \u0639\u0644\u0649 \u0627\u0644\u0645\u0646\u062A\u062C (\u062A\u0648\u062C\u062F \u0645\u0633\u0648\u062F\u0629 \u0623\u0648 \u0644\u0645 \u064A\u062A\u0645 \u062D\u0641\u0638 \u0627\u0644\u062A\u063A\u064A\u064A\u0631\u0627\u062A).
-
-T_MASS_EDIT_CONFIRM_MESSAGE_DETAIL_REASON_NON_EDITABLE=\u0627\u0644\u062A\u062D\u0631\u064A\u0631 \u063A\u064A\u0631 \u0645\u0633\u0645\u0648\u062D \u0628\u0647 \u0644\u0644\u0645\u0646\u062A\u062C.
-
-T_MASS_EDIT_CONFIRM_BUTTON_TEXT=\u062A\u062D\u0631\u064A\u0631
-
-T_MASS_EDIT_CANCEL_BUTTON_TEXT=\u0625\u0644\u063A\u0627\u0621