@sapui5/sap.suite.ui.generic.template 1.130.9 → 1.130.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.130.9",
+  "version": "1.130.11",
   "description": "SAPUI5 Library sap.suite.ui.generic.template",
   "keywords": [
     "sapui5",
@@ -16,7 +16,7 @@
     "testsuite-qunit" : "ui5 serve  --config ./ui5-local.yaml --open \"/test-resources/sap/suite/ui/generic/template/qunit/testsuite.qunit.html\""
   },
   "devDependencies": {
-    "sonarqube-scanner": "^2.8.1",
+    "sonarqube-scanner": "3.5.0",
     "@sap/ux-ui5-tooling": "latest"
   }
 }

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

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

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

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

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

@@ -45,7 +45,10 @@ sap.ui.define([
 	) {
 	"use strict";
 	var sClassName = "ObjectPage.controller.ControllerImplementation";
-	var oLogger = new FeLogger(sClassName).getLogger();
+	var oFeLogger = new FeLogger(sClassName);
+	var oLogger = oFeLogger.getLogger();
+	var oLevel = oFeLogger.Level;
+	oLogger.setLevel(oLevel.ALL);
 	var DEFAULT_GROWING_THRESHOLD = 20;
 
 	// Scroll the specified object page to top
@@ -1450,15 +1453,54 @@ sap.ui.define([
 				}); // Normalize the return value such that it always is a Promise
 			}
 
-			function fnFocusForEdit(bFocusAtTop){
-				setTimeout(function(){
-					var oFocusControlPromise = getFocusForEditPromise(bFocusAtTop);
-					oFocusControlPromise.then(function(oFocusControl){
-						controlHelper.focusUI5Control(oFocusControl);
-					});
+			function fnFocusForEdit(bFocusAtTop) {
+				setTimeout(function () {
+					// check if extension is found 
+					var bhasExtensionFound = oController.hasOwnProperty("focusOnEditExtension");
+					var oFocusControl;
+					if (bhasExtensionFound) {
+						var sSelectedSection = oObjectPage.getSelectedSection();
+						// call the extension method and get the control passed by application
+						oFocusControl = oController.focusOnEditExtension(sSelectedSection);
+					}
+
+					// Check if the passed control is defined, focusable, and visible within the viewport.
+					if (oFocusControl && oFocusControl.focus && oFocusControl.getDomRef()) {
+						//set the focus on the control passed by application
+						if (controlHelper.isSmartField(oFocusControl)) {
+							// check whether the SmartField is the correct target for focussing				 
+							controlHelper.getSmartFieldIsFocussableForInputPromise(oFocusControl).then(function (bIsFocusable) {
+								if (bIsFocusable) {
+									controlHelper.focusUI5Control(oFocusControl);
+								} else {
+									oLogger.info("Provided control is not focusable or visible in the viewport, hence fall back to the standard focus handling");
+									fnStandardFocusHandlingOnEdit(bFocusAtTop);
+								}
+							});
+						} else {
+							//if the passed control is not a smart field, check and set the focus on 
+							controlHelper.focusUI5Control(oFocusControl);
+						}
+					} else {
+						// If no extension is defined, proceed with the standard execution flow.
+						// If the control passed via the extension does not meet the required conditions,
+						// fall back to the standard focus handling mechanism.
+						if (bhasExtensionFound) {
+							oLogger.info("Provided control is not focusable or visible in the viewport, hence fall back to the standard focus handling");
+						}
+						fnStandardFocusHandlingOnEdit(bFocusAtTop);
+					}
 				}, 0);
 			}
 
+			function fnStandardFocusHandlingOnEdit(bFocusAtTop) {
+				var oFocusControlPromise = getFocusForEditPromise(bFocusAtTop);
+				oFocusControlPromise.then(function (oFocusControl) {
+					controlHelper.focusUI5Control(oFocusControl);
+				});
+			}
+
+
 			/* Begin: Functions dealing with the search field on tables */
 
 			// a search field in one of the tables is used to trigger a search.

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

@@ -28,7 +28,8 @@ sap.ui.define([
 					onChildOpenedExtension:  { "public": true, "final": false, overrideExecution: OverrideExecution.After},
 					onSubSectionEnteredExtension:  { "public": true, "final": false, overrideExecution: OverrideExecution.After},
 					beforeSmartLinkPopoverOpensExtension:  { "public": true, "final": false, overrideExecution: OverrideExecution.After},
-					onBeforeExportTableExtension:  { "public": true, "final": false, overrideExecution: OverrideExecution.After}
+					onBeforeExportTableExtension:  { "public": true, "final": false, overrideExecution: OverrideExecution.After},
+					focusOnEditExtension:{ "public": true, "final": false, overrideExecution: OverrideExecution.After}
 				}
 			},
 
@@ -262,6 +263,22 @@ sap.ui.define([
 			 */
 			getContext: function(oContext) {
 				return oContext;
-			}
-		};
-	});
+			},
+
+			/**
+			* Extension point for the application to specify the control to focus on in the object page upon edit.
+			*
+			* @param {String} sSelectedSection - The ID of the selected section.
+			* @returns {sap.ui.core.Control} - The control that needs to be focused.
+			*
+			* The returned control must meet the following criteria:
+			* - Be focusable and have a "focus" property.
+			* - Be visible within the viewport.
+			*
+			* If the returned control does not satisfy these conditions, the standard focus handling logic is executed.
+			*/
+			focusOnEditExtension: function (sSelectedSection) {
+				return {};
+		}
+	};
+});

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

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

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

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.130.9"
+			"version": "1.130.11"
 		},
 		"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.130.9"
+		"version": "1.130.11"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

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

@@ -17,7 +17,9 @@
 					<Label id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Label"
 						   labelFor="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Field"
 						   text="{path: 'dataField>Label', formatter: 'AHModel.format'}"
-						   class="sapSmartTemplatesObjectPageHeaderFormLabel sapUiTinyMarginEnd"/>
+						   class="sapSmartTemplatesObjectPageHeaderFormLabel sapUiTinyMarginEnd"
+						   showColon="true"
+					/>
 					<fe:Link id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Field"
 						  press="._templateEventHandlers.onContactDetails"
 						  ariaLabelledBy="{:= ${parameter>/stableId}.getStableId({type: 'ObjectPageHeader', subType: 'HeaderTitle', sFacet: ${facetId>id}})} header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Label"
@@ -37,9 +39,11 @@
 			<HBox binding="{parts: [{path: 'headerFacet>Target'}, {path: 'entitySet>'}], formatter: 'AH.getNavigationPathWithExpand'}"
 				visible="{path: 'dataField>', formatter: 'AH.getBindingForHiddenPath'}">
 				<Label
-						id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Label"
-						text="{parts: [{path: 'dataField>'}, {path: 'entitySet>'}], formatter: 'AH.getLabelForDFwithIBN'}"
-						class="sapSmartTemplatesObjectPageHeaderFormLabel sapUiTinyMarginEnd"/>
+					id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Label"
+					text="{parts: [{path: 'dataField>'}, {path: 'entitySet>'}], formatter: 'AH.getLabelForDFwithIBN'}"
+					class="sapSmartTemplatesObjectPageHeaderFormLabel sapUiTinyMarginEnd"
+					showColon="true"
+				/>
 				<fe:Link
 						id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Field"
 						text="{parts: [{path: 'dataField>'}, {path: 'entitySet>'}], formatter: 'AH.getLinkTextForDFwithIBN'}"
@@ -61,6 +65,7 @@
 					binding="{parts: [{path: 'headerFacet>Target'}, {path: 'entitySet>'}], formatter: 'AH.getNavigationPathWithExpand'}"
 					visible="{path: 'dataField>', formatter: 'AH.getBindingForHiddenPath'}" >
 					<sfi:SmartLabel
+						showColon="true"
 						labelFor="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Field"
 						class="sapSmartTemplatesObjectPageHeaderFormLabel sapUiTinyMarginEnd" />
 
@@ -88,6 +93,7 @@
 					<sfi:SmartLabel
 							id="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Label"
 							labelFor="header::{path: 'headerFacet>', formatter: 'AH.getStableIdPartFromFacet'}::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}::Field"
+							showColon="true"
 							class="{= ${dataField>Criticality} ? 'sapSmartTemplatesObjectPageHeaderFormLabel': 'sapSmartTemplatesObjectPageHeaderFormLabelNCriticcal' }  sapUiTinyMarginEnd"/>
 					<!-- TODO: Should also work with ...format -->
 					<template:with path="headerFacet>Target" helper="AHModel.gotoEntitySet" var="annotation">

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

@@ -64,16 +64,17 @@ sap.ui.define([
 	}
 
 	// returns a Promise that resolves to the boolean information whether the SmartField is a possible focus target for input.
-	function getSmartFieldIsFocussableForInputPromise(oSmartField){
-		var oSmartFieldMetadataAvailablePromise = oSmartField._getComputedMetadata();
-		return oSmartFieldMetadataAvailablePromise.then(function(){
-			return (oSmartField.getMode() === "edit") && (oSmartField._getICRenderedPromise() || Promise.resolve()).then(function(){
-				var oFirstFocusableInput = !oSmartField._bEdmBoolDetected && getFirstEditableInput(oSmartField.getDomRef());
-				return !(!oFirstFocusableInput || oFirstFocusableInput.type === "checkbox");
-			});
+	function getSmartFieldIsFocussableForInputPromise(oSmartField) {
+		return oSmartField._getComputedMetadata().then(function () {
+			return (oSmartField.getMode() === "edit") && (oSmartField._getICRenderedPromise() || Promise.resolve());
+		}).then(function () {
+			var oFirstFocusableInput = !oSmartField._bEdmBoolDetected && getFirstEditableInput(oSmartField.getDomRef());
+			return !(!oFirstFocusableInput || oFirstFocusableInput.type === "checkbox");
+		}).catch(function () {
+			return false;
 		});
-	}	
-	
+	}
+
 	// returns the UI5 control which currently has the focus, if there is one. Otherwise returns a faulty value.
 	// Implementation as recommended by UI5 until the provide an own abstraction.
 	function getControlWithFocus(){

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

@@ -4,22 +4,22 @@ sap.ui.define([
 
 	/**
 	 * Constructor for SmartVariantManagementWrapper
-	 * @param {sap.ui.comp.smartvariants.SmartVariantManagement} vTarget - The SmartVariantManagement control 
+	 * @param {sap.ui.comp.smartvariants.SmartVariantManagement} vTarget - The SmartVariantManagement control
 	 * or the Id of control for which this wrapper is created
-	 * @param {object} oController - the controller of the current component 
+	 * @param {object} oController - the controller of the current component
 	 * @param {object} oFactory - the controlStateWrapperFactory
-	 * @param {object} mParams 
-	 * @param {array} mParams.managedControlWrappers - array of controlStateWrappers for controls handled by the SVM 
-	 * (currently also including SFB wrapper - to be removed) 
+	 * @param {object} mParams
+	 * @param {array} mParams.managedControlWrappers - array of controlStateWrappers for controls handled by the SVM
+	 * (currently also including SFB wrapper - to be removed)
 	 * @param {Object} mParams.dynamicPageWrapper - dynamicPageWrapper instance handled by SVM
 	 * @returns {object}
 	 */
-	
+
 	function SmartVariantManagementWrapper(vTarget, oController, oFactory, mParams) {
 		// Special handling of SmartFilterBarWrapper for several reasons:
 		// - Suppress selection when restoring a variant. Selection is solely triggered according to information in appState. Otherwise, erroneous selection could be triggered in
 		//		a few situations:
-		//		- Variant marked as execute on select, but no data selected in appState (execute on select marked when saving variant without selecting, or changed after state was 
+		//		- Variant marked as execute on select, but no data selected in appState (execute on select marked when saving variant without selecting, or changed after state was
 		//			stored)
 		//		- Fallback to standard variant in case of dirty variant in state
 		//		- Fallback to standard variant if variant cannot be read (logic of SVM)
@@ -42,11 +42,11 @@ sap.ui.define([
 		// - not available at this point in time, and no corresponding event to attach to available
 		// - provides only those controls with directly connection to SVM implemented (i.e. with wrappers marked with bVMConnection)
 
-		// ensure managed state wrappers do not trigger change event when applying state to them. 
+		// ensure managed state wrappers do not trigger change event when applying state to them.
 		// Todo: rethink, whether this is the right place to do this (or rather when the wrappers get created)
 		mParams.managedControlWrappers = mParams.managedControlWrappers.map(oFactory.getSuppressChangeEventWhenApplyingWrapper);
 
-		// Any change of managed control should also mark variant as modified. However, this is not true for controls with direct connection to SVM (SFB, SmartTable, SmartChart). 
+		// Any change of managed control should also mark variant as modified. However, this is not true for controls with direct connection to SVM (SFB, SmartTable, SmartChart).
 		// For these controls, a real user changes are already handled by the direct connection. On the other hand, these controls also fire their change events, if their state is
 		// changed from SVM (by the same connection) - setting variant dirty here would be wrong.
 		mParams.managedControlWrappers.forEach(function(oWrapper){
@@ -56,18 +56,18 @@ sap.ui.define([
 				});
 			}
 		});
-		
-		
+
+
 
 		function fnSetControl(oControl) {
 			oSmartVariantManagement = oControl;
 			fnResolveControlAssigned(oSmartVariantManagement);
 		}
-		
+
 		var oSmartFilterBarWrapper = mParams.managedControlWrappers.find(function(oWrapper){
 			return oWrapper.setSVMWrapperCallbacks;
 		});
-		
+
 		// provide callbacks needed for SFB wrapper to store/restore extnesion state with variant
 		if (oSmartFilterBarWrapper){
 			oSmartFilterBarWrapper.setSVMWrapperCallbacks({
@@ -105,28 +105,28 @@ sap.ui.define([
 				oControl.attachAfterVariantInitialise(function() {
 					//set currentVariantId only when sVariantId is not standard (as it might be overriding existing
 					//different currentVariantId) or smartTable's (oControl) currentVariantId is not equal to sVariantId.
-					if (sVariantId !== '*standard*') {
+					if (sVariantId !== '*standard*' && sVariantId !== '') {
 						if (oControl.getCurrentVariantId && oControl.getCurrentVariantId() !== sVariantId) {
 							oControl.setCurrentVariantId(sVariantId);
 						}
 						oSmartVariantManagement.setModified(false);
 					}
 				});
-			} 
+			}
 			oSmartVariantManagement.setCurrentVariantId(sVariantId);
 			if (oSmartFilterBarWrapper){
 				oSmartFilterBarWrapper.suppressSelection(false);
 			}
 		}
 
-		// Restore state of all managed controls 
+		// Restore state of all managed controls
 		function fnSetManagedControlStates(oState){
-			// Usually, looping through mParams.managedControlWrappers or through oState.managedControlStates should be equivalent, but in exceptional cases, their might be 
-			// differences, if application has changed (changing the controls managed by the SVM - in LR, this could be achieved by changing setting SmartVariantManagement). 
+			// Usually, looping through mParams.managedControlWrappers or through oState.managedControlStates should be equivalent, but in exceptional cases, their might be
+			// differences, if application has changed (changing the controls managed by the SVM - in LR, this could be achieved by changing setting SmartVariantManagement).
 			// mParams.managedControlWrappers reflects current state, while oState.managedControlStates reflects state at the time iAppState was written
 			// - when adding a control (in LR changing setting SmartVariantManagement from false to true), state for that control would not be contained  - calling the wrapper with
 			//		undefined to ensure initial state
-			// - when removing a control, state would be contained that should not be applied here 
+			// - when removing a control, state would be contained that should not be applied here
 			mParams.managedControlWrappers.forEach(function(oWrapper){
 				oWrapper.setState(oState.managedControlStates[oWrapper.getLocalId()]);
 			});
@@ -164,8 +164,8 @@ sap.ui.define([
 					// set (which is achieved by empty string)
 					fnSetVariant("");
 					// Usually restoring the state of any of the managed controls should mark the variant as dirty, but there might be edge cases (state from an old release not containing information for any
-					// managed control now relevant), so to be on the safe side, we set modified=true explicitly. 
-					oSmartVariantManagement.currentVariantSetModified(true); 
+					// managed control now relevant), so to be on the safe side, we set modified=true explicitly.
+					oSmartVariantManagement.currentVariantSetModified(true);
 					fnSetManagedControlStates(oPreliminaryState);
 				} else {
 					fnSetVariant(oPreliminaryState.variantId);
@@ -177,7 +177,7 @@ sap.ui.define([
 							oSmartFilterBarWrapper.setState(oPreliminaryState.managedControlStates[oSmartFilterBarWrapper.getLocalId()]);
 						}
 						if (oPreliminaryState.variantId !== oSmartVariantManagement.getCurrentVariantId()){
-							// variant could not be set because it is not known, i.e. it could be private and URL was shared, or could be deleted after page was bookmarked. In this case, 
+							// variant could not be set because it is not known, i.e. it could be private and URL was shared, or could be deleted after page was bookmarked. In this case,
 							// standard variant is set (by VM). Additionally, it should be marked as modified.
 							oSmartVariantManagement.currentVariantSetModified(true);
 						}
@@ -193,19 +193,19 @@ sap.ui.define([
 			oControlAssignedPromise.then(function() {
 				// state change when user selects a different variant
 				oSmartVariantManagement.attachSelect(fnHandler);
-				
+
 				// when user saves current state as a new variant, this is also a state change (as the variant id is part of the state)
 				// note: Even if new (SFB) variant is marked as execute on select, and currently no data is selected, no need to select data here (and thus also not to collapse header).
-				// This is one of the possible ways to get into a state with a clean variant with execute on select, but no data loaded - see also comment to identify SFB wrapper.  
+				// This is one of the possible ways to get into a state with a clean variant with execute on select, but no data loaded - see also comment to identify SFB wrapper.
 				oSmartVariantManagement.attachAfterSave(fnHandler);
-				
+
 				// any change of a managed control is state change
 				mParams.managedControlWrappers.forEach(function(oWrapper){
 					oWrapper.attachStateChanged(fnHandler);
 				});
 			});
 		}
-		
+
 		return {
 			getState : getState,
 			setState : setState,
@@ -215,4 +215,4 @@ sap.ui.define([
 	}
 
 	return SmartVariantManagementWrapper;
-});
+});

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

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

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

@@ -103,6 +103,7 @@ sap.ui.define([
 			getSubtitle: getSubtitle,
 			titlePressed: function (oEvent) { // the user wants to navigate from the message to the corresponding control
 				MessageUtils.navigateFromMessageTitleEvent(oTemplateUtils, oEvent, oComponent, bIsDraftEnabled, sCurrentBindingPath);
+				oMessagePopover.close();
 			}
 		}).then(function (oMPopover) {
 			oMessagePopover = oMPopover;

package/src/sap/suite/ui/generic/template/lib/navigation/NavigationController.js

@@ -3181,7 +3181,7 @@ sap.ui.define(["sap/ui/base/Object",
 	 * @param {sap.suite.ui.generic.template.lib.AppComponent} oAppComponent The AppComponent instance
 	 * @public
 	 * @extends sap.ui.base.Object
-	 * @version 1.130.9
+	 * @version 1.130.11
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

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

@@ -64,7 +64,7 @@ sap.ui.define([
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.130.9",
+		version: "1.130.11",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {

package/src/sap/suite/ui/generic/template/themes/base/ObjectPage.less

@@ -217,10 +217,6 @@ html[dir="rtl"] .sapSmartTemplatesObjectPage .sapUxAPObjectPageHeaderContent .sa
   float: right;
 }
 
-.sapSmartTemplatesObjectPage .sapSmartTemplatesObjectPageHeaderForm.sapMLabel:after, .sapSmartTemplatesObjectPageHeaderFormLabelNCriticcal.sapMLabel:after, .sapSmartTemplatesObjectPageHeaderFormLabel.sapMLabel:after, .sapSmartTemplatesObjectPageDataPointLabel.sapMLabel:after {
-  content: ":";
-}
-
 .sapSmartTemplatesObjectPage .sapSmartTemplatesObjectPageHeaderForm .sapSmartTemplatesObjectPageHeaderFormField .sapMText,
 .sapSmartTemplatesObjectPage .sapSmartTemplatesObjectPageHeaderForm .sapSmartTemplatesObjectPageHeaderFormField .sapMLnk,
 .sapSmartTemplatesObjectPage .sapSmartTemplatesObjectPageHeaderForm .sapSmartTemplatesObjectPageHeaderFormField.sapMLnk,

package/src/sap/suite/ui/generic/template/themes/sap_belize_base/ObjectPage.less

@@ -217,10 +217,6 @@ html[dir="rtl"] .sapSmartTemplatesObjectPage .sapUxAPObjectPageHeaderContent .sa
   float: right;
 }
 
-.sapSmartTemplatesObjectPage .sapSmartTemplatesObjectPageHeaderForm.sapMLabel:after, .sapSmartTemplatesObjectPageHeaderFormLabelNCriticcal.sapMLabel:after, .sapSmartTemplatesObjectPageHeaderFormLabel.sapMLabel:after, .sapSmartTemplatesObjectPageDataPointLabel.sapMLabel:after {
-  content: ":";
-}
-
 .sapSmartTemplatesObjectPage .sapSmartTemplatesObjectPageHeaderForm .sapSmartTemplatesObjectPageHeaderFormField .sapMText,
 .sapSmartTemplatesObjectPage .sapSmartTemplatesObjectPageHeaderForm .sapSmartTemplatesObjectPageHeaderFormField .sapMLnk,
 .sapSmartTemplatesObjectPage .sapSmartTemplatesObjectPageHeaderForm .sapSmartTemplatesObjectPageHeaderFormField.sapMLnk,

package/src/sap/suite/ui/generic/template/themes/sap_bluecrystal_base/ObjectPage.less

@@ -217,10 +217,6 @@ html[dir="rtl"] .sapSmartTemplatesObjectPage .sapUxAPObjectPageHeaderContent .sa
   float: right;
 }
 
-.sapSmartTemplatesObjectPage .sapSmartTemplatesObjectPageHeaderForm.sapMLabel:after, .sapSmartTemplatesObjectPageHeaderFormLabelNCriticcal.sapMLabel:after, .sapSmartTemplatesObjectPageHeaderFormLabel.sapMLabel:after, .sapSmartTemplatesObjectPageDataPointLabel.sapMLabel:after {
-  content: ":";
-}
-
 .sapSmartTemplatesObjectPage .sapSmartTemplatesObjectPageHeaderForm .sapSmartTemplatesObjectPageHeaderFormField .sapMText,
 .sapSmartTemplatesObjectPage .sapSmartTemplatesObjectPageHeaderForm .sapSmartTemplatesObjectPageHeaderFormField .sapMLnk,
 .sapSmartTemplatesObjectPage .sapSmartTemplatesObjectPageHeaderForm .sapSmartTemplatesObjectPageHeaderFormField.sapMLnk,

package/src/sap/suite/ui/generic/template/themes/sap_hcb/base_ObjectPage.less

@@ -217,10 +217,6 @@ html[dir="rtl"] .sapSmartTemplatesObjectPage .sapUxAPObjectPageHeaderContent .sa
   float: right;
 }
 
-.sapSmartTemplatesObjectPage .sapSmartTemplatesObjectPageHeaderForm.sapMLabel:after, .sapSmartTemplatesObjectPageHeaderFormLabelNCriticcal.sapMLabel:after, .sapSmartTemplatesObjectPageHeaderFormLabel.sapMLabel:after, .sapSmartTemplatesObjectPageDataPointLabel.sapMLabel:after {
-  content: ":";
-}
-
 .sapSmartTemplatesObjectPage .sapSmartTemplatesObjectPageHeaderForm .sapSmartTemplatesObjectPageHeaderFormField .sapMText,
 .sapSmartTemplatesObjectPage .sapSmartTemplatesObjectPageHeaderForm .sapSmartTemplatesObjectPageHeaderFormField .sapMLnk,
 .sapSmartTemplatesObjectPage .sapSmartTemplatesObjectPageHeaderForm .sapSmartTemplatesObjectPageHeaderFormField.sapMLnk,