@sapui5/sap.suite.ui.generic.template 1.125.0 → 1.127.0

package/src/sap/suite/ui/generic/template/ObjectPage/templateSpecificPreparationHelper.js

@@ -331,13 +331,21 @@ sap.ui.define([
 			fnSetTargetEntity(oEntitySet);
 
 			var bToolbarButtonVisible = fnGetTableToolbarButtonVisibility(oSettings, oEntitySet, oResult.type);
-			var sPathforInsertRestriction = fnGetInsertRestrictionForPasteButton(oEntitySet);
+			var oPathforRestriction = fnGetRestrictionForPasteButton(oEntitySet);
 			/* Workaround fix for non draft apps with no section settings defined in the manifest. In UI5v1.93, the export to excel button is displayed by default because of a code gap in
 			   FE which later got fixed with a change related to paste button in UI5v1.96 wherein the export button is not displayed by default. This looks like a regression issue to customers
 			   for which we have provided this temporary solution which shall get removed soon. */
 			oResult.bExportToExcel = (!oComponentUtils.isDraftEnabled() && !oSettings.sections) || bToolbarButtonVisible;
-			if (sPathforInsertRestriction) {
-				oResult.vShowPasteButton = bToolbarButtonVisible ? "{= ${ui>/editable} && ${" + sPathforInsertRestriction + "}}" : false;
+			if (oPathforRestriction) {
+				var sPathforRestriction = "";
+				if (oPathforRestriction.insertable) {
+					sPathforRestriction = "${" + oPathforRestriction.insertable + "}";
+				}
+				if (oPathforRestriction.updatable) {
+					sPathforRestriction = sPathforRestriction ? sPathforRestriction + " || ${" + oPathforRestriction.updatable + "}" : "${" + oPathforRestriction.updatable + "}";
+				}
+				sPathforRestriction = sPathforRestriction && "(" + sPathforRestriction + ")";
+				oResult.vShowPasteButton = bToolbarButtonVisible ? "{= ${ui>/editable} && " + sPathforRestriction + "}" : false;
 			} else {
 				oResult.vShowPasteButton = bToolbarButtonVisible ? "{ui>/editable}" : false;
 			}
@@ -348,21 +356,39 @@ sap.ui.define([
 			return oResult;
 		}
 		
-		function fnGetInsertRestrictionForPasteButton(oEntitySet) {
+		// fnGetRestrictionForPasteButton return object contains updatable and insertable restriction for the given Entity Set.
+		function fnGetRestrictionForPasteButton(oEntitySet) {
 			var oLeadingEntitySet = oMetaModel.getODataEntitySet(sLeadingEntitySet);
-			var oInsertableAnnotation, oSectionInsertRestriction;
-			var oRestrictionSetViaNavRestrictions = AnnotationHelper.handleNavigationRestrictions(oMetaModel, oLeadingEntitySet, oEntitySet, 'Insertable');
-			if (oRestrictionSetViaNavRestrictions) {
-				oInsertableAnnotation = oRestrictionSetViaNavRestrictions['Insertable'];
+			var oInsertableAnnotation, oUpdatableAnnotation;
+			
+			var oInsertRestrictionSetViaNavRestrictions = AnnotationHelper.handleNavigationRestrictions(oMetaModel, oLeadingEntitySet, oEntitySet, 'Insertable');
+			if (oInsertRestrictionSetViaNavRestrictions) {
+				oInsertableAnnotation = oInsertRestrictionSetViaNavRestrictions['Insertable'];
 			} else {
-				oSectionInsertRestriction = oEntitySet['Org.OData.Capabilities.V1.InsertRestrictions'];
+				var oSectionInsertRestriction = oEntitySet['Org.OData.Capabilities.V1.InsertRestrictions'];
 				oInsertableAnnotation = oSectionInsertRestriction && oSectionInsertRestriction['Insertable'];
 			}
-			if (oInsertableAnnotation && oInsertableAnnotation.Path) {
-				return oInsertableAnnotation.Path;
+
+			var oUpdateRestrictionSetViaNavRestrictions = AnnotationHelper.handleNavigationRestrictions(oMetaModel, oLeadingEntitySet, oEntitySet, 'Updatable');
+			if (oUpdateRestrictionSetViaNavRestrictions) {
+				oUpdatableAnnotation = oUpdateRestrictionSetViaNavRestrictions['Updatable'];
+			} else {
+				var oSectionUpdatableRestriction = oEntitySet['Org.OData.Capabilities.V1.UpdateRestrictions'];
+				oUpdatableAnnotation = oSectionUpdatableRestriction && oSectionUpdatableRestriction['Updatable'];
+			}
+
+			var sInsertablePath = oInsertableAnnotation ? oInsertableAnnotation.Path : "";
+			var sUpdatablePath = oUpdatableAnnotation ? oUpdatableAnnotation.Path : "";
+			
+			if (sInsertablePath || sUpdatablePath) {
+				return {
+					insertable: sInsertablePath,
+					updatable: sUpdatablePath
+				};
 			}
-			return false;
+			return null;
 		}
+		
 		// used in the process of determining the visibility of export to excel and paste button depending on certain restrictions/conditions.
 		function fnGetTableToolbarButtonVisibility(oSettings, oEntitySet, sTableType) {	
 			var oInsertableAnnotation, sEntityType, oSectionInsertRestriction;

package/src/sap/suite/ui/generic/template/ObjectPage/view/Details.view.xml

@@ -115,8 +115,10 @@
 								</uxap:ObjectPageDynamicHeaderTitle>
 							</template:then>
 							<template:else>
+								<!-- The formatter 'sap/suite/ui/generic/template/js/formatters/formatImageUrl' is used by 'AH.formatHeaderImage' -->
 								<uxap:ObjectPageHeader
 									id="objectPageHeader"
+									core:require="{formatImageUrl: 'sap/suite/ui/generic/template/js/formatters/formatImageUrl'}"
 									objectTitle="{_templPriv>/objectPage/headerInfo/objectTitle}"
 									objectSubtitle="{_templPriv>/objectPage/headerInfo/objectSubtitle}"
 									objectImageURI="{parts:[{path: 'entityType>com.sap.vocabularies.UI.v1.HeaderInfo'}, {path: 'parameter>/appComponentName'}], formatter: 'AH.formatHeaderImage'}"

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/Actions.fragment.xml

@@ -130,7 +130,7 @@
 		ariaHasPopup="Dialog"
 		fesr:press="fe:sum:summarize"
 		type="Ghost"
-		visible="{_templPrivGlobal>/generic/isSummarizationEnabled}" />
+		visible="{_templPrivGlobal>/generic/fioriAI/isSummarizationEnabled}" />
 
 	<template:if test="{parameter>/settings/showRelatedApps}">
 		<uxap:ObjectPageHeaderActionButton id="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageAction', subType: 'RelatedApps'}) }"

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/CRUDActionButtons.fragment.xml

@@ -2,7 +2,7 @@
 	xmlns:fesr="http://schemas.sap.com/sapui5/extension/sap.ui.core.FESR/1"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
 	template:require="{AH: 'sap/suite/ui/generic/template/js/AnnotationHelper'}">
-	
+
 	<!-- @classdesc @name: Name: sap.suite.ui.generic.template.ObjectPage.view.fragments.CRUDActionButtons.fragment.xml -->
 	<template:if test="{parts: [ {path: 'listEntitySet>Org.OData.Capabilities.V1.InsertRestrictions'}, {path: 'listEntitySet>'}, {value: 'Insertable'}, {path: 'entitySet>name'}], formatter: 'AH.areBooleanRestrictionsValidAndPossible'}">
 		<template:with path="objectPageTableSettings>value/commandExecution/Create" var="createAction">
@@ -12,7 +12,7 @@
 				press="{createAction>press}"
 				fesr:press="fe:createItem"
 				enabled="{createAction>enabled}"
-				visible="{parts: [{path: 'entitySet>'}, {path: 'listEntitySet>'}, {path: 'parameter>/settings/subPages/'}, {path: 'facet>'}, {path: 'parameter>/settings'}, {path: 'parameter>/isDraftEnabled'}, {path: 'createWithParameterDialog>'}, {path: 'objectPageTableSettings>value/type'}], formatter: 'AH.isRelatedEntityCreatable'}">
+				visible="{parts: [{path: 'entitySet>'}, {path: 'listEntitySet>'}, {path: 'parameter>/settings/subPages/'}, {path: 'facet>'}, {path: 'parameter>/settings'}, {path: 'parameter>/isDraftEnabled'}, {path: 'createWithParameterDialog>'}, {path: 'objectPageTableSettings>value/type'}, {path: 'appSettings>/'}], formatter: 'AH.isRelatedEntityCreatable'}">
 				<template:if test="!${createAction>isStandardAction}">
 					<layoutData>
 						<OverflowToolbarLayoutData priority = "{createAction>importance}"/>

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/HeaderContainer.fragment.xml

@@ -299,6 +299,17 @@
 																			beforeNavigationCallback="._templateEventHandlers.onBeforeSemanticObjectLinkNavigationCallback"
 																			forceLinkRendering="{parts: [{path: 'entitySet>'},{path: 'parameter>/templateSpecific/targetEntities'}], formatter: 'AH.hasQuickViewFacet'}"/>
 									</sfi:semanticObjectController>
+									<template:if test="{= ${dataPoint>Criticality} }">
+										<sfi:controlProposal>
+											<sfi:ControlProposal>
+												<sfi:objectStatus>
+													<sfi:ObjectStatus
+															criticality="{= ${dataPoint>Criticality/EnumMember} ? ${dataPoint>Criticality/EnumMember} : ${path: 'dataPoint>Criticality', formatter: 'AHModel.simplePath'} }"
+															criticalityRepresentationType="WithoutIcon"/>
+												</sfi:objectStatus>
+											</sfi:ControlProposal>
+										</sfi:controlProposal>
+									</template:if>
 								</sfi:SmartField>
 							</l:VerticalLayout>
 						</template:else>

package/src/sap/suite/ui/generic/template/ObjectPage/view/fragments/SmartTable.fragment.xml

@@ -1,4 +1,4 @@
-<core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:st="sap.ui.comp.smarttable" xmlns:table="sap.ui.table" xmlns:layout="sap.ui.layout" xmlns:plugins="sap.m.plugins" xmlns:rowmodes="sap.ui.table.rowmodes"
+<core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:st="sap.ui.comp.smarttable" xmlns:table="sap.ui.table" xmlns:layout="sap.ui.layout" xmlns:plugins="sap.m.plugins"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
 	template:require="{AH: 'sap/suite/ui/generic/template/js/AnnotationHelper', AHModel: 'sap/ui/model/odata/AnnotationHelper', StableIdHelper: 'sap/suite/ui/generic/template/js/StableIdHelper'}">
 
@@ -30,7 +30,7 @@
 									headerLevel="H5"
 									headerStyle="H5"
 									useVariantManagement="{objectPageTableSettings>value/variantManagement}"
-									enableExport = "{objectPageTableSettings>value/bExportToExcel}"
+									enableExport="{objectPageTableSettings>value/bExportToExcel}"
 									useTablePersonalisation="true"
 									entitySet="{path: 'listEntitySet>name'}"
 									ignoreFromPersonalisation="{path: 'collection>', formatter: 'AH.suppressP13NDuplicateColumns'}"
@@ -123,7 +123,7 @@
 									<template:if test="{= ${parameter>/isDraftEnabled} }">
 										<template:then>
 											<st:customData>
-												<core:CustomData key="creationMode" value="{parts: [{path: 'facet>'}, {path: 'parameter>/settings'}], formatter: 'AH.getCreationMode'}" />
+												<core:CustomData key="creationMode" value="{parts: [{path: 'facet>'}, {path: 'parameter>/settings'}, {path: 'appSettings>/'}], formatter: 'AH.getCreationMode'}" />
 												<core:CustomData key="disableInlineCreateSort" value="{parts: [{path: 'facet>'}, {path: 'parameter>/settings'}], formatter: 'AH.isInlineCreateSorting'}" />
 												<core:CustomData key="isCreationAllowedByBoolAndPathRestrictions" value="{= ${parts: [{path: 'listEntitySet>Org.OData.Capabilities.V1.InsertRestrictions'}, {path: 'listEntitySet>'}, {value: 'Insertable'}, {path: 'entitySet>'}], formatter: 'AH.isCreationAllowedByBoolAndPathRestrictions'}}"/>
 												<core:CustomData key="inlineCreationRowsConfig" value="{= ${parts: [{path: 'entitySet>'}, {path: 'listEntitySet>'}], formatter: 'AH.buildInlineCreationRowsConfig'} }"/>
@@ -138,10 +138,9 @@
 									<template:if test="{= ${objectPageTableSettings>value/type} === 'AnalyticalTable' &amp;&amp; ${listEntityType>sap:semantics} === 'aggregate'}">
 										<template:then>
 											<table:AnalyticalTable id="{path: 'facet>', formatter: 'AH.getStableIdPartFromFacet'}::analyticalTable"
-												enableColumnReordering="true"
+												visibleRowCountMode="Auto" enableColumnReordering="true"
 												rowSelectionChange="._templateEventHandlers.onSelectionChange"
 												beforeOpenContextMenu="._templateEventHandlers.beforeOpenContextMenu($event, '{smartControlId>id}')"
-												showColumnVisibilityMenu="false"
 												enableColumnFreeze="true" enableCellFilter="true" rowActionCount="{= ${parts: [ {path: 'listEntitySet>'}, {path: 'parameter>/settings/subPages/'}, {path: 'parameter>/manifest'}, {path: 'facet>Target/AnnotationPath'},{path: 'parameter>/isDraftEnabled'}], formatter: 'AH.getRowActionCountForDetailPage'}}">
 												<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartTableUiTableCommons" type="XML"/>
 												<table:columns>
@@ -150,14 +149,12 @@
 														<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.AnalyticalTableColumns" type="XML"/>
 													</template:with>
 												</table:columns>
-												<table:rowMode>
-													<rowmodes:Auto/>
-												</table:rowMode>
 											</table:AnalyticalTable>
 										</template:then>
 										<!--Tree table implementation: Begins-->
 										<template:elseif test="{= ${objectPageTableSettings>value/type} === 'TreeTable'}">
 											<table:TreeTable id="{path: 'facet>', formatter: 'AH.getStableIdPartFromFacet'}::treeTable"
+												visibleRowCountMode="Auto"
 												rowSelectionChange="._templateEventHandlers.onSelectionChange"
 												beforeOpenContextMenu="._templateEventHandlers.beforeOpenContextMenu($event, '{smartControlId>id}')"
 												rowActionCount="{= ({parts: [{path: 'listEntitySet>'}, {path: 'parameter>/settings/subPages/'}], formatter: 'AH.hasSubObjectPage'} ? 1 : 0 )}">
@@ -168,15 +165,12 @@
 														<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.TreeTableColumns" type="XML"/>
 													</template:with>
 												</table:columns>
-												<table:rowMode>
-													<rowmodes:Auto/>
-												</table:rowMode>
 											</table:TreeTable>
 										</template:elseif>
 										<!--Tree table implementation: Ends-->
 										<template:elseif test="{= ${objectPageTableSettings>value/type} === 'GridTable'}">
 											<table:Table id="{path: 'facet>', formatter: 'AH.getStableIdPartFromFacet'}::gridTable"
-												enableColumnReordering="true" showColumnVisibilityMenu="false"
+												enableColumnReordering="true" visibleRowCountMode="Auto"
 												rowSelectionChange="._templateEventHandlers.onSelectionChange"
 												beforeOpenContextMenu="._templateEventHandlers.beforeOpenContextMenu($event, '{smartControlId>id}')"
 												enableColumnFreeze="true" enableCellFilter="true"
@@ -188,9 +182,6 @@
 														<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.GridTableColumns" type="XML"/>
 													</template:with>
 												</table:columns>
-												<table:rowMode>
-													<rowmodes:Auto/>
-												</table:rowMode>
 											</table:Table>
 										</template:elseif>
 										<template:else>

package/src/sap/suite/ui/generic/template/QuickCreate/manifest.json

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.125.0"
+			"version": "1.127.0"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/QuickCreate/view/QuickCreate.controller.js

@@ -367,18 +367,19 @@ sap.ui.define(["../../js/QuickTemplates/QuickActionBaseController", "../../js/Qu
         onRemoveLineItemPress: function (oEvent) {
             var that = this;
             this.setBusy(true);
-            var context = oEvent.getSource().getBindingContext();
+            var oContext = oEvent.getSource().getBindingContext();
 
             if (this.bDraftEnabled) {
                 this.oTransactionController.triggerSubmitChanges().then(function (oResponse) {
-                    that._deleteLineItem(context);
+                    that._deleteLineItem(oContext);
                 }, function (oError) {
                     this.setBusy(false);
                     this.onError(oError);
 
                 }.bind(this));
             } else {
-                this.getView().getModel().deleteCreatedEntry(context);
+                var sContextPath = oContext.getPath();
+                this.getView().getModel().resetChanges([sContextPath], undefined, true);
                 this.setBusy(false);
                 if (this.oQuickCreateAPI) {
                     this.oQuickCreateAPI.calculateViewHeight(this.getView(), false);

package/src/sap/suite/ui/generic/template/QuickView/manifest.json

@@ -6,7 +6,7 @@
 	"type": "component",
 	"i18n": "i18n/i18n.properties",
 	"applicationVersion": {
-		"version": "1.125.0"
+		"version": "1.127.0"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/designtime/AnalyticalListPage.designtime.js

@@ -22,7 +22,7 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 					properties: ["ignoredChartTypes", "selectionMode", "noData", "showChartTooltip", "showChartTypeSelectionButton", "showDownloadButton", "showLegendButton"]
 				},
 				"sap.ui.comp.smarttable.SmartTable": {
-					properties: ["enableExport", "showRowCount", "exportType", "fitContainer", "showTablePersonalisation"],
+					properties: ["useExportToExcel", "showRowCount", "exportType", "showTablePersonalisation"],
 					actions: ["settings"]
 				},
 				"sap.ui.table.AnalyticalColumn": {
@@ -58,7 +58,7 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 					properties: ["useDateRangeType"]
 				},
 				"sap.ui.table.AnalyticalTable": {
-					properties: ["selectionMode"]
+					properties: ["selectionMode", "minAutoRowCount", "visibleRowCountMode"]
 				},
 				"sap.ui.table.AnalyticalColumn": {
 					properties: ["width", "minWidth"]

package/src/sap/suite/ui/generic/template/designtime/ListReport.designtime.js

@@ -19,7 +19,7 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 					properties: ["liveMode"]
 				},
 				"sap.ui.comp.smarttable.SmartTable": {
-					properties: ["enableExport"],
+					properties: ["useExportToExcel"],
 					actions: ["settings"]
 				},
 				"sap.m.Table": {
@@ -90,7 +90,7 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 					properties: ["selectionMode"]
 				},
 				"sap.ui.table.AnalyticalTable": {
-					properties: ["selectionMode"]
+					properties: ["selectionMode", "minAutoRowCount", "visibleRowCountMode"]
 				},
 				"sap.ui.table.AnalyticalColumn": {
 					properties: ["width", "minWidth", "showFilterMenuEntry", "summed"]

package/src/sap/suite/ui/generic/template/designtime/ObjectPage.designtime.js

@@ -29,9 +29,6 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 				"sap.m.HBox": {								// meant in the VBox mentioned above, and for paginator buttons (todo: check exact place)
 					properties: ["visible"]
 				},
-				"sap.ui.layout.Grid": {						// meant for Grid in subSection. Actually there are two grids - clarify whether both are needed and which is meant
-					properties: ["defaultSpan"]			// Todo: check, how this works at all
-				},
 				"sap.uxap.ObjectPageSection": {
 					properties: ["showTitle", "titleUppercase", "title"]
 				},
@@ -39,7 +36,7 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 					properties: ["title"]
 				},
 				"sap.ui.comp.smarttable.SmartTable": {
-					properties: ["enableExport", "editable", "showPasteButton"],
+					properties: ["useExportToExcel", "editable", "showPasteButton"],
 					actions: ["settings"]
 				},
 				"sap.m.Table": {
@@ -112,7 +109,7 @@ sap.ui.define(["sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
 					properties: ["selectionMode"]
 				},
 				"sap.ui.table.AnalyticalTable": {
-					properties: ["selectionMode"]
+					properties: ["selectionMode", "minAutoRowCount", "visibleRowCountMode"]
 				},
 				"sap.ui.table.AnalyticalColumn": {
 					properties: ["width", "minWidth"]

package/src/sap/suite/ui/generic/template/designtime/utils/DesigntimeHandler.js

@@ -1,5 +1,6 @@
-sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend"
-	], function(BaseObject, extend) {
+sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend",
+	"sap/suite/ui/generic/template/designtime/utils/designtimeHelper"
+	], function(BaseObject, extend, designtimeHelper) {
 		"use strict";
 
 	/*
@@ -30,6 +31,7 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend"
 			if (!bWithRestart){
 				oTemplateContract.oApplicationProxy.setStates(false);                        
 			}			
+			designtimeHelper.stopMutationObserver();
 		}
 
 		return {

package/src/sap/suite/ui/generic/template/designtime/utils/designtimeHelper.js

@@ -41,6 +41,7 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 	var aViews = [];
 	var oLogger = new FeLogger("designtime.utils.designTimeHelper").getLogger();
 	var RTA_MODE_URL_PARAM_KEY = "fiori-tools-rta-mode";
+	var oMutationObserver;
 	/**
 	 * get effective designtime for all controls on current active view
 	 * @return {Promise} promise resolving to a map, with key = control id, value = designtime
@@ -81,20 +82,35 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 			oView.findAggregatedObjects(true).forEach(addToControlInfo);
 			
 			// if anything is added later (e.g. for dynamic multi edit dialog, fields are added in js code), we need to retrieve the corresponding designtime 
-			oTopNode.addEventListener('DOMNodeInserted', function(oEventInfo){
-				// one control can add mutliple node hierarchy levels, so find the next (known) control above
-				var oNode = findPreceedingKnownNode(oEventInfo.relatedNode);
-				var oControl = oNode && sap.ui.getCore().byId(oNode.id);
-				if (oControl) {
-					oControl.findAggregatedObjects(true).forEach(addToControlInfo);
-				}
-			});
+			// Create a MutationObserver instance to observe mutations
+			var fnMutationCallback = function (mutationsList) {
+				mutationsList.forEach(function (mutation) {
+					if (mutation.type === 'childList' && mutation.addedNodes.length > 0) {
+						mutation.addedNodes.forEach(function (node) {
+							// Find the preceding known node and the corresponding control
+							var oNode = findPreceedingKnownNode(node);
+							var oControl = oNode && sap.ui.getCore().byId(oNode.id);
+							if (oControl) {
+								// For each control, find aggregated objects and add them to control info
+								oControl.findAggregatedObjects(true).forEach(addToControlInfo);
+							}
+						});
+					}
+				});
+			};
+			if (!oMutationObserver) {
+				oMutationObserver = oMutationObserver || new MutationObserver(fnMutationCallback);
+				var oMutationObserverConfig = { childList: true, subtree: true };
+				oMutationObserver.observe(oTopNode, oMutationObserverConfig);
+			}
 		});
 				
 		
 		return Promise.all(aPromises);
 	}
-
+	function fnStopMutationObserver() {
+		oMutationObserver && oMutationObserver.disconnect();
+	}
 	/**
 	 * Parses the URL parameters and returns the value of RTA mode URL parameter (fiori-tools-rta-mode)
 	 * @returns {Promise<boolean>} A promise which returns a value of RTA mode
@@ -389,6 +405,7 @@ sap.ui.define(["sap/base/util/extend", "sap/base/util/deepExtend", "sap/base/uti
 	return {
 		getMergedAllowList: deepMergeWithArray, 
 		getViewDesignTime: getViewDesignTime,
-		getRtaModeValue : getRtaModeValue
+		getRtaModeValue: getRtaModeValue,
+		stopMutationObserver: fnStopMutationObserver
 	};
 });

package/src/sap/suite/ui/generic/template/fragments/ContactDetails.fragment.xml

@@ -18,10 +18,10 @@
 					displaySize="S"
 					displayShape="Circle"
 					class="sapUiTinyMarginEnd"
+					tooltip="{contact>/contactStatus/badgeTooltip}"
 					badgeValueState="{contact>/contactStatus/badgeValueState}" badgeIcon="{contact>/contactStatus/badgeIcon}" badgeTooltip="{contact>/contactStatus/badgeTooltip}"
 					macrodata:type="{contact>/teamsCollabOptions/0/key}"
 					macrodata:email="{contact>/email}"
-					press=".onTeamsCollabOptionPress"
                 />
                 <VBox class="sapUiTinyMarginBegin">
                     <Title text="{contact>/fn}" level="H3" wrapping="true"/>
@@ -31,7 +31,6 @@
 
 			<!-- render options for teams contact collaboration -->
 			<VBox visible="{= ${contact>/teamsCollabOptions} !== undefined &amp;&amp; ${contact>/teamsCollabOptions}.length > 0 }" class="sapUiSmallMarginBottom">
-				<Toolbar width="100%" height="1px"/>
 				<Toolbar >
 					<Title text="{i18n>CONTACT_OPTION}" level="H5" class="sapUiTinyMarginBegin"/> 
 					<ToolbarSpacer/>
@@ -63,38 +62,38 @@
 			</VBox>
 
 			<VBox visible="{= !!${contact>/title}}" class="sapUiTinyMarginBottom">
-				<Label text="{i18n>CONTACT_JOB_TITLE}:"/>
-				<Text text="{contact>/title}" class="sapUiTinyMarginBottom" />
+				<Label text="{i18n>CONTACT_JOB_TITLE}:" labelFor="template:::contact:::contactDetails::jobTitle"/>
+				<Text id="template:::contact:::contactDetails::jobTitle" text="{contact>/title}" class="sapUiTinyMarginBottom" />
 			</VBox>
 
 			<VBox visible="{= !!${contact>/org}}" class="sapUiTinyMarginBottom">
-				<Label text="{i18n>CONTACT_DEPARTMENT}:"/>
-				<Text text="{contact>/org}" class="sapUiTinyMarginBottom" />
+				<Label text="{i18n>CONTACT_DEPARTMENT}:" labelFor="template:::contact:::contactDetails::department"/>
+				<Text id="template:::contact:::contactDetails::department" text="{contact>/org}" class="sapUiTinyMarginBottom" />
 			</VBox>
 
 			<VBox visible="{= !!${contact>/email}}" class="sapUiTinyMarginBottom">
-				<Label text="{i18n>CONTACT_EMAIL}:" />
-				<Link text="{contact>/email}" href="{path: 'contact>/email', formatter: '.formatUri'}" class="sapUiTinyMarginBottom" wrapping="true"/>
+				<Label text="{i18n>CONTACT_EMAIL}:" labelFor="template:::contact:::contactDetails::email"/>
+				<Link id="template:::contact:::contactDetails::email" text="{contact>/email}" href="{path: 'contact>/email', formatter: '.formatUri'}" class="sapUiTinyMarginBottom" wrapping="true"/>
 			</VBox>
 
 			<VBox visible="{= !!${contact>/work}}" class="sapUiTinyMarginBottom">
-				<Label text="{i18n>CONTACT_PHONE}:"/>
-				<Link text="{contact>/work}" href="{path: 'contact>/work', formatter: '.formatUri'}" class="sapUiTinyMarginBottom" wrapping="true"/>
+				<Label text="{i18n>CONTACT_PHONE}:" labelFor="template:::contact:::contactDetails::phone"/>
+				<Link id="template:::contact:::contactDetails::phone" text="{contact>/work}" href="{path: 'contact>/work', formatter: '.formatUri'}" class="sapUiTinyMarginBottom" wrapping="true"/>
 			</VBox>
 			
 			<VBox visible="{= !!${contact>/cell}}" class="sapUiTinyMarginBottom">
-				<Label text="{i18n>CONTACT_MOBILE}:"/>
-				<Link text="{contact>/cell}" href="{path: 'contact>/cell', formatter: '.formatUri'}" class="sapUiTinyMarginBottom" wrapping="true"/>
+				<Label text="{i18n>CONTACT_MOBILE}:" labelFor="template:::contact:::contactDetails::mobile"/>
+				<Link id="template:::contact:::contactDetails::mobile" text="{contact>/cell}" href="{path: 'contact>/cell', formatter: '.formatUri'}" class="sapUiTinyMarginBottom" wrapping="true"/>
 			</VBox>
 			
 			<VBox visible="{= !!${contact>/fax}}" class="sapUiTinyMarginBottom">
-				<Label text="{i18n>CONTACT_FAX}:"/>
-				<Text text="{contact>/fax}" class="sapUiTinyMarginBottom" />
+				<Label text="{i18n>CONTACT_FAX}:" labelFor="template:::contact:::contactDetails::fax"/>
+				<Text id="template:::contact:::contactDetails::fax" text="{contact>/fax}" class="sapUiTinyMarginBottom" />
 			</VBox>
 
 			<VBox visible="{= !!${contact>/adr}}" class="sapUiTinyMarginBottom">
-				<Label text="{i18n>CONTACT_ADDRESS}:"/>
-				<Text text="{contact>/adr}" class="sapUiTinyMarginBottom" />
+				<Label text="{i18n>CONTACT_ADDRESS}:" labelFor="template:::contact:::contactDetails::address"/>
+				<Text id="template:::contact:::contactDetails::address" text="{contact>/adr}" class="sapUiTinyMarginBottom" />
 			</VBox>
 
         </VBox>

package/src/sap/suite/ui/generic/template/fragments/ContactDetailsQuickViewGroupReplica.fragment.xml

@@ -10,7 +10,6 @@
 		<!-- render options for teams contact collaboration -->
 		<template:if test="{= !!${path: 'contact>email/[${type/EnumMember}.indexOf(\'ContactInformationType/work\')>=0]/address', formatter: 'AHModel.format'} &amp;&amp; ${parameter>/templateSpecific/teamsCollabOptions} !== undefined &amp;&amp; ${parameter>/templateSpecific/teamsCollabOptions}.length > 0 }">
 			<VBox class="sapUiSmallMarginBegin sapUiTinyMarginTopBottom">
-				<Toolbar width="100%" height="1px"/>
 				<Toolbar>
 					<Title text="{i18n>CONTACT_OPTION}" level="H5" class="sapUiTinyMarginBegin"/> 
 					<ToolbarSpacer/>

package/src/sap/suite/ui/generic/template/fragments/EasyFilter.fragment.xml

@@ -0,0 +1,24 @@
+<core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core">
+    <VBox >
+        <MessageStrip
+            text="{i18n>ST_EASY_FILTER_PROMPT_INFO}"
+            showIcon="true"
+            showCloseButton="true"
+            class="sapUiSmallMarginBottom"/>
+        <FlexBox renderType="Bare">
+            <Input id="easyFilter"
+            width="100%" class="sapUiSmallMarginEnd"
+            placeholder="{i18n>ST_EASY_FILTER_INPUT_PLACEHOLDER}"
+            change="._templateEventHandlers.onEasyFilterChange"
+            showClearIcon="true"
+            maxLength="100"
+            submit="._templateEventHandlers.onEasyFilterEnterPress">
+            </Input>
+            <Button text="{i18n>ST_EASY_FILTER_GO_BUTTON_TEXT}"
+                    type="Emphasized"
+                    icon="sap-icon://ai"
+                    press="._templateEventHandlers.onEasyFilterGoButtonPress">
+            </Button>
+        </FlexBox>
+    </VBox>
+</core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/fragments/GridTableCells.fragment.xml

@@ -28,6 +28,17 @@
                     <smartField:configuration>
                         <smartField:Configuration displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'entitySet>'}, {path: 'dataFieldTarget>Data'}], formatter: 'AH.getTextArrangementForSCFields'}"/>
                     </smartField:configuration>
+                    <template:if test="{= ${dataField>Criticality}}">
+                        <smartField:controlProposal>
+                            <smartField:ControlProposal>
+                                <smartField:objectStatus>
+                                    <smartField:ObjectStatus criticality="{= ${dataField>Criticality/EnumMember} ? ${dataField>Criticality/EnumMember} : ${path: 'dataField>Criticality', formatter: 'AHModel.simplePath'} }"
+                                                            criticalityRepresentationType="{= (${dataField>CriticalityRepresentation/EnumMember} === 'com.sap.vocabularies.UI.v1.CriticalityRepresentationType/WithoutIcon') ? 'WithoutIcon' : 'WithIcon'}"
+                                                            ariaLabelledBy="{columnId>id}"/>
+                                </smartField:objectStatus>
+                            </smartField:ControlProposal>
+                        </smartField:controlProposal>
+                    </template:if>
                 </smartField:SmartField>
             </template:elseif>
             <!-- template for DataFieldForAction and DataFieldForIntentBasedNavigation -->
@@ -38,7 +49,7 @@
             <!-- ObjectPage Self-Linking.  Template for DataFieldWithNavigationPath-->
             <template:elseif test="{= (${dataField>RecordType} === 'com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath')}">
                 <smartField:SmartField value="{path: 'dataField>Value', formatter: 'AH.getDataFieldValueSimplePath'}"
-                     editable="{ui>/editable}" press="._templateEventHandlers.onDataFieldWithNavigationPath">
+                     editable="{ui>/editable}" linkPress="._templateEventHandlers.onDataFieldWithNavigationPath">
                     <smartField:customData>
                         <core:CustomData key="Target" value="{dataField>Target/NavigationPropertyPath}" />
                     </smartField:customData>

package/src/sap/suite/ui/generic/template/fragments/HeaderDataPointContent.fragment.xml

@@ -20,6 +20,17 @@
 				<sfi:Configuration
 						displayBehaviour="{parts: [{path: 'dataPoint>'}, {path: 'annotation>'}, {path: 'entitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}"/>
 			</sfi:configuration>
+			<template:if test="{= ${dataPoint>Criticality} }">
+				<sfi:controlProposal>
+					<sfi:ControlProposal>
+						<sfi:objectStatus>
+							<sfi:ObjectStatus
+									criticality="{= ${dataPoint>Criticality/EnumMember} ? ${dataPoint>Criticality/EnumMember} : ${path: 'dataPoint>Criticality', formatter: 'AHModel.simplePath'} }"
+									criticalityRepresentationType="WithoutIcon"/>
+						</sfi:objectStatus>
+					</sfi:ControlProposal>
+				</sfi:controlProposal>
+			</template:if>
 		</sfi:SmartField>
 	</template:with>
 </core:FragmentDefinition>

package/src/sap/suite/ui/generic/template/fragments/HeaderFormDataField.fragment.xml

@@ -68,7 +68,7 @@
 						id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Field"
 						value="{path: 'dataField>Value', formatter: 'AH.getDataFieldValueSimplePath'}"
 						textLabel="{parts: [{path: 'dataField>'}, {path: 'entitySet>'}, {path: 'headerFacet>'}], formatter: 'AH.getLabelForDFwithIBN'}"
-						editable="{ui>/editable}" press="._templateEventHandlers.onDataFieldWithNavigationPath">
+						editable="{ui>/editable}" linkPress="._templateEventHandlers.onDataFieldWithNavigationPath">
 						<sfi:configuration>
 							<sfi:Configuration
 								displayBehaviour="{parts: [{path: 'dataField>'}, {value: ''}, {path: 'entitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}" />
@@ -108,6 +108,18 @@
 								<sfi:Configuration
 										displayBehaviour="{parts: [{path: 'dataField>'}, {path: 'annotation>'}, {path: 'entitySet>'}], formatter: 'AH.getTextArrangementForSmartControl'}"/>
 							</sfi:configuration>
+							<template:if test="{= ${dataField>Criticality} }">
+								<sfi:controlProposal>
+									<sfi:ControlProposal>
+										<sfi:objectStatus>
+											<sfi:ObjectStatus
+													criticality="{= ${dataField>Criticality/EnumMember} ? ${dataField>Criticality/EnumMember} : ${path: 'dataField>Criticality', formatter: 'AHModel.simplePath'} }"
+													criticalityRepresentationType="{= (${dataField>CriticalityRepresentation/EnumMember} === 'com.sap.vocabularies.UI.v1.CriticalityRepresentationType/WithoutIcon') ? 'WithoutIcon' : 'WithIcon'}"
+													class="sapSmartTemplatesObjectPageHeaderFormObjectStatus"/>
+										</sfi:objectStatus>
+									</sfi:ControlProposal>
+								</sfi:controlProposal>
+							</template:if>
 							<sfi:customData>
 								<core:CustomData key="defaultTextInEditModeSource" value="{path: 'dataFieldValue>', formatter: 'AH.setValidationForValueList'}" />
 								<core:CustomData

package/src/sap/suite/ui/generic/template/fragments/MessageDialog.fragment.xml

@@ -1,7 +1,7 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core">
 	<Dialog class="sapUiNoContentPadding" state="{settings>/state}" type="Message" afterClose="afterClose"
 		showHeader="true" horizontalScrolling="false" draggable="true" 
-		contentHeight="440px" contentWidth="440px" verticalScrolling="false">
+		contentHeight="440px" contentWidth="440px" verticalScrolling="false" resizable="true">
 		<content>
 			<MessageView items="{settings>/messages}" showDetailsPageHeader="false" itemSelect="onMessageSelect" groupItems="{settings>/grouping}">
 				<MessageItem type="{settings>type}" title="{settings>message}" description="{settings>description}" 

package/src/sap/suite/ui/generic/template/fragments/MessageInfluencingCRUDAction.fragment.xml

@@ -1,7 +1,7 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core">
 	<Dialog class="sapUiNoContentPadding" id="ShowConfirmationOnDraftActivate" state="{model>/state}" afterClose="afterClose" type="Message" initialFocus="Close" 
 		showHeader="true" horizontalScrolling="false" draggable="true"
-		contentHeight="440px" contentWidth="440px" verticalScrolling="false">
+		contentHeight="440px" contentWidth="440px" verticalScrolling="false" resizable="true">
 		<content>
 			<MessageView  id="messageView" items="{msg>/}" showDetailsPageHeader="false" itemSelect="onMessageSelect" activeTitlePress="titlePressed" groupItems="true">
 				<MessageItem id="messageItem" type="{msg>type}" title="{msg>message}" description="{msg>description}"