@sapui5/sap.suite.ui.generic.template 1.149.0 → 1.150.0

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

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

package/src/sap/suite/ui/generic/template/designtime/utils/designtimeUtils.js

@@ -303,9 +303,9 @@ sap.ui.define([
 				"sap/m/MessageStrip"
 			], function (Dialog, Button, MessageStrip) {
 				const warningText = new MessageStrip({
-					type: MessageType.Information,
+					type: MessageType.Warning,
 					showIcon: true,
-					text: "{i18n>RTA_CONFIGURATION_INFO_MESSAGE}"
+					text: "{i18n>RTA_CONFIGURATION_WARNING_MESSAGE}"
 				});
 				warningText.addStyleClass("sapUiSmallMarginBottom");
 				const dialog = new Dialog({

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

@@ -27,6 +27,7 @@ sap.ui.define([
 		var aBasicFilters = [];
 		var oSmartFilterBar = oControl;
 		var oEasyFilterCallbacks = null;
+		var oPendingEasyFilterState = null;
 
 		var oVariantManagementInitializedPromise;
 
@@ -71,21 +72,47 @@ sap.ui.define([
 			// after this has happened, we can get the custom data from SFB.
 			oSmartFilterBar.attachAfterVariantLoad(function(){
 				var oCustomData = oSmartFilterBar.getCustomFilterData();
+				var oGenericData;
+				if (oCustomData && oCustomData[dataPropertyNameGeneric]) {
+					oGenericData = oCustomData[dataPropertyNameGeneric];
+				} else {
+					// getCustomFilterData() returns null on cold start (no prior sap-iapp-state) because
+					// setCustomFilterData() is only called from beforeVariantFetch (variant save path),
+					// never during the initial LREP variant load. The _CUSTOM section is present in the
+					// variant content — fall back to reading it via getVariantContent().
+					try {
+						var oSVM = oSmartFilterBar.getSmartVariant();
+						// getCurrentVariantId() converts STANDARDVARIANTKEY to "" which _getVariantById can't look up.
+						// getCurrentVariantKey() returns the raw internal key and works for all variants.
+						var sVariantKey = oSVM && (oSVM.getCurrentVariantKey ? oSVM.getCurrentVariantKey() : oSVM.getStandardVariantKey());
+						var oVariantContent = oSVM && oSVM.getVariantContent(oSmartFilterBar, sVariantKey);
+						var oFilterBarVariant = oVariantContent && oVariantContent.filterBarVariant && JSON.parse(oVariantContent.filterBarVariant);
+						var oCustomSection = oFilterBarVariant && oFilterBarVariant._CUSTOM;
+						oGenericData = (oCustomSection && oCustomSection[dataPropertyNameGeneric]) || Object.create(null);
+					} catch (e) {
+						oGenericData = Object.create(null);
+					}
+				}
 				// variant stored with 1.103 or later: all customFilter data stored in property customFilters
 				// legacy variant stored with 1.102 or earlier: customFilters (from storing point of view) separated according to their origin
-				var oCustomFiltersState = oCustomData[dataPropertyNameGeneric].customFilters || {
-						editState: oCustomData[dataPropertyNameGeneric].editStateFilter,
-						appExtension: oCustomData[dataPropertyNameCustom],
-						adaptationExtensions: oCustomData[dataPropertyNameExtension]
+				var oCustomFiltersState = oGenericData.customFilters || {
+						editState: oGenericData.editStateFilter,
+						appExtension: oCustomData && oCustomData[dataPropertyNameCustom],
+						adaptationExtensions: oCustomData && oCustomData[dataPropertyNameExtension]
 					};
 				aBasicFilters = oSmartFilterBar.getAllFilterItems(true);
 				mParams.oCustomFiltersWrapper.setState(oCustomFiltersState);
-				oSVMWrapperCallbacks.setManagedControlStates(oCustomData[dataPropertyNameGeneric]);
+				oSVMWrapperCallbacks.setManagedControlStates(oGenericData);
 				if (oEasyFilterCallbacks) {
 					oEasyFilterCallbacks.setState({
-						filterMode: oCustomData[dataPropertyNameGeneric].filterMode,
-						easyFilter: oCustomData[dataPropertyNameGeneric].easyFilter
+						filterMode: oGenericData.filterMode,
+						easyFilter: oGenericData.easyFilter
 					});
+				} else {
+					oPendingEasyFilterState = {
+						filterMode: oGenericData.filterMode,
+						easyFilter: oGenericData.easyFilter
+					};
 				}
 			});
 
@@ -142,7 +169,8 @@ sap.ui.define([
 							.map(oFilterItem => oFilterItem.getName()),
 						...aRemovedFromStandard
 					])],
-					customFilters: mParams.oCustomFiltersWrapper.getState()
+					customFilters: mParams.oCustomFiltersWrapper.getState(),
+					easyFilterState: oEasyFilterCallbacks ? oEasyFilterCallbacks.getState() : null
 			};
 		}
 
@@ -175,6 +203,14 @@ sap.ui.define([
 
 			mParams.oCustomFiltersWrapper.setState(oState && oState.customFilters);
 
+			if (oState && oState.easyFilterState) {
+				if (oEasyFilterCallbacks) {
+					oEasyFilterCallbacks.setState(oState.easyFilterState);
+				} else {
+					oPendingEasyFilterState = oState.easyFilterState;
+				}
+			}
+
 			// set visibility
 			// TODO:
 			// - How to deal with old states (not containing all information about visibility) -> legacy state handler?
@@ -250,6 +286,10 @@ sap.ui.define([
 			setSVMWrapperCallbacks: setSVMWrapperCallbacks,
 			setEasyFilterCallbacks: function(oCallbacks) {
 				oEasyFilterCallbacks = oCallbacks;
+				if (oPendingEasyFilterState) {
+					oEasyFilterCallbacks.setState(oPendingEasyFilterState);
+					oPendingEasyFilterState = null;
+				}
 			},
 			bVMConnection: oSmartFilterBar.getSmartVariant(),
 			suppressSelection: oSmartFilterBar.setSuppressSelection.bind(oSmartFilterBar), // if multiple reasons for suppressing overlap, a counter (to avoid to early resume) could be implemented here

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

@@ -734,7 +734,6 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 			}
 		},
 
-
 		getShareOptionVisibility: function(bFlexibleColumnLayout) {
             if (bFlexibleColumnLayout) {
                 return "{= !(" + fnGetCommonShareVisibilityPath() + " || ${_templPrivGlobal>/generic/FCL/highestViewLevel})}";

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.149.0
+	 * @version 1.150.0
 	 * @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/CRUDManager.js

@@ -541,7 +541,13 @@ sap.ui.define(["sap/ui/base/Object",
 				var aMessagesBeforeSave = CRUDHelper.fnGetMessagesFromContextFilter(oContextFilter, oMessageManager, true);
 				var mMessagesBeforeSave = Object.create(null);
 				aMessagesBeforeSave.forEach(function(oMessage){
-					mMessagesBeforeSave[oMessage.getId()] = oMessage;
+					// Exclude transition messages (persistent === false) left over from a prior 412 response.
+					// Including them causes false-positive deduplication on retry: the new 412 produces
+					// the same message IDs, they are filtered out of aNewMessages, and fnHandleWarning
+					// is never called.
+					if (oMessage.persistent !== false) {
+						mMessagesBeforeSave[oMessage.getId()] = oMessage;
+					}
 				});
 
 				// Handles the 412 Warning case.
@@ -564,10 +570,23 @@ sap.ui.define(["sap/ui/base/Object",
 						var aMessagesAfterSave = CRUDHelper.fnGetMessagesFromContextFilter(oContextFilter, oMessageManager, true);
 						var aAllMessages = aMessagesAfterSave.map(function(oMessage){
 							if (!mMessagesBeforeSave[oMessage.getId()]) { // if this is a new message
-								oMessage.persistent = false;
-								oMessage.technical = false;
-								bWarningOccured = bWarningOccured || oMessage.technicalDetails.statusCode === "412" && oMessage.technicalDetails.headers["preference-applied"] === "handling=strict";
-								aNewMessages.push(oMessage);
+								// Create a new Message instance instead of mutating the original object.
+								// The original object may be held by ODataMessageParser._lastMessages; mutating it
+								// in-place causes _propagateMessages to treat the message as non-persistent on the
+								// next successful OData response and silently remove it before the popover opens.
+								var oNewMessage = new Message({
+									message: oMessage.getMessage(),
+									type: oMessage.getType(),
+									target: oMessage.getTargets ? oMessage.getTargets() : [oMessage.getTarget()],
+									processor: oMessage.getMessageProcessor(),
+									persistent: false,
+									technical: false,
+									code: oMessage.getCode(),
+									description: oMessage.getDescription(),
+									technicalDetails: oMessage.getTechnicalDetails()
+								});
+								bWarningOccured = bWarningOccured || oNewMessage.technicalDetails.statusCode === "412" && oNewMessage.technicalDetails.headers["preference-applied"] === "handling=strict";
+								aNewMessages.push(oNewMessage);
 							}
 							return oMessage;
 						});
@@ -577,15 +596,6 @@ sap.ui.define(["sap/ui/base/Object",
 						// If there is at least one new message we assume that the backend has checked the object (and found business errors). Thus, the old messages can be removed and only the new messages
 						// have to stay. However, we delete all messages and then add the new ones. This ensures, that the message model gets a change event even if no message has been there before.
 						// This will trigger the follow-up activities.
-						// Reset pending changes before adding messages to prevent infinite loop when entering edit mode again.
-						// Invalid values cause infinite loop because the pending changes (with invalid values) are resubmitted when the user clicks Edit, triggering the same error.
-						// Must run before addMessages: resetChanges calls _discardEntityChanges which removes messages whose target path starts
-						// with the binding context path — on a sub-object page this would delete the error messages we are about to add.
-						var oContext = oController.getView().getBindingContext();
-						var sContextPath = oContext && oContext.getPath();
-						if (sContextPath && oModel && oModel.hasPendingChanges()) {
-							oModel.resetChanges([sContextPath], undefined, true);
-						}
 						if (aNewMessages.length) {
 							oMessageManager.removeMessages(aAllMessages);
 							oMessageManager.addMessages(aNewMessages);

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

@@ -1417,8 +1417,15 @@ sap.ui.define(["sap/ui/base/Object",
 			var oColumn = oSmartTableHandler.getColumnByKey(sColumnKey);
 			//if the column is visible in the table, then only we bind the visible property of the cell
 			if (oColumn && oColumn.getVisible()){
+				// For UITable, getCells() only contains cells for visible columns (sap.ui.table.Table._getRowClone
+				// skips invisible columns). indexOfColumn returns the position in the full columns aggregation
+				// (including invisible), so we resolve the visible-column index instead to avoid an off-by-N
+				// mismatch when columns have been deactivated. For ResponsiveTable, indexOfColumn is correct.
+				var iCellIndex = controlHelper.isUiTable(oTable)
+					? oTable.getColumns().filter(function(c) { return c.getVisible(); }).indexOf(oColumn)
+					: oTable.indexOfColumn(oColumn);
 				aItems.forEach(function(oItem) {
-					var oCell = oItem.getCells()[oTable.indexOfColumn(oColumn)];
+					var oCell = iCellIndex >= 0 ? oItem.getCells()[iCellIndex] : undefined;
 					if (oCell) {
 						// Only apply the binding if it is not already set with the correct path.
 						// This avoids unnecessary teardown/recreation during scroll (rowsUpdated),
@@ -2777,7 +2784,17 @@ sap.ui.define(["sap/ui/base/Object",
 		 * @param {*} aNavRestriction - list of 1:n navigation properties
 		 */
 		function modifyDataSourceUrl(oExportEvent, aNavRestriction) {
-			let aSplitDataUrl = oExportEvent.mParameters.exportSettings.dataSource.dataUrl.split("&$");
+			let sDataUrl = oExportEvent.mParameters.exportSettings.dataSource.dataUrl;
+			// Extract non-$-prefixed query parameters (e.g. &search=NVT, &sap-client=100) before
+			// splitting by "&$". Without this, such parameters remain appended to the preceding
+			// $-parameter segment and their & / = characters get encoded by encodeURIComponent,
+			// corrupting the OData URL sent to the backend.
+			const aNonDollarParams = [];
+			sDataUrl = sDataUrl.replace(/&(?!\$)([^&]+)/g, function(match) {
+				aNonDollarParams.push(match);
+				return "";
+			});
+			let aSplitDataUrl = sDataUrl.split("&$");
 			const idxSelect = aSplitDataUrl.findIndex(data => data.startsWith("select"));
 			const idxExpand = aSplitDataUrl.findIndex(data => data.startsWith("expand"));
 			// reconsturct select query from URL.
@@ -2796,7 +2813,8 @@ sap.ui.define(["sap/ui/base/Object",
 					aSplitDataUrl.splice(idxExpand, 1);
 				}
 			}
-			oExportEvent.mParameters.exportSettings.dataSource.dataUrl = aSplitDataUrl.join("&$");
+			// Re-append the preserved non-$-prefixed parameters after the $-parameter reconstruction.
+			oExportEvent.mParameters.exportSettings.dataSource.dataUrl = aSplitDataUrl.join("&$") + aNonDollarParams.join("");
 		}
 
 		/**
@@ -2947,6 +2965,7 @@ sap.ui.define(["sap/ui/base/Object",
 		var getPaginatorInfo = testableHelper.testable(getPaginatorInfo, "getPaginatorInfo");
 		var fnRenderTeamsContactCollabOptions = testableHelper.testable(fnRenderTeamsContactCollabOptions, "fnRenderTeamsContactCollabOptions");
 		var removeUnsupportedColumnsToExport = testableHelper.testable(removeUnsupportedColumnsToExport, "removeUnsupportedColumnsToExport");
+		var modifyDataSourceUrl = testableHelper.testable(modifyDataSourceUrl, "modifyDataSourceUrl");
 		var fnAddMultiEditFieldGroupProperties = testableHelper.testable(fnAddMultiEditFieldGroupProperties,"fnAddMultiEditFieldGroupProperties");
 		var fnHideTableCells = testableHelper.testable(fnHideTableCells, "fnHideTableCells");
 		var fnApplyCellHiddenBindings = testableHelper.testable(fnApplyCellHiddenBindings, "fnApplyCellHiddenBindings");

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

@@ -403,7 +403,8 @@ sap.ui.define([
 			var fnFilter = oTemplateContract.oApplicationProxy.isTransientMessageNoCustomMessage;
 			var sState; // Only one message which is a success (or info/None) message -> show as message toast
 			// Remove transient messages that already exist in the error cache
-			fnRemoveTransientMessages(isDuplicateMessage.bind(this));
+			// isDuplicateMessage is a plain closure function — no this binding needed
+			fnRemoveTransientMessages(isDuplicateMessage);
 			var aTransientMessages = fnGetTransientMessages(false, fnFilter);
 			if (aTransientMessages.length === 0) { // no transient messages -> immediate return
 				return Promise.resolve();
@@ -658,8 +659,8 @@ sap.ui.define([
 			}
 			let oError;
 			oError = JSON.parse(rawMessage);
-			// Check if any cached error matches the parsed error
-			return aWarningCache.some((oCachedError) => this.areMessagesSame(oCachedError, oError));
+			// areMessagesSame is a plain closure — call it directly, no this needed
+			return aWarningCache.some((oCachedError) => areMessagesSame(oCachedError, oError));
 		}
 
 		/**

package/src/sap/suite/ui/generic/template/lib/ai/EasyFill/EasyFillAIOrchestrator.js

@@ -131,18 +131,28 @@ sap.ui.define([
          * - collectionFields: row-level updates for SmartTable collections
          *
          * Collection fields are identified by the isCollection flag in the field mapping.
-         * Currently only the first valid collection is processed (single-table limitation).
+         * For tables that allow creation (mCollectionState.mCollectionAllowsCreation), rows
+         * without _rowIndex or _contextPath are treated as new rows to be created.
+         * Only one new row per table is supported; extra new rows are flagged via multipleNewRows.
+         * Tables where the AI proposed new rows but creation is not allowed are tracked in
+         * collectionsWithRejectedNewRows so the renderer can show a per-table warning strip.
          *
          * @param {object} oAiData - the AI response data map { fieldName: value | rowArray }
          * @param {object} mFieldMapping - the complete field mapping
          * @param {object} oFieldCollector - EasyFillFieldCollector (used for SmartTable validation)
          * @param {object} oObjectPage - the ObjectPage control (used for SmartTable validation)
-         * @returns {{ simpleFields: object, collectionFields: object }}
+         * @param {object} mCollectionState - collection tracking state (used for allowsCreation check)
+         * @returns {{ simpleFields: object, collectionFields: object, attemptedMultipleNewRows: boolean, collectionsWithRejectedNewRows: object }}
          */
-        splitAIResultByCollection: function(oAiData, mFieldMapping, oFieldCollector, oObjectPage) {
+        splitAIResultByCollection: function(oAiData, mFieldMapping, oFieldCollector, oObjectPage, mCollectionState) {
             var oSplitResult = {
                 simpleFields: {},
-                collectionFields: {}
+                collectionFields: {},
+                attemptedMultipleNewRows: false,
+                // Map of { navProperty: "all" | "mixed" } for tables where AI proposed new rows
+                // but creation is not allowed. "all" = only new rows proposed; "mixed" = some
+                // existing updates + some rejected new rows.
+                collectionsWithRejectedNewRows: {}
             };
 
             Object.keys(oAiData || {}).forEach(function(sFieldName) {
@@ -158,17 +168,41 @@ sap.ui.define([
                 }
 
                 if (oFieldMeta && oFieldMeta.isCollection === true && aCollectionRows) {
-                    // Validate that each row update has at least a context path or row index for binding
-                    var aRowUpdates = aCollectionRows.filter(function(oRow) {
+                    var bAllowsCreation = !!(mCollectionState && mCollectionState.mCollectionAllowsCreation &&
+                        mCollectionState.mCollectionAllowsCreation[sFieldName]);
+
+                    // Separate existing-row updates (have _rowIndex or _contextPath) from new rows
+                    var aExistingRowUpdates = aCollectionRows.filter(function(oRow) {
                         return oRow && typeof oRow === "object" &&
                             (typeof oRow._contextPath === "string" || typeof oRow._rowIndex === "number");
                     });
+                    var aRawNewRows = aCollectionRows.filter(function(oRow) {
+                        return oRow && typeof oRow === "object" &&
+                            typeof oRow._contextPath !== "string" &&
+                            typeof oRow._rowIndex !== "number";
+                    });
+
+                    // Track tables where AI proposed new rows that cannot be created
+                    if (!bAllowsCreation && aRawNewRows.length > 0) {
+                        var sRejectionType = aExistingRowUpdates.length === 0 ? "all" : "mixed";
+                        oSplitResult.collectionsWithRejectedNewRows[sFieldName] = sRejectionType;
+                    }
+
+                    var aNewRows = bAllowsCreation ? aRawNewRows : [];
+
+                    // Cap new rows to one per table; flag if the AI proposed more
+                    if (aNewRows.length > 1) {
+                        oSplitResult.attemptedMultipleNewRows = true;
+                        aNewRows = [aNewRows[0]];
+                    }
+
+                    var aRowUpdates = aExistingRowUpdates.concat(aNewRows);
 
                     var oValidation = oFieldCollector.isValidSmartTable(oFieldMeta.entitySet, oObjectPage);
-                    if (aRowUpdates.length > 0 &&
-                        oValidation.isValid) {
+                    if (aRowUpdates.length > 0 && oValidation.isValid) {
                         oSplitResult.collectionFields[sFieldName] = aRowUpdates;
-                        oLogger.debug("splitAIResultByCollection: accepted collection field '" + sFieldName + "' with " + aRowUpdates.length + " rows");
+                        oLogger.debug("splitAIResultByCollection: accepted collection field '" + sFieldName + "' with " +
+                            aExistingRowUpdates.length + " updates and " + aNewRows.length + " new row(s)");
                     }
                 } else {
                     // Scalar field → goes to simpleFields