@sapui5/sap.suite.ui.generic.template 1.133.0 → 1.134.2

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

@@ -1,12 +1,11 @@
-<core:FragmentDefinition xmlns:core="sap.ui.core" xmlns:layout="sap.ui.layout"
-	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
+<core:FragmentDefinition xmlns:core="sap.ui.core" xmlns:layout="sap.ui.layout" xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
 	template:require="{AH: 'sap/suite/ui/generic/template/js/AnnotationHelper', AHModel: 'sap/ui/model/odata/AnnotationHelper', StableIdHelper: 'sap/suite/ui/generic/template/js/StableIdHelper'}">
 
 	<!-- @classdesc @name: Name: sap.suite.ui.generic.template.ObjectPage.view.fragments.Facet.fragment.xml
 		@param {UI.Facet} [facet] @param {edm.EntitySet} [entitySet] @param {edm.EntityType}
 		[entityType] -->
 	<template:with path="parameter>/variables" helper="AH.getNewVariable" var="objectPageTableSettings">
-		<template:if test="{:= ${objectPageTableSettings>}.set(${block>tableSettings})}"/>
+		<template:if test="{:= ${objectPageTableSettings>}.set(${block>tableSettings})}" />
 		<template:if test="{= ${objectPageTableSettings>value/type} !== 'TreeTable' || !${device>/system/phone}}">
 			<layout:Grid defaultSpan="XL12 L12 M12 S12" hSpacing="0" vSpacing="0" class="sapSmartTemplatesObjectPageSubSectionGrid">
 				<!--
@@ -16,42 +15,48 @@
 				-->
 				<template:if test="{path: 'facet>Target', formatter: 'AHModel.isMultiple'}">
 					<template:then>
-						<template:if test="{=${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.UI.v1.LineItem') > -1}">
-							<template:then>
-								<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartTable" type="XML"/>
-							</template:then>
-							<template:elseif test="{=${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.Communication.v1.Contact') > -1}">
-								<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.Contacts" type="XML"/>
-							</template:elseif>
-							<template:elseif test="{=${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.UI.v1.Chart') > -1}">
-								<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartChart" type="XML" />
-							</template:elseif>
-						</template:if>
+						<template:with path="facet>Target" helper="AHModel.gotoEntitySet" var="listEntitySet">
+							<template:with path="listEntitySet>entityType" helper="AHModel.gotoEntityType" var="listEntityType">
+								<template:if test="{parts:[{path: 'facet>Target/AnnotationPath'}, {path: 'listEntityType>'}], formatter: 'AH.checkFacetHasLineItemAnnotations'}">
+									<template:then>
+										<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartTable" type="XML" />
+									</template:then>
+									<template:elseif test="{=${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.Communication.v1.Contact') > -1}">
+										<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.Contacts" type="XML" />
+									</template:elseif>
+									<template:elseif test="{=${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.UI.v1.Chart') > -1}">
+										<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartChart" type="XML" />
+									</template:elseif>
+								</template:if>
+							</template:with>
+						</template:with>
 					</template:then>
-					<template:elseif test="{= ${facet>RecordType}.indexOf('com.sap.vocabularies.UI.v1.CollectionFacet') > -1 ||
-												(${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.UI.v1.FieldGroup') > -1
-											     || ${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.UI.v1.Identification') > -1) }">
-						<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartForm" type="XML"/>
+					<template:elseif test="{= ${facet>RecordType}.indexOf('com.sap.vocabularies.UI.v1.CollectionFacet') > -1
+							|| (${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.UI.v1.FieldGroup') > -1
+							|| ${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.UI.v1.Identification') > -1) }">
+						<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartForm" type="XML" />
 					</template:elseif>
 					<template:elseif test="{= ${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.UI.v1.DataPoint') > -1 }">
 						<template:with path="facet>Target" helper="AHModel.resolvePath" var="dataPoint">
-							<template:if test="{= ${dataPoint>Visualization/EnumMember}.indexOf('com.sap.vocabularies.UI.v1.VisualizationType/Rating') = -1 }">
+							<template:if test="{= ${dataPoint>Visualization/EnumMember}.indexOf('com.sap.vocabularies.UI.v1.VisualizationType/Rating') === -1 }">
 								<template:then>
-									<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartForm" type="XML"/>
+									<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartForm" type="XML" />
 								</template:then>
 							</template:if>
 						</template:with>
 					</template:elseif>
 					<template:elseif test="{= ${facet>Target/AnnotationPath}.indexOf('com.sap.vocabularies.Communication.v1.Address') > -1 }">
 						<!-- Be aware: variable facet is not always provided (in case of SmartForm it is not meaningful, as the SmartForm actually shows multiple facets).
-								 Thus, it does not make sense to create facetId globally (for this fragment). In fact, doing this would lead to console errors for not provided mandatory parameter
-								 sRecordType when trying to build the id. 
+								 Thus, it does not make sense to create facetId globally (for this fragment). In fact, doing this would lead to console errors for not provided mandatory
+						parameter
+								 sRecordType when trying to build the id.
 								 AddressFacet is the only case, where facetId is used, so we create it only here. In this case, facet obviously is provided.
 						 -->
 						<template:with path="parameter>/" helper="StableIdHelper.preparePathForStableId" var="facetId">
-							<template:if test="{= ${facetId>}.buildStableId({ type:'ObjectPage', subType:'StandardFacet', sRecordType: ${facet>RecordType}, sAnnotationPath: ${facet>Target/AnnotationPath} , sAnnotationId: ${facet>ID/String} }) }"/>
+							<template:if
+								test="{= ${facetId>}.buildStableId({ type:'ObjectPage', subType:'StandardFacet', sRecordType: ${facet>RecordType}, sAnnotationPath: ${facet>Target/AnnotationPath} , sAnnotationId: ${facet>ID/String} }) }" />
 							<template:with path="facet>Target" helper="AHModel.resolvePath" var="address">
-								<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.AddressFacet" type="XML"/>
+								<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.AddressFacet" type="XML" />
 							</template:with>
 						</template:with>
 					</template:elseif>
@@ -59,12 +64,12 @@
 					<!-- better: check for <template:elseif test="{= ${block>additionalData/type} === 'SmartForm'}">
 								but currently this is not (yet) supplied in case of mixed reference facets on 3rd level  -->
 					<template:else>
-						<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartForm" type="XML"/>
-						<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.StreamSupport" type="XML"/>
+						<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.SmartForm" type="XML" />
+						<core:Fragment fragmentName="sap.suite.ui.generic.template.ObjectPage.view.fragments.StreamSupport" type="XML" />
 					</template:else>
 				</template:if>
 
 			</layout:Grid>
 		</template:if>
 	</template:with>
-</core:FragmentDefinition>
+</core:FragmentDefinition>

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

@@ -8,7 +8,7 @@
 	<template:with path="facet>Target" var="target">
 		<template:with path="target>" helper="AHModel.gotoEntitySet" var="listEntitySet">
 			<template:with path="listEntitySet>entityType" helper="AHModel.gotoEntityType" var="listEntityType">
-				<template:with path="target>" helper="AHModel.resolvePath" var="collection">
+				<template:with path="target>" helper="AH.getListItemCollection" var="collection">
 					<template:with path="listEntityType>com.sap.vocabularies.UI.v1.HeaderInfo" var="header">
 						<template:with path="parameter>/" helper="StableIdHelper.preparePathForStableId" var="smartControlId">
 							<template:with path="parameter>/" helper="StableIdHelper.preparePathForStableId" var="facetId">
@@ -62,18 +62,14 @@
 										<core:CustomData key="dateFormatSettings"
 											value='\{"UTC":true,"style":"medium"\}' />
 										<core:CustomData key="useUTCDateTime" value="true" />
-										<template:if test="{= ${facet>Target/AnnotationPath}.split('#')[1]}">
+										<template:if test="{= ${objectPageTableSettings>value/lineItemQualifier}}">
 											<core:CustomData key="lineItemQualifier"
-												value="{= ${facet>Target/AnnotationPath}.split('#')[1]}" />
+												value="{= ${objectPageTableSettings>value/lineItemQualifier}}" />
+										</template:if>
+										<template:if test="{= ${objectPageTableSettings>value/lineItemSortOrder}}">
+											<core:CustomData key="TemplateSortOrder"
+												value="{= ${objectPageTableSettings>value/lineItemSortOrder}}" />
 										</template:if>
-										<template:with
-											path="listEntityType>com.sap.vocabularies.UI.v1.PresentationVariant"
-											var="variant">
-											<template:if test="{= ${variant>SortOrder}}">
-												<core:CustomData key="TemplateSortOrder"
-													value="{path: 'variant>SortOrder', formatter: 'AH.getSortOrder'}" />
-											</template:if>
-										</template:with>
 									</st:customData>
 									<st:semanticObjectController>
 										<!-- Fragment SemanticObjectControllerForDataField uses variable 'entitySet to address the entoty set. Currently entitySet points to the entity set of whole OP. Reset pointer to the entity set of the table.-->

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

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

package/src/sap/suite/ui/generic/template/designtime/controls/ObjectPageLayout.designtime.js

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * @param {Object} mSettings - The global manifest settings object.
 	 * @returns {Object} - The object containing the runtime adaptation properties.
 	 */
-		function getRuntimeAdapationProperties(aAllowedDesigntimeSettings, mSettings) {
+		function getRuntimeAdaptationProperties(aAllowedDesigntimeSettings, mSettings) {
 			const mPropertyValues = {};
 
 			aAllowedDesigntimeSettings.forEach(oSetting => {
@@ -66,7 +66,10 @@ sap.ui.define([
 					case "editableHeaderContent":
 						mPropertyValues[sProperty] = mSettings[sProperty] ?? oSetting.value;
 						break;
-					case "variantManagement":
+					case "tableVariantManagement":
+						mPropertyValues[sProperty] = mSettings[sProperty] ?? oSetting.value;
+						break;
+					case "chartVariantManagement":
 						mPropertyValues[sProperty] = mSettings[sProperty] ?? oSetting.value;
 						break;
 					case "showRelatedApps":
@@ -101,15 +104,27 @@ sap.ui.define([
 			/**
 			 * @type {DesigntimeSetting}
 			 */
-			const variantManagement = {
-				id: "variantManagement",
+			const tableVariantManagement = {
+				id: "tableVariantManagement",
 				name: "Table Variant Management",
-				description: "Decide whether Variant Management is used",
-				value: false,
+				description: "Decide whether the variant management is enabled for tables",
+				value: true, // The default value is true
 				getPath: () => 'component/settings/tableSettings/variantManagement',
 				type: "boolean",
 				keyUser: true
 			};
+			/**
+			 * @type {DesigntimeSetting}
+			 */
+			const chartVariantManagement = {
+				id: "chartVariantManagement",
+				name: "Chart Variant Management",
+				description: "Decide whether the variant management is enabled for charts",
+				value: true, // The default value is true
+				getPath: () => 'component/settings/chartSettings/variantManagement',
+				type: "boolean",
+				keyUser: true
+			};
 
 			/**
 			 * @type {DesigntimeSetting}
@@ -126,7 +141,8 @@ sap.ui.define([
 
 			return [
 				editableHeaderContent,
-				variantManagement,
+				tableVariantManagement,
+				chartVariantManagement,
 				showRelatedApps
 			];
 
@@ -137,7 +153,8 @@ sap.ui.define([
 		function getObjectPageSettings(oComponent) {
 			return {
 				editableHeaderContent: JSON.parse(oComponent.getEditableHeaderContent()),
-				variantManagement: !!(ObjectPath.get(["variantManagement"], oComponent.getTableSettings())),
+				tableVariantManagement: ObjectPath.get(["variantManagement"], oComponent.getTableSettings()),
+				chartVariantManagement: ObjectPath.get(["variantManagement"], oComponent.getChartSettings()),
 				showRelatedApps: JSON.parse(oComponent.getShowRelatedApps())
 			};
 		}
@@ -151,7 +168,7 @@ sap.ui.define([
 		 * @param {object} mPropertyBag - The property bag.
 		 * @returns {Promise<ControlChangeParams[]>} - The changes.
 		 */
-		async function fnOpenTableConfigurationDialog(oControl, mPropertyBag) {
+		async function fnOpenObjectPageConfigurationDialog(oControl, mPropertyBag) {
 			const oResourceModel = oControl.getModel("i18n");
 			const oComponent = designtimeUtils.getOwnerComponentFor(oControl);
 
@@ -170,7 +187,7 @@ sap.ui.define([
 
 
 			// Get the current values of the properties
-			const mRuntimeAdaptationPropertyValues = getRuntimeAdapationProperties(aAllowedDesigntimeSettings, mObjectPageSettings);
+			const mRuntimeAdaptationPropertyValues = getRuntimeAdaptationProperties(aAllowedDesigntimeSettings, mObjectPageSettings);
 			// Save the unchanged data to compare later
 			const mUnchangedData = deepClone(mRuntimeAdaptationPropertyValues);
 			// Get the settings of the dialog from the designtime settings using which the dialog will be created
@@ -192,7 +209,7 @@ sap.ui.define([
 		}
 
 		// Expose the functions for QUnit tests
-		testableHelper.testableStatic(fnOpenTableConfigurationDialog, "fnOpenTableConfigurationDialog");
+		testableHelper.testableStatic(fnOpenObjectPageConfigurationDialog, "fnOpenObjectPageConfigurationDialog");
 
 
 		const oHelper = {
@@ -203,7 +220,7 @@ sap.ui.define([
 							fe: {
 								name: "Configuration",
 								icon: "sap-icon://developer-settings",
-								handler: fnOpenTableConfigurationDialog
+								handler: fnOpenObjectPageConfigurationDialog
 							}
 						}
 					}

package/src/sap/suite/ui/generic/template/designtime/controls/SmartTable.designtime.js

@@ -93,7 +93,9 @@ sap.ui.define([
 				const oSections = oComponent.getSections();
 				const sSectionKey = getSectionKey(oSmartTable);
 				const oSectionTableSettings = oSections?.[sSectionKey]?.tableSettings || {};
-				oEffectiveTableSettings = merge(oSupportedGlobalTableSettings, oSectionTableSettings);
+				// Fetch the create mode from smart table's custom data
+				const oCreateMode = {"createMode": oSmartTable.data("creationMode")};
+				oEffectiveTableSettings = merge(oSupportedGlobalTableSettings, oSectionTableSettings, oCreateMode);
 			} else {
 				const oComponentTableSettings = oComponent.getTableSettings() || {};
 				let oSelectedVariantTableSettings = {};
@@ -123,7 +125,7 @@ sap.ui.define([
 		 * @param {object} oTableSettings - The table settings from the manifest.
 		 * @returns {Object} - The adaptation properties for the SmartTable.
 		 */
-		function getRuntimeAdapationProperties(aDesigntimeSettings, oTableSettings) {
+		function getRuntimeAdaptationProperties(aDesigntimeSettings, oTableSettings) {
 			const mPropertyValues = {};
 			// Handle the multiple ways of defining the table type?
 			aDesigntimeSettings.forEach(oSetting => {
@@ -195,7 +197,7 @@ sap.ui.define([
 			const mTableSettings = getManifestTableSettings(oSmartTable);
 
 			// Get the current values of the properties
-			const mRuntimeAdaptationPropertyValues = getRuntimeAdapationProperties(aAllowedDesigntimeSettings, Object.assign(mOtherTableSettings, mTableSettings));
+			const mRuntimeAdaptationPropertyValues = getRuntimeAdaptationProperties(aAllowedDesigntimeSettings, Object.assign(mOtherTableSettings, mTableSettings));
 
 			// Save the unchanged data to compare later
 			const mUnchangedData = deepClone(mRuntimeAdaptationPropertyValues);
@@ -331,7 +333,7 @@ sap.ui.define([
 					{ id: "AnalyticalTable", name: "Analytical Table" }
 				],
 				bSupportsGlobalScope: false,
-				keyUser: true
+				keyUser: false
 			};
 
 			/**
@@ -367,24 +369,26 @@ sap.ui.define([
 				keyUser: true
 			};
 
-			// /**
-			//  * @type {DesigntimeSetting}
-			//  */
-			// const createMode = {
-			// 	id: "createMode",
-			// 	name: "Create Mode",
-			// 	description: "Define the create mode",
-			// 	value: "creationRows",
-			// 	type: "string",
-			// 	getPath: getPathForTableSettings("createMode", true),
-			// 	enums: [
-			// 		{ id: "creationRows", name: "creationRows" },
-			// 		{ id: "NewPage", name: "NewPage" },
-			// 		{ id: "Inline", name: "Inline" }
-			// 	],
-			// 	bSupportsGlobalScope: true,
-			// 	restrictedTo: [sObjectPageComponentName]
-			// };
+			/**
+			 * @type {DesigntimeSetting}
+			 */
+			const createMode = {
+				id: "createMode",
+				name: "Create Mode",
+				description: "Define the create mode",
+				value: "creationRows",
+				type: "string",
+				getPath: (mSmartTableInfo) => `component/settings/sections/${mSmartTableInfo.sSectionKey}/createMode`,
+				enums: [
+					{ id: "newPage", name: "New Page" },
+					{ id: "inline", name: "Inline" },
+					{ id: "creationRows", name: "Inline Creation Rows" },
+					{ id: "creationRowsHiddenInEditMode", name: "Inline Creation Rows (Hidden in edit page)" }
+				],
+				bSupportsGlobalScope: true,
+				restrictedTo: [sObjectPageComponentName],
+				keyUser: true
+			};
 
 			/**
 			 * @type {DesigntimeSetting}
@@ -411,7 +415,6 @@ sap.ui.define([
 				type: "boolean",
 				getPath: getPathForTableSettings("widthIncludingColumnHeader"),
 				bSupportsGlobalScope: true,
-				restrictedTo: [sListReportComponentName],
 				bGlobalSettingsOnly: true,
 				keyUser: true
 			};
@@ -421,7 +424,7 @@ sap.ui.define([
 			 */
 			const addCardtoInsightsHidden = {
 				id: "addCardtoInsightsHidden",
-				name: "Disable Insights",
+				name: "Hide \"Add Card to Insights\"",
 				description: "Define if the table should have a insights button",
 				value: false,
 				type: "boolean",
@@ -443,15 +446,13 @@ sap.ui.define([
 				keyUser: true
 			};
 
-
-
 			const designtimeSettings = [
 				tableType,
 				condensedTableLayout,
 				widthIncludingColumnHeader,
 				selectionMode,
 				selectAll,
-				// createMode,
+				createMode,
 				selectionLimit,
 				addCardtoInsightsHidden
 			];
@@ -465,7 +466,7 @@ sap.ui.define([
 		// Expose the functions for QUnit tests
 		getAllDesigntimeSettings = testableHelper.testableStatic(getAllDesigntimeSettings, "getAllDesigntimeSettings");
 		getPathForTableSettings = testableHelper.testableStatic(getPathForTableSettings, "getPathForTableSettings");
-		testableHelper.testableStatic(getRuntimeAdapationProperties, "getRuntimeAdapationProperties");
+		testableHelper.testableStatic(getRuntimeAdaptationProperties, "getRuntimeAdaptationProperties");
 		testableHelper.testableStatic(getManifestTableSettings, "getManifestTableSettings");
 		testableHelper.testableStatic(getSelectedTabKey, "getSelectedTabKey");
 		testableHelper.testableStatic(getVariantInfo, "getVariantInfo");

package/src/sap/suite/ui/generic/template/designtime/floorplans/AnalyticalListPage.designtime.js

@@ -92,7 +92,9 @@ sap.ui.define([
 				actions: ["compVariant"]		// allows to adapt filters (same as adapt filters for end user)
 			},
 			"sap.suite.ui.generic.template.AnalyticalListPage.control.SmartFilterBarExt": {
-				actions: ["compVariant"]		// allows to adapt filters (same as adapt filters for end user)
+				// compVariant - allows to adapt filters (same as adapt filters for end user)
+				// annotation - allows to change text arrangement
+				actions: ["compVariant", "annotation"]		
 			},
 			"sap.ui.comp.smarttable.SmartTable": {
 				actions: ["compVariant"]		// allows table personalization (same as for end user)

package/src/sap/suite/ui/generic/template/designtime/floorplans/ListReport.designtime.js

@@ -157,7 +157,9 @@ sap.ui.define([
 					actions: ["compVariant"]		// allows to adapt filters (same as adapt filters for end user)
 				},
 				"sap.ui.comp.smartfilterbar.SmartFilterBar": {
-					actions: ["compVariant"]		// allows to adapt filters (same as adapt filters for end user)
+					// compVariant - allows to adapt filters (same as adapt filters for end user)
+					// annotation - allows to change text arrangement
+					actions: ["compVariant", "annotation"]
 				},
 				"sap.ui.comp.smarttable.SmartTable": {
 					actions: ["compVariant"]		// allows table personalization (same as for end user)

package/src/sap/suite/ui/generic/template/designtime/floorplans/ObjectPage.designtime.js

@@ -226,7 +226,7 @@ sap.ui.define([
 					actions: ["rename", "remove", "reveal"]
 				},
 				"sap.ui.comp.smartform.SmartForm": {				// not documented in allow list, but checked by RTA OPA test
-					actions: ["localReset"],
+					actions: ["localReset", "annotation"],
 					aggregations: {
 						groups: {
 							actions: ["move", "createContainer", "remove"]	// actually, only move seems to be checked, but createContainer is needed to achieve the correct index in context menu
@@ -255,6 +255,9 @@ sap.ui.define([
 				},
 				"sap.m.Title": {
 					actions: ["rename"]
+				},
+				"sap.ui.comp.smartfield.SmartField": {
+					actions: ["annotation"] // Allows to change text arrangement
 				}
 			};
 

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

@@ -171,6 +171,7 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/gener
 								var fnSuccess = function(){ // what to do if cancellation was successfull
 									fnCancellationResult = fnResolve; // now the end of the process is considered as a resolve
 									fnAfterCancellation(); // perform the after cancel navigation
+									fnDisplayDiscardMessage();//display a discard draft message
 									fnCleanUpAfterCancellation(); // clean up the state of this class
 									if (fnSetFocus){
 										oTemplateUtils.oServices.oApplication.setNextFocus(fnSetFocus);
@@ -188,6 +189,18 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/extend", "sap/suite/ui/gener
 							});
 							oBusyHelper.setBusy(oCancellationPromise);
 						};
+						//This function is responsible for showing the "Draft Discarded" or "Changes Discarded" confirmation text
+						function fnDisplayDiscardMessage() {
+							fnNeedsConfirmation().then(function (bNeedsConfirmation) { //checks if changes are made in the draft
+								if (bNeedsConfirmation) { // Ensure this is a boolean check
+									if (oUiModel.getProperty("/createMode")) { //if it is a "Create Draft"
+										oTemplateUtils.oServices.oApplication.showMessageToast(oTemplateUtils.oCommonUtils.getText("ST_GENERIC_DRAFT_WITHOUT_ACTIVE_DOCUMENT_DELETED"));
+									} else {
+										oTemplateUtils.oServices.oApplication.showMessageToast(oTemplateUtils.oCommonUtils.getText("ST_GENERIC_DRAFT_WITH_ACTIVE_DOCUMENT_DELETED"));//if it is an "Edit Draft"
+									}
+								}
+							});
+						}
 						fnNeedsConfirmation().then(function (bNeedsConfirmation) {
 							if (oCancelButton && bNeedsConfirmation){
 								fnCancellationConfirmed = fnExecuteCancellation;

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/MessagePopover.fragment.xml

@@ -6,13 +6,13 @@
 					subtitle="{parts:[{path: 'msg>id'}, {path: 'msg>controlIds'}, {path: 'msg>additionalText'}, {path: 'helper>/isPopoverOpen'}, {path: 'helper>/heartBeat'}], formatter: '.getSubtitle'}"
 					description="{parts:[{path: 'msg>id'}, {path: 'msg>controlIds'}, {path: 'msg>description'}, {path: 'helper>/isPopoverOpen'}, {path: 'helper>/heartBeat'}], formatter: '.getDescription'}"
 					longtextUrl="{msg>descriptionUrl}"
-					markupDescription="{helper>/isAIErrorExplanationEnabled}"
+					markupDescription="{= ${helper>/isAIErrorExplanationEnabled} }"
 					activeTitle="{parts:[{path: 'msg>id'}, {path: 'msg>controlIds'}, {path: 'helper>/isPopoverOpen'}], formatter: '.isPositionable'}"
 					groupName="{= ${helper>/messageToGroupName}[${msg>id}] }">
 					<Link
 						text="{i18n>ST_AI_EE_BUTTON_LABEL}"
 						icon="sap-icon://ai"
-						visible="{helper>/isAIErrorExplanationEnabled}"
+						visible="{= ${helper>/isAIErrorExplanationEnabled} }"
 						press="generateErrorExplanation">
 						<customData>
 							<core:CustomData key="message" value="{msg>message}" />

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

@@ -1,6 +1,6 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core"
     xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1" 
-	template:require="{StableIdHelper: 'sap/suite/ui/generic/template/js/StableIdHelper'}">
+	template:require="{StableIdHelper: 'sap/suite/ui/generic/template/js/StableIdHelper', AH: 'sap/suite/ui/generic/template/js/AnnotationHelper'}">
 
 	<template:with path="parameter>/" helper="StableIdHelper.preparePathForStableId" var="contextMenuId">
 		<template:if test="{= ${contextMenuId>}.buildStableId({type: 'SmartControl', subType: 'ContextMenu', sSmartTableId: ${smartControlId>id}})}" />

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;