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

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'}">
 
@@ -21,6 +21,7 @@
 									persistencyKey="{parts: [{path: 'smartControlId>id'}, {path: 'objectPageTableSettings>value/persistencyKeyState'}], formatter: 'AH.getPersistencyKey'}"
 									tableBindingPath="{= ${path: 'target>AnnotationPath'}.slice(0, ${path: 'target>AnnotationPath'}.lastIndexOf('/')) }"
 									fitContainer="false"
+									useOnlyOneSolidToolbar="true"
 									enableAutoBinding="false"
 									showRowCount="true"
 									fieldChange="._templateEventHandlers.onTableSmartFieldModelValueChanged"
@@ -30,7 +31,7 @@
 									headerLevel="H5"
 									headerStyle="H5"
 									useVariantManagement="{objectPageTableSettings>value/variantManagement}"
-									enableExport = "{objectPageTableSettings>value/bExportToExcel}"
+									useExportToExcel = "{objectPageTableSettings>value/bExportToExcel}"
 									useTablePersonalisation="true"
 									entitySet="{path: 'listEntitySet>name'}"
 									ignoreFromPersonalisation="{path: 'collection>', formatter: 'AH.suppressP13NDuplicateColumns'}"
@@ -138,10 +139,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 +150,14 @@
 														<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"
+												rootLevel="0"
+												visibleRowCountMode="Auto"
+												expandFirstLevel="false"
 												rowSelectionChange="._templateEventHandlers.onSelectionChange"
 												beforeOpenContextMenu="._templateEventHandlers.beforeOpenContextMenu($event, '{smartControlId>id}')"
 												rowActionCount="{= ({parts: [{path: 'listEntitySet>'}, {path: 'parameter>/settings/subPages/'}], formatter: 'AH.hasSubObjectPage'} ? 1 : 0 )}">
@@ -168,15 +168,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 +185,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.126.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.126.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/fragments/ContactDetails.fragment.xml

@@ -18,6 +18,7 @@
 					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}"
@@ -63,38 +64,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/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="{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 -->

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="{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

@@ -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="{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/QuickViewSmartForm.fragment.xml

@@ -13,8 +13,10 @@
 		class="navigationPopover navigationPopoverHeader sapMQuickViewPage sapSmartTemplatesSmartLinkNavPopoverContentTitleAreaTrunc">
 		<!--the icon comes from the target entity type header,
 		the binding context is set relatively to the the target, and an expand is added if the picture is behind a nav property-->
+		<!-- The formatter 'sap/suite/ui/generic/template/js/formatters/formatImageUrl' is used by 'AH.formatImageOrTypeUrl' -->
 		<Avatar
 			id="{:= ${parameter>/stableId}.getStableId({type: 'QuickView', subType: 'Avatar'})}"
+			core:require="{formatImageUrl: 'sap/suite/ui/generic/template/js/formatters/formatImageUrl'}"
 			tooltip="{path: 'header>Title/Value', formatter: 'AHModel.format'}"
 			visible="{= !!(${path: 'header>ImageUrl'} || ${path: 'header>TypeImageUrl'}) }"
 			binding="{parts:[{path: 'entitySet>'}, {path: 'quickView>/navigationPath'}, {path: 'header>ImageUrl'}, {path: 'header>TypeImageUrl'}], formatter: 'AH.getPathWithExpandFromHeader'}"

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

@@ -66,6 +66,17 @@
 										<sfi:customData>
 											<core:CustomData key="defaultTextInEditModeSource" value="{path: 'dataFieldValue>', formatter: 'AH.setValidationForValueList'}" />
 										</sfi:customData>
+										<template:if test="{= ${connectedFieldElement>Criticality} }">
+											<sfi:controlProposal>
+												<sfi:ControlProposal>
+													<sfi:objectStatus>
+														<sfi:ObjectStatus
+															criticality="{path: 'connectedFieldElement>Criticality', formatter: 'AHModel.simplePath'}"
+															criticalityRepresentationType="{= (${connectedFieldElement>CriticalityRepresentation/EnumMember} === 'com.sap.vocabularies.UI.v1.CriticalityRepresentationType/WithoutIcon') ? 'WithoutIcon' : 'WithIcon'}" />
+													</sfi:objectStatus>
+												</sfi:ControlProposal>
+											</sfi:controlProposal>
+										</template:if>
 										<sfi:customData>
 											<template:with path="connectedFieldElement>Value" helper="AHModel.resolvePath" var="connectedFieldElementValue">
 												<core:CustomData key="SideEffectSourcePropertyType"
@@ -183,6 +194,16 @@
 													<smartlink:SemanticObjectController ignoredFields="{parts: [{path: 'quickView>/'}, {path: 'dataField>'}], formatter: 'AH.disableSemanticObjectLinksOnPopups'}" />
 												</sfi:semanticObjectController>
 											</template:if>
+											<template:if test="{= ${dataField>Criticality} }">
+												<sfi:controlProposal>
+													<sfi:ControlProposal>
+														<sfi:objectStatus>
+															<sfi:ObjectStatus criticality="{path: 'dataField>Criticality', formatter: 'AHModel.simplePath'}"
+																criticalityRepresentationType="{= (${dataField>CriticalityRepresentation/EnumMember} === 'com.sap.vocabularies.UI.v1.CriticalityRepresentationType/WithoutIcon') ? 'WithoutIcon' : 'WithIcon'}"/>
+														</sfi:objectStatus>
+													</sfi:ControlProposal>
+												</sfi:controlProposal>
+											</template:if>
 											<sfi:customData>
 												<core:CustomData key="SideEffectSourcePropertyType"
 													value="{parts: [{path: 'dataFieldValue>name'}, {path: 'parameter>/isDraftEnabled'}, {path: 'parameter>/metaModel'}, {path: 'parameter>/entityType'}], formatter: 'AH.getSideEffectSourcePropertyType'}" />

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

@@ -14,6 +14,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="{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:then>
 					<template:elseif test="{parts: [{path: 'listEntitySet>'}, {path: 'dataField>'}], formatter: 'AHStream.checkIfEntityOrAssociationHasStreamEnabled'}">

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartFilterBarWrapper.js

@@ -24,6 +24,7 @@ sap.ui.define([
 	function SmartFilterBarWrapper(vTarget, oFactory, mParams) {
 		var bIsApplying = false;
 		var aBasicFilters = [];
+		var aMissingNavFilters = [];
 		var oSmartFilterBar, oControlAssignedResolve, oPreliminaryState;
 		var oControlAssignedPromise = new Promise(function (resolve) {
 			oControlAssignedResolve = resolve;
@@ -81,9 +82,54 @@ sap.ui.define([
 				/* SFB header state of a variant (standard or custom) gets determined by the Apply Automatically checkbox's value of the corresponding
 				   variant i.e. if the checkbox is checked, then the header should be collapsed and vice versa. */
 				oSVMWrapperCallbacks.setHeaderState(!oEvent.getParameter("executeOnSelect"));
+				aMissingNavFilters = fnGetNavigationProperties();
 			});
 
 		}
+
+		function fnGetNavigationProperties() {
+			//Fetch the navigation properties
+			var oMetaModel = oSmartFilterBar.getModel().getMetaModel(),
+				sEntitySet = oSmartFilterBar.getEntitySet(),
+				oDataEntitySet = oMetaModel.getODataEntitySet(sEntitySet),
+				oDataEntityType = oMetaModel.getODataEntityType(oDataEntitySet.entityType),
+				oNavigationProperties = oDataEntityType['navigationProperty'],
+				aAddedNavigationProperties = [];
+			//Fetch the added filters in the current variant
+			var sCurrentVariantID = oSmartFilterBar.getVariantManagement().getCurrentVariantId();
+			var oCurrentVariant = oSmartFilterBar.getVariantManagement().getAllVariants().find(function(variant) {
+				return variant.getId() === sCurrentVariantID;
+			});			
+			if (oCurrentVariant === undefined || oCurrentVariant.getContent() === undefined) {
+				return aAddedNavigationProperties;
+			}
+			var oSmartFilterBarVariant = JSON.parse( oCurrentVariant.getContent().searchListReportVariant.filterBarVariant );
+			delete oSmartFilterBarVariant["_CUSTOM"];
+			//Compare the filter source and navigation properties
+			var aMatchedRanges = [];
+			for (var key in oSmartFilterBarVariant) {
+				for (var i = 0; i < oNavigationProperties.length; i++) {
+					var obj = oNavigationProperties[i];
+					if (key.startsWith(obj.name)) {
+						if (oSmartFilterBarVariant[key].ranges) {
+							aMatchedRanges.push(oSmartFilterBarVariant[key].ranges);
+						}
+					}
+				}
+			}
+            if (aMatchedRanges.length) {
+                //Compare the manifest property with the filter source
+                var oManifestNavigationProperties = oSmartFilterBar.getNavigationProperties() || [];
+                var missingNavProperty = aMatchedRanges.filter(function(item) {
+                    var sKeyField = item[0].keyField.split('.')[0];
+                    return !oManifestNavigationProperties.includes(sKeyField);
+                });
+                if (missingNavProperty.length) {
+                    aAddedNavigationProperties = aMatchedRanges;
+                }
+            }
+			return aAddedNavigationProperties;
+		}
 		
 		function fnGetState() {
 			if (!oSmartFilterBar) {
@@ -242,6 +288,10 @@ sap.ui.define([
 			oSmartFilterBar = oControl;
 			oControlAssignedResolve(oSmartFilterBar);
 		}
+
+		function fnGetMissingNavProperties() {
+			return aMissingNavFilters;
+		}
 		
 		// check waiting for initialization (like in SmartTableWrapper/SmartChartWrapper)
 		// currently, whole appState restoring is waiting for initialized event from sfb - but probably it would be enough to wait for it here
@@ -256,7 +306,8 @@ sap.ui.define([
 			// specific properties (needed to workaround direct connection between SFB and SVM)
 			setSVMWrapperCallbacks: setSVMWrapperCallbacks,
 			bVMConnection: oSmartFilterBar.getSmartVariant(),
-			suppressSelection: oSmartFilterBar.setSuppressSelection.bind(oSmartFilterBar) // if multiple reasons for suppressing overlap, a counter (to avoid to early resume) could be implemented here 
+			suppressSelection: oSmartFilterBar.setSuppressSelection.bind(oSmartFilterBar), // if multiple reasons for suppressing overlap, a counter (to avoid to early resume) could be implemented here 
+			getMissingNavProperties: fnGetMissingNavProperties
 		};
 	}
 

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartTableChartCommon.js

@@ -53,9 +53,11 @@ sap.ui.define([
                     // don't create UiState (managed object) from scratch, but fetch it from control and only apply known properties from state - thus, if any other properties would be added, we don't
                     // interfere with them
                     var oUiState = oControl.getUiState();
-                    oUiState.setPresentationVariant(oState.oUiState.oPresentationVariant);
-                    oUiState.setSelectionVariant(oState.oUiState.oSelectionVariant);
-                    oControl.setUiState(oUiState);
+                    if (!oUiState.getProperty("variantName")){
+                        oUiState.setPresentationVariant(oState.oUiState.oPresentationVariant);
+                        oUiState.setSelectionVariant(oState.oUiState.oSelectionVariant);
+                        oControl.setUiState(oUiState);
+                    }
                     bIsApplying = false;
                 } else {
                     // set standard variant to overcome "implicit personalization" (esp. for OP when navigating to different object in discovery mode)
@@ -198,7 +200,7 @@ sap.ui.define([
             setState: fnSetState,
             setControl: fnSetControl,
             attachStateChanged: fnAttachStateChanged,
-            bVMConnection: bVariantManagementActive
+            bVMConnection: oSmartControl && oSmartControl.getSmartVariant && !!oSmartControl.getSmartVariant()
         };
     }
 

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartVariantManagementWrapper.js

@@ -103,9 +103,9 @@ sap.ui.define([
 			var oControl = oController.getView().byId(sId);
 			if (oControl && oControl.isA("sap.ui.comp.smarttable.SmartTable")) {
 				oControl.attachAfterVariantInitialise(function() {
-                                        //set currentVariantId only when sVariantId is not standard (as it might be overriding existing
-                                        //different currentVariantId) or smartTable's (oControl) currentVariantId is not equal to sVariantId.
-					if (sVariantId !== '*standard*' && oControl.getCurrentVarintId && oControl.getCurrentVarintId() !== sVariantId) {
+					//set currentVariantId only when sVariantId is not standard (as it might be overriding existing
+					//different currentVariantId) or smartTable's (oControl) currentVariantId is not equal to sVariantId.
+					if (sVariantId !== '*standard*' && oControl.getCurrentVariantId && oControl.getCurrentVariantId() !== sVariantId) {
 						oControl.setCurrentVariantId(sVariantId);
 						oSmartVariantManagement.setModified(false);
 					}

package/src/sap/suite/ui/generic/template/js/AnnotationHelper.js

@@ -10,9 +10,10 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 	"sap/m/library",
 	"sap/ui/core/library",
 	"sap/suite/ui/generic/template/genericUtilities/metadataAnalyser",
+	"sap/ui/base/ManagedObject",
 	"sap/suite/ui/generic/template/js/RuntimeFormatters" // just to make sure that it is loaded
 ], function (AnnotationHelperModel, AnnotationHelperModelBasics, SmartField, FeLogger, formatMessage, deepExtend, StableIdHelper, utils, Device,
-	SapMLibrary, SapCoreLibrary, metadataAnalyser) {
+	SapMLibrary, SapCoreLibrary, metadataAnalyser, ManagedObject) {
 	"use strict";
 
 	// shortcut for sap.ui.core.ValueState
@@ -3910,7 +3911,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 		SmartLinks expect a boolean value for forceLinkRendering which is not covered in this function, as semanticObjectController covers all cases
 		*/
 		hasQuickViewFacet: function (oEntitySet, oTargetEntities) {
-			return oTargetEntities[oEntitySet.entityType].sForceLinkRendering; //Example return value '\\{"ProductForEdit":"true"\\}'
+			return ManagedObject.escapeSettingsValue(oTargetEntities[oEntitySet.entityType].sForceLinkRendering); //Example return value '\\{"ProductForEdit":"true"\\}'
 		},
 
 		/*

package/src/sap/suite/ui/generic/template/lib/AppComponent.js

@@ -921,7 +921,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.UIComponent
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.125.0
+	 * @version 1.126.0
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {

package/src/sap/suite/ui/generic/template/lib/Application.js

@@ -26,11 +26,9 @@ sap.ui.define(["sap/ui/base/Object",
 		"use strict";
 		
 		var GHOSTNAVIGATIONHANDLER = {
-			storeInnerAppStateWithImmediateReturn: function(){
+			storeInnerAppStateAsync: function(){
 				return {
-					promise: {
-						fail: Function.prototype
-					}
+					fail: Function.prototype
 				};
 			},
 			parseNavigation: function(){

package/src/sap/suite/ui/generic/template/lib/CRUDHelper.js

@@ -523,15 +523,18 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 									aTransientErrors.push(oMessage);
 								}
 							});
-							var bHasStateError = aCurrentStateMessages.some(function(oMessage){
+							var bHasStateError = aCurrentStateMessages.some(function(oMessage) {
 								return oMessage.type === "Error";
 							});
 							var bIsWarning = bIs412 && !bHasStateError;
-							if (bIsWarning){
+							if (bIsWarning) {
 								// Only show transient warnings in the confirmation popup if no state warning is available (note that backend sometimes sends warnings redundantly as transient and state message)
-								var aMessagesForUserDecision = aCurrentStateMessages.length > 0 ? aCurrentStateMessages : aTransientWarnings;
+								var bHasStateWarning = aCurrentStateMessages.some(function(oMessage) {
+									return oMessage.type === "Warning";
+								});
+								var aMessagesForUserDecision = bHasStateWarning ? aCurrentStateMessages : aTransientWarnings;
 								var oCustomMessageProvider = aCurrentStateMessages.length === 0 && { // if confirmation popup is to show transient messages these messages should be excluded from the
-									isCustomMessage: function(oMessage){                             // normal handling of transient messages (until the confirmation popup is closed)
+									isCustomMessage: function (oMessage) {                             // normal handling of transient messages (until the confirmation popup is closed)
 										return aTransientWarnings.indexOf(oMessage) >= 0;
 									}
 								};

package/src/sap/suite/ui/generic/template/lib/CommonEventHandlers.js

@@ -1350,7 +1350,6 @@ sap.ui.define(["sap/ui/base/Object",
 			var oSmartTable = oEvent.getSource();
 			var oTable = oSmartTable.getTable();
 			var bIsMTable = controlHelper.isMTable(oTable);
-			var bIsTreeTable = controlHelper.isTreeTable(oTable);
 			var oColumns = oTable.getColumns();
 
 			if (!oCallbacks || (oCallbacks && oCallbacks.isPopinWithoutHeader) && bIsMTable) { //Setting popin display without header
@@ -1375,12 +1374,6 @@ sap.ui.define(["sap/ui/base/Object",
 				};
 			}
 
-			//For tree table, set the parameters "rootLevel" and "numberOfExpandedLevels"
-			if (bIsTreeTable) {
-				oBindingParams.parameters.rootLevel = oBindingParams.parameters.rootLevel || 0;
-				oBindingParams.parameters.numberOfExpandedLevels = oBindingParams.parameters.numberOfExpandedLevels || oCallbacks.numberOfExpandedLevels || 0;
-			}
-
 			//Get all the CustomData associated with Smarttable and create an object which is a key value pair of each custom data
 			var aCustomData = oSmartTable.getCustomData();
 			var oCustomData = {};