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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.125.0",
+  "version": "1.126.0",
   "description": "SAPUI5 Library sap.suite.ui.generic.template",
   "keywords": [
     "sapui5",

package/src/sap/suite/ui/generic/template/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.125.0</version>
+	<version>1.126.0</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/control/visualfilterbar/FilterItem.js

@@ -15,7 +15,7 @@ sap.ui.define(["sap/ui/core/Control", "sap/ui/model/Filter"],
 				dimensionFieldIsDateTimeOffset: { type: "boolean", group: "Misc", defaultValue: false },
 				dimensionFieldDisplay: { type: "string", group: "Misc", defaultValue: null },
 				dimensionFilter: { type: "any", group: "Misc", defaultValue: null },
-				dimensionFilterExternal: { type: "sap.ui.model.Filter", group: "Misc", defaultValue: null },
+				dimensionFilterExternal: { type: "any", group: "Misc", defaultValue: null },
 				measureField: { type: "string", group: "Misc", defaultValue: null },
 				unitField: { type: "string", group: "Misc", defaultValue: null },
 				isCurrency: { type: "boolean", group: "Misc", defaultValue: false },

package/src/sap/suite/ui/generic/template/AnalyticalListPage/control/visualfilterbar/FilterItemMicroChart.js

@@ -51,6 +51,7 @@ sap.ui.define([
 				chartQualifier: {type: "string", group: "Misc", defaultValue: null},
 				smartFilterId: { type: "string", group: "Misc", defaultValue: null},
 				isParameter: { type: "boolean", group: "Misc", defaultValue: false },
+				activeVisualFilters: { type: "boolean", group: "Misc", defaultValue: false },
 				stringdate: { type: "string", group: "Misc", defaultValue: "" } //dummy property
 			},
 			aggregations: {

package/src/sap/suite/ui/generic/template/AnalyticalListPage/controller/ControllerImplementation.js

@@ -1058,22 +1058,26 @@ sap.ui.define(["sap/fe/navigation/SelectionVariant",
 							oTemplateUtils.oCommonUtils.setEnabledToolbarButtons(ev.getSource());
 						},
 						onAfterApplyChartVariant: function() {
-							oState.oIappStateHandler.fnStoreCurrentAppStateAndAdjustURL();
+							// Wait until the previous invocation of storing the app state is completed.
+							// Then, proceed with storing the current app state.
+							setTimeout(function () {
+								oState.oIappStateHandler.fnStoreCurrentAppStateAndAdjustURL();
+							}, 0);
 						},
 						onFilterModeSegmentedButtonChange: function(oEvent) {
-							oState.filterBarController.handleFilterSwitch(oEvent.getParameter("key"), oEvent.oSource._bApplyingVariant);
+							oState.filterBarController.handleFilterSwitch();
 							oState.oController._templateEventHandlers.onSegmentButtonPressed();
 							oState.filterBarController.fnCheckMandatory();
 						},
 						onContentViewSegmentButtonPressed: function(oEvent){
 							//todo: check if DSH loads if the default filter mode is crosstable
 							//ideally we can init DSH post GO button press
+							var sSelectedKey = oEvent.getSource().getSelectedKey();
 
-							if (oEvent.getParameter("key") === "crosstable" && !oState.oAnalyticGrid) {
+							if (sSelectedKey === "crosstable" && !oState.oAnalyticGrid) {
 								oState.oAnalyticGridController.initAnalyticGrid();
 							}
 							
-							var sSelectedKey = oEvent.getSource().getSelectedKey();
 							if ((sSelectedKey === "table" || sSelectedKey === "charttable") && bTableRebindRequired) {
 								oState.oSmartTable.rebindTable();
 								bTableRebindRequired = false;
@@ -1222,13 +1226,6 @@ sap.ui.define(["sap/fe/navigation/SelectionVariant",
 							};
 							oState.oSmartFilterbar.addAdaptFilterDialogCustomContent(mCustomView);
 						},
-						//Event handling for dialog buttons
-						onSearchForFilters: function(oEvent) {
-							oState.visualFilterDialogContainer._triggerSearchInFilterDialog.call(oState.visualFilterDialogContainer, oEvent);
-						},
-						onDialogSearch: function(oEvent) {
-							oState.visualFilterDialogContainer._searchDialog.call(oState.visualFilterDialogContainer);
-						},
 						onDialogClear: function(oEvent) {
 							oController.onClearFilterExtension(oEvent);
 						},
@@ -1251,9 +1248,11 @@ sap.ui.define(["sap/fe/navigation/SelectionVariant",
 						},
 						onAddCardsToRepository: function(oEvent) {
 							var oPresentationControlHandler = oTemplateUtils.oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oState.oSmartChart);
-							oState.oInsightsHandler.prepareAndShowCard(oEvent, {
-								"cardType" : "Analytical"
-							}, oPresentationControlHandler);
+							oPresentationControlHandler.getInitializationPromise().then(function () {
+								oState.oInsightsHandler.prepareAndShowCard(oEvent, {
+									"cardType" : "Analytical"
+								}, oPresentationControlHandler);
+							});
 						},
 						onBeforeExport: function (oExportEvent) {
 							oTemplateUtils.oCommonEventHandlers.onBeforeExport(oExportEvent);

package/src/sap/suite/ui/generic/template/AnalyticalListPage/controller/DropDownController.js

@@ -65,7 +65,8 @@ sap.ui.define([
 		oDialog.addContent(oList);
 		//Attaching the selection change of the list to update the selection accordingly.
 		oList.attachSelectionChange(function(oEvt) {
-			var currentSelectedItem = oList.getModel().getData(oEvt.mParameters.listItem.getBindingContext().sPath);
+			var sBindingPath = oEvt.getParameter("listItem").getBindingContext().getPath();
+			var currentSelectedItem = oList.getModel().getProperty(sBindingPath);
 			currentSelectedItem = currentSelectedItem[property.dimensionField];
 			var selected = oEvt.getParameters().listItem.mProperties.selected;
 			if (property.filterRestriction === 'multiple') {
@@ -138,9 +139,8 @@ sap.ui.define([
 			this.oSearchField = new SearchField({
 				liveChange: fnApplyFilterOnDropdown,
 				search: fnApplyFilterOnDropdown,
-				enabled:bIsEntitySearchable,
-				initialFocus : true
-				});
+				enabled: bIsEntitySearchable
+			});
 
 			this._oPopoverDialog = new ResponsivePopover('',{
 				placement: SapMLibrary.PlacementType.Bottom,

package/src/sap/suite/ui/generic/template/AnalyticalListPage/controller/FilterBarController.js

@@ -165,17 +165,14 @@ sap.ui.define(["sap/m/SegmentedButtonItem", "sap/m/Button", "sap/m/Text", "sap/m
 			setDefaultFilter:function(mode) {
 				var oTemplatePrivate = this.oState.oController.getOwnerComponent().getModel("_templPriv");
 				oTemplatePrivate.setProperty('/alp/filterMode', mode);
-				this.handleFilterSwitch(mode); // Don't want to trigger a mode change event, this will cause the data to be reloaded too earlier, the reload will happen when variants are processed
+				this.handleFilterSwitch(); // Don't want to trigger a mode change event, this will cause the data to be reloaded too earlier, the reload will happen when variants are processed
 			},
 			/**
 			 * press handler for filter switch button
 			 *
-			 * @param {string} mode - compact or visual
-			 * @param {boolean} bApplyingVariant - true is variant is being applied
-			 *
 			 * @returns {void}
 			 */
-			handleFilterSwitch:function(mode, bApplyingVariant) {
+			handleFilterSwitch:function() {
 				var oComponent = this.oState.oController.getOwnerComponent();
 				var oTemplatePrivate = oComponent.getModel("_templPriv");
 				var oModel = this.oState.alr_visualFilterBar && this.oState.alr_visualFilterBar.getModel();

package/src/sap/suite/ui/generic/template/AnalyticalListPage/controller/VisualFilterDialogController.js

@@ -55,7 +55,6 @@ sap.ui.define([
 		_createForm: function() {
 			// store as a string to parse later ad restore
 			// since cloning via jquery extend is not working on json model
-			this._searchTriggered = false;
 			this._restoreTriggered = false;
 			var oVisualFilterDialogModel = new JSONModel();
 			var visualFilterBarConfigModel = this.oState.alr_visualFilterBar.getModel('_visualFilterConfigModel');
@@ -104,14 +103,6 @@ sap.ui.define([
 			}
 		},
 
-		_searchDialog: function() {
-			//only update the flag on search event and update visual filters on close of the dialog
-			this._searchTriggered = true;
-			if (this.bSearchPendingAfterDialogFilterChange) {
-				this.bSearchPendingAfterDialogFilterChange = false;
-				this.oState.oSmartFilterbar.search();
-			}
-		},
 		/*
 			called on go and save to update the filter bar with the changes made in dialog
 		*/

package/src/sap/suite/ui/generic/template/AnalyticalListPage/extensionAPI/ExtensionAPI.js

@@ -15,6 +15,9 @@ sap.ui.define(["sap/ui/base/Object",
 		var oNavigationController;
 		return /** @lends sap.suite.ui.generic.template.AnalyticalListPage.extensionAPI.ExtensionAPI.prototype */ {
 			/**
+			 * Generally, this method returns the currently selected contexts in the given ui element (table, chart, or list).
+			 * In case the context menu is opened, it returns the contexts applicable to the context menu.
+			 *
 			 * Get the list entries currently selected
 			 * @param {string} sUiElementId the id identifying the ui element the selected context is requested for
 			 * @return {sap.ui.model.Context[]} contains the entries selected
@@ -26,7 +29,13 @@ sap.ui.define(["sap/ui/base/Object",
 				if (sUiElementId) {
 					oControl = oController.byId(sUiElementId);
 				}
-				return oTemplateUtils.oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oTemplateUtils.oCommonUtils.getOwnerPresentationControl(oControl)).getSelectedContexts();
+				var oPresentationControl = oTemplateUtils.oCommonUtils.getOwnerPresentationControl(oControl);
+				// This focus info is added to state by sap.suite.ui.generic.template.lib.ContextMenuHandler when the context menu is opened
+				// If the state contains focus info, return the contexts applicable for context menu
+				if (oState.oFocusInfo && oState.oFocusInfo.smartControlId === oPresentationControl.getId()) {
+					return oState.oFocusInfo.applicableContexts;
+				}
+				return oTemplateUtils.oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oPresentationControl).getSelectedContexts();
 			},
 			/**
 			 * Triggers rebinding on the list

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

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.125.0"
+			"version": "1.126.0"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/AnalyticalListPage/view/AnalyticalListPage.view.xml

@@ -67,7 +67,7 @@
 									<template:then>
 										<SegmentedButton
 											id = "template::FilterSwitchButton"
-											selectedKey="{_templPriv>/alp/filterMode}" width="inherit" visible="{_templPriv>/listReport/isHeaderExpanded}" select="._templateEventHandlers.onFilterModeSegmentedButtonChange">
+											selectedKey="{_templPriv>/alp/filterMode}" width="inherit" visible="{_templPriv>/listReport/isHeaderExpanded}" selectionChange="._templateEventHandlers.onFilterModeSegmentedButtonChange">
 											<layoutData>
 												<OverflowToolbarLayoutData priority="NeverOverflow"/>
 											</layoutData>

package/src/sap/suite/ui/generic/template/AnalyticalListPage/view/fragments/ContentViewButtons.fragment.xml

@@ -1,7 +1,7 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1">
 
-	<SegmentedButton selectedKey="{_templPriv>/alp/contentView}" select="._templateEventHandlers.onContentViewSegmentButtonPressed">
+	<SegmentedButton selectedKey="{_templPriv>/alp/contentView}" selectionChange="._templateEventHandlers.onContentViewSegmentButtonPressed">
 		<items>
 			<template:if test="{= !${device>/system/phone}}">
 				<SegmentedButtonItem

package/src/sap/suite/ui/generic/template/AnalyticalListPage/view/fragments/SmartFilterBar.fragment.xml

@@ -20,10 +20,8 @@
 		reset="{= (${parameter>/settings/hideVisualFilter} === false || ${parameter>/settings/hideVisualFilter} === undefined) ? '._templateEventHandlers.onRestore' : undefined}"
 		filtersDialogClosed="{= (${parameter>/settings/hideVisualFilter} === false || ${parameter>/settings/hideVisualFilter} === undefined) ? '._templateEventHandlers.onDialogClosed' : undefined}"
 		filtersDialogBeforeOpen="{= (${parameter>/settings/hideVisualFilter} === false || ${parameter>/settings/hideVisualFilter} === undefined) ? '._templateEventHandlers.onDialogOpened' : undefined}"
-		filtersDialogSearch="{= (${parameter>/settings/hideVisualFilter} === false || ${parameter>/settings/hideVisualFilter} === undefined) ? '._templateEventHandlers.onDialogSearch' : undefined}"
 		filtersDialogCancel="{= (${parameter>/settings/hideVisualFilter} === false || ${parameter>/settings/hideVisualFilter} === undefined) ? '._templateEventHandlers.onDialogCancel' : undefined}"
 		clear="._templateEventHandlers.onDialogClear"
-		filtersDialogSearchForFilters="{= (${parameter>/settings/hideVisualFilter} === false || ${parameter>/settings/hideVisualFilter} === undefined) ? '._templateEventHandlers.onSearchForFilters' : undefined}"
 		useProvidedNavigationProperties="{= ${entityType>sap:semantics} === 'aggregate' }"
 		>
 		<smartfilterbarext:controlConfiguration>
@@ -32,7 +30,7 @@
 					key="{controlConfigurationSetting>key}"
 					groupId="{controlConfigurationSetting>groupId}"
 					index="{controlConfigurationSetting>index}"
-					visibleInFilterBar="{controlConfigurationSetting>visibleInFilterBar}"
+					visibleInAdvancedArea="{controlConfigurationSetting>visibleInAdvancedArea}"
 					conditionType="{controlConfigurationSetting>conditionType}"
 					historyEnabled="{controlConfigurationSetting>historyEnabled}"/>
 			</template:repeat>

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

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.125.0"
+			"version": "1.126.0"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

package/src/sap/suite/ui/generic/template/ListReport/controller/ControllerImplementation.js

@@ -23,9 +23,11 @@ sap.ui.define([
 	"sap/m/table/Util",
 	"sap/suite/ui/generic/template/genericUtilities/filterHelper",
 	"sap/suite/ui/generic/template/js/AnnotationHelperHiddenTermSupport",
-	"sap/m/IllustratedMessageType"
+	"sap/m/IllustratedMessageType",
+	"sap/ui/model/FilterOperator",
+	"sap/ui/core/message/MessageType"
 ], function (Filter, ExtensionAPI, listUtils, MessageStripHelper, IappStateHandler, MultipleViewsHandler,
-	WorklistHandler, ShareUtils, controlHelper, FeLogger, testableHelper, ObjectPath, StableIdHelper, deepExtend, CreateWithDialogHandler, CtxMenuHandler, MultiEditHandler, SelectionVariant, InsightsHandler, filterSettingsPreparationHelper, TableUtil, filterHelper, AnnotationHelperHiddenTermSupport, IllustratedMessageType) {
+	WorklistHandler, ShareUtils, controlHelper, FeLogger, testableHelper, ObjectPath, StableIdHelper, deepExtend, CreateWithDialogHandler, CtxMenuHandler, MultiEditHandler, SelectionVariant, InsightsHandler, filterSettingsPreparationHelper, TableUtil, filterHelper, AnnotationHelperHiddenTermSupport, IllustratedMessageType, FilterOperator, MessageType) {
 	"use strict";
 
 	var oLogger = new FeLogger("ListReport.controller.ControllerImplementation").getLogger();
@@ -548,6 +550,8 @@ sap.ui.define([
 
 					var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
 
+					oTemplatePrivateModel.setProperty("/listReport/aMissingNavProperties", false);
+
 					oTemplatePrivateModel.setProperty("/generic/bDataAreShownInTable", false);
 					//set a property for the state of LR table. At this state data have never been requested for LR table. Later once data is recieved for LR table we will set it to true.
 					oTemplatePrivateModel.setProperty("/listReport/firstSelection", false);
@@ -705,6 +709,56 @@ sap.ui.define([
 						// However, this connection is not there in the multi view multi table scenario which is the only case in which this snapshot
 						// will be used later.
 						var aFiltersFromRebindEvent = oBindingParams.filters.slice(0);
+						// To get the missing navigation properties rom the user variant
+						var oSmartFilterBarId = oState.oSmartFilterbar.getId();
+						var oSmartFilterBarWrapper = oTemplateUtils.oCommonUtils.getControlStateWrapperById(oSmartFilterBarId, "SmartFilterBar");
+						var aAddedFilters = oSmartFilterBarWrapper.getMissingNavProperties();
+						if (aAddedFilters.length) {
+							var aFilters = Object.keys(aAddedFilters).map(function(filterKey) {
+								return aAddedFilters[filterKey][0].keyField.replace('.', '/');
+							});
+							var sCurrentVariant =  oState.oSmartFilterbar.getVariantManagement().getId();
+							var sCurrentVariantId =  oState.oSmartFilterbar.getCurrentVariantId();
+							var oAllVariants = sap.ui.getCore().byId(sCurrentVariant).getAllVariants();
+							var oCurrentVariant = oAllVariants.find(function(variant) {
+								return variant.getId() === sCurrentVariantId;
+							});
+							var sCurrentVariantName = oCurrentVariant ? oCurrentVariant.mProperties.texts.variantName.value : '';
+							var oEntityType = oTemplateUtils.oCommonUtils.getMetaModelEntityType(oState.oSmartFilterbar.getEntitySet());
+							var aFilterNames = aFilters.reduce(function(acc, sFilter) {
+								var matchingProperties = oEntityType.property.filter(function(element) {
+									return element['sap:text'] && element['sap:text'].startsWith(sFilter);
+								});
+								matchingProperties.forEach(function(oProperty) {
+									if (oProperty) {
+										acc.push(oProperty.name);
+									}
+								});
+								return acc;
+							}, []).filter(Boolean);
+							var sMessage = oTemplateUtils.oCommonUtils.getText("MESSAGE_FILTER_NOT_AVAILABLE",[sCurrentVariantName,aFilterNames.join(", ")]);
+							var oMsg = {
+								message: sMessage,
+								type: MessageType.Warning
+							};
+							var sSelectedTabKey = oState.oMultipleViewsHandler.getSelectedKey();
+							this.extensionAPI.setCustomMessage(oMsg,sSelectedTabKey);
+							aAddedFilters.forEach(function (range) {
+								if (!range[0].exclude) {
+									var filter = new Filter({
+										aFilters: [
+											new Filter({
+												path: range[0].keyField.replace('.', '/'),
+												operator: FilterOperator[range[0].operation],
+												value1: range[0].value1
+											})
+										],
+										bAnd: false
+									});
+									oBindingParams.filters.push(filter);
+								}
+							});
+						}
 						oTemplateUtils.oCommonEventHandlers.onBeforeRebindTable(oEvent, {
 							determineSortOrder: oState.oMultipleViewsHandler.determineSortOrder,
 							ensureExtensionFields: oController.templateBaseExtension.ensureFieldsForSelect,
@@ -716,8 +770,7 @@ sap.ui.define([
 							isPopinWithoutHeader: true,
 							isDataFieldForActionRequired: true,
 							isFieldControlsPathRequired: true,
-							isMandatoryFiltersRequired: true,
-							numberOfExpandedLevels: 1
+							isMandatoryFiltersRequired: true
 						});
 						oController.onBeforeRebindTableExtension(oEvent);
 						var fnDataRequested = oBindingParams.events.dataRequested || Function.prototype;

package/src/sap/suite/ui/generic/template/ListReport/controller/IappStateHandler.js

@@ -887,6 +887,16 @@ sap.ui.define([
 			// regarding a), while SFB takes care to set the data for standard filters (created via annotation), for others (extension filters, edit state filter, anything else that
 			// should be controlled by VM (currently anything else we add to iAppState, but maybe that's only correct in case of page variant management)) we have to set it
 			// (independent of the context).
+			if (sap.ui.getCore().getMessageManager().getMessageModel().oData.length) {
+                var removedMessages = [];
+                for (var i in sap.ui.getCore().getMessageManager().getMessageModel().oData) {
+                    var msg = sap.ui.getCore().getMessageManager().getMessageModel().oData[i];
+                    if (msg.persistent && oEvent.getParameters().context === undefined) {
+                        removedMessages.push(msg);
+                    }
+                }
+                sap.ui.getCore().getMessageManager().removeMessages(removedMessages);
+            }
 			fnRestoreExtendedFilterDataOnAfterSFBVariantLoad(oEvent);
 		}
 

package/src/sap/suite/ui/generic/template/ListReport/i18n/i18n.properties

@@ -171,4 +171,7 @@ CREATE_DIALOG_TITLE=New Object
 # YMSG,30: used in MessageBox after partial update.
 PARTIAL_UPDATE={0} of {1} objects updated.
 
+ # YMSG,150: used to show the applied filters which are no longer visible.
+MESSAGE_FILTER_NOT_AVAILABLE=Filters have been applied to the current view \"{0}\" that are no longer visible: {1}. Contact your administrator to make the filters visible again.
+
 #---End of final block: texts to be redefined by the application ----------------------------------------

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

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.125.0"
+			"version": "1.126.0"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ListReport/view/fragments/SmartFilterBar.fragment.xml

@@ -24,7 +24,7 @@
 						key="{controlConfigurationSetting>key}"
 						groupId="{controlConfigurationSetting>groupId}"
 						index="{controlConfigurationSetting>index}"
-						visibleInFilterBar="{controlConfigurationSetting>visibleInFilterBar}"
+						visibleInAdvancedArea="{controlConfigurationSetting>visibleInAdvancedArea}"
 						conditionType="{controlConfigurationSetting>conditionType}"
 						historyEnabled="{controlConfigurationSetting>historyEnabled}"/>
 			</template:repeat>

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

@@ -1,4 +1,4 @@
-<core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:smarttable="sap.ui.comp.smarttable" xmlns:table="sap.ui.table" xmlns:plugins="sap.m.plugins" xmlns:rowmodes="sap.ui.table.rowmodes"
+<core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:smarttable="sap.ui.comp.smarttable" xmlns:table="sap.ui.table" xmlns:plugins="sap.m.plugins"
 	xmlns:customData="http://schemas.sap.com/sapui5/extension/sap.ui.core.CustomData/1"
 	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
 	template:require="{
@@ -28,7 +28,7 @@
 						showDetailsButton="{parameter>/templateSpecific/isResponsiveTable}"
 						showFullScreenButton="{device>/system/phone}"
 						detailsButtonSetting="{= ${parameter>/templateSpecific/isResponsiveTable} ? 'None,Low,Medium' : null}"
-						enableExport="{= !${parameter>/settings/isWorklist} }"
+						useExportToExcel="{= !${parameter>/settings/isWorklist} }"
 						smartVariant="{= (${parameter>/settings/smartVariantManagement} &amp;&amp; !${parameter>/settings/variantManagementHidden}) ? 'template::PageVariant' : null }"
 						customData:p13nDialogSettings="{= (${parameter>/settings/smartVariantManagement} &amp;&amp; !${parameter>/settings/enableTableFilterInPageVariant} &amp;&amp; !${parameter>/settings/isWorklist}) ? '{filter:{visible:false}}' : '{filter:{visible:true}}'}"
 						ignoreFromPersonalisation="{parts: [{path: 'entityType>com.sap.vocabularies.UI.v1.LineItem'}], formatter: 'AH.suppressP13NDuplicateColumns'}"
@@ -92,9 +92,10 @@
 						<template:if test="{= ${tableSettings>type} === 'AnalyticalTable' }">
 							<template:then>
 								<table:AnalyticalTable	id="{:= ${parameter>/stableId}.getStableId({type: 'ListReportTable', subType: 'AnalyticalTable', sQuickVariantKey: ${tabItem>key}})}"
+									visibleRowCountMode="Auto"
 									showOverlay="{= ${_templPriv>/listReport/firstSelection} &amp;&amp; !${_templPriv>/generic/bDataAreShownInTable}}"
 									class="{path: 'parameter>/settings/condensedTableLayout', formatter: 'AHListReport.setSizeCondensedCssClass'}"
-									enableColumnReordering="true" showColumnVisibilityMenu="false"
+									enableColumnReordering="true"
 									rowSelectionChange="._templateEventHandlers.onSelectionChange"
 									beforeOpenContextMenu="._templateEventHandlers.beforeOpenContextMenu($event, '{smartControlId>id}')"
 									enableColumnFreeze="true" enableCellFilter="true"
@@ -117,16 +118,16 @@
 											</template:with>
 										</table:columns>
 									</template:with>
-									<table:rowMode>
-										<rowmodes:Auto/>
-									</table:rowMode>
 								</table:AnalyticalTable>
 							</template:then>
 							<!--Tree table implementation: Begins -->
 							<template:elseif test="{= ${tableSettings>type} === 'TreeTable'}">
 								<table:TreeTable id="{:= ${parameter>/stableId}.getStableId({type: 'ListReportTable', subType: 'TreeTable', sQuickVariantKey: ${tabItem>key}})}"
+									rootLevel="0"
+									visibleRowCountMode="Auto"
 									showOverlay="{= ${_templPriv>/listReport/firstSelection} &amp;&amp; !${_templPriv>/generic/bDataAreShownInTable}}"
 									class="{path: 'parameter>/settings/condensedTableLayout', formatter: 'AHListReport.setSizeCondensedCssClass'}"
+									expandFirstLevel="true" 
 									rowSelectionChange="._templateEventHandlers.onSelectionChange"
 									beforeOpenContextMenu="._templateEventHandlers.beforeOpenContextMenu($event, '{smartControlId>id}')"
 									rowActionCount="{parts: [{path: 'entitySet>'}, {path: 'parameter>/settings/subPages/'}, {path: 'parameter>/manifest/'}, {path: 'parameter>/settings/'}], formatter: 'AH.getRowActionCountForListReport'}">
@@ -148,17 +149,15 @@
 											</template:with>
 										</table:columns>
 									</template:with>
-									<table:rowMode>
-										<rowmodes:Auto/>
-									</table:rowMode>
 								</table:TreeTable>
 							</template:elseif>
 							<!--Tree table implementation: Ends -->
 							<template:elseif test="{= ${tableSettings>type} === 'GridTable' }">
 								<table:Table id="{:= ${parameter>/stableId}.getStableId({type: 'ListReportTable', subType: 'GridTable', sQuickVariantKey: ${tabItem>key}})}"
+									visibleRowCountMode="Auto"
 									showOverlay="{= ${_templPriv>/listReport/firstSelection} &amp;&amp; !${_templPriv>/generic/bDataAreShownInTable}}"
 									class="{path: 'parameter>/settings/condensedTableLayout', formatter: 'AHListReport.setSizeCondensedCssClass'}"
-									enableColumnReordering="true" showColumnVisibilityMenu="false"
+									enableColumnReordering="true"
 									rowSelectionChange="._templateEventHandlers.onSelectionChange"
 									beforeOpenContextMenu="._templateEventHandlers.beforeOpenContextMenu($event, '{smartControlId>id}')"
 									enableColumnFreeze="true" enableCellFilter="true"
@@ -181,9 +180,6 @@
 											</template:with>
 										</table:columns>
 									</template:with>
-									<table:rowMode>
-										<rowmodes:Auto/>
-									</table:rowMode>
 								</table:Table>
 							</template:elseif>
 							<template:else >

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

@@ -197,7 +197,8 @@ sap.ui.define(["sap/suite/ui/generic/template/lib/TemplateAssembler",
 				// If EditFlow is display, the save and cancel stays in object page unless this property is set to true
 				// If EditFlow is direct, the save and cancel moves to LR after action, unless this property is set to false
 				// The default value of this property is undefined.
-				"navToListOnSave": "boolean"
+				"navToListOnSave": "boolean",
+				"relatedAppsSettings": "object"
 			},
 			// app descriptor format
 			"manifest": "json"

package/src/sap/suite/ui/generic/template/ObjectPage/controller/ControllerImplementation.js

@@ -382,6 +382,8 @@ sap.ui.define([
 					oBeforeSavePromise.then(function(){
 						var oCRUDActionHandler = oTemplateUtils.oComponentUtils.getCRUDActionHandler();
 						oCRUDActionHandler.handleCRUDScenario(iScenario, fnImpl);
+					}).catch(function(vError){
+						oLogger.info("Can't proceed with 'Save' as 'beforeSaveExtension' failed " + vError);
 					});
 				}, sButtonId);
 			}
@@ -2513,8 +2515,7 @@ sap.ui.define([
 							isPopinWithoutHeader: true,
 							isDataFieldForActionRequired: true,
 							isFieldControlsPathRequired: true,
-							isMandatoryFiltersRequired: true,
-							numberOfExpandedLevels: 0
+							isMandatoryFiltersRequired: true
 						});
 						oController.onBeforeRebindTableExtension(oEvent);
 						var fnRefresh = oBindingParams.events.refresh || Function.prototype;

package/src/sap/suite/ui/generic/template/ObjectPage/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/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/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="{path: 'dataPoint>Criticality', formatter: 'AHModel.simplePath'}"
+															criticalityRepresentationType="WithoutIcon"/>
+												</sfi:objectStatus>
+											</sfi:ControlProposal>
+										</sfi:controlProposal>
+									</template:if>
 								</sfi:SmartField>
 							</l:VerticalLayout>
 						</template:else>