@sapui5/sap.suite.ui.generic.template 1.123.0 → 1.124.0

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

@@ -22,13 +22,20 @@ sap.ui.define([
 				oTemplateUtils.oCommonEventHandlers.onCallActionFromToolBarForContexts(oSmartControl, oSmartControl.getTable(), oButtonCustomData, oFocusInfo.applicableContexts, null, oSmartControl.getEntitySet(), true);
 			}
 		}
+
+		function fnFindBreakoutActionByLocalId(aBreakoutActionsData, sToolbarButtonLocalId) {
+            return aBreakoutActionsData.find(function (oBreakoutAction) {
+                return sToolbarButtonLocalId === oBreakoutAction.id;
+            });
+        }
 		
 		function getGenericHandler(sSmartControlId){
 			var oRet = mGenericCtxMenuHandlers[sSmartControlId];
 			if (!oRet){
 				var oSmartControl = oController.byId(sSmartControlId);
 				var oConfiguration = {
-					executeAction: fnExecuteAction.bind(null, sSmartControlId)
+					executeAction: fnExecuteAction.bind(null, sSmartControlId),
+					findBreakoutActionByLocalId: fnFindBreakoutActionByLocalId
 				};
 				oRet = new ContextMenuHandler(oController, oTemplateUtils, oState, oSmartControl, oConfiguration);
 				mGenericCtxMenuHandlers[sSmartControlId] = oRet;

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

@@ -2,15 +2,12 @@ sap.ui.define([
 	"sap/ui/base/Object",
 	"sap/base/util/extend",
 	"sap/ui/model/Sorter",
-	"sap/ui/core/library",
+	"sap/ui/core/message/MessageType",
 	"sap/suite/ui/generic/template/lib/MessageUtils",
 	"sap/suite/ui/generic/template/genericUtilities/controlHelper"
-], function(BaseObject, extend, Sorter, SapCoreLibrary, MessageUtils, controlHelper) {
+], function(BaseObject, extend, Sorter, MessageType, MessageUtils, controlHelper) {
 	"use strict";
 
-	// shortcut for sap.ui.core.MessageType
-	var MessageType = SapCoreLibrary.MessageType;
-
 	// This class is a helper class to implement function fnPrepareForMessageHandling within the ControllerImplementation of the object page.
 	// For this purpose it provides a single public function getPrepareMessageDisplayPromise, which implements the part of that function
 	// that deals with the list binding for the messages to be displayed in the popup/popover.

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

@@ -1,10 +1,11 @@
 sap.ui.define([
 	"sap/ui/base/Object",
 	"sap/base/util/extend",
+	"sap/ui/core/message/MessageType",
 	"sap/ui/model/Filter",
 	"sap/suite/ui/generic/template/lib/MessageStripHelper",
 	"sap/suite/ui/generic/template/lib/MessageUtils"
-], function (BaseObject, extend, Filter, MessageStripHelper, MessageUtils) {
+], function (BaseObject, extend, MessageType, Filter, MessageStripHelper, MessageUtils) {
 	"use strict";
 
 	// Adapter class to make sap.suite.ui.generic.template.lib.MessageStripHelper usable for object page.
@@ -47,7 +48,7 @@ sap.ui.define([
 		 * 
 		 * @param {object} oMessage - Message object
 		 * @param {string} oMessage.message - The message text
-		 * @param {sap.ui.core.MessageType} oMessage.type - The message severity
+		 * @param {module:sap/ui/core/message/MessageType} oMessage.type - The message severity
 		 * @param {string} sSmartTableId 
 		 * @returns 
 		 */
@@ -77,7 +78,7 @@ sap.ui.define([
 			if (!sSmartTableId) {
 				var oTemplatePrivateModel = oController.getOwnerComponent().getModel("_templPriv");
 				oTemplatePrivateModel.setProperty("/objectPage/messageStripInfo/messageText", oMessage ? oMessage.message : "");
-				oTemplatePrivateModel.setProperty("/objectPage/messageStripInfo/messageType", oMessage ? oMessage.type : sap.ui.core.MessageType.None);
+				oTemplatePrivateModel.setProperty("/objectPage/messageStripInfo/messageType", oMessage ? oMessage.type : MessageType.None);
 				return;
 			}
 			var oMeta = getMeta(sSmartTableId);

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

@@ -306,10 +306,21 @@ sap.ui.define([
             return oResult;
         }
 
+        function getAdditionalProperty() {
+            var aAdditionalProperty = [];
+            aColumnData.forEach(function(oColumn) {
+                if (oColumn.additionalProperty) {
+                    aAdditionalProperty.push(oColumn.property);
+                } 
+            });
+            return aAdditionalProperty;
+        }
+
         function fnShowToastAfterPaste() {
             var sNonPastedColumns = "", bMultipleColumns = false;
+            var aAdditionalProperty = getAdditionalProperty();
             aPotentialReadOnlyFields.forEach(function(oColumn) {
-                if (oColumn.ignoredFromPaste) {
+                if (oColumn.ignoredFromPaste && !aAdditionalProperty.includes(oColumn.name)) {
                     if (sNonPastedColumns) {
                         sNonPastedColumns += ", ";
                         bMultipleColumns = true;

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

@@ -1,8 +1,11 @@
-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) {
+sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/generic/template/genericUtilities/controlHelper", "sap/ui/core/library",
+		"sap/suite/ui/generic/template/genericUtilities/FeLogger"
+	], function(BaseObject, extend, controlHelper, SapCoreLibrary, FeLogger) {
 		"use strict";
 
 		var STYLE_CLASS_FOR_ADJUSTMENT = "sapUiTableOnObjectPageAdjustmentsForSection";
+		var sClassName = "ObjectPage.controller.SectionTitleHandler";
+		var oLogger = new FeLogger(sClassName).getLogger();
 
 		function getMethods(oController, oObjectPage) {
 			
@@ -10,6 +13,8 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/gener
 			
 			var mSubSectionTitleInfo = Object.create(null);
 
+			var oAppComponent = oController.getOwnerComponent().getAppComponent();
+
 			var bIsIconTabBarMode = oObjectPage.getUseIconTabBar();
 			
 			oObjectPage.getSections().forEach(function(oSection){
@@ -23,7 +28,14 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/gener
 				}
 			});
 			
-			function fnSetAsTitleOwner(oControl, bIsStandardSection){
+			function fnSetAsTitleOwner(oControl, bIsStandardSection) {
+				// If the manifest setting is set, then the title of the section will not be adjusted
+
+				if (!oAppComponent.getMergeObjectPageSectionTitle()) {
+					oLogger.warning("Title of the section will not be adjusted as the manifest setting \"mergeObjectPageSectionTitle\" is set.");
+					return;
+				}
+
 				var oSubSection;
 				for (var oTestControl = oControl; oTestControl; oTestControl = controlHelper.getParent(oTestControl)){
 					if (controlHelper.isObjectPageSubSection(oTestControl)){

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

@@ -69,7 +69,7 @@ sap.ui.define([
              * Please refer the function "onUIModelPropChanged". Once the inline creation rows added to a table, it's id will be removed from the set.
              * 
              */
-            var oTablesToBeProcessed = {
+            var oTablesWaitingForUIModelChange = {
                 creationRows: new Set(),
                 creationRowsHiddenInEditMode: new Set()
             };
@@ -93,8 +93,8 @@ sap.ui.define([
              */
             function fnOnBeforeRebindObjectPage(){
                 //Clear the cache
-                oTablesToBeProcessed.creationRows.clear();
-                oTablesToBeProcessed.creationRowsHiddenInEditMode.clear();
+                oTablesWaitingForUIModelChange.creationRows.clear();
+                oTablesWaitingForUIModelChange.creationRowsHiddenInEditMode.clear();
                 //Invoke "beforeRebindObjectPage" on all the RequiredPropHelper instances
                 Array.from(mRequiredPropHelperByTableId.values()).forEach(function (oRequiredPropHelper) {
                     oRequiredPropHelper.onBeforeRebindObjectPage();
@@ -238,15 +238,13 @@ sap.ui.define([
                     sSmartTableCreationMode = fnGetSmartTableCreationMode(oSmartTable),
                     sUIModelProp = oUIModelPropForCreationMode[sSmartTableCreationMode],
                     sSmartTableId = oSmartTable.getId();
-                // Ignore it when the table is already in process
-                if (oTablesToBeProcessed[sSmartTableCreationMode].has(sSmartTableId)) {
-                    return;
-                }    
-                //Add the smart table id to the list of tables to be processed
-                oTablesToBeProcessed[sSmartTableCreationMode].add(sSmartTableId);
-                //If the property is true, proceed with the creating inline creation rows
+  
+                // If the property is true, proceed with the creating inline creation rows
+                // Otherwise, add the smart table id to the list of tables to be processed
                 if (oUIModel.getProperty(sUIModelProp)) {
                     fnAddCreationRows(oSmartTable);
+                } else {
+                    oTablesWaitingForUIModelChange[sSmartTableCreationMode].add(sSmartTableId);
                 }
                 //Additionally, ensure the required registration of "onEditablePropertyChanged". See more there
                 if (!oUIModelPropsWithChangeEventAttached.has(sUIModelProp)) {
@@ -262,10 +260,12 @@ sap.ui.define([
              */
             function onUIModelPropChanged(sSmartTableCreationMode, oEvent) {
                 if (oEvent.getSource().getValue()) { // called by the change of UI Model
-                    var oTablesToBeProcessedOnCreationMode = oTablesToBeProcessed[sSmartTableCreationMode];
+                    var oTablesToBeProcessedOnCreationMode = oTablesWaitingForUIModelChange[sSmartTableCreationMode];
                     oTablesToBeProcessedOnCreationMode.forEach(function (sSmartTableId) {
                         var oControl = sap.ui.getCore().byId(sSmartTableId);
-                        fnAddCreationRows(oControl);
+                        fnAddCreationRows(oControl).then(function () {
+                            oTablesToBeProcessedOnCreationMode.delete(sSmartTableId);
+                        });
                     });
                 }
             }
@@ -349,7 +349,6 @@ sap.ui.define([
              */
             function fnAddCreationRowsImpl(oSmartTable, oDefaultValues, mParameters) {
                 var oTable = oSmartTable.getTable();
-                var sSmartTableCreationMode = fnGetSmartTableCreationMode(oSmartTable);
                 var bResponsiveTable = mParameters.isResponsiveTable;
                 var oItemsBinding = mParameters.itemsBinding;
                 // for grid table, all creations are at the end. only add creation rows when list binding's length is final
@@ -360,8 +359,6 @@ sap.ui.define([
                 if (bIsLengthFinal && oItemsBinding.isResolved() && bIsCreationAllowedByPath && !bTableHasCreationRows) { // no inline creation rows have been added yet
                     // for responsive table, the very first creation is at the start and the following at the end
                     createInactiveLineItem(oItemsBinding, oDefaultValues, !bResponsiveTable);
-                    // Remove the smart table id from the list of tables to be processed
-                    oTablesToBeProcessed[sSmartTableCreationMode].delete(oSmartTable.getId());
                     // Hide navigation and delete controls on inactive rows
                     var fnAfterRenderCallback = fnUpdateTableRows.bind(null, oTable);
                     fnInvokeCallbackAfterRendering(oTable, fnAfterRenderCallback);

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

@@ -3,9 +3,10 @@ sap.ui.define([
     "sap/base/util/extend",
     "sap/base/util/deepEqual",
     "sap/ui/core/message/Message",
+    "sap/ui/core/message/MessageType",
     "sap/suite/ui/generic/template/genericUtilities/controlHelper",
     "sap/suite/ui/generic/template/lib/MessageUtils"
-], function (BaseObject, extend, deepEqual, Message, controlHelper, MessageUtils) {
+], function (BaseObject, extend, deepEqual, Message, MessageType, controlHelper, MessageUtils) {
     "use strict";
     /**
      * This class takes care of the error message handling for the required properties in inline creation rows
@@ -183,7 +184,7 @@ sap.ui.define([
              var oMessage = (aHiddenRequiredPropColumns && aHiddenRequiredPropColumns.length > 0) ?  
                 {
                     message: fnGetHiddenRequiredPropColumnsErrorMessage(aHiddenRequiredPropColumns),
-                    type: sap.ui.core.MessageType.Error
+                    type: MessageType.Error
                 } : null;
             
             oMessageStripHelper.setTechnicalMessage(oMessage, oSmartTable.getId());
@@ -254,7 +255,7 @@ sap.ui.define([
                     technical: false,
                     target: sTarget,
                     fullTarget: sFullTarget,
-                    type: sap.ui.core.MessageType.Error,
+                    type: MessageType.Error,
                     processor: oModel
                 });
                 oMessageManager.addMessages(oMessage);

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

@@ -87,6 +87,10 @@ MSG_SUBTITLE_ROW_HIDDEN_COLUMN_HIDDEN=Row (Hidden): {0}, Column (Hidden): {1}
 # XTIT,30: Title of a form with contact person information
 CONTACT_INFO=Contact Information
 
+
+# XTIT,30: Title of a Toolbar with share button
+CONTACT_OPTION=Microsoft Teams
+
 # XTIT,30: Job title of a person
 CONTACT_JOB_TITLE=Job Title
 

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

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.123.0"
+			"version": "1.124.0"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",
@@ -78,7 +78,10 @@
 				},
 				"sap.fe.placeholder":{
 			  		"minVersion":"1.86.0"
-			  	}
+			  	},
+				"sap.cards.ap.common": {
+					"minVersion": "1.121.0"
+				}
 			}
 		},
 		"commands": {

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

@@ -120,6 +120,18 @@
 		</template:if>
 	</template:repeat>
 
+	<uxap:ObjectPageHeaderActionButton id="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageAction', subType: 'Summarize'}) }"
+		text="{i18n>SUMMARIZE}"
+		icon="sap-icon://ai"
+		hideText="false"
+		importance="High"
+		enabled="{ui>/enabled}"
+		press="._templateEventHandlers.onSummarize"
+		ariaHasPopup="Dialog"
+		fesr:press="fe:sum:summarize"
+		type="Ghost"
+		visible="{_templPrivGlobal>/generic/isSummarizationEnabled}" />
+
 	<template:if test="{parameter>/settings/showRelatedApps}">
 		<uxap:ObjectPageHeaderActionButton id="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageAction', subType: 'RelatedApps'}) }"
 			text="{i18n>RELATED_APPS}"
@@ -132,18 +144,6 @@
 			visible="{_templPrivGlobal>/generic/crossAppNavSupport}"/>
 	</template:if>
 
-	<uxap:ObjectPageHeaderActionButton id="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageAction', subType: 'Summarize'}) }"
-		text="{i18n>SUMMARIZE}"
-		icon="sap-icon://ai"
-		hideText="false"
-		importance="High"
-		enabled="{ui>/enabled}"
-		press="._templateEventHandlers.onSummarize"
-		ariaHasPopup="Dialog"
-		fesr:press="stepname:fe:sum:summarize"
-		type="Default"
-		visible="{_templPrivGlobal>/generic/isSummarizationEnabled}" />
-
 	<MenuButton id="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageAction', subType: 'Share'}) }"
 		text=""
 		icon="sap-icon://action"

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

@@ -44,7 +44,7 @@
 									visible="{path: 'facet>', formatter: 'AH.getBindingForHiddenPath'}"
 									editable="{ui>/editable}"
 									showPasteButton = "{objectPageTableSettings>value/vShowPasteButton}"
-									placeToolbarInTable="{= ${objectPageTableSettings>value/type} === 'ResponsiveTable' && ${device>/system/desktop}}"
+									placeToolbarInTable="{=${device>/system/desktop}}"
 									beforePaste="._templateEventHandlers.onBeforePaste('{smartControlId>id}', $event)"
 									paste="._templateEventHandlers.onPaste('{smartControlId>id}', $event)"
 									customizeConfig="{parts: [{path: 'entitySet>'}, {path: 'listEntitySet>'}, {path: 'objectPageTableSettings>calculateWidthIncludingColumnHeader'}], formatter: 'AH.buildSmartTableCustomizeConfig'}"

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

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

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

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

package/src/sap/suite/ui/generic/template/detailTemplates/detailUtils.js

@@ -2,8 +2,8 @@ sap.ui.define([	"sap/suite/ui/generic/template/genericUtilities/FeLogger", "sap/
 	"sap/suite/ui/generic/template/extensionAPI/NavigationController", "sap/suite/ui/generic/template/lib/MessageButtonHelper", "sap/suite/ui/generic/template/genericUtilities/testableHelper",
 	"sap/suite/ui/generic/template/detailTemplates/DiscardEditHandler", "sap/suite/ui/generic/template/detailTemplates/PaginatorButtonsHelper",
 	"sap/suite/ui/generic/template/ObjectPage/extensionAPI/DraftTransactionController", "sap/suite/ui/generic/template/ObjectPage/extensionAPI/NonDraftTransactionController",
-	"sap/m/DraftIndicator"],
-	function(FeLogger, UIComponent, HashChanger, Filter, FilterOperator, controlHelper, NavigationController, MessageButtonHelper, testableHelper, DiscardEditHandler, PaginatorButtonsHelper, DraftTransactionController, NonDraftTransactionController) {
+	"sap/ui/core/message/MessageType", "sap/m/DraftIndicator"],
+	function(FeLogger, UIComponent, HashChanger, Filter, FilterOperator, controlHelper, NavigationController, MessageButtonHelper, testableHelper, DiscardEditHandler, PaginatorButtonsHelper, DraftTransactionController, NonDraftTransactionController, MessageType) {
 		"use strict";
 		var oLogger = new FeLogger("detailTemplates.detailUtils").getLogger();
 
@@ -26,7 +26,7 @@ sap.ui.define([	"sap/suite/ui/generic/template/genericUtilities/FeLogger", "sap/
 					},
 					messageStripInfo: { // Contains information about OP header message strip
 						messageText: "",
-						messageType: sap.ui.core.MessageType.None
+						messageType: MessageType.None
 					},
 					cancelEnabled: true       // should the cancel buuton in the footer bar be enabled (only relevant if it is visible)
 				});

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

@@ -43,6 +43,8 @@ sap.ui.define(["sap/suite/ui/generic/template/lib/TemplateAssembler",
 		},
 
 		/**
+		 * @deprecated As of version 1.124, please refer the {@link topic:4120052d90374ce8b1cea24a0d8bd317 documentation} for the migration steps.
+		 * 
 		 * This method can be used to define specific controller extension(s) for a template which is used more than once within a SAP Fiori elements application.
 		 * More precisely: In the manifest of a SAP Fiori elements application, you can register a controller extension.
 		 * This controller extension is defined at <code>sap.ui5/extends/extensions/sap.ui.controllerExtensions/{template}</code>.

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

@@ -212,7 +212,7 @@
 					<template:if test="{parts: [{path: 'listEntitySet>'}, {path: 'dataField>'}], formatter: 'AH.checkMultiplicityForDataFieldAssociation'}">
 						<table:AnalyticalColumn 
 								id="{:= ${parameter>/stableId}.getStableId({type: 'TableColumn', subType: 'DataField', sSmartTableId: ${smartControlId>id}, sProperty: ${dataField>Value/Path}})}"
-								width="{parts: [{path: 'dataFieldValue>'}, {path: 'dataField>'}, {path: 'listEntitySet>'}, ], formatter: 'AH.getDefaultWidthForTableColumn'}"
+								width="{parts: [{path: 'dataFieldValue>'}, {path: 'dataField>'}, {path: 'listEntitySet>'}], formatter: 'AH.getDefaultWidthForTableColumn'}"
 								visible="{= ${dataField>com.sap.vocabularies.UI.v1.Importance/EnumMember} === 'com.sap.vocabularies.UI.v1.ImportanceType/High' ? 'true' :
 								( ${dataField>com.sap.vocabularies.UI.v1.Importance/EnumMember} === 'com.sap.vocabularies.UI.v1.ImportanceType/Medium' &amp;&amp; ( ${device>/system/tablet} || ${device>/system/desktop} ) ? 'true' : ${device>/system/desktop} ? 'true' : 'false' ) }">
 								<table:customData>

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

@@ -16,8 +16,12 @@
                 <Avatar
                     src="{= ${contact>/photo} ? ${contact>/photo} : 'sap-icon://person-placeholder'}"
 					displaySize="S"
-					displayShape="Square"
+					displayShape="Circle"
 					class="sapUiTinyMarginEnd"
+					badgeValueState="{contact>/contactStatus/badgeValueState}" badgeIcon="{contact>/contactStatus/badgeIcon}" badgeTooltip="{contact>/contactStatus/badgeTooltip}"
+					macrodata:type="{contact>/teamsCollabOptions/0/key}"
+					macrodata:email="{contact>/email}"
+					press=".onTeamsCollabOptionPress"
                 />
                 <VBox class="sapUiTinyMarginBegin">
                     <Title text="{contact>/fn}" level="H3" wrapping="true"/>
@@ -27,15 +31,18 @@
 
 			<!-- render options for teams contact collaboration -->
 			<VBox visible="{= ${contact>/teamsCollabOptions} !== undefined &amp;&amp; ${contact>/teamsCollabOptions}.length > 0 }" class="sapUiSmallMarginBottom">
-				<HBox>
+				<Toolbar width="100%" height="1px"/>
+				<Toolbar >
+					 <Title text="{i18n>CONTACT_OPTION}" level="H5" class="sapUiTinyMarginBegin"/> 
+					 <ToolbarSpacer/>
 					<Button
 						icon="{contact>/teamsCollabOptions/0/icon}"
 						tooltip="{contact>/teamsCollabOptions/0/tooltip}"
 						macrodata:type="{contact>/teamsCollabOptions/0/key}"
 						macrodata:email="{contact>/email}"
 						press=".onTeamsCollabOptionPress"
-						class="sapUiSmallMarginEnd"
-						type="Transparent"
+						class="sapUiTinyMarginEnd sapUiTinyMarginBegin"
+						type="Ghost"
 						fesr:press="{contact>/teamsCollabOptions/0/fesrStepName}">
 					</Button>
 					<Button
@@ -43,8 +50,8 @@
 						macrodata:type="{contact>/teamsCollabOptions/1/key}"
 						macrodata:email="{contact>/email}"
 						press=".onTeamsCollabOptionPress"
-						class="sapUiSmallMarginEnd"
-						type="Transparent"
+						class="sapUiTinyMarginEnd"
+						type="Ghost"
 						fesr:press="{contact>/teamsCollabOptions/1/fesrStepName}">
 					</Button>
 					<Button
@@ -52,11 +59,10 @@
 						macrodata:type="{contact>/teamsCollabOptions/2/key}"
 						macrodata:email="{contact>/email}"
 						press=".onTeamsCollabOptionPress"
-						class="sapUiSmallMarginEnd"
-						type="Transparent"
+						type="Ghost"
 						fesr:press="{contact>/teamsCollabOptions/2/fesrStepName}">
 					</Button>
-				</HBox>
+				</Toolbar>
 			</VBox>
 
 			<VBox visible="{= !!${contact>/title}}" class="sapUiTinyMarginBottom">

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

@@ -10,7 +10,10 @@
 		<!-- render options for teams contact collaboration -->
 		<template:if test="{= !!${path: 'contact>email/[${type/EnumMember}.indexOf(\'ContactInformationType/work\')>=0]/address', formatter: 'AHModel.format'} &amp;&amp; ${parameter>/templateSpecific/teamsCollabOptions} !== undefined &amp;&amp; ${parameter>/templateSpecific/teamsCollabOptions}.length > 0 }">
 			<VBox class="sapUiSmallMarginBegin sapUiTinyMarginTopBottom">
-				<HBox>
+				<Toolbar width="100%" height="1px"/>
+				<Toolbar>
+					<Title text="{i18n>CONTACT_OPTION}" level="H5" class="sapUiTinyMarginBegin"/> 
+					<ToolbarSpacer/>
 					<template:repeat list="{parameter>/templateSpecific/teamsCollabOptions}" var="teamsCollabOption">
 						<Button
 							icon="{teamsCollabOption>icon}"
@@ -19,11 +22,11 @@
 							macrodata:email="{path: 'contact>email/[${type/EnumMember}.indexOf(\'ContactInformationType/work\')>=0]/address', formatter: 'AHModel.format'}"
 							press="._templateEventHandlers.onTeamsCollabOptionPress"
 							class="sapUiSmallMarginEnd"
-							type="Transparent"
+							type="Ghost"
 							fesr:press="{teamsCollabOption>fesrStepName}">
 						</Button>
 					</template:repeat>
-				</HBox>
+				</Toolbar>
 			</VBox>
 		</template:if>
 

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

@@ -83,7 +83,10 @@
 													<template:with path="dataField>Value" helper="AHModel.resolvePath" var="dataFieldValue">
 														<template:if test="{= ${path: 'isFirstEmail>', formatter: 'AH.fnCheckFirstEmail'} &amp;&amp; ${dataFieldValue>com.sap.vocabularies.Communication.v1.IsEmailAddress}.Bool === 'true' &amp;&amp; ${parameter>/templateSpecific/teamsCollabOptions} !== undefined &amp;&amp; ${parameter>/templateSpecific/teamsCollabOptions}.length > 0}">
 															<VBox visible="{path: 'dataField>Value', formatter: 'AHModel.format'}" class="sapUiSmallMarginBegin sapUiTinyMarginTop">
-																<HBox>
+																<Toolbar width="100%" height="1px"/>
+																<Toolbar>
+																	<Title text="{i18n>CONTACT_OPTION}" level="H5" class="sapUiTinyMarginBegin"/> 
+																	<ToolbarSpacer/>
 																	<template:repeat list="{parameter>/templateSpecific/teamsCollabOptions}" var="teamsCollabOption">
 																		<Button
 																			icon="{teamsCollabOption>icon}"
@@ -92,11 +95,11 @@
 																			macrodata:email="{path: 'dataField>Value', formatter: 'AH.getDataFieldValueSimplePath'}"
 																			press="._templateEventHandlers.onTeamsCollabOptionPress"
 																			class="sapUiSmallMarginEnd"
-																			type="Transparent"
+																			type="Ghost"
 																			fesr:press="{teamsCollabOption>fesrStepName}">
 																		</Button>
 																	</template:repeat>
-																</HBox>
+																</Toolbar>
 															</VBox>
 															<template:if test="{:= ${isFirstEmail>}.set(false)}"/>
 														</template:if>

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

@@ -26,6 +26,7 @@
 							importance="{= ${path: 'dataField>', formatter: 'AH.getImportanceForTableColumns'}}">
 							<customData>
 								<core:CustomData key="p13nData" value="{parts: [{path: 'listEntitySet>'}, {path: 'tableSettings>calculateWidthIncludingColumnHeader'}], formatter: 'AH.createP13NFileUploader'}" />
+								<core:CustomData key="isFERenderedColumn" value="true"/>
 							</customData>
 							<Text text="{path: 'dataField>Label', formatter: 'AHModel.format'}" />
 							</Column>
@@ -44,6 +45,7 @@
 							<customData>
 								<core:CustomData key="p13nData" value="{parts: [{path: 'listEntitySet>'}, {path: 'dataFieldValue>'}, {path: 'dataField>'}, {path: 'tableSettings>calculateWidthIncludingColumnHeader'}], formatter: 'AH.createP13N'}" />
 								<core:CustomData key="addCardtoInsightsConfig" value="{'isMultiValueColumn':true}"/>
+								<core:CustomData key="isFERenderedColumn" value="true"/>
 							</customData>
 							<template:if test="{dataField>Label}">
 								<template:then>
@@ -68,6 +70,7 @@
 							importance="{parts: [{path: 'listEntitySet>'}, {path: 'dataField>'}], formatter: 'AH.getImportanceForTableColumnsWithSemanticKeyTitleAndDescription'}">
 						<customData>
 							<core:CustomData key="p13nData" value="{parts: [{path: 'listEntitySet>'}, {path: 'dataFieldValue>'}, {path: 'dataField>'}, {path: 'tableSettings>calculateWidthIncludingColumnHeader'}], formatter: 'AH.createP13N'}" />
+							<core:CustomData key="isFERenderedColumn" value="true"/>
 						</customData>
 						<Text
 							text="{parts: [{path: 'dataFieldValue>'}, {path: 'dataField>'}], formatter: 'AH.getColumnHeaderText'}" wrappingType="Hyphenated">
@@ -86,6 +89,7 @@
 								importance="{= ${path: 'dataField>', formatter: 'AH.getImportanceForTableColumns'}}">
 							<customData>
 								<core:CustomData key="p13nData" value="{parts: [{path: 'listEntitySet>'}, {path: 'dataFieldValue>'}, {path: 'dataField>'}, {path: 'tableSettings>calculateWidthIncludingColumnHeader'}], formatter: 'AH.createP13N'}" />
+								<core:CustomData key="isFERenderedColumn" value="true"/>
 							</customData>
 							<template:if test="{dataField>Label}">
 								<template:then>
@@ -110,6 +114,7 @@
 								importance="{= ${path: 'dataField>', formatter: 'AH.getImportanceForTableColumns'}}">
 							<customData>
 								<core:CustomData key="p13nData" value="{parts: [{path: 'listEntitySet>'}, {path: 'dataFieldValue>'}, {path: 'dataField>'}, {path: 'tableSettings>calculateWidthIncludingColumnHeader'}], formatter: 'AH.createP13N'}" />
+								<core:CustomData key="isFERenderedColumn" value="true"/>
 							</customData>
 							<template:if test="{dataField>Label}">
 								<template:then>
@@ -133,6 +138,7 @@
 							importance="{= ${path: 'dataField>', formatter: 'AH.getImportanceForTableColumns'}}">
 						<customData>
 							<core:CustomData key="p13nData" value="{parts: [{path: 'dataField>'}, {path: 'tableSettings>calculateWidthIncludingColumnHeader'}], formatter: 'AH.createP13NColumnForAction'}" />
+							<core:CustomData key="isFERenderedColumn" value="true"/>
 						</customData>
 						<Text text="{parts: [{path: 'dataField>'}, {path: 'listEntitySet>'}], formatter: 'AH.getLabelForDFwithIBN'}" />
 					</Column>
@@ -157,6 +163,7 @@
 								importance="{= ${path: 'dataField>', formatter: 'AH.getImportanceForTableColumns'}}">
 							<customData>
 								<core:CustomData key="p13nData" value="{parts: [{path: 'dataField>'}, {path: 'tableSettings>calculateWidthIncludingColumnHeader'}], formatter: 'AH.createP13NColumnForAction'}" />
+								<core:CustomData key="isFERenderedColumn" value="true"/>
 							</customData>
 							<template:if test="{dataField>Label}">
 								<template:then>
@@ -176,6 +183,7 @@
 						importance="{= ${path: 'dataField>', formatter: 'AH.getImportanceForTableColumns'}}">
 						<customData>
 							<core:CustomData key="p13nData" value="{parts: [{path: 'dataField>'}, {path: 'tableSettings>calculateWidthIncludingColumnHeader'}], formatter: 'AH.createP13NColumnForAction'}" />
+							<core:CustomData key="isFERenderedColumn" value="true"/>
 						</customData>
 						<Text	text="{parts: [{path: 'dataField>'}, {path: 'listEntitySet>'}], formatter: 'AH.getLabelForDFwithIBN'}" />
 					</Column>
@@ -194,6 +202,7 @@
 										importance="{= ${path: 'dataField>', formatter: 'AH.getImportanceForTableColumns'}}">
 									<customData>
 										<core:CustomData key="p13nData" value="{parts: [{path: 'listEntitySet>'}, {path: 'dataField>'}, {path: 'dataFieldTarget>'}, {path: 'dataField>Target/AnnotationPath'}, {path: 'tableSettings>calculateWidthIncludingColumnHeader'}], formatter: 'AH.createP13NColumnForContactPopUp'}" />
+										<core:CustomData key="isFERenderedColumn" value="true"/>
 									</customData>
 									<template:if test="{dataField>Label}">
 										<template:then>
@@ -235,6 +244,7 @@
 										</template:if>
 										<customData>
 											<core:CustomData key="p13nData" value="{parts: [{path: 'listEntitySet>'}, {path: 'dataField>'}, {path: 'dataFieldTarget>'}, {path: 'tableSettings>calculateWidthIncludingColumnHeader'} ], formatter: 'AH.createP13NColumnForConnectedFields'}"/>
+											<core:CustomData key="isFERenderedColumn" value="true"/>
 										</customData>
 									</Column>
 								</template:if>
@@ -253,6 +263,7 @@
 								<template:with path="dataField>Target" helper="AHModel.resolvePath" var="dataFieldTarget">
 									<customData>
 										<core:CustomData key="p13nData" value="{parts: [{path: 'listEntitySet>'}, {path: 'dataField>'}, {path: 'dataFieldTarget>'}, {path: 'dataField>Target/AnnotationPath'}, {path: 'tableSettings>calculateWidthIncludingColumnHeader'}], formatter: 'AH.createP13NColumnForChart'}" />
+										<core:CustomData key="isFERenderedColumn" value="true"/>
 									</customData>
 								</template:with>
 								<template:if test="{dataField>Label}">
@@ -277,6 +288,7 @@
 													importance="{path: 'dataField>', formatter: 'AH.getImportanceForTableColumns'}">
 												<customData>
 													<core:CustomData key="p13nData" value="{parts: [{path: 'listEntitySet>'}, {path: 'dataField>'}, {path: 'dataFieldTarget>'}, {path: 'dataFieldTargetValue>'}, {path: 'dataField>Target/AnnotationPath'}, {path: 'tableSettings>calculateWidthIncludingColumnHeader'}], formatter: 'AH.createP13NColumnForIndicator'}" />
+													<core:CustomData key="isFERenderedColumn" value="true"/>
 												</customData>
 												<template:if test="{dataField>Label}">
 													<template:then>

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