@sapui5/sap.suite.ui.generic.template 1.145.1 → 1.147.0

package/src/sap/suite/ui/generic/template/QuickView/view/QuickView.view.xml

@@ -29,7 +29,7 @@
 					<template:if test="{badge>ImageUrl}">
 						<template:then>
 							<FlexBox alignItems="Start" justifyContent="Center">
-								<Avatar 
+								<Avatar
 									src="{path: 'badge>ImageUrl', formatter: 'AHModel.format'}"
 									class="sapUiSmallMarginEnd sapQuickViewBadgeImageBorder"
 									displaySize="L"
@@ -58,7 +58,7 @@
 	<FlexBox visible="{=${badge>/badgeVisible}}" width="100%" alignItems="Start" justifyContent="Start">
 		<HBox alignItems="Left" justifyContent="Left" width="100%">
 			<FlexBox visible="{=${badge>/imgUrlDefined}}" alignItems="Start" justifyContent="Center">
-				<Avatar 
+				<Avatar
 					src="{badge>/imgUrl}"
 					class="sapUiSmallMarginEnd sapQuickViewBadgeImageBorder"
 					displaySize="L"
@@ -100,14 +100,14 @@
 								<template:then>
 									<Label
 										labelFor="field::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}"
-										
+
 										text="{path: 'dataField>Label', formatter: 'AH.formatWithExpandSimple'}" class="sapQuickViewSmartFieldLabel"/>
 								</template:then>
 								<template:else>
 									<smart:SmartLabel labelFor="field::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}" class="sapQuickViewSmartFieldLabel"/>
 								</template:else>
 							</template:if>
-							
+
 							<template:if test="{= ${dataField>RecordType} === 'com.sap.vocabularies.UI.v1.DataFieldWithUrl'}">
 								<template:then>
 									<fe:Link id="field::{path: 'dataField>', formatter: 'AH.getStableIdPartFromDataField'}"
@@ -125,7 +125,7 @@
 										clientSideMandatoryCheck="false"
 										value="{path: 'dataField>Value', formatter: 'AHModel.format'}"
 										url="{= ${dataField>Url} ? ${path: 'dataField>Url', formatter: 'AHModel.format'} : ''}"
-										innerControlsCreated="onSmartFieldsCreated"
+										innerControlsCreated=".onSmartFieldsCreated"
 										class="sapQuickViewTextTitle"/>
 								</template:else>
 							</template:if>
@@ -184,7 +184,7 @@
 														contextEditable="false"
 														value="{path: 'columnItemFieldValue>Value', formatter: 'AHModel.format'}"
 														url="{= ${columnItemFieldValue>Url} ? ${path: 'columnItemFieldValue>Url', formatter: 'AHModel.format'} : ''}"
-														innerControlsCreated="onSmartFieldsCreated"/>
+														innerControlsCreated=".onSmartFieldsCreated"/>
 												</template:repeat>
 											</cells>
 										</ColumnListItem>

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

@@ -324,6 +324,89 @@ sap.ui.define([
 		let getAllDesigntimeSettings = function getAllDesigntimeSettings(oSmartTable, oControl) {
 			let oResourceBundle = designtimeUtils.getResourceBundle(oControl);
 
+			/**
+			 * Resolves the effective table type for designtime.
+			 * @param {sap.ui.comp.smarttable.SmartTable} oSmartTable - The SmartTable instance
+			 * @returns {string} One of: ResponsiveTable, GridTable, TreeTable, AnalyticalTable, Table
+			 */
+			function getTableType(oSmartTable) {
+				const oManifestTableSettings = getManifestTableSettings(oSmartTable);
+
+				if (oManifestTableSettings && oManifestTableSettings.type) {
+					return oManifestTableSettings.type;
+				}
+
+				return oSmartTable.getTableType();
+			}
+
+			const sTableType = getTableType(oSmartTable);
+
+			/**
+			 * Factory for Create Mode enums based on the SmartTable type.
+			 * @param {string} smartTableType - SmartTable table type
+			 * @returns {Enum[]} Create mode enum definitions
+			 */
+			function getCreateModeEnums(smartTableType) {
+				const RESPONSIVE_AND_GRID_TABLE_ENUMS = [
+					{ id: "inline", name: "Inline" },
+					{ id: "creationRows", name: "Inline Creation Rows" },
+					{ id: "creationRowsHiddenInEditMode", name: "Inline Creation Rows (Hidden in edit page)" },
+					{ id: "newPage", name: "New Page" }
+				];
+
+				const TREE_TABLE_ENUMS = [
+					{ id: "inline", name: "Inline" },
+					{ id: "newPage", name: "New Page" }
+				];
+
+				const mEnumsByTableType = {
+					AnalyticalTable: [],
+					GridTable: RESPONSIVE_AND_GRID_TABLE_ENUMS,
+					ResponsiveTable: RESPONSIVE_AND_GRID_TABLE_ENUMS,
+					TreeTable: TREE_TABLE_ENUMS
+				};
+
+				return mEnumsByTableType[smartTableType] || RESPONSIVE_AND_GRID_TABLE_ENUMS;
+			}
+
+			/**
+			 * Returns the default create mode value from the given enums (first enum).
+			 * Returns undefined when enums are empty (e.g. AnalyticalTable).
+			 * @param {Enum[]} enums - Create mode enum definitions
+			 * @returns {string|undefined} Default value or undefined when create mode is not supported
+			 */
+			function getDefaultCreateMode(enums) {
+				if (!enums || enums.length === 0) {
+					return undefined;
+				}
+				return enums[0].id;
+			}
+
+			/**
+			 * Determines whether the 'Creation Mode' option should be shown in the RTA configuration dialog
+			 * for the given SmartTable. The custom data key "isCreationAllowedByBoolAndPathRestrictions"
+			 * is set on the SmartTable at template time based on OData InsertRestrictions.
+			 *
+			 * - Non-draft app: the key is not set, so this returns false and the option is hidden.
+			 *   Only 'New page' create mode is supported in this case, so exposing 'Creation Mode' in
+			 *   the RTA dialog would be meaningless.
+			 * - Draft app, editable table: the key is set to true/"true", so this returns true and
+			 *   the option is shown. All table types are supported.
+			 * - Draft app, non-editable table: the key is set to null/false/"false", so this returns false
+			 *   and the option is hidden, since creation is restricted by OData annotations.
+			 *
+			 * @param {sap.ui.comp.smarttable.SmartTable} oSmartTable - The SmartTable instance
+			 * @returns {boolean} True if the 'Creation Mode' option should be available in RTA
+			 */
+			function isTableCreationAllowed(oSmartTable) {
+				const vCreationAllowed = oSmartTable.data("isCreationAllowedByBoolAndPathRestrictions");
+				return ["true", true].includes(vCreationAllowed);
+			}
+
+			const createModeEnums = getCreateModeEnums(sTableType);
+			const createModeDefaultValue = getDefaultCreateMode(createModeEnums);
+			const isCreateModeAvailable = createModeEnums.length > 0 && isTableCreationAllowed(oSmartTable);
+
 			/**
 			 * @type {DesigntimeSetting}
 			 */
@@ -384,15 +467,10 @@ sap.ui.define([
 				id: "createMode",
 				name: oResourceBundle.getText('RTA_CREATE_MODE'),
 				description: oResourceBundle.getText('RTA_CREATE_MODE_DESC'),
-				value: "creationRows",
+				value: createModeDefaultValue,
 				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)" }
-				],
+				enums: createModeEnums,
 				bSupportsGlobalScope: true,
 				restrictedTo: [sObjectPageComponentName],
 				keyUser: true
@@ -489,7 +567,7 @@ sap.ui.define([
 				widthIncludingColumnHeader,
 				selectionMode,
 				selectAll,
-				createMode,
+				isCreateModeAvailable ? createMode : null,
 				selectionLimit,
 				threshold,
 				scrollThreshold
@@ -499,12 +577,14 @@ sap.ui.define([
 				widthIncludingColumnHeader,
 				selectionMode,
 				selectAll,
-				createMode,
+				isCreateModeAvailable ? createMode : null,
 				threshold,
 				addCardtoInsightsHidden
 			];
 
-			const designtimeSettings = (oSmartTable.getTableType() === "ResponsiveTable") ? aMTableDesigntimeSettings : aUITableDesigntimeSettings ;
+			const designtimeSettings = (sTableType === "ResponsiveTable") ?
+			    aMTableDesigntimeSettings.filter(Boolean) :
+			    aUITableDesigntimeSettings.filter(Boolean);
 
 			return designtimeSettings.filter(oSetting => {
 				const sComponentName = designtimeUtils.getOwnerComponentFor(oSmartTable).getMetadata().getComponentName();

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

@@ -164,7 +164,24 @@ sap.ui.define([	"sap/suite/ui/generic/template/genericUtilities/FeLogger", "sap/
 			function fnApplyAndUp(oEvent) {
 				var oControl = oEvent.getSource();
 				var oCRUDActionHandler = oTemplateUtils.oComponentUtils.getCRUDActionHandler();
-				oCRUDActionHandler.handleCRUDScenario(2, fnApplyAndUpImpl.bind(null, oControl));
+
+				// Pre-check validation to decide navigation
+				var oAppComponent = oController.getOwnerComponent().getAppComponent();
+				var oManifestSettings = oAppComponent.getManifest()["sap.ui.generic.app"];
+				var bNavigateImmediately = oManifestSettings &&
+										oManifestSettings.settings &&
+										oManifestSettings.settings.applyButtonNavigatesImmediately;
+				if (bNavigateImmediately) {
+					oCRUDActionHandler.hasValidationMessageOnDetailsViews().then(function(bHasValidationErrors) {
+						if (!bHasValidationErrors) {
+							// No frontend errors - navigate immediately
+							fnNavigateUp();
+							oTemplateUtils.oServices.oApplicationController.synchronizeDraftAsync();
+						}
+					});
+				} else  {
+					oCRUDActionHandler.handleCRUDScenario(2, fnApplyAndUpImpl.bind(null, oControl));
+				}
 			}
 
 			var oDiscardEditHandler; // singleton, initialized on demand

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

@@ -17,7 +17,7 @@
             <ToolbarSpacer />
             <Button
                 text="{i18n>ST_GENERIC_DIALOG_CLOSE_BUT}"
-                press="onCloseAiPopover" />
+                press=".onCloseAiPopover" />
         </OverflowToolbar>
     </footer>
 </Popover>

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

@@ -2,7 +2,7 @@
 	<Dialog id="actionConfirmationDialog" title="{list>/dialogTitle}" class="sapUiContentPadding" state="Warning" ariaLabelledBy="warningText">
 		<content>
 			<Text id="warningText" text="{list>/warningText}" />
-			<VBox> 
+			<VBox>
 				<List items = "{path: 'list>/aInApplicableItems'}" >
 					<items>
 						<StandardListItem title = "{list>sKey}" class="sapSmartTemplatesSLIBold" />
@@ -16,10 +16,10 @@
 			</VBox>
 		</content>
 		<beginButton>
-			<Button text="{i18n>ST_GENERIC_DIALOG_CONTINUE_BUT}" press="onContinue" visible="true" type="Emphasized"/>
+			<Button text="{i18n>ST_GENERIC_DIALOG_CONTINUE_BUT}" press=".onContinue" visible="true" type="Emphasized"/>
 		</beginButton>
 		<endButton>
-			<Button text="{i18n>CANCEL}" press="onCancel"/>
+			<Button text="{i18n>CANCEL}" press=".onCancel"/>
 		</endButton>
 	</Dialog>
 </core:FragmentDefinition>

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

@@ -8,8 +8,8 @@
 		placement="Auto"
 		showHeader="false"
 		contentWidth="20rem"
-		afterClose="afterClose"
-		afterOpen="afterOpen">
+		afterClose=".afterClose"
+		afterOpen=".afterOpen">
         <VBox>
             <HBox class="sapUiSmallMarginBottom">
                 <Avatar
@@ -31,7 +31,7 @@
 			<!-- render options for teams contact collaboration -->
 			<VBox visible="{= ${contact>/teamsCollabOptions} !== undefined &amp;&amp; ${contact>/teamsCollabOptions}.length > 0 }" class="sapUiSmallMarginBottom">
 				<Toolbar >
-					<Title text="{i18n>CONTACT_OPTION}" level="H5" class="sapUiTinyMarginBegin"/> 
+					<Title text="{i18n>CONTACT_OPTION}" level="H5" class="sapUiTinyMarginBegin"/>
 					<ToolbarSpacer/>
 					<Button
 						icon="{contact>/teamsCollabOptions/0/icon}"
@@ -79,12 +79,12 @@
 				<Label text="{i18n>CONTACT_PHONE}:" labelFor="template:::contact:::contactDetails::phone"/>
 				<Link id="template:::contact:::contactDetails::phone" text="{contact>/work}" href="{path: 'contact>/work', formatter: '.formatUri'}" class="sapUiTinyMarginBottom" wrapping="true"/>
 			</VBox>
-			
+
 			<VBox visible="{= !!${contact>/cell}}" class="sapUiTinyMarginBottom">
 				<Label text="{i18n>CONTACT_MOBILE}:" labelFor="template:::contact:::contactDetails::mobile"/>
 				<Link id="template:::contact:::contactDetails::mobile" text="{contact>/cell}" href="{path: 'contact>/cell', formatter: '.formatUri'}" class="sapUiTinyMarginBottom" wrapping="true"/>
 			</VBox>
-			
+
 			<VBox visible="{= !!${contact>/fax}}" class="sapUiTinyMarginBottom">
 				<Label text="{i18n>CONTACT_FAX}:" labelFor="template:::contact:::contactDetails::fax"/>
 				<Text id="template:::contact:::contactDetails::fax" text="{contact>/fax}" class="sapUiTinyMarginBottom" />

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

@@ -5,9 +5,9 @@
 		</content>
 		<buttons>
 			<Button text="{= ${dataLoss>/isLeaving} ? ${i18n>DATA_LOSS_LEAVE_BTN} : ${i18n>PROCEED} }"
-				press="onDataLossOK" type="Emphasized" />
+				press=".onDataLossOK" type="Emphasized" />
 			<Button text="{i18n>CANCEL}"
-				press="onDataLossCancel" />
+				press=".onDataLossCancel" />
 		</buttons>
 	</Dialog>
 </core:FragmentDefinition>

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

@@ -5,10 +5,10 @@
 		</content>
 		<buttons>
 			<Button text="{i18n>DATA_LOSS_DISCARD_CHANGES}"
-				press="onDataLossOK"
+				press=".onDataLossOK"
 				visible="{dataLoss>/isLeaving}" type="Emphasized"/>
 			<Button text="{= ${dataLoss>/isLeaving} ? ${i18n>CANCEL} : ${i18n>CLOSE} }"
-				press="onDataLossCancel" />
+				press=".onDataLossCancel" />
 		</buttons>
 	</Dialog>
-</core:FragmentDefinition>		
+</core:FragmentDefinition>

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

@@ -1,8 +1,8 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core">
-	<Popover id="DiscardDraftPopover" placement="{discard>/placement}" showHeader="false" class="sapUiContentPadding" ariaLabelledBy="DiscardDraftText" beforeClose="beforeClose" afterClose="afterClose">
+	<Popover id="DiscardDraftPopover" placement="{discard>/placement}" showHeader="false" class="sapUiContentPadding" ariaLabelledBy="DiscardDraftText" beforeClose=".beforeClose" afterClose=".afterClose">
 		<VBox id="DiscardDraftBox">
 			<Text id="DiscardDraftText" width="16rem" text="{discard>/text}"/>
-			<Button id="DiscardDraftConfirmButton" text="{i18n>DISCARD}" width="100%" press="onDiscardConfirm" />	
-		</VBox>	
+			<Button id="DiscardDraftConfirmButton" text="{i18n>DISCARD}" width="100%" press=".onDiscardConfirm" />
+		</VBox>
 	</Popover>
 </core:FragmentDefinition>

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

@@ -7,7 +7,7 @@
 			 placement="Auto"
 			 class="sapSmartTemplatesListReportPopover sapUiContentPadding">
 		<endButton>
-				<Button icon="sap-icon://decline" tooltip="{i18n>CLOSE}" press="closeDraftAdminPopover" />
+				<Button icon="sap-icon://decline" tooltip="{i18n>CLOSE}" press=".closeDraftAdminPopover" />
 		</endButton>
 
 		<VBox class="sapUiContentPadding">

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

@@ -223,7 +223,7 @@
 								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' && ( ${device>/system/tablet} || ${device>/system/desktop} ) ? 'true' : ${device>/system/desktop} ? 'true' : 'false' ) }">
 							<table:customData>
-								<core:CustomData key="p13nData" value="{parts: [{path: 'listEntitySet>'}, {path: 'dataFieldValue>'}, {path: 'dataField>'}, {path: 'tableSettings>calculateWidthIncludingColumnHeader'}], formatter: 'AH.createP13N'}" />
+								<core:CustomData key="p13nData" value="{parts: [{path: 'listEntitySet>'}, {path: 'dataFieldValue>'}, {path: 'dataField>'}, {path: 'tableSettings>calculateWidthIncludingColumnHeader'}, {value: 'GridTable'}], formatter: 'AH.createP13N'}"/>
 							</table:customData>
 							<table:template>
 								<core:Fragment fragmentName="sap.suite.ui.generic.template.fragments.GridTableCells" type="XML" />

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

@@ -1,10 +1,10 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core">
-	<Dialog class="sapUiNoContentPadding" state="{settings>/state}" type="Message" afterClose="afterClose"
-		showHeader="true" horizontalScrolling="false" draggable="true" 
+	<Dialog class="sapUiNoContentPadding" state="{settings>/state}" type="Message" afterClose=".afterClose"
+		showHeader="true" horizontalScrolling="false" draggable="true"
 		contentHeight="440px" contentWidth="440px" verticalScrolling="false" resizable="true">
 		<content>
-			<MessageView items="{settings>/messages}" showDetailsPageHeader="false" itemSelect="onMessageSelect" groupItems="{settings>/grouping}">
-				<MessageItem type="{settings>type}" title="{settings>message}" description="{settings>description}" 
+			<MessageView items="{settings>/messages}" showDetailsPageHeader="false" itemSelect=".onMessageSelect" groupItems="{settings>/grouping}">
+				<MessageItem type="{settings>type}" title="{settings>message}" description="{settings>description}"
 							longtextUrl="{settings>descriptionUrl}" groupName="{= ${settings>/messageToGroupName}[${settings>id}] || ${settings>/genericGroupName} }" />
 			</MessageView>
 		</content>
@@ -14,7 +14,7 @@
 					<Text text="{settings>/title}" />
 				</contentMiddle>
 				<contentLeft>
-					<Button icon="sap-icon://nav-back" visible="{settings>/backButtonVisible}" press="onBackButtonPress"/>
+					<Button icon="sap-icon://nav-back" visible="{settings>/backButtonVisible}" press=".onBackButtonPress"/>
 					<core:Icon
 						src="{path: 'settings>/state', formatter: '.getSeverityIconFromIconPool'}"
 						color="{path: 'settings>/state', formatter: '.getIconColor'}"
@@ -23,8 +23,8 @@
 			</Bar>
 		</customHeader>
 		<buttons>
-			<Button text="{settings>/actionButtonText}" visible="{settings>/showActionButton}" press="onActionButtonPressed"  type="Emphasized"/>
-			<Button text="{=${settings>/showActionButton} ? ${settings>/cancelButtonText} : ${settings>/closeButtonText}}" press="onMessageDialogClose"/>
+			<Button text="{settings>/actionButtonText}" visible="{settings>/showActionButton}" press=".onActionButtonPressed"  type="Emphasized"/>
+			<Button text="{=${settings>/showActionButton} ? ${settings>/cancelButtonText} : ${settings>/closeButtonText}}" press=".onMessageDialogClose"/>
 		</buttons>
 	</Dialog>
 </core:FragmentDefinition>

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

@@ -1,12 +1,12 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core">
-	<Dialog class="sapUiNoContentPadding" id="ShowConfirmationOnDraftActivate" state="{model>/state}" afterClose="afterClose" type="Message" initialFocus="Close" 
+	<Dialog class="sapUiNoContentPadding" id="ShowConfirmationOnDraftActivate" state="{model>/state}" afterClose=".afterClose" type="Message" initialFocus="Close"
 		showHeader="true" horizontalScrolling="false" draggable="true"
 		contentHeight="440px" contentWidth="440px" verticalScrolling="false" resizable="true">
 		<content>
-			<MessageView  id="messageView" items="{msg>/}" showDetailsPageHeader="false" itemSelect="onMessageSelect" activeTitlePress="titlePressed" groupItems="true">
-				<MessageItem id="messageItem" type="{msg>type}" title="{msg>message}" description="{msg>description}" 
+			<MessageView  id="messageView" items="{msg>/}" showDetailsPageHeader="false" itemSelect=".onMessageSelect" activeTitlePress=".titlePressed" groupItems="true">
+				<MessageItem id="messageItem" type="{msg>type}" title="{msg>message}" description="{msg>description}"
 						subtitle="{= (${model>/messageToSubtitle} || {})[${msg>id}]  }"
-						longtextUrl="{msg>descriptionUrl}" activeTitle="{path: 'msg>controlIds', formatter: '.isPositionable'}" 
+						longtextUrl="{msg>descriptionUrl}" activeTitle="{path: 'msg>controlIds', formatter: '.isPositionable'}"
 						groupName="{= (${model>/messageToGroupName} || {})[${msg>id}]  }" />
 			</MessageView>
 		</content>
@@ -16,7 +16,7 @@
 					<Title level="H1" text="{model>/title}"/>
 				</contentMiddle>
 				<contentLeft>
-					<Button icon="sap-icon://nav-back" visible="{model>/backbtnvisibility}" press="onBackButtonPress" tooltip="{i18n>BACK}" />
+					<Button icon="sap-icon://nav-back" visible="{model>/backbtnvisibility}" press=".onBackButtonPress" tooltip="{i18n>BACK}" />
 					<core:Icon
 						src="{path: 'model>/messageType', formatter: '.getSeverityIconFromIconPool'}"
 						color="{path: 'model>/messageType', formatter: '.getIconColor'}"/>
@@ -24,10 +24,10 @@
 			</Bar>
 		</customHeader>
 		<beginButton>
-			<Button text="{model>/CRUDAction}" visible="{= ${model>/situation} === 4}"  press="onAccept" type="Emphasized"/>
+			<Button text="{model>/CRUDAction}" visible="{= ${model>/situation} === 4}"  press=".onAccept" type="Emphasized"/>
 		</beginButton>
 		<endButton>
-			<Button text="{i18n>CANCEL}" press="onReject"/>
+			<Button text="{i18n>CANCEL}" press=".onReject"/>
 		</endButton>
 	</Dialog>
 </core:FragmentDefinition>

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

@@ -1,7 +1,7 @@
 <core:FragmentDefinition
 		xmlns="sap.m"
 		xmlns:core="sap.ui.core">
-	<MessagePopover groupItems="true" items="{msg>/}" activeTitlePress="titlePressed" beforeOpen="beforeOpen" afterClose="afterClose" >
+	<MessagePopover groupItems="true" items="{msg>/}" activeTitlePress=".titlePressed" beforeOpen=".beforeOpen" afterClose=".afterClose" >
 		<MessageItem  type="{msg>type}"  title="{msg>message}"
 					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'}"
@@ -13,7 +13,7 @@
 						text="{i18n>ST_AI_EE_BUTTON_LABEL}"
 						icon="sap-icon://ai"
 						visible="{= ${helper>/isAIErrorExplanationEnabled} &amp;&amp; ${msg>type} !== 'Information'}"
-						press="generateErrorExplanation">
+						press=".generateErrorExplanation">
 						<customData>
 							<core:CustomData key="message" value="{msg>message}" />
 							<core:CustomData key="description" value="{msg>description}" />

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

@@ -1,7 +1,7 @@
 <core:FragmentDefinition xmlns="sap.m" xmlns:core="sap.ui.core" xmlns:footerbar="sap.ushell.ui.footerbar">
 	<Menu>
-        <MenuItem id="shareEmailButton" icon="sap-icon://email" press="sharePageToPressed('Email')" text="{share>/emailButtonText}" class="sapMFlexBox" visible="{= !${ui>/createMode}}"/>
-        <MenuItem id="shareJamButton" icon="sap-icon://share-2" press="shareJamPressed" text="{share>/jamButtonText}" visible="{share>/jamVisible}" class="sapMFlexBox"/>
-        <MenuItem id="bookmarkButton" icon="{share>/tileIcon}" press="shareTilePressed" text="{share>/tileText}" visible="{share>/tileVisible}" class="sapMFlexBox"/>
+        <MenuItem id="shareEmailButton" icon="sap-icon://email" press=".sharePageToPressed('Email')" text="{share>/emailButtonText}" class="sapMFlexBox" visible="{= !${ui>/createMode}}"/>
+        <MenuItem id="shareJamButton" icon="sap-icon://share-2" press=".shareJamPressed" text="{share>/jamButtonText}" visible="{share>/jamVisible}" class="sapMFlexBox"/>
+        <MenuItem id="bookmarkButton" icon="{share>/tileIcon}" press=".shareTilePressed" text="{share>/tileText}" visible="{share>/tileVisible}" class="sapMFlexBox"/>
     </Menu>
 </core:FragmentDefinition>

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

@@ -1,26 +1,26 @@
-/* FE specific implementation of a Link that preserves whitespaces */
-sap.ui.define([
-	"sap/m/Link", 
-	"sap/m/LinkRenderer", 
-	"sap/base/strings/whitespaceReplacer", 
-	"sap/suite/ui/generic/template/lib/SideEffectUtil"
-], function (Link, LinkRenderer, whitespaceReplacer, SideEffectUtil){
-	"use strict";
-
-	var FELink = Link.extend("sap.suite.ui.generic.template.genericUtilities.Link", {
-		init: function(){
-			var setText = this.setText.bind(this);
-			this.setText = function(sText){
-				setText(whitespaceReplacer(sText));	
-			};
-		},
-		renderer: function(oRM, oControl){
-			LinkRenderer.render(oRM, oControl);
-		},
-		onAfterRendering : function() {
-			SideEffectUtil.assignFieldGroupIdsToLinkField(this);
-		}
-	});
-	
-	return FELink;
-});
+/* FE specific implementation of a Link that preserves whitespaces */
+sap.ui.define([
+	"sap/m/Link",
+	"sap/base/strings/whitespaceReplacer",
+	"sap/suite/ui/generic/template/lib/SideEffectUtil"
+], function (Link, whitespaceReplacer, SideEffectUtil){
+	"use strict";
+
+	var FELink = Link.extend("sap.suite.ui.generic.template.genericUtilities.Link", {
+		init: function(){
+			var setText = this.setText.bind(this);
+			this.setText = function(sText){
+				setText(whitespaceReplacer(sText));
+			};
+		},
+		renderer: {
+			// reuse the renderer of sap.m.Link
+			apiVersion: 2
+		},
+		onAfterRendering : function() {
+			SideEffectUtil.assignFieldGroupIdsToLinkField(this);
+		}
+	});
+
+	return FELink;
+});

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

@@ -103,18 +103,22 @@ sap.ui.define([
 			// Note: beforeVariantFetch is even called on initial startup, i.e. without explicetly removing it, the superfluous select option would always be there.
 			oSelectOptions = oSelectOptions && oSelectOptions.filter(function(oSelectOption){
 				return oSelectOption.PropertyName !== dataPropertyNameGeneric;
-			});
-			const oVariantManagement = oSmartFilterBar.getVariantManagement?.();
-			// Cache getAllFilterItems call to avoid multiple expensive operations
-			const aAllFilterItems = oSmartFilterBar.getAllFilterItems(true);
-			const aCurrentVisibleFilters = aAllFilterItems.filter(oFilterItem => oFilterItem.getVisibleInFilterBar()).map(oFilterItem => oFilterItem.getName());
-			const aStandardItems = oVariantManagement?.getStandardVariant(oSmartFilterBar)?.filterbar ?? [];
-			const aRemovedFromStandard = aStandardItems.filter(oItem => !aCurrentVisibleFilters.includes(oItem.name)).map(oItem => oItem.name);
-			return {
-					selectOptions:	oSelectOptions,
-					parameters: oUiState.getSelectionVariant().Parameters,
-					semanticDates: oUiState.getSemanticDates(),
-					addedFilterItems: aAllFilterItems.filter(function(oFilterItem){
+		});
+		const oVariantManagement = oSmartFilterBar.getVariantManagement?.();
+		// Cache getAllFilterItems call to avoid multiple expensive operations
+		const aAllFilterItems = oSmartFilterBar.getAllFilterItems(true);
+		const aCurrentVisibleFilters = aAllFilterItems.filter(oFilterItem => oFilterItem.getVisibleInFilterBar()).map(oFilterItem => oFilterItem.getName());
+		const aStandardItems = oVariantManagement?.getStandardVariant(oSmartFilterBar)?.filterbar ?? [];
+		const aRemovedFromStandard = aStandardItems.filter(oItem => !aCurrentVisibleFilters.includes(oItem.name)).map(oItem => oItem.name);
+		// Extract orderedItems from UiState
+		// orderedItems contains filter field sequence: {[{ group: string, name: string }]}
+		var oOrderedItems = oUiState.getOrderedItems();
+		return {
+				selectOptions:	oSelectOptions,
+				parameters: oUiState.getSelectionVariant().Parameters,
+				semanticDates: oUiState.getSemanticDates(),
+				orderedItems: oOrderedItems, // Filter field sequence from SFB
+				addedFilterItems: aAllFilterItems.filter(function(oFilterItem){
 						// Remark: getAllFilterItems(true) returns also items not visible, but with value set (in adapt filters dialog) => need to check visibility ourselves
 						return oFilterItem.getGroupName() !== sap.ui.comp.filterbar.FilterBar.INTERNAL_GROUP && oFilterItem.getVisibleInFilterBar();
 					}).map(function(oFilterItem){
@@ -148,6 +152,9 @@ sap.ui.define([
 			oUiState.getSelectionVariant().SelectOptions = oState && oState.selectOptions;
 			oUiState.getSelectionVariant().Parameters = oState && oState.parameters;
 			oUiState.setSemanticDates(oState && oState.semanticDates);
+			// Restore orderedItems (filter field sequence) from state
+			// This ensures the filter fields appear in the same order as when the state was saved
+			oUiState.setOrderedItems(oState && oState.orderedItems);
 			// setState is meant to set the state absolutely, no merge needed => replace and strictMode can be set to true.
 			// (replace=false can be used to set additional selectOptions but keeping the existing ones. strictMode=false is used to map filters to parameters. Both might make sense in navigation
 			// scenarios (navigation parameter to be merged with defaults, property used in source app as filter but in target as parameter), but not when just restoring to a state (provided from the

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

@@ -278,10 +278,10 @@ sap.ui.define([
 		/**
 		 * check does column having 1/n property or not.
 		 * 
-		 * @param {*} oTable - Table instance
-		 * @param {*} sEntitySet - table entity set
-		 * @param {*} sProperty - column property
-		 * @returns 
+		 * @param {Object} oTable - Table instance
+		 * @param {Object} sEntitySet - table entity set
+		 * @param {Object} sProperty - column property
+		 * @returns - returns either "1:n nav property" if any as string or else false.
 		 */
 		checkFor1ToNProperty(oTable, sEntitySet, sProperty) {
 			var aProperty = sProperty.split("/");
@@ -295,7 +295,7 @@ sap.ui.define([
 			for (var i = 0; i < aProperty.length - 1; i++) {
 				var oDataAssociationEnd = oTableMetaModel.getODataAssociationEnd(oTableEntityType, aProperty[i]);
 				if (oDataAssociationEnd.multiplicity === "*") {
-					return true;
+					return aProperty[i] + "/";
 				}
 				oTableEntityType = oTableMetaModel.getODataEntityType(oDataAssociationEnd.type);
 			}

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

@@ -2165,7 +2165,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			return sP13N;
 		},
 
-		createP13N: function (oInterface, oContextSet, oContextProp, oDataField, mColumnWidthIncludingColumnHeader, oDataFieldTarget, oDataFieldTargetValue) {
+		createP13N: function (oInterface, oContextSet, oContextProp, oDataField, mColumnWidthIncludingColumnHeader, sTableType) {
 			var sP13N = "", aAdditionalProperties = [], sNavigation = "", sColumnIdentifier;
 			if (oDataField.RecordType === "com.sap.vocabularies.UI.v1.DataField" || oDataField.RecordType === "com.sap.vocabularies.UI.v1.DataFieldForAnnotation" ||
 				oDataField.RecordType === "com.sap.vocabularies.UI.v1.DataFieldWithUrl") {
@@ -2262,6 +2262,21 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 				}
 				var oContext = oInterface.getInterface(2);
 				var iColumnIndex = oAnnotationHelper._determineColumnIndex(oContext);
+				var bIsDraftEnabled = !!(oContextSet && oContextSet["com.sap.vocabularies.Common.v1.DraftRoot"]);
+				if (sTableType === "GridTable" && bIsDraftEnabled) {
+					var sLineItemPath = oContext.getPath();
+					var oModel = oContext.getModel();
+					var sLineItemArrayPath = sLineItemPath.substring(0, sLineItemPath.lastIndexOf("/"));
+					var oLineItemContext = oModel.createBindingContext(sLineItemArrayPath);
+					var oLineItem = oModel.getObject(sLineItemArrayPath);
+					var iDraftColumnIndex = oAnnotationHelper._determineColumnIndexForDraftColumn(
+						oLineItemContext,
+						oLineItem          
+					);
+					if (iDraftColumnIndex && iColumnIndex >= iDraftColumnIndex) {
+						iColumnIndex = iColumnIndex + 1;
+					}
+				}
 				if (iColumnIndex >= 0) {
 					sP13N += '", "columnIndex":"' + iColumnIndex;
 				}

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

@@ -959,7 +959,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.145.1
+	 * @version 1.147.0
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {
@@ -1019,6 +1019,10 @@ sap.ui.define([
 					type: "string",
 					defaultValue: "Middle"
 				},
+				applyButtonNavigatesImmediately : {
+					type:"boolean",
+					defaultValue: false
+				},
 				//The column layout is used by default in the SmartForm on the object page
 				useColumnLayoutForSmartForm: {
 					type: "boolean",