@sapui5/sap.suite.ui.generic.template 1.130.7 → 1.130.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.130.7",
+  "version": "1.130.10",
   "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.7</version>
+	<version>1.130.10</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.7"
+			"version": "1.130.10"
 		},
 		"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.7"
+			"version": "1.130.10"
 		},
 		"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.7"
+			"version": "1.130.10"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

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

@@ -35,7 +35,7 @@
 															 label="{i18n>EDITING_STATUS}"
 															 groupId="_BASIC">
 							<smartfilterbar:customControl>
-								<Select selectedKey="{_templPriv>/listReport/vDraftState}" id="editStateFilter">
+								<Select selectedKey="{_templPriv>/listReport/vDraftState}" id="editStateFilter" wrapItemsText="true">
 									<items>
 										<core:Item key="0" text="{i18n>ALL_OBJECTS}"/>
 										<core:Item key="5" text="{i18n>ALL_OBJECTS_HIDING_DRAFT}"/>

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

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

@@ -4,6 +4,7 @@
 			 ariaLabelledBy="objectNoDataText unsavedPopoverText lockedPopoverText objectChangedText"
 			 contentWidth="15.625rem"
 			 verticalScrolling="false"
+			 placement="Auto"
 			 class="sapSmartTemplatesListReportPopover sapUiContentPadding">
 		<endButton>
 				<Button icon="sap-icon://decline" tooltip="{i18n>CLOSE}" press="closeDraftAdminPopover" />

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/filterHelper.js

@@ -204,10 +204,12 @@ sap.ui.define([
 		}
 		var sRet = aFiltersForProperty.map(function (oFilter) {
 			var bCaseSensitive = true;
+			// Define the date range operations that need date formatting
+			var dateRangeOperations = ["DATE", "DATERANGE", "DATETIMERANGE", "FROM", "TO"];
 			if (oFilter.bCaseSensitive === undefined) {
 				bCaseSensitive = true;
 			}
-			if ((oProperty.type === "Edm.DateTime" || oProperty.type === "Edm.DateTimeOffset") && oParams.oFilterData[sPropertyForFilterData].conditionTypeInfo && oParams.oFilterData[sPropertyForFilterData].conditionTypeInfo.data.operation !== "DATE") {
+			if ((oProperty.type === "Edm.DateTime" || oProperty.type === "Edm.DateTimeOffset") && oParams.oFilterData[sPropertyForFilterData].conditionTypeInfo && !dateRangeOperations.includes(oParams.oFilterData[sPropertyForFilterData].conditionTypeInfo.data.operation)) {
 				if (!DynamicDateUtil.getAllOptionKeys().includes(oParams.oFilterData[sPropertyForFilterData].conditionTypeInfo.data.operation)) {
 					oParams.bIsStatic = true;
 					return;

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.7
+	 * @version 1.130.10
 	 * @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/CommonUtils.js

@@ -243,7 +243,7 @@ sap.ui.define(["sap/ui/base/Object",
 			var iEntitySetName = sSmartControlId.indexOf("::" + oComponent.getEntitySet() + "--") + 2; //Ensure only Entity set is picked up for processing
 			var sI18nKey = sSmartControlId.substring(iEntitySetName, sSmartControlId.lastIndexOf("::")),
 				sI18nKey = sI18nKey.replace(/--/g, "|").replace(/::/g, "|"); //sId = "STTA_C_MP_Product|to_ProductText|com.sap.vocabularies.UI.v1.LineItem"
-			
+
 			return sI18nKey;
 		}
 
@@ -291,9 +291,9 @@ sap.ui.define(["sap/ui/base/Object",
 
 		/*
 			* Sets the enabled value for Toolbar buttons
-			* 
-			* Currently, the property applicablePath (resp. sap:applicable-path) is only evaluated for buttons in header and 
-			* footer (influencing the visibility) and for toolbar buttons which require a context (influencing the enablement). 
+			*
+			* Currently, the property applicablePath (resp. sap:applicable-path) is only evaluated for buttons in header and
+			* footer (influencing the visibility) and for toolbar buttons which require a context (influencing the enablement).
 			* For static toolbar buttons (i.e. toolbar buttons that do not require a selection) the property is ignored.
 			* TO DO : make sure the properties applicablePath/sap:applicable-path influence the visibility of static toolbar buttons as well
 			*
@@ -348,11 +348,11 @@ sap.ui.define(["sap/ui/base/Object",
 				oComponentUtils.getTemplatePrivateModel().setProperty("/listReport/multiEditEnabled", aContexts.filter(fnIsContextEditable).length > 0);
 			}
 			if (oEnabledPromise){
-				// check if "enabled" is bound to the path '/generic/controlProperties/' in the model - otherwise it's bound to another path or has a hard coded true/false				
+				// check if "enabled" is bound to the path '/generic/controlProperties/' in the model - otherwise it's bound to another path or has a hard coded true/false
 				if (oEnabledPromise && !/generic\/controlProperties/.test(oButton.getBindingPath("enabled"))) {
 					oEnabledPromise = null;
 					bEnabled = oButton.getEnabled();
-				}								
+				}
 			}
 			return {
 				enabledPromise: oEnabledPromise,
@@ -548,21 +548,21 @@ sap.ui.define(["sap/ui/base/Object",
 			// This method is invoked twice in ALP. Once for smart table and once again for smart chart.
 			// In the first iteration (smart table actions), the calculated enablement value is stored on "mBreakoutActionEnabled".
 			// In the second iteration (smart chart actions), the enablement should be calculated only for the chart actions (oBreakoutAction.filter = "chart").
-			// As the previously calculated value for the table actions should be retained, the value stored on "mBreakoutActionEnabled" is used as the default value. 
+			// As the previously calculated value for the table actions should be retained, the value stored on "mBreakoutActionEnabled" is used as the default value.
 			var bDefaultValue = !bIsAnalyticalListPage || !!mBreakOutActionEnabled[sControlId].enabled;
 			var bEnabled = fnIsBreakoutActionEnabled(oBreakoutAction, aContexts, oModel, oControl, bDefaultValue, bIsAnalyticalListPage);
-			
+
 			mBreakOutActionEnabled[sControlId] = {
 					enabled: bEnabled
-			};			
+			};
 		}
-		
+
 		/**
 		 * This method analyzes the applicable contexts and tells whether the breakout action should be enabled.
-		 * 
-		 * If the context based analysis is not required (i.e the action doesn't require selection), 
+		 *
+		 * If the context based analysis is not required (i.e the action doesn't require selection),
 		 * it will simply return the default value <code>bDefaultValue</code>.
-		 * 
+		 *
 		 * @param {object} oBreakoutAction Manifest information about the breakout action
 		 * @param {Array<sap.ui.model.Context>} aContexts Applicable contexts
 		 * @param {sap.ui.model.Model} oModel Model of the smart control
@@ -583,14 +583,14 @@ sap.ui.define(["sap/ui/base/Object",
 							// check if applicablePath is true for this context
 							var oObject = oModel.getObject(oContext.getPath() + oApplicablePathInfo.navigationPath);
 							return oObject[oApplicablePathInfo.property] === true;
-						});							
+						});
 					} else {
 						bEnabled = bEnabled || (bFilterIsChart ? controlHelper.isSmartChart(oControl) : controlHelper.isSmartTable(oControl));
 					}
 				} else if (controlHelper.isSmartChart(oControl)) {
 					//table button chart ondata received
 					// For LR/OP, directly evaluate the drill stack filters and enable the action accordingly.
-					// For ALP, evaluate the drill stack filters only when oBreakoutAction.filter is "chart" and skip the evaluation for table based actions. 
+					// For ALP, evaluate the drill stack filters only when oBreakoutAction.filter is "chart" and skip the evaluation for table based actions.
 					if (!bIsAnalyticalListPage || bFilterIsChart) {
 						// If enabled Selection is made on the chart but drilldown is performed later.
 						bEnabled = oControl.getDrillStackFilters().length > 0;
@@ -601,7 +601,7 @@ sap.ui.define(["sap/ui/base/Object",
 				}
 			}
 			return bEnabled;
-			
+
 		}
 
 		function fnUpdateBreakoutEnablement(mBreakOutActionEnabled, mBreakoutActions, aContexts, oModel, sSelectedTabKey, oControl) {
@@ -828,13 +828,13 @@ sap.ui.define(["sap/ui/base/Object",
 
 		/**
 		 * Provides the Navigation Context about the smart link clicked by the user
-		 * 
+		 *
 		 * @param {Array} aKeys - Array of Navigation Key Properties Object
 		 * @param {object} oResponse - response of oDataModel's GET request
 		 * @returns {string} route string for Context Navigation
 		 * @private
 		 */
-		
+
 		function fnMergeNavigationKeyPropertiesWithValues(aKeys, oResponse) {
 			var sKeySeparator, sRoute;
 			for (var i = 0, ilength = aKeys.length; i < ilength; i++) {
@@ -904,7 +904,7 @@ sap.ui.define(["sap/ui/base/Object",
 
 		/**
 		 * Provides the information about the smart link clicked by user
-		 * 
+		 *
 		 * @param {*} oEvent beforePopoverOpens event
 		 * @returns {object} oSourceInfo - object contains the smart link info
 		 * oSourceInfo.smartLink - The clicked smart link
@@ -916,9 +916,9 @@ sap.ui.define(["sap/ui/base/Object",
 				oSmartLink = sap.ui.getCore().byId(sSmartLinkId),
 				oOwnerControl = getOwnerControl(oSmartLink, true),
 				oSourceInfo = Object.create(null);
-			
+
 			oSourceInfo.smartLink = oSmartLink;
-				
+
 			if (controlHelper.isSmartTable(oOwnerControl)) {
 				var oSmartTableHandler = oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oOwnerControl);
 				oSourceInfo.smartTable = oOwnerControl;
@@ -1001,7 +1001,7 @@ sap.ui.define(["sap/ui/base/Object",
 				// call extension
 				oController.adaptNavigationParameterExtension(oSelectionVariant, oObjectInfo);
 				sSelectionVariantPrepared = oSelectionVariant.toJSONString();
-			}			
+			}
 			delete oEventParameters.semanticAttributes;
 			oNavigationHandler.processBeforeSmartLinkPopoverOpens(oEventParameters, sSelectionVariantPrepared);
 		}
@@ -1025,7 +1025,7 @@ sap.ui.define(["sap/ui/base/Object",
 			var sOwnerComponentEntitySet = oController.getOwnerComponent().getEntitySet();
 			if (controlHelper.isSemanticObjectController(oControl) || controlHelper.isSmartTable(oControl)) {
 				sControlEntitySet = oControl.getEntitySet();
-			} else {	
+			} else {
 				// When navigation from table is triggered from an OP Table, oControl is not a smart table but a link or a button in the table.
 				var oOwnerControl = getOwnerControl(oControl);
 				var oParentControl = oOwnerControl && oOwnerControl.getParent();
@@ -1087,7 +1087,7 @@ sap.ui.define(["sap/ui/base/Object",
 				fnHandleMandatoryField("HasActiveEntity");
 			}
 		}
-		
+
 		function isMultiViewMultiEntity() {
 			return !!(oComponentUtils && oComponentUtils.getSettings() && oComponentUtils.getSettings().quickVariantSelectionX);
 		}
@@ -1369,7 +1369,7 @@ sap.ui.define(["sap/ui/base/Object",
 			var aLinksToCheck = [], aInternalLinks = [];
 			var oAppComponent = oComponent.getAppComponent();
 			var UshellContainer = sap.ui.require("sap/ushell/Container");
-			var oXApplNavigation = UshellContainer && UshellContainer.getServiceAsync("Navigation");
+			var oXAppNavigation = UshellContainer && UshellContainer.getServiceAsync("Navigation");
 			var oSupportedIntents = oTemplatePrivateModel.getProperty("/generic/supportedIntents/");
 			var aToolbarContent = oToolbar.getContent();
 			var iButtonsNumber = aToolbarContent.length;
@@ -1390,51 +1390,51 @@ sap.ui.define(["sap/ui/base/Object",
 				}
 			}
 
-			if (aLinksToCheck.length > 0 && oXApplNavigation) {
-				oXApplNavigation.then(function(oCrossAppNavigator) {
-					var oDeferredLinks = oCrossAppNavigator.getLinks(aLinksToCheck);
-					oDeferredLinks.then(function(aLinks) {
-						oSupportedIntents = oTemplatePrivateModel.getProperty("/generic/supportedIntents/");
-						var iLinksNumber = aLinks.length;
-						// Entries in aLinks should correspond to aInternalLinks: if a link is not supported an empty object is returned by the method getLinks
-						var aHrefPromises = [];
-						for (var i = 0; i < iLinksNumber; i++) {
-							if (aLinks[i].length > 0) {
-								var sHref = oCrossAppNavigator.getHref({ target: { shellHash: aLinks[i][0].intent } }, oAppComponent);
-								aHrefPromises.push(sHref);
+			if (!aLinksToCheck.length || !oXAppNavigation) {
+				return;
+			}
+			oXAppNavigation.then(function(oCrossAppNavigator) {
+				var oDeferredLinks = oCrossAppNavigator.getLinks(aLinksToCheck);
+				oDeferredLinks.then(function(aLinks) {
+					oSupportedIntents = oTemplatePrivateModel.getProperty("/generic/supportedIntents/");
+					var iLinksNumber = aLinks.length;
+					// Entries in aLinks should correspond to aInternalLinks: if a link is not supported an empty object is returned by the method getLinks
+					var aHrefPromises = [],
+					aHrefLinks = [];
+					for (var i = 0; i < iLinksNumber; i++) {
+						if (aLinks[i].length > 0) {
+							var sHref = oCrossAppNavigator.getHref({ target: { shellHash: aLinks[i][0].intent } }, oAppComponent);
+							aHrefPromises.push(sHref);
+							// Store value in separate array. Count in aHrefLinks and in aInternalLinks may differs
+							aHrefLinks.push(aInternalLinks[i]);
+						}
+					}
+					Promise.all(aHrefPromises).then(function(aResponses) {
+						for (var j = 0; j < aResponses.length; j++) {
+							if (aResponses[j]) {
+								aHrefLinks[j].bLinkIsSupported = true;
 							}
 						}
-						Promise.all(aHrefPromises).then(function(aResponses) {
-							for (var j = 0; j < aResponses.length; j++) {
-								if (aResponses[j]) {
-									aInternalLinks[j].bLinkIsSupported = true;
-								}
-									// add the value to the model
-								var sSemObj = aInternalLinks[j].semanticObject;
-								var sAction = aInternalLinks[j].action;
-	
-								var oSemObjProp = oTemplatePrivateModel.getProperty("/generic/supportedIntents/" + sSemObj);									if (!oSemObjProp) {  // no semantic object in the model yet
-									oSupportedIntents[sSemObj] = {};
-									oSupportedIntents[sSemObj][sAction] =
-									{
-										"visible" :aInternalLinks[j].bLinkIsSupported
-									};
-								} else if (!oSemObjProp[sAction]) {  // no action in the model yet
-									oSemObjProp[sAction] =
-									{
-										"visible" :aInternalLinks[j].bLinkIsSupported
-									};
-								} else {
-									oSemObjProp[sAction]["visible"] = aInternalLinks[i].bLinkIsSupported;
-								}
+					}).then(function() {
+						aInternalLinks.forEach(function(entry) {
+							// add the value to the model
+							var sSemObj = entry.semanticObject,
+								sAction = entry.action,
+								oSemObjProp = oTemplatePrivateModel.getProperty("/generic/supportedIntents/" + sSemObj);
+
+							if (!oSemObjProp) {  // no semantic object in the model yet
+								oSupportedIntents[sSemObj] = {};
+								oSupportedIntents[sSemObj][sAction] = { "visible" :entry.bLinkIsSupported };
+							} else if (!oSemObjProp[sAction]) {  // no action in the model yet
+								oSemObjProp[sAction] = { "visible" :entry.bLinkIsSupported };
+							} else {
+								oSemObjProp[sAction]["visible"] = entry.bLinkIsSupported;
 							}
-						}).then(function() {
-							oTemplatePrivateModel.updateBindings();
 						});
+						oTemplatePrivateModel.updateBindings();
 					});
 				});
-				
-			}
+			});
 		}
 
 		// This function executes the given handler fnHandler if preconditions are given
@@ -1607,10 +1607,10 @@ sap.ui.define(["sap/ui/base/Object",
 		}
 
 		/**
-		 * While exporting data from a table, this function removes the technical properties 
-		 * (like "IsActiveEntity", "HasActiveEntity") and adds the actual value of "Editing Status" select box 
-		 * into the exported file. 
-		 * 
+		 * While exporting data from a table, this function removes the technical properties
+		 * (like "IsActiveEntity", "HasActiveEntity") and adds the actual value of "Editing Status" select box
+		 * into the exported file.
+		 *
 		 * @param {sap.ui.export.util.Filter[]} aFilterSettings Filters in the exported file
 		 */
 		function fnTransformTechnicalPropsOnExportedFile (aFilterSettings) {
@@ -1625,7 +1625,7 @@ sap.ui.define(["sap/ui/base/Object",
 			// Find the technical props for the selected draft state value
 			var sDraftStateValue = oEditStateControl.getSelectedKey(),
 				aTechnicalProps = oDraftStateToTechnicalProps[sDraftStateValue];
-			
+
 			aTechnicalProps.forEach(function (oTechnicalProp){
 				// Find the index of filter settings to be removed
 				var iIndexOfFilterSettingsToBeRemoved = aFilterSettings.findIndex(function (oFilterSettings){
@@ -1639,7 +1639,7 @@ sap.ui.define(["sap/ui/base/Object",
 					aFilterSettings.splice(iIndexOfFilterSettingsToBeRemoved, 1);
 				}
 			});
-			
+
 			//Create a new filter with the value retrieved from "editStateFilter" select control
 			var sEditStateLabel = oEditStateControl.getLabels().at(0).getText(),
 				sEditStateValue = oEditStateControl.getSelectedItem().getText(),
@@ -1651,9 +1651,9 @@ sap.ui.define(["sap/ui/base/Object",
 		}
 
 		/**
-		 * This method reads the values of analytical parameters from the smart filter bar 
+		 * This method reads the values of analytical parameters from the smart filter bar
 		 * and adds them to the list of filters in the exported file
-		 * 
+		 *
 		 * @param {sap.ui.comp.smarttable.SmartTable} oSmartTable The smart table which has the data to be exported
 		 * @param {sap.ui.export.util.Filter[]} aFilterSettings Current filters in the exported file
 		 */
@@ -1755,7 +1755,7 @@ sap.ui.define(["sap/ui/base/Object",
 												}, fnReject);
 											});
 										};
-										
+
 										var fnIsFieldModified = function(oSourceControl) {
 											var oInnerControl = oSourceControl.getFirstInnerControl && oSourceControl.getFirstInnerControl();
 											if (oInnerControl.getValue() !== oInnerControl.getLastValue()) {
@@ -1780,7 +1780,7 @@ sap.ui.define(["sap/ui/base/Object",
 													if (!fnIsFieldModified(oSourceControl)) {
 														mAdditionalParameters.callPreparationOnly = true;
 													}
-													fnCallExecuteSideEffect();													
+													fnCallExecuteSideEffect();
 													// Resolve the promise and exit the loop for Inactive transient row
 													return fnResolve();
 												}

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.7
+	 * @version 1.130.10
 	 * @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.7",
+		version: "1.130.10",
 		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,