@sapui5/sap.suite.ui.generic.template 1.121.2 → 1.122.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.121.2",
+  "version": "1.122.1",
   "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.121.2</version>
+	<version>1.122.1</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

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

@@ -28,12 +28,13 @@ sap.ui.define(["sap/fe/navigation/SelectionVariant",
 	"sap/ui/comp/personalization/Util",
 	"sap/suite/ui/generic/template/lib/insights/InsightsHandler",
 	"sap/suite/ui/generic/template/genericUtilities/metadataAnalyser",
-	"sap/suite/ui/generic/template/genericUtilities/filterHelper"
+	"sap/suite/ui/generic/template/genericUtilities/filterHelper",
+	"sap/suite/ui/generic/template/js/AnnotationHelperHiddenTermSupport"
 ], function(SelectionVariant, ExtensionAPI,
 			FilterBarController, ToolbarController, VisualFilterBarController, VisualFilterDialogController, AnalyticGridController, AnalyticalTable,
 			ODataAnnotationHelper, Analytics, ContentAreaController, IappStateHandler, Device, SegmentedButtonItem, ALPHelper, controlHelper, FeLogger, 
 			ObjectPath, ShareUtils, merge, deepExtend, ListUtils, MultipleViewsHandler, StableIdHelper, MessageStripHelper, JSONModel, PersonalizationControllerUtil, 
-			InsightsHandler, metadataAnalyser, filterHelper) {
+			InsightsHandler, metadataAnalyser, filterHelper, AnnotationHelperHiddenTermSupport) {
 
 		"use strict";
 
@@ -689,6 +690,12 @@ sap.ui.define(["sap/fe/navigation/SelectionVariant",
 								toolbar = oSmartTable.getToolbar(),
 								oToolBarcontent = toolbar.getContent(),
 								nSettingsLength ;
+							
+							var oHiddenColumnInfo = AnnotationHelperHiddenTermSupport.getHiddenColumnInfo(oSmartTable);
+							if (oHiddenColumnInfo && oHiddenColumnInfo.staticHiddenColumns && oHiddenColumnInfo.staticHiddenColumns.length > 0) {
+								// Hide all columns which are statically hidden at initialization of the table
+								oSmartTable.deactivateColumns(oHiddenColumnInfo.staticHiddenColumns);
+							}
 							//To check if navigation targets are supported of the toolbar buttons are supported
 							oSmartTable.setHeight("100%");
 							oTemplateUtils.oCommonUtils.checkToolbarIntentsSupported(oSmartTable);
@@ -784,6 +791,8 @@ sap.ui.define(["sap/fe/navigation/SelectionVariant",
 							oBindingParams.events.dataReceived = function(oReceivedEvent){
 								oState.oContentArea.enableToolbar();
 								oTemplateUtils.oCommonEventHandlers.onDataReceived(oSmartTable);
+								var oHiddenColumnInfo = AnnotationHelperHiddenTermSupport.getHiddenColumnInfo(oSmartTable);
+								oTemplateUtils.oCommonEventHandlers.hideTableCells(oSmartTable, oHiddenColumnInfo);
 								oTemplateUtils.oComponentUtils.hidePlaceholder();
 								fnDataReceived.call(this, oReceivedEvent);
 							};

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

@@ -45,7 +45,7 @@ sap.ui.define(["sap/m/SegmentedButtonItem", "sap/m/Button", "sap/m/Text", "sap/m
 				//Enable "AdaptFilter" beside the "Go" button
 				if (!bShowGoButtonOnFilter) {
 					//TODO:Hiding "AdaptFilter" button using private API , public API to be used when available
-					me.oState.oSmartFilterbar._oFiltersButton.setVisible(false);
+					me.oState.oSmartFilterbar.getAggregation("_filtersButton").setVisible(false);
 				}
 
 				oState.oHeader = oState.oPage.getHeader();

package/src/sap/suite/ui/generic/template/AnalyticalListPage/i18n/i18n_da.properties

@@ -21,7 +21,7 @@ KPI_TOOLTIP_GOOD={0} {1}\nStatus\: God
 
 KPI_TOOLTIP_CRITICAL={0} {1}\nStatus\: Risiko
 
-KPI_DETERMINING_ERROR={0}\nKan ikke determinere v\u00E6rdien.
+KPI_DETERMINING_ERROR={0}\nKan ikke bestemme v\u00E6rdien.
 
 KPI_DETERMINING_WARNING={0}\nData er enten ugyldige eller blev ikke fundet.
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/i18n/i18n_mk.properties

@@ -27,7 +27,7 @@ KPI_DETERMINING_WARNING={0}\n\u041F\u043E\u0434\u0430\u0442\u043E\u0446\u0438\u0
 
 KPI_AUTHORIZATION_ISSUE=\u041F\u043E\u0441\u0442\u043E\u0438 \u043F\u0440\u043E\u0431\u043B\u0435\u043C \u0441\u043E \u0430\u0432\u0442\u043E\u0440\u0438\u0437\u0430\u0446\u0438\u0458\u0430\u0442\u0430.
 
-KPI_DEFAULT_PV_ERROR_MESSAGE=\u041D\u0435\u0434\u043E\u0441\u0442\u0430\u0441\u0443\u0432\u0430 \u0430\u043D\u043E\u0442\u0430\u0446\u0438\u0458\u0430 \u043D\u0430 \u0432\u0430\u0440\u0438\u0458\u0430\u043D\u0442\u0430 \u043D\u0430 \u043F\u0440\u0438\u043A\u0430\u0437\u043E\u0442.
+KPI_DEFAULT_PV_ERROR_MESSAGE=\u041D\u0435\u0434\u043E\u0441\u0442\u0438\u0433\u0430 \u0430\u043D\u043E\u0442\u0430\u0446\u0438\u0458\u0430 \u043D\u0430 \u0432\u0430\u0440\u0438\u0458\u0430\u043D\u0442\u0430 \u043D\u0430 \u043F\u0440\u0438\u043A\u0430\u0437\u043E\u0442.
 
 KPI_DRILLDOWN_NAVIGATION_MESSAGE=\u0412\u043D\u0435\u0441\u0435\u0442\u0435 \u0434\u0435\u0442\u0430\u043B\u0438 \u0437\u0430 \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u0458\u0430.
 
@@ -100,7 +100,7 @@ CONTACT_FAX=\u0424\u0430\u043A\u0441
 
 
 
-CONTAINER_VIEW_TABLE=\u041F\u0440\u0438\u043A\u0430\u0437 \u043D\u0430 \u0442\u0430\u0431\u0435\u043B\u0430
+CONTAINER_VIEW_TABLE=\u0422\u0430\u0431\u0435\u043B\u0430\u0440\u0435\u043D \u043F\u0440\u0438\u043A\u0430\u0437
 
 CONTAINER_VIEW_CHART=\u041F\u0440\u0438\u043A\u0430\u0437 \u043D\u0430 \u0434\u0438\u0458\u0430\u0433\u0440\u0430\u043C
 
@@ -168,7 +168,7 @@ M_VISUAL_FILTERS_MULTIPLE_UNIT=\u0417\u0430 \u0434\u0430 \u0433\u043E \u0432\u04
 
 M_VISUAL_FILTER_HIDDEN_MEASURE=\u041D\u0435 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0432\u0447\u0438\u0442\u0430 \u0432\u0438\u0437\u0443\u0435\u043B\u043D\u0438\u043E\u0442 \u0444\u0438\u043B\u0442\u0435\u0440. \u041F\u043E\u043A\u0430\u0437\u0430\u0442\u0435\u043B\u043E\u0442 {0} \u0435 \u043E\u0437\u043D\u0430\u0447\u0435\u043D \u0441\u043E UI.Hidden.
 
-REQUIRED_VH_FIELDS_OVERLAY_MESSAGE=\u041D\u0435 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0432\u0447\u0438\u0442\u0430\u0430\u0442 \u043F\u043E\u0434\u0430\u0442\u043E\u0446\u0438 \u0431\u0438\u0434\u0435\u0458\u045C\u0438 \u043D\u0435\u0434\u043E\u0441\u0442\u0430\u0441\u0443\u0432\u0430\u0430\u0442 \u0437\u0430\u0434\u043E\u043B\u0436\u0438\u0442\u0435\u043B\u043D\u0438\u0442\u0435 \u043F\u043E\u043B\u0438\u045A\u0430. \u041A\u043E\u043D\u0442\u0430\u043A\u0442\u0438\u0440\u0430\u0458\u0442\u0435 \u0441\u043E \u0430\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0430\u0442\u043E\u0440\u043E\u0442.
+REQUIRED_VH_FIELDS_OVERLAY_MESSAGE=\u041D\u0435 \u043C\u043E\u0436\u0435 \u0434\u0430 \u0441\u0435 \u0432\u0447\u0438\u0442\u0430\u0430\u0442 \u043F\u043E\u0434\u0430\u0442\u043E\u0446\u0438 \u0431\u0438\u0434\u0435\u0458\u045C\u0438 \u043D\u0435\u0434\u043E\u0441\u0442\u0438\u0433\u0430\u0430\u0442 \u0437\u0430\u0434\u043E\u043B\u0436\u0438\u0442\u0435\u043B\u043D\u0438\u0442\u0435 \u043F\u043E\u043B\u0438\u045A\u0430. \u041A\u043E\u043D\u0442\u0430\u043A\u0442\u0438\u0440\u0430\u0458\u0442\u0435 \u0441\u043E \u0430\u0434\u043C\u0438\u043D\u0438\u0441\u0442\u0440\u0430\u0442\u043E\u0440\u043E\u0442.
 
 INVALID_MEASURE_DONUT_MESSAGE=\u041D\u0435\u0432\u0430\u0436\u0435\u0447\u043A\u0438 \u043F\u043E\u043A\u0430\u0437\u0430\u0442\u0435\u043B \u0437\u0430 \u043F\u0440\u0441\u0442\u0435\u043D\u0435\u0441\u0442\u0438\u043E\u0442 \u0434\u0438\u0458\u0440\u0430\u0433\u0440\u0430\u043C. \u0423\u0432\u0435\u0440\u0435\u0442\u0435 \u0441\u0435 \u0434\u0435\u043A\u0430 \u043F\u043E\u043A\u0430\u0437\u0430\u0442\u0435\u043B\u043E\u0442 \u0435 \u043A\u0443\u043C\u0443\u043B\u0430\u0442\u0438\u0432\u0435\u043D \u0438 \u043F\u043E\u0437\u0438\u0442\u0438\u0432\u0435\u043D.
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/i18n/i18n_nl.properties

@@ -19,7 +19,7 @@ KPI_TOOLTIP_ERROR={0} {1}\nStatus\: Hoog risico
 
 KPI_TOOLTIP_GOOD={0} {1}\nStatus\: Goed
 
-KPI_TOOLTIP_CRITICAL={0} {1}\nStatus\: Kritiek
+KPI_TOOLTIP_CRITICAL={0} {1}\nStatus\: Risico
 
 KPI_DETERMINING_ERROR={0}\nWaarde kan niet worden bepaald.
 

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.121.2"
+			"version": "1.122.1"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

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.121.2"
+			"version": "1.122.1"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

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

@@ -21,9 +21,10 @@ sap.ui.define([
 	"sap/suite/ui/generic/template/lib/insights/InsightsHandler",
 	"sap/suite/ui/generic/template/listTemplates/filterSettingsPreparationHelper",
 	"sap/m/table/Util",
-	"sap/suite/ui/generic/template/genericUtilities/filterHelper"
+	"sap/suite/ui/generic/template/genericUtilities/filterHelper",
+	"sap/suite/ui/generic/template/js/AnnotationHelperHiddenTermSupport"
 ], function (Filter, ExtensionAPI, listUtils, MessageStripHelper, IappStateHandler, MultipleViewsHandler,
-	WorklistHandler, ShareUtils, controlHelper, FeLogger, testableHelper, ObjectPath, StableIdHelper, deepExtend, CreateWithDialogHandler, CtxMenuHandler, MultiEditHandler, SelectionVariant, InsightsHandler, filterSettingsPreparationHelper, TableUtil, filterHelper) {
+	WorklistHandler, ShareUtils, controlHelper, FeLogger, testableHelper, ObjectPath, StableIdHelper, deepExtend, CreateWithDialogHandler, CtxMenuHandler, MultiEditHandler, SelectionVariant, InsightsHandler, filterSettingsPreparationHelper, TableUtil, filterHelper, AnnotationHelperHiddenTermSupport) {
 	"use strict";
 
 	var oLogger = new FeLogger("ListReport.controller.ControllerImplementation").getLogger();
@@ -678,13 +679,13 @@ sap.ui.define([
 					onBeforeRebindTable: function (oEvent) {
 						var oSmartTable = oEvent.getSource();
 						setNoDataTextIfRequired(oSmartTable);
-						//in table tabs case oEvent.bindingParams.filters do not contain the values from the SmartFilterbar so far but it will contain filters
-						//which can be set directly on the table under 'settings'
-						// we have to remember these filters in order to exclude them later for counts
 						var oBindingParams = oEvent.getParameters().bindingParams;
-						oState.oMultipleViewsHandler.aTableFilters = deepExtend({}, oBindingParams.filters);
-						// initial filters from smarttable, a copy
-						var aFiltersFromSmartTable = oBindingParams.filters.slice(0);
+						// Build a snapshot of oBindingParams.filters as how they are passed to the onBeforeRebind-Event.
+						// This snapshot always contains the filters being defined on the table itself (table settings, column headers).
+						// In case the table is connected to the SmartFilterbar the snapshot also contains the standard filters derived by the SFB.
+						// 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);
 						oTemplateUtils.oCommonEventHandlers.onBeforeRebindTable(oEvent, {
 							determineSortOrder: oState.oMultipleViewsHandler.determineSortOrder,
 							ensureExtensionFields: oController.templateBaseExtension.ensureFieldsForSelect,
@@ -707,6 +708,8 @@ sap.ui.define([
 						var fnDataReceived = oBindingParams.events.dataReceived || Function.prototype;
 						oBindingParams.events.dataReceived = function(oReceivedEvent){
 							fnOnDataReceived(oSmartTable);
+							var oHiddenColumnInfo = AnnotationHelperHiddenTermSupport.getHiddenColumnInfo(oSmartTable);
+							oTemplateUtils.oCommonEventHandlers.hideTableCells(oSmartTable, oHiddenColumnInfo);
 							fnDataReceived.call(this, oReceivedEvent);
 						};
 						var fnRefresh = oBindingParams.events.refresh || Function.prototype;
@@ -715,7 +718,7 @@ sap.ui.define([
 							fnRefresh.call(this, oRefreshEvent);
 						};
 						oState.oMessageStripHelper.onBeforeRebindControl(oEvent);
-						oState.oMultipleViewsHandler.onRebindContentControl(oBindingParams, aFiltersFromSmartTable);
+						oState.oMultipleViewsHandler.onRebindContentControl(oBindingParams, aFiltersFromRebindEvent);
 						listUtils.handleErrorsOnTableOrChart(oTemplateUtils, oEvent, oState);
 					},
 					onListNavigate: function (oEvent) {
@@ -783,12 +786,10 @@ sap.ui.define([
 					onBeforeRebindChart: function (oEvent) {
 						var oSmartChart = oEvent.getSource();
 						setNoDataChartTextIfRequired(oSmartChart);
-						//in table tabs case oEvent.bindingParams.filters do not contain the values from the SmartFilterbar so far but it will contain filters
-						//which can be set directly on the table under 'settings'
-						// we have to remember these filters in order to exclude them later for counts
 						var oBindingParams = oEvent.getParameters().bindingParams;
-						oState.oMultipleViewsHandler.aTableFilters = deepExtend({}, oBindingParams.filters);
-						var aFiltersFromSmartChart = oBindingParams.filters.slice(0);
+						// Build a snapshot of oBindingParams.filters as how they are passed to the onBeforeRebind-Event.
+						// This snapshot contains the filters being defined on the chart itself (chart settings).
+						var aFiltersFromRebindEvent = oBindingParams.filters.slice(0);
 						var oCallbacks = {
 							setBindingPath: oSmartChart.setChartBindingPath.bind(oSmartChart),
 							ensureExtensionFields: Function.prototype, // needs further clarification
@@ -808,7 +809,7 @@ sap.ui.define([
 							oTemplateUtils.oComponentUtils.hidePlaceholder();
 							fnDataReceived.call(this, oReceivedEvent);
 						};
-						oState.oMultipleViewsHandler.onRebindContentControl(oBindingParams, aFiltersFromSmartChart);
+						oState.oMultipleViewsHandler.onRebindContentControl(oBindingParams, aFiltersFromRebindEvent);
 						listUtils.handleErrorsOnTableOrChart(oTemplateUtils, oEvent, oState);
 					},
 					onChartInitialized: function (oEvent) {
@@ -841,9 +842,13 @@ sap.ui.define([
 					// Note: In the multiple view multi tables mode this will be called once for each SmartTable
 					onTableInit: function (oEvent) {
 						var oSmartTable = oEvent.getSource();
+						var oHiddenColumnInfo = AnnotationHelperHiddenTermSupport.getHiddenColumnInfo(oSmartTable);
+						if (oHiddenColumnInfo && oHiddenColumnInfo.staticHiddenColumns && oHiddenColumnInfo.staticHiddenColumns.length > 0) {
+							// Hide all columns which are statically hidden at initialization of the table
+							oSmartTable.deactivateColumns(oHiddenColumnInfo.staticHiddenColumns);
+						}
 						oTemplateUtils.oCommonUtils.checkToolbarIntentsSupported(oSmartTable);
 						oSmartTable.setModel(new sap.ui.model.base.ManagedObjectModel(oSmartTable), "tableobserver");
-
 						oTemplateUtils.oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oSmartTable).addCellSelector();
 					},
 					//search function called in worklist light version of LR

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

@@ -23,7 +23,7 @@ sap.ui.define([
 				oTemplateUtils.oCommonEventHandlers.onCallActionFromToolBarForContexts(oSmartControl, oSmartControl.getTable(), oButtonCustomData, oFocusInfo.applicableContexts, oState, oSmartControl.getEntitySet(), true);
 			}
 		}
-		
+
 		function getGenericHandler(sSmartControlId){
 			var oRet = mGenericCtxMenuHandlers[sSmartControlId];
 			if (!oRet){
@@ -31,7 +31,7 @@ sap.ui.define([
 				var oConfiguration = {
 					executeAction: fnExecuteAction.bind(null, sSmartControlId)
 				};
-				oRet = new ContextMenuHandler(oController, oTemplateUtils, oSmartControl, oConfiguration);
+				oRet = new ContextMenuHandler(oController, oTemplateUtils, oState, oSmartControl, oConfiguration);
 				mGenericCtxMenuHandlers[sSmartControlId] = oRet;
 			}
 			return oRet;

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

@@ -34,11 +34,11 @@ sap.ui.define([
 			oGenericMultipleViewsHandler.updateCounts();
 		}
 
-		function onRebindContentControl(oBindingParams, aFiltersFromSmartTable) {
+		function onRebindContentControl(oBindingParams, aFiltersFromRebindEvent) {
 			if (!oGenericMultipleViewsHandler) {
 				return;
 			}
-			oGenericMultipleViewsHandler.onRebindContentControl(oBindingParams, aFiltersFromSmartTable);
+			oGenericMultipleViewsHandler.onRebindContentControl(oBindingParams, aFiltersFromRebindEvent);
 		}
 
 		function fnResolveParameterizedEntitySet(oEntitySet, oParameterInfo) {

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

@@ -16,12 +16,18 @@ sap.ui.define(["sap/ui/base/Object",
 			var oNavigationController;
 			return /** @lends sap.suite.ui.generic.template.ListReport.extensionAPI.ExtensionAPI.prototype */ {
 				/**
-				 * Get the list entries currently selected for smart table
+				 * Generally, it returns the currently selected contexts of the smart table.
+				 * In case the context menu is opened, it returns the contexts applicable to the context menu.
 				 *
 				 * @return {sap.ui.model.Context[]} contains one entry per line selected
 				 * @public
 				 */
 				getSelectedContexts: function() {
+					// 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) {
+						return oState.oFocusInfo.applicableContexts;
+					}
 					return oState.oPresentationControlHandler.getSelectedContexts();
 				},
 				/**

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

@@ -62,9 +62,9 @@ OBJECT_NOT_EDITABLE=\u041E\u0431\u0458\u0435\u043A\u0442\u043E\u0442 \u043D\u043
 NODATA_SMARTTABLE_LR=\u0417\u0430 \u0434\u0430 \u0437\u0430\u043F\u043E\u0447\u043D\u0435\u0442\u0435, \u043F\u043E\u0441\u0442\u0430\u0432\u0435\u0442\u0435 \u0433\u0438 \u0440\u0435\u043B\u0435\u0432\u0430\u043D\u0442\u043D\u0438\u0442\u0435 \u0444\u0438\u043B\u0442\u0440\u0438 \u0438 \u0438\u0437\u0431\u0435\u0440\u0435\u0442\u0435 \u201E\u041F\u043E\u0458\u0434\u0438\u201C.
 
 
-CANCEL_AND_DISCARD=\u0421\u0430\u043A\u0430\u0442\u0435 \u043B\u0438 \u0434\u0430 \u0433\u043E \u043E\u0442\u0444\u0440\u043B\u0438\u0442\u0435 \u043E\u0432\u043E\u0458 \u043D\u0430\u0446\u0440\u0442?
+CANCEL_AND_DISCARD=\u0414\u0430\u043B\u0438 \u0441\u0430\u043A\u0430\u0442\u0435 \u0434\u0430 \u0433\u043E \u043E\u0442\u0444\u0440\u043B\u0438\u0442\u0435 \u043E\u0432\u043E\u0458 \u043D\u0430\u0446\u0440\u0442?
 
-DISCARD_EDIT=\u0421\u0430\u043A\u0430\u0442\u0435 \u043B\u0438 \u0434\u0430 \u0433\u0438 \u043E\u0442\u0444\u0440\u043B\u0438\u0442\u0435 \u0441\u0438\u0442\u0435 \u043F\u0440\u043E\u043C\u0435\u043D\u0438?
+DISCARD_EDIT=\u0414\u0430\u043B\u0438 \u0441\u0430\u043A\u0430\u0442\u0435 \u0434\u0430 \u0433\u0438 \u043E\u0442\u0444\u0440\u043B\u0438\u0442\u0435 \u0441\u0438\u0442\u0435 \u043F\u0440\u043E\u043C\u0435\u043D\u0438?
 
 DISCARD=\u041E\u0442\u0444\u0440\u043B\u0438
 

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.121.2"
+			"version": "1.122.1"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

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

@@ -96,6 +96,7 @@
 									class="{path: 'parameter>/settings/condensedTableLayout', formatter: 'AHListReport.setSizeCondensedCssClass'}"
 									enableColumnReordering="true" showColumnVisibilityMenu="false"
 									rowSelectionChange="._templateEventHandlers.onSelectionChange"
+									beforeOpenContextMenu="._templateEventHandlers.beforeOpenContextMenu($event, '{smartControlId>id}')"
 									enableColumnFreeze="true" enableCellFilter="true"
 									rowActionCount="{parts: [{path: 'entitySet>'}, {path: 'parameter>/settings/subPages/'}, {path: 'parameter>/manifest/'}, {path: 'parameter>/settings/'}], formatter: 'AH.getRowActionCountForListReport'}">
 									<template:with path="entitySet>" var="listEntitySet">
@@ -127,6 +128,7 @@
 									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'}">
 									<template:with path="entitySet>" var="listEntitySet">
 										<core:Fragment fragmentName="sap.suite.ui.generic.template.listTemplates.fragments.SmartTableUiTableCommons" type="XML"/>
@@ -156,6 +158,7 @@
 									class="{path: 'parameter>/settings/condensedTableLayout', formatter: 'AHListReport.setSizeCondensedCssClass'}"
 									enableColumnReordering="true" showColumnVisibilityMenu="false"
 									rowSelectionChange="._templateEventHandlers.onSelectionChange"
+									beforeOpenContextMenu="._templateEventHandlers.beforeOpenContextMenu($event, '{smartControlId>id}')"
 									enableColumnFreeze="true" enableCellFilter="true"
 									rowActionCount="{parts: [{path: 'entitySet>'}, {path: 'parameter>/settings/subPages/'}, {path: 'parameter>/manifest/'}, {path: 'parameter>/settings/'}], formatter: 'AH.getRowActionCountForListReport'}">
 									<template:with path="entitySet>" var="listEntitySet">
@@ -186,6 +189,7 @@
 									sticky="ColumnHeaders,HeaderToolbar"
 									mode="{tableSettings>mode}"
 									selectionChange="._templateEventHandlers.onSelectionChange"
+									beforeOpenContextMenu="._templateEventHandlers.beforeOpenContextMenu($event, '{smartControlId>id}')"
 									delete="._templateEventHandlers.deleteEntry"
 									itemPress="._templateEventHandlers.onListNavigate"
 									multiSelectMode="{= (${tableSettings>multiSelect} &amp;&amp; ${tableSettings>selectAll}) ? 'SelectAll' : 'ClearAll'}">

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

@@ -23,9 +23,7 @@ sap.ui.define([
 	"sap/ui/model/FilterProcessor",
 	"sap/suite/ui/generic/template/js/StableIdHelper",
 	"sap/base/util/extend",
-	"sap/base/util/UriParameters",
 	"sap/base/util/isEmptyObject",
-	"sap/ui/dom/jquery/Focusable",
 	"sap/suite/ui/generic/template/genericUtilities/FeError",
 	"sap/suite/ui/generic/template/lib/CreateWithDialogHandler",
 	"sap/ui/Device",
@@ -37,7 +35,7 @@ sap.ui.define([
 ], function (ControllerExtension, MessageBox, Filter, Sorter, ManagedObjectModel, SelectionVariant, controlHelper, 
 	testableHelper, detailUtils, MessageSortingHandler, MessageStripHelper, SectionTitleHandler, SideContentHandler, ExtensionAPI, 
 	ResponsiveTable, ShareUtils, FeLogger, MultipleViewsHandler, MessageUtils, KeyCodes, merge, FilterProcessor,
-	StableIdHelper, extend, UriParameters, isEmptyObject, Focusable, FeError, 
+	StableIdHelper, extend, isEmptyObject, FeError, 
 	CreateWithDialogHandler, Device, whitespaceReplacer, deepExtend, CtxMenuHandler, 
 	InlineCreationRowsHelper, RelatedAppsHandler
 	) {
@@ -79,7 +77,7 @@ sap.ui.define([
 			//TODO: Need to see whether we need to initialize the SideContentHandler here
 			var oSideContentHandler = new SideContentHandler(oController, oTemplateUtils, oTemplateUtils.oComponentUtils.stateChanged); // handles all task connected with SideContent
 			var oRelatedAppsHandler = new RelatedAppsHandler(oController, oTemplateUtils); //Handle related app Case
-			var oContextMenuHandler = new CtxMenuHandler(oController, oTemplateUtils, {
+			var oContextMenuHandler = new CtxMenuHandler(oController, oTemplateUtils, oState, {
 				deleteEntries: function(oSmartTable, aContexts){
 					var oTable = oSmartTable.getTable();
 					var sUiElementId = oTable.getId();
@@ -1679,7 +1677,23 @@ sap.ui.define([
 			function onDataReceivedForTable(oControl) {
 				setNoDataTextIfRequired(oControl);
 			}
+			
+			
+			// Common Implementation for switching between active and draft version used by static and dynamic header
+			function fnSwitchDraftAndActiveImpl(bHasDraftEntity, fnFocusAfterSwitch){
+				oTemplateUtils.oServices.oApplicationController.synchronizeDraftAsync().then(function() {
+					oTemplateUtils.oServices.oApplication.performAfterSideEffectExecution(function () {
+						// Focus should stay on the toggle button, but the sheet should be closed
+						oTemplateUtils.oServices.oApplication.setNextFocus(fnFocusAfterSwitch);
+						var oBusyHelper = oTemplateUtils.oServices.oApplication.getBusyHelper();
+						oBusyHelper.setBusy(oTemplateUtils.oServices.oApplication.getSwitchToSiblingFunctionPromise(bHasDraftEntity).then(function(fnSwitch){
+							fnSwitch();
+						}));
+					}, true);
+				});				
+			}
 
+			// Implementation of draft toggle for dynamic header
 			function onSwitchDraftAndActiveObjectPopOverImpl(oToggleButton) {
 				var oSheet;
 				return oTemplateUtils.oCommonUtils.getDialogFragmentAsync("sap.suite.ui.generic.template.ObjectPage.view.fragments.SwitchDraftAndActiveObjectPopOver", {
@@ -1688,19 +1702,11 @@ sap.ui.define([
 						if (sSelectedKey === (bHasDraftEntity ? "SwitchToActive" : "SwitchToDraft")) {
 							return;
 						}
-						oTemplateUtils.oServices.oApplicationController.synchronizeDraftAsync().then(function() {
-							oTemplateUtils.oServices.oApplication.performAfterSideEffectExecution(function () {
-								// Focus should stay on the toggle button, but the sheet should be closed
-								oTemplateUtils.oServices.oApplication.setNextFocus(function(){
-									controlHelper.focusUI5Control(oToggleButton);
-									oSheet.close();
-								});
-								var oBusyHelper = oTemplateUtils.oServices.oApplication.getBusyHelper();
-								oBusyHelper.setBusy(oTemplateUtils.oServices.oApplication.getSwitchToSiblingFunctionPromise(bHasDraftEntity).then(function(fnSwitch){
-									fnSwitch();
-								}));
-							}, true);
-						});
+						var fnFocusAfterSwitch = function(){ // Focus should stay on the toggle button, but the sheet should be closed
+							controlHelper.focusUI5Control(oToggleButton);
+							oSheet.close();
+						};
+						fnSwitchDraftAndActiveImpl(bHasDraftEntity, fnFocusAfterSwitch);
 					}
 				}, "SwitchDraftAndActiveObjectPopOver", Function.prototype, true).then(function(oControl){
 					oSheet = oControl;
@@ -2356,25 +2362,19 @@ sap.ui.define([
 					}
 				},
 				handlers: {
-					onEditAndActiveToggle: function () {
+					onEditAndActiveToggle: function () { // Implementation of draft toggle for static header
 						var oUIModel = oObjectPage.getModel("ui");
 						var bIsEditable = oUIModel.getProperty("/editable");
-						oTemplateUtils.oServices.oApplicationController.synchronizeDraftAsync().then(function() {
-							oTemplateUtils.oServices.oApplication.performAfterSideEffectExecution(function () {
-								var oBusyHelper = oTemplateUtils.oServices.oApplication.getBusyHelper();
-								oBusyHelper.setBusy(oTemplateUtils.oServices.oApplication.getSwitchToSiblingFunctionPromise(!bIsEditable).then(function(fnSwitch){
-									fnSwitch();
-									// as the toggling is implemented by two buttons which are made visible/invisible vice versa we have to create the id of the other button which will become visible now
-									oTemplateUtils.oServices.oApplication.setNextFocus(function(){
-										var sOtherButtonId = oController.createId(StableIdHelper.getStableId({
-											type: "ObjectPageAction",
-											subType: bIsEditable ? "ContinueEditing" : "DisplayActiveVersion"
-										}));
-										setTimeout(controlHelper.focusControl.bind(null, sOtherButtonId), 0);
-									});
-								}));
-							}, true);
-						});
+						
+						// as the toggling is implemented by two buttons which are made visible/invisible vice versa we have to create the id of the other button which will become visible now
+						var fnFocusAfterSwitch = function(){
+							var sOtherButtonId = oController.createId(StableIdHelper.getStableId({
+								type: "ObjectPageAction",
+								subType: bIsEditable ? "ContinueEditing" : "DisplayActiveVersion"
+							}));
+							setTimeout(controlHelper.focusControl.bind(null, sOtherButtonId), 0);
+						};
+						fnSwitchDraftAndActiveImpl(!bIsEditable, fnFocusAfterSwitch);						
 					},
 					
 					addEntry: fnAddEntry,
@@ -2608,6 +2608,8 @@ sap.ui.define([
 						var fnDataReceived = oBindingParams.events.dataReceived || Function.prototype;
 						oBindingParams.events.dataReceived = function(oReceivedEvent){
 							oTemplateUtils.oCommonEventHandlers.onDataReceived(oSmartTable);
+							var oHiddenColumnInfo = oSmartTableInfoObject.getHiddenColumnInfo();
+							oTemplateUtils.oCommonEventHandlers.hideTableCells(oSmartTable, oHiddenColumnInfo);
 							fnDataReceived.call(this, oReceivedEvent);
 						};
 						oMultipleViewsHandler.onRebindContentControl(oSmartTable.getId(), oBindingParams);
@@ -2717,7 +2719,6 @@ sap.ui.define([
 							// Hide all columns which are statically hidden at initialization of the table
 							oSmartTable.deactivateColumns(aHiddenColumnInfo.staticHiddenColumns);
 						}
-						
 						oTemplateUtils.oCommonUtils.checkToolbarIntentsSupported(oSmartTable);
 						var bIsMTable = controlHelper.isMTable(oTable);
 						if (bIsMTable || controlHelper.isUiTable(oTable)) {
@@ -2799,16 +2800,9 @@ sap.ui.define([
 					},
 
 					setVMVisibilityForVendor: function () {
-						var oUriParameters = new UriParameters(window.location.href);
-						if (oUriParameters.mParams["sap-ui-layer"]) {
-							var aUiLayer = oUriParameters.mParams["sap-ui-layer"];
-							for (var i = 0; i < aUiLayer.length; i++) {
-								if (aUiLayer[i].toUpperCase() === "VENDOR") {
-									return true;
-								}
-							}
-						}
-						return false;
+						var oUriParameters = new URL(window.location.href).searchParams;
+						var sUiLayer = oUriParameters.get("sap-ui-layer");
+						return sUiLayer && sUiLayer.toUpperCase() === "VENDOR";
 					},
 
 					/*

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

@@ -5,7 +5,7 @@ sap.ui.define([
 ], function(BaseObject, extend, ContextMenuHandler) {
 	"use strict";
 
-	function getMethods(oController, oTemplateUtils, oCallbacks) {
+	function getMethods(oController, oTemplateUtils, oState, oCallbacks) {
 		// Begin: Instance variables
 		var mGenericCtxMenuHandlers = Object.create(null);
 		
@@ -30,7 +30,7 @@ sap.ui.define([
 				var oConfiguration = {
 					executeAction: fnExecuteAction.bind(null, sSmartControlId)
 				};
-				oRet = new ContextMenuHandler(oController, oTemplateUtils, oSmartControl, oConfiguration);
+				oRet = new ContextMenuHandler(oController, oTemplateUtils, oState, oSmartControl, oConfiguration);
 				mGenericCtxMenuHandlers[sSmartControlId] = oRet;
 			}
 			return oRet;
@@ -54,8 +54,8 @@ sap.ui.define([
 	}
 
 	return BaseObject.extend("sap.suite.ui.generic.template.ObjectPage.controller.CtxMenuHandler", {
-		constructor: function(oController, oTemplateUtils, oCallbacks) {
-			extend(this, getMethods(oController, oTemplateUtils, oCallbacks));
+		constructor: function(oController, oTemplateUtils, oState, oCallbacks) {
+			extend(this, getMethods(oController, oTemplateUtils, oState, oCallbacks));
 		}
 	});
 });

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

@@ -1,5 +1,5 @@
-sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/generic/template/genericUtilities/controlHelper"
-	], function(BaseObject, extend, controlHelper) {
+sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/generic/template/genericUtilities/controlHelper", "sap/ui/core/library"
+	], function(BaseObject, extend, controlHelper, SapCoreLibrary) {
 		"use strict";
 
 		var STYLE_CLASS_FOR_ADJUSTMENT = "sapUiTableOnObjectPageAdjustmentsForSection";
@@ -78,10 +78,10 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/gener
 						setHeaderStyle(sCurrentHeaderStyle);
 						oSection.removeStyleClass(STYLE_CLASS_FOR_ADJUSTMENT);
 						oSubSection.setShowTitle(true);
-						oSubSection.setTitleLevel(sap.ui.core.TitleLevel.H4);
+						oSubSection.setTitleLevel(SapCoreLibrary.TitleLevel.H4);
 						if (oTitleInfo.isStaticallySingleChild){
 							oSection.setShowTitle(true);
-							oSection.setTitleLevel(sap.ui.core.TitleLevel.H3);
+							oSection.setTitleLevel(SapCoreLibrary.TitleLevel.H3);
 						}
 						delete oTitleInfo.titleOwner;
 						oSubSectionTitleBinding.destroy();
@@ -89,14 +89,16 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/gener
 				};
 				fnAdjustTitle();
 				oSubSection.setShowTitle(false);
-				oSubSection.setTitleLevel(sap.ui.core.TitleLevel.Auto);
+				oSubSection.setTitleLevel(SapCoreLibrary.TitleLevel.Auto);
 				oSection.addStyleClass(STYLE_CLASS_FOR_ADJUSTMENT);
 				if (oTitleInfo.isStaticallySingleChild){
 					oSection.setShowTitle(false);
-					oSection.setTitleLevel(sap.ui.core.TitleLevel.Auto);
+					oSection.setTitleLevel(SapCoreLibrary.TitleLevel.Auto);
+				}
+				setHeaderLevel(oTitleInfo.isStaticallySingleChild ? SapCoreLibrary.TitleLevel.H3 : SapCoreLibrary.TitleLevel.H4); // If one Section has only 1 Sub-Section, then Control title is set as "H3" else Section Title is "H3" and Control Title is "H4"
+				if (oSection.getSubSections().length === 1) { // If one Section has only 1 Sub-Section, then Control's headerStyle will be set as "H4" irrespective of the headerLevel. This is done as per the suggestion from Object Page Community
+					setHeaderStyle(SapCoreLibrary.TitleLevel.H4);
 				}
-				setHeaderLevel(oTitleInfo.isStaticallySingleChild ? sap.ui.core.TitleLevel.H3 : sap.ui.core.TitleLevel.H4); // If one Section has only 1 Sub-Section, then Control title is set as "H3" else Section Title is "H3" and Control Title is "H4"
-				setHeaderStyle(sap.ui.core.TitleLevel.H4); // If Section and Sub-Section title is hidden, then Control's headerStyle will be set as "H4" irrespective of the headerLevel. This is done as per the suggestion from Object Page Community
 			}
 
 			// public instance methods