@sapui5/sap.suite.ui.generic.template 1.123.1 → 1.124.1

package/src/sap/suite/ui/generic/template/genericUtilities/controlHelper.js

@@ -1,8 +1,9 @@
 sap.ui.define([
 	"sap/ui/dom/getFirstEditableInput", 
 	"sap/suite/ui/generic/template/genericUtilities/FeLogger",
-	"sap/ui/core/Element"
-], function(getFirstEditableInput, FeLogger, Element) {
+	"sap/ui/core/Element",
+	"sap/ui/table/plugins/MultiSelectionPlugin"
+], function(getFirstEditableInput, FeLogger, Element, MultiSelectionPlugin) {
 		"use strict";
 		
 	var oFeLogger = new FeLogger("genericUtilities.controlHelper");
@@ -235,15 +236,10 @@ sap.ui.define([
 	/**
 	 * Returns the selection plugin for the given UI table
 	 * @param {sap.ui.table.Table} oUiTable 
-	 * @returns {sap.ui.table.plugins.MultiSelectionPlugin}
+	 * @returns {sap.ui.table.plugins.MultiSelectionPlugin|undefined}
 	 */
 	function fnGetSelectionPluginForUITable (oUiTable) {
-		// TODO: "sap.ui.table.Table#getPlugins" API is deprecated. 
-		// It should be removed once the table team provides a standard API to find a plugin.
-		var aDepsAndPlugins = oUiTable.getDependents().concat(oUiTable.getPlugins());
-		return aDepsAndPlugins.find(function (oPlugin) {
-			return oPlugin.isA("sap.ui.table.plugins.MultiSelectionPlugin");
-		});
+		return MultiSelectionPlugin.findOn(oUiTable);
 	}
 
 	var oControlHelper =  {

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

@@ -1,5 +1,5 @@
-sap.ui.define(["sap/base/security/encodeXML", "sap/ui/core/format/NumberFormat", "sap/suite/ui/generic/template/genericUtilities/FeLogger", "sap/suite/ui/generic/template/genericUtilities/testableHelper", "sap/suite/ui/generic/template/genericUtilities/utils"
-	], function (encodeXML, NumberFormat, FeLogger, testableHelper, utils) {
+sap.ui.define(["sap/base/security/encodeXML", "sap/ui/core/format/NumberFormat", "sap/ui/core/message/MessageType", "sap/suite/ui/generic/template/genericUtilities/FeLogger", "sap/suite/ui/generic/template/genericUtilities/testableHelper", "sap/suite/ui/generic/template/genericUtilities/utils"
+	], function (encodeXML, NumberFormat, MessageType, FeLogger, testableHelper, utils) {
 	"use strict";
 
 	var oLogger = new FeLogger("js.RuntimeFormatters").getLogger();
@@ -104,7 +104,6 @@ sap.ui.define(["sap/base/security/encodeXML", "sap/ui/core/format/NumberFormat",
 			}
 			
 			var sMessage = "None";
-			var MessageType = sap.ui.core.MessageType; // for better access to the enum
 			if (bEditable){
 				var aMessage = oRowContext.getMessages();
 				for (var i = 0; i < aMessage.length; i++){

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

@@ -698,14 +698,12 @@ sap.ui.define([
 					var oData;
 					if (oVisibleItem.getId().endsWith("DataPoint")) {
 						oData = fnExtractDataFromDataPoint(oVisibleItem, oController);
-						if (oData) {
-							aVisibleItemsData.push(oData);
-						}
 					} else if (oVisibleItem.getId().endsWith("PlainTextVBox")) {
 						oData = fnExtractDataFromPlainTextVBox(oVisibleItem, oController);
-						aVisibleItemsData.push(oData);
 					} else if (oVisibleItem.getId().endsWith("Form")) {
 						oData = fnExtractDataFromForm(oVisibleItem, oController);
+					}
+					if (oData) {
 						aVisibleItemsData.push(oData);
 					}
 				});

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

@@ -478,7 +478,7 @@ sap.ui.define([
 				}
 
 				// busy handling for Diagnostics Plugin
-				if (oAppComponent && oAppComponent.getMetadata() && oAppComponent.getMetadata().getManifest()) {
+				if (oAppComponent && oAppComponent.getManifest()) {
 					// Set component id to allow access to manifest even when app does not load successfully.
 					CommonMethods.setAppComponent(oAppComponent);
 				}
@@ -761,20 +761,13 @@ sap.ui.define([
 		function getInternalManifest() {
 			if (!oInternalManifest) {
 				//We need to copy the original manifest due to read-only settings of the object
-				oInternalManifest = extend({}, oAppComponent.getMetadata().getManifest());
+				oInternalManifest = extend({}, oAppComponent.getManifest());
 				//Overwrite the part with our app. descriptor (see getConfig)
 				oInternalManifest["sap.ui.generic.app"] = getConfig();
 			}
 			return oInternalManifest;
 		}
 
-		// Overriding private method _getRouterClassName of Component. We do not want to have router class derived from manifest settings, but derive it
-		// from whether we use FCL or not.
-		function getRouterClassName(){
-			var sRoutingType = oAppComponent.getFlexibleColumnLayout() ? "f" : "m";
-			return "sap." + sRoutingType + ".routing.Router";
-		}
-
 		function fnGetShellDataLossPopup(oShellContext) {
 			return !oTemplateContract.ghostapp && oTemplateContract.oDataLossHandler.getShellDataLossPopup(oShellContext);
 		}
@@ -822,11 +815,6 @@ sap.ui.define([
 			 * @private
 			 */
 			restore: restore,
-			/**
-			 * 
-			 * @private
-			 */
-			_getRouterClassName: getRouterClassName,
 			/**
 			 * 
 			 * @private
@@ -931,10 +919,10 @@ sap.ui.define([
 	 * @extends sap.ui.core.UIComponent
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
-	return UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {
+	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {
 		metadata: {
 			config: {
 				title: "SAP UI Application Component", // TODO: This should be set from App descriptor
@@ -1018,6 +1006,10 @@ sap.ui.define([
 					defaultValue: {
 						isShareAsCardEnabled: true
 					}
+				},
+				mergeObjectPageSectionTitle: {
+					type: "boolean",
+					defaultValue: true
 				}
 			},
 			events: {
@@ -1068,4 +1060,20 @@ sap.ui.define([
 			(UIComponent.prototype.constructor || Function.prototype).apply(this, arguments);
 		}
 	});
+
+	/**
+	 * Implement "_fnGetRouterClassName" hook to derive the router class name.
+	 * We do not want to have router class derived from "/sap.ui5/routing" section of manifest settings, 
+	 * instead derive it from FCL setting of Fiori Elements section ("sap.ui.generic.app") 
+	 * @param {*} oManifest 
+	 * @returns {string} Router class name
+	 */
+	oAppComponent._fnGetRouterClassName = function (oManifest) {
+		var oGenericAppEntry = oManifest.getEntry("/sap.ui.generic.app");
+		var bIsFlexibleColumnLayout = oGenericAppEntry && oGenericAppEntry.settings && oGenericAppEntry.settings.flexibleColumnLayout;
+		var sRoutingType = bIsFlexibleColumnLayout ? "f" : "m";
+		return "sap." + sRoutingType + ".routing.Router";
+	};
+
+	return oAppComponent;
 });

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

@@ -10,8 +10,8 @@
  */
 
  sap.ui.define(["sap/ui/base/Object", "sap/ui/model/Filter", "sap/ui/model/FilterOperator", "sap/base/util/extend", "sap/suite/ui/generic/template/lib/MessageUtils", "sap/ui/model/json/JSONModel", 
- "sap/suite/ui/generic/template/genericUtilities/controlHelper"
-], function(BaseObject, Filter, FilterOperator, extend, MessageUtils, JSONModel, controlHelper) {
+ "sap/suite/ui/generic/template/genericUtilities/controlHelper", "sap/ui/core/message/MessageType"
+], function(BaseObject, Filter, FilterOperator, extend, MessageUtils, JSONModel, controlHelper, MessageType) {
 	"use strict";
 
 	// A Filter that filters for messages that are at least of severity warning
@@ -19,11 +19,11 @@
 		filters: [new Filter({
 			path: "type",
 			operator: FilterOperator.EQ,
-			value1: sap.ui.core.MessageType.Warning
+			value1: MessageType.Warning
 			}), new Filter({
 			path: "type",
 			operator: FilterOperator.EQ,
-			value1: sap.ui.core.MessageType.Error
+			value1: MessageType.Error
 		})],
 		and: false
 	});
@@ -31,7 +31,7 @@
 	var oBaseErrorFilter = new Filter({
 		path: "type",
 		operator: FilterOperator.EQ,
-		value1: sap.ui.core.MessageType.Error
+		value1: MessageType.Error
 	});
 
 	var sLocalModelName = "model";

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

@@ -12,8 +12,9 @@ sap.ui.define(["sap/ui/base/Object",
 	"sap/m/MessageBox",
 	"sap/suite/ui/generic/template/genericUtilities/oDataModelHelper",
 	"sap/ui/core/message/Message",
+	"sap/ui/core/message/MessageType",
 	"sap/suite/ui/generic/template/js/AnnotationHelper"
-], function(BaseObject, ModelUtil, ActionUtil, MessageUtils, CRUDHelper, CacheHelper, testableHelper, extend, isEmptyObject, FeError, Context, MessageBox, oDataModelHelper, Message, AnnotationHelper) {
+], function(BaseObject, ModelUtil, ActionUtil, MessageUtils, CRUDHelper, CacheHelper, testableHelper, extend, isEmptyObject, FeError, Context, MessageBox, oDataModelHelper, Message, MessageType, AnnotationHelper) {
 		"use strict";
         var	sClassName = "lib.CRUDManager";
 
@@ -486,7 +487,7 @@ sap.ui.define(["sap/ui/base/Object",
 							technical: false,
 							target: sTarget + "/" + sMandatory,
 							fullTarget: sFullTarget + "/" + sMandatory,
-							type: sap.ui.core.MessageType.Error,
+							type: MessageType.Error,
 							processor: oModel
 						});
 						oMessageManager.addMessages(oMessage);

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

@@ -1074,55 +1074,18 @@ sap.ui.define(["sap/ui/base/Object",
 			};
 
 			fnFetchTeamsOptions()
-			.then(function (aTeamsCollabOptions) {
-				renderQuickViewFragment.call(this, aTeamsCollabOptions);
-			}).catch(function (oError) {
-				renderQuickViewFragment.call(this);
-			});
-
-			if (false && !bFieldGroupAvailable && aContactTitleArea && aContactTitleArea.length && aContactTitleArea.length < 2) {	// Below code is to consume Teams Contacts Collaboration Helper. Commenting this code until we get clarity on CA
-				var oModel = oController.getOwnerComponent().getModel();
-				var oContactDataContext = oModel.getContext(sControlBindingContextPath);
-				var oContactData = oContactDataContext.getProperty(oTargetAnnotation.navigation);
-				var oTargetEntityType = oMetaModel.getODataEntityType(oTargetAnnotation.entityType);
-				var oTargetContactAnnotation = aContactTitleArea[0].Target.AnnotationPath && aContactTitleArea[0].Target.AnnotationPath.replace('@', '');
-				var oTargetContactAnnotationData = oTargetEntityType[oTargetContactAnnotation];
-				var sEmail = "", sEnumTypeContactEmail;
-
-				if (oTargetContactAnnotationData.email && oTargetContactAnnotationData.email[0]) {
-					sEnumTypeContactEmail =  (oTargetContactAnnotationData.email[0].type) && (oTargetContactAnnotationData.email[0].type.EnumMember);
-					if (sEnumTypeContactEmail && sEnumTypeContactEmail.indexOf("com.sap.vocabularies.Communication.v1.ContactInformationType/work") > -1) {
-						if (oTargetContactAnnotationData.email[0].address && oTargetContactAnnotationData.email[0].address.Path) {
-							sEmail = oContactData[oTargetContactAnnotationData.email[0].address.Path];
-						} else {
-							sEmail = (oTargetContactAnnotationData.email[0].address && oTargetContactAnnotationData.email[0].address.String);
-						}
-					}
-				}
-			}
-
-			var skipBelowCode = true;
-			if (!skipBelowCode) {	// Below code is to consume Teams Contacts Collaboration. Commenting this code until we get clarity on CA
-				ServiceContainer.getServiceAsync().then(function (oTeamsHelper) {
-					if (typeof oTeamsHelper.isContactsCollaborationSupported === 'function' && oTeamsHelper.isContactsCollaborationSupported()) {
-						return oTeamsHelper.enableContactsCollaboration(sEmail);
-					} else {
-						return Promise.reject();
-					}
-				})
-				.then(function (oPopover) {
-					oPopover.openBy(oControl);
-				})
-				.catch(function (oError) {
+				.then(function (aTeamsCollabOptions) {
+					renderQuickViewFragment.call(this, aTeamsCollabOptions);
+				}).catch(function (oError) {
 					renderQuickViewFragment.call(this);
-				}.bind(this));
-			}
+				});
 		}
 
-		function fnRenderTeamsCollabOptionsOnContactCard (oEntityType, oEventParameters, aTeamsCollabOptions, oControl, sControlBindingContextPath) {
+		function fnRenderTeamsCollabOptionsOnContactCard(oEntityType, oEventParameters, aTeamsCollabOptions, oControl, sControlBindingContextPath) {
 			var oContactCardForm = oEventParameters && oEventParameters.popoverForms;
 			if (aTeamsCollabOptions && aTeamsCollabOptions.length && oControl.mProperties.contactAnnotationPath && oContactCardForm && oContactCardForm.length) {
 				var oModel = oController.getOwnerComponent().getModel();
+				var oi18nModel = oController.getOwnerComponent().getModel("i18n");
 				var oMetaModel = oModel.getMetaModel();
 				var oNavigationEntitySet = oMetaModel.getODataAssociationEnd(oEntityType, oControl.mProperties.contactAnnotationPath);
 				var oNavigationEntityType = oMetaModel.getODataEntityType(oNavigationEntitySet.type);
@@ -1139,7 +1102,13 @@ sap.ui.define(["sap/ui/base/Object",
 					}));
 					callBackHandler.call(this, oEvent);
 				};
-				var Buttons = [];
+				var aContent = [];
+				var oTitle = new sap.m.Title({
+					text: oi18nModel.getResourceBundle().getText("CONTACT_OPTION")
+				}).addStyleClass("sapUiTinnyMarginTop");
+				var oToolbarSpacer = new sap.m.ToolbarSpacer();
+				aContent.push(oTitle);
+				aContent.push(oToolbarSpacer);
 				for (var key in aTeamsCollabOptions) {
 					var oTeamsCollabOption = aTeamsCollabOptions[key];
 					var oButton = new Button({
@@ -1147,18 +1116,21 @@ sap.ui.define(["sap/ui/base/Object",
 						type: "Transparent",
 						press: oButtonPressHandler.bind(this, oTeamsCollabOption.callBackHandler),
 						tooltip: oTeamsCollabOption.tooltip
-					}).addStyleClass("sapUiSmallMarginEnd");
+					}).addStyleClass("sapUiTinyMarginEnd");
 					oButton.addCustomData(new CustomData({
 						key: "type",
 						value: oTeamsCollabOption.key
 					}));
 					FESRHelper.setSemanticStepname(oButton, "press", oTeamsCollabOption.fesrStepName);
-					Buttons.push(oButton);
+					aContent.push(oButton);
 				}
 				var oVbox = new VBox({
 					items: [
-						new HBox({
-							items: Buttons
+						new sap.m.Toolbar({
+							height: "1px"
+						}),
+						new sap.m.Toolbar({
+							content: aContent
 						})
 					]
 				});
@@ -2026,6 +1998,11 @@ sap.ui.define(["sap/ui/base/Object",
 			}
 		}
 
+		function handleTypeMismatch(){
+			var sMessageText = oCommonUtils.getText("ST_STREAM_TYPE_MISMATCH");
+			oServices.oApplication.showMessageToast(sMessageText);
+		}
+
 		function removeStream(oEvent){
 				var oSource = oEvent.getSource();
 				var aPath = [oController.getView().getBindingContext().sPath + "/$value"];
@@ -2480,10 +2457,20 @@ sap.ui.define(["sap/ui/base/Object",
 			}
 		}
 
+		function fnFetchContactStatus(sEmail) {
+			return ServiceContainer.getServiceAsync().then(function (oTeamsHelper) {
+				if (typeof oTeamsHelper.isContactsCollaborationSupported === 'function' && oTeamsHelper.isContactsCollaborationSupported()) {
+					return oTeamsHelper.getTeamsContactStatus(sEmail);
+				}
+			}).then(function (oContactStatus) {
+				return Promise.resolve(oContactStatus);
+			});
+		}
+
 		// for ColumnLayout of smartForm, layouts are no longer accepted as a part of form content
 		// Thus binding of fragment is to be done at runtime, as opposed to inline fragment call earlier
 		function onContactDetails(oEvent, sNavigationPropertyPath) {
-			var renderContactDetailsFragment = function(aTeamsCollabOptions) {
+			var renderContactDetailsFragment = function (aTeamsCollabOptions, oContactStatus) {
 				var oSourceControl = oEvent.getSource();
 				var oModel = oSourceControl.getModel();
 				var oContext = oSourceControl.getBindingContext();
@@ -2493,20 +2480,43 @@ sap.ui.define(["sap/ui/base/Object",
 				// In general we can show at max fn (FullName), photo & role properties in the Contacts facet. So if these key length is more than 3 that means we have already the other required properties
 				// in the model and straight away we can go for populating the contact quickView otherwise we need to trigger a model GET request with the bindingPath
 				if (Object.keys(oContactData.getProperty()).length > 3) {
-					ContactCardDetailHelper.populateDataInContactQuickView(oCommonUtils, oSourceControl, oContactData, aTeamsCollabOptions);
+					ContactCardDetailHelper.populateDataInContactQuickView(oCommonUtils, oSourceControl, oContactData, aTeamsCollabOptions, oContactStatus);
 				} else {
-					var oPromise = oDataModelHelper.getData(oModel, sPath).then(function() {
-						ContactCardDetailHelper.populateDataInContactQuickView(oCommonUtils, oSourceControl, oContactData, aTeamsCollabOptions);
+					var oPromise = oDataModelHelper.getData(oModel, sPath).then(function () {
+						ContactCardDetailHelper.populateDataInContactQuickView(oCommonUtils, oSourceControl, oContactData, aTeamsCollabOptions, oContactStatus);
 					});
 					oComponentUtils.getBusyHelper().setBusy(oPromise);
 				}
 			};
 
-			fnFetchTeamsOptions()
-			.then(function (aTeamsCollabOptions) {
-				renderContactDetailsFragment.call(this, aTeamsCollabOptions);
+			var oSourceControl = oEvent.getSource();
+			var  oModel = oSourceControl.getModel();
+			var  oContext = oSourceControl.getBindingContext();
+			var  sPath = oContext.getPath();
+			var  oContactData = oModel.getContext(sPath);
+			var oContactAnnotation = JSON.parse(oSourceControl.data("contactDetails"));
+			var sEmail;
+			if (oContactAnnotation.email[0].address && oContactAnnotation.email[0].address.Path) {
+				sEmail = oContactData.getProperty(oContactAnnotation.email[0].address.Path);
+			} else {
+				sEmail = (oContactAnnotation.email[0].address && oContactAnnotation.email[0].address.String);
+			}
+
+
+			fnFetchContactStatus(sEmail).then(function (oContactStatus) {
+				fnFetchTeamsOptions()
+					.then(function (aTeamsCollabOptions) {
+						renderContactDetailsFragment.call(this, aTeamsCollabOptions, oContactStatus);
+					}).catch(function (oError) {
+						renderContactDetailsFragment.call(this);
+					});
 			}).catch(function (oError) {
-				renderContactDetailsFragment.call(this);
+				fnFetchTeamsOptions()
+					.then(function (aTeamsCollabOptions) {
+						renderContactDetailsFragment.call(this, aTeamsCollabOptions);
+					}).catch(function (oError) {
+						renderContactDetailsFragment.call(this);
+					});
 			});
 		}
 
@@ -2519,7 +2529,7 @@ sap.ui.define(["sap/ui/base/Object",
 			var oSourceControl = oEvent;
 			ServiceContainer.getServiceAsync().then(function (oTeamsHelper) {
 				if (typeof oTeamsHelper.isContactsCollaborationSupported === 'function' && oTeamsHelper.isContactsCollaborationSupported()) {
-					return oTeamsHelper.enableMinimalContactsCollaboration(sEmail);
+					return oTeamsHelper.enableContactsCollaboration(sEmail);
 				} else {
 					return Promise.reject();
 				}
@@ -2678,6 +2688,7 @@ sap.ui.define(["sap/ui/base/Object",
 			uploadStream: uploadStream,
 			removeStream: removeStream,
 			handleUploadComplete: handleUploadComplete,
+			handleTypeMismatch: handleTypeMismatch,
 			evaluateParameters: fnEvaluateParameters,
 			onBeforeExport: fnOnBeforeExport,
 			handleSideEffectForField: fnHandleSideEffectForField,

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

@@ -14,9 +14,10 @@ sap.ui.define(["sap/ui/base/Object",
 	"sap/suite/ui/generic/template/genericUtilities/oDataModelHelper",
 	"sap/ui/core/IconPool",
 	"sap/ui/export/util/Filter",
-	"sap/ui/model/odata/ODataUtils"
+	"sap/ui/model/odata/ODataUtils",
+	"sap/ui/comp/util/TableUtil"
 ], function(BaseObject, ControllerExtension, MessageBox, SelectionVariant, controlHelper, metadataAnalyser,
-			testableHelper, FeLogger, odata4analytics, extend, deepExtend, FeError, ControlStateWrapperFactory, oDataModelHelper, IconPool, ExportFilter, ODataUtils) {
+			testableHelper, FeLogger, odata4analytics, extend, deepExtend, FeError, ControlStateWrapperFactory, oDataModelHelper, IconPool, ExportFilter, ODataUtils, TableUtil) {
 	"use strict";
 	var	sClassName = "lib.CommonUtils";
 
@@ -95,6 +96,18 @@ sap.ui.define(["sap/ui/base/Object",
 			return mOverflowToolbarCustomData[sControlId] || [];
 		}
 
+		function fnIsCustomColumn(oSmartTable, oColumn) {
+			var isCustomColumn;
+			var aFERenderedAndCustomColums = TableUtil.getCustomColumns(oSmartTable);
+			var oCurrentColumn = aFERenderedAndCustomColums.find(function(oCol) {
+				return ((oColumn.data("p13nData") && oColumn.data("p13nData").columnKey) === (oCol.data("p13nData") && oCol.data("p13nData").columnKey));
+			});
+			if (oCurrentColumn) {
+				isCustomColumn = oCurrentColumn.data("isFERenderedColumn") ? false : true;
+			}
+			return isCustomColumn;
+		}
+
 		function getMetaModelEntityType(sEntitySet) {
 			var oMetaModel, oEntitySet, oEntityType;
 			oMetaModel = oController.getOwnerComponent().getModel().getMetaModel();
@@ -1525,11 +1538,19 @@ sap.ui.define(["sap/ui/base/Object",
 			if (oStreamData && oStreamData.__metadata){
 				var edit_media = oStreamData.__metadata.edit_media;
 				var content_type = oStreamData.__metadata.content_type;
-				var url = edit_media && new URL(edit_media);
-				var urlPath = url && url.pathname;
+				var urlPath = "";
+				if (edit_media) {
+					if (edit_media.startsWith("http:") || edit_media.startsWith("https:")) {
+						//To ensure code is backward compatible with older versions of SAP Gateway
+						var url = edit_media && new URL(edit_media);
+						urlPath = url && url.pathname;
+					} else {
+						urlPath = edit_media;
+					}
+				}
 				var bIcon = IconPool.getIconForMimeType(content_type);
 				var obj = {
-					url : urlPath,
+					url: urlPath,
 					fileType: content_type,
 					icon: bIcon
 				};
@@ -1814,17 +1835,19 @@ sap.ui.define(["sap/ui/base/Object",
 			},
 			getToolbarCustomData: fnGetToolbarCustomData,
 
-			isSupportedColumn: function(oColumn, oProperty) {
+			isSupportedColumn: function(oColumn, oProperty, oSmartTable) {
 				var sColumnKey = oColumn.data("p13nData") && oColumn.data("p13nData").columnKey;
 				if (sColumnKey.indexOf("DataFieldForAnnotation") > -1 ||
 					sColumnKey.indexOf("DataFieldForAction") > -1 ||
 					sColumnKey.indexOf("DataFieldForIntentBasedNavigation") > -1 ||
 					(oProperty && oProperty['com.sap.vocabularies.UI.v1.IsImageURL'] && oProperty['com.sap.vocabularies.UI.v1.IsImageURL'].Bool === "true") ||
-					(oColumn.data("addCardtoInsightsConfig") && oColumn.data("addCardtoInsightsConfig").isMultiValueColumn)) {
+					(oColumn.data("addCardtoInsightsConfig") && oColumn.data("addCardtoInsightsConfig").isMultiValueColumn) ||
+					fnIsCustomColumn(oSmartTable, oColumn)) {
 					return false;
 				}
 				return true;
 			},
+			isCustomColumn: fnIsCustomColumn,
 
 			getCustomDataText: function(oElement) {
 				return new Promise(function (resolve, reject) {

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

@@ -14,7 +14,7 @@ sap.ui.define([
      * @private
     */
     
-    function fnPopulateDataInContactQuickView(oCommonUtils, oSourceControl, oContactData, aTeamsCollabOptions) {
+    function fnPopulateDataInContactQuickView(oCommonUtils, oSourceControl, oContactData, aTeamsCollabOptions, oContactStatus) {
         var oContactAnnotation = JSON.parse(oSourceControl.data("contactDetails"));
         var sEmail = "", sEnumTypeContactEmail;
 
@@ -122,28 +122,14 @@ sap.ui.define([
                 if (aTeamsCollabOptions && aTeamsCollabOptions.length && sEmail) {
                     oContactModel.setProperty("/teamsCollabOptions", aTeamsCollabOptions);
                 }
+                if (oContactStatus && oContactStatus.length && sEmail) {
+                    oContactModel.setProperty("/contactStatus", oContactStatus[0]);
+                }
                 oContactPopover.openBy(oSourceControl);
             });
         };
 
         renderContactDetailsFragment.call(this); // To be removed when we consume the Teams Contacts Collaboration Helper
-
-        var skipBelowCode = true;
-        if (!skipBelowCode) {	// Below code is to consume Teams Contacts Collaboration. Commenting this code until we get clarity on CA
-            ServiceContainer.getServiceAsync().then(function (oTeamsHelper) {
-                if (typeof oTeamsHelper.isContactsCollaborationSupported === 'function' && oTeamsHelper.isContactsCollaborationSupported()) {
-                    return oTeamsHelper.enableContactsCollaboration(sEmail);
-                } else {
-                    return Promise.reject();
-                }
-            })
-            .then(function (oPopover) {
-                oPopover.openBy(oSourceControl);
-            })
-            .catch(function (oError) {
-                renderContactDetailsFragment.call(this);
-            });
-        }
     }
 
     function getFormattedAddress(oContactData, oContactAnnotation) {

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

@@ -21,6 +21,7 @@ sap.ui.define([
 
 	// Constants
 	var MAX_RECORDS_OPEN_IN_NEW_TAB = 10;
+	var aToolbarContentsToBeOmitted = ["btnPersonalisation", "btnExcelExport"];
 
 	function getMethods(oController, oTemplateUtils, oState, oSourceControl, oConfiguration) {
 
@@ -46,6 +47,7 @@ sap.ui.define([
 		var oView = oController.getView();
 		var oTemplatePrivateModel = oView.getModel("_templPriv");
 		var oCommonUtils = oTemplateUtils.oCommonUtils;
+		var oComponentUtils = oTemplateUtils.oComponentUtils;
 
 		// reserve a place in the template private model which can be used to determine the content of the context menu in a declarative way.
 		// The corresponding entries are evaluated in .fragments.SmartControlContextMenu fragment.
@@ -60,7 +62,7 @@ sap.ui.define([
 		});
 
 		var oPresentationControlHandler = oTemplateUtils.oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oSourceControl);
-		var bNavigationSupported = oTemplateUtils.oComponentUtils.canNavigateToSubEntitySet(oSourceControl.getEntitySet());
+		var bNavigationSupported = oComponentUtils.canNavigateToSubEntitySet(oSourceControl.getEntitySet());
 		var mHandlers; // maps keys of context menu entries to handler functions for the corresponding entry
 		var iCreatedMenuItemsCounter = 0; // increased whenever a new MenuItem is being created In fnAddMenuItem). Used to generate a key for mHandlers.
 
@@ -213,25 +215,18 @@ sap.ui.define([
 		}
 
 		function fnAddToolbarButtonToContextMenu(sPathToItems, oFocusInfo, oToolbarControlsData, aItems, oButton, bStartsNewSection){
-			// If button has the stable id, find local id using "oButton.getId()".
-			// Otherwise, if the button was created using design time adaption, use the custom data "originalButtonId" to find local id. 
-			var sButtonId = oView.getLocalId(oButton.getId()) || oView.getLocalId(oButton.data("originalButtonId"));
-			// In the multi table multi view scenario, the toolbar button id is suffixed with icon tab bar's current key.
-			var oMultipleViewsHandler = oState.oMultipleViewsHandler;
-			var sButtonIdSuffix = oMultipleViewsHandler.getMode && oMultipleViewsHandler.getMode() === "multi" ? oState.oMultipleViewsHandler.getSelectedKey() : "";
-			
+			// Case 1: If button has the stable id, use it to find local id.
+			// Case 2: If the button was created using design time adaption, use the custom data "originalButtonId" to find local id. 
+			var sButtonLocalId = oView.getLocalId(oButton.getId()) || oView.getLocalId(oButton.data("originalButtonId"));
+
 			var oHandlePromise = null;
 			//Check if the control data available on standard actions
 			var oStandardControlData = oToolbarControlsData.standardActions.find(function(oControlData){
-				return oControlData.ID === sButtonId;
+				return oControlData.ID === sButtonLocalId;
 			});
 
 			// If not check on breakout actions
-			var oBreakoutControlData = !oStandardControlData && oToolbarControlsData.breakoutActions.find(function (oBreakoutAction){
-				// In multi table multi view, breakout action id = (manifest action id + "-" + multi view tab id).
-				var sBreakoutActionId = sButtonIdSuffix ? (oBreakoutAction.id + "-" + sButtonIdSuffix) : oBreakoutAction.id;
-				return sBreakoutActionId === sButtonId;
-			});
+			var oBreakoutControlData = oConfiguration.findBreakoutActionByLocalId(oToolbarControlsData.breakoutActions, sButtonLocalId);
 
 			// Get the handle promise based on the control type (standard / breakout)
 			if (oStandardControlData) {
@@ -284,7 +279,13 @@ sap.ui.define([
 			aToolbarContent.forEach(function(oToolbarEntry){
 				if (!(oToolbarEntry.getVisible && oToolbarEntry.getVisible())) {
 					return;
-				}			
+				}
+				var bIgnoreToolbarEntry = aToolbarContentsToBeOmitted.some(function (sControlToBeOmitted) {
+					return oToolbarEntry.getId().includes(sControlToBeOmitted);
+				});
+				if (bIgnoreToolbarEntry) {
+					return;
+				}
 				if (controlHelper.isButton(oToolbarEntry)){
 					bFirst = !fnAddToolbarButtonToContextMenu(sItemsPath, oFocusInfo, oToolbarControlsData, aItems, oToolbarEntry, bFirst) && bFirst;
 				} else if (controlHelper.isMenuButton(oToolbarEntry)){
@@ -326,7 +327,7 @@ sap.ui.define([
 			var sTargetPathPrefix = sDeepPath.startsWith("/") ? "&" : "&/";
 			// If the app supports FCL, the object page should be opened in full screen mode
 			if (oAppComponent.getFlexibleColumnLayout()) {
-				var iViewLevel = oTemplateUtils.oComponentUtils.getViewLevel();
+				var iViewLevel = oComponentUtils.getViewLevel();
 				var sTargetFCLLayout = iViewLevel === 0 ? LayoutType.MidColumnFullScreen : LayoutType.EndColumnFullScreen;
 				// Update "FCLLayout"
 				oUrlParams.set("FCLLayout", sTargetFCLLayout);
@@ -361,7 +362,7 @@ sap.ui.define([
 		 */
 		function fnOpenNavigableContextsInNewTab (oFocusInfo, aNavigableContexts) {
 			if (oFocusInfo.applicableContexts.length > MAX_RECORDS_OPEN_IN_NEW_TAB) {
-				var sWarningMessage = oTemplateUtils.oCommonUtils.getText("T_TABLE_NAVIGATION_TOO_MANY_ITEMS_SELECTED", [MAX_RECORDS_OPEN_IN_NEW_TAB]);
+				var sWarningMessage = oCommonUtils.getText("T_TABLE_NAVIGATION_TOO_MANY_ITEMS_SELECTED", [MAX_RECORDS_OPEN_IN_NEW_TAB]);
 				MessageBox.warning(sWarningMessage);
 				return;
 			}
@@ -388,7 +389,8 @@ sap.ui.define([
 		/**
 		 * Returns the promise which resolves the event handler for "Open in new tab/window" entry.
 		 * 
-		 * Negative scenario: It just returns without value when anyone of the following condition met.
+		 * Negative scenario: It just returns without any value when anyone of the following condition met.
+		 * So that, "Open in new tab" option isn't added in context menu.
 		 *   a. Navigation is not supported by the table
 		 *   b. Direct edit flow (when the edit icon is pressed on row, the object is opened with draft record) is configured.  
 		 *   c. The controller is configured with onListNavigationExtension (i.e custom navigation logic written by app).