@sapui5/sap.suite.ui.generic.template 1.152.1 → 1.154.0

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

@@ -835,10 +835,10 @@ sap.ui.define(["sap/ui/base/Object",
 
 				setComponentRefreshBehaviour(oOutbound);
 
-				// We now  ensure that the 'sap-ushell-navmode' parameter is passed to the NavigationHandler.navigate method
-				// and skip setting the app to busy mode when opening a new tab
-				if (oOutbound.parameters["sap-ushell-navmode"] === "explace") {
-					oNavigationHandler.navigate(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, null, null, oOutbound.parameters["sap-ushell-navmode"]);
+				// We now skip setting the app to busy mode when opening a new tab and bypass the re-entry guard (fnNavigateExternal) for explace navigations:
+				// the source app stays alive when a new tab is opened, so without the bypass AppComponent.restore() is never called and the guard is never reset.
+				if (oServices.oApplication.isExplaceNavigation(oOutbound.parameters)) {
+					oNavigationHandler.navigate(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, null, null, "explace");
 				} else {
 					oServices.oApplication.navigateExternal(oOutbound.semanticObject, oOutbound.action, oSelectionVariant.toJSONString(), null, fnHandleError);
 					//null object has to be passed to the NavigationHandler as an
@@ -1791,6 +1791,36 @@ sap.ui.define(["sap/ui/base/Object",
 		var fnRemovePropertiesFromNavigationContext = testableHelper.testable(fnRemovePropertiesFromNavigationContext, "removePropertiesFromNavigationContext");
 		/* eslint-enable */
 
+		/**
+		 * Returns the first visible, enabled custom Emphasized button in the view, or null.
+		 * Skips excluded controls and their children, framework buttons (template:: IDs),
+		 * buttons inside dialogs or popovers (including closed ones), buttons in hidden containers,
+		 * and the internal buttons of a sap.m.PDFViewer.
+		 * Used by Ctrl+Enter on LR (live mode or worklist), ALP (live mode) and OP.
+		 * @param {sap.ui.core.mvc.View} oView The view to scan
+		 * @param {sap.ui.core.Control[]} aExcludedControls Controls to skip together with their children
+		 * @returns {sap.m.Button|null} The button, or null
+		 */
+		function fnFindCustomEmphasizedButton(oView, aExcludedControls) {
+			var aButtons = oView.findAggregatedObjects(true, function(oControl) {
+				if (!oControl.isA("sap.m.Button") || oControl.getType() !== "Emphasized" ||
+						!oControl.getVisible() || !oControl.getEnabled() ||
+						aExcludedControls.indexOf(oControl) >= 0 || oControl.getId().indexOf("template::") !== -1) {
+					return false;
+				}
+				for (var oParent = oControl.getParent(); oParent && oParent !== oView; oParent = oParent.getParent()) {
+					if (aExcludedControls.indexOf(oParent) >= 0 ||
+							oParent.isA("sap.m.Dialog") || oParent.isA("sap.m.Popover") ||
+							oParent.isA("sap.m.PDFViewer") ||
+							(oParent.getVisible && !oParent.getVisible())) {
+						return false;
+					}
+				}
+				return true;
+			});
+			return aButtons[0] || null;
+		}
+
 		return {
 			getPositionableControlId: getPositionableControlId,
 			getMetaModelEntityType: getMetaModelEntityType,
@@ -2101,7 +2131,8 @@ sap.ui.define(["sap/ui/base/Object",
 			transformTechnicalPropsOnExportedFile: fnTransformTechnicalPropsOnExportedFile,
 			includeEntitySetParametersToExportedFile: fnIncludeEntitySetParametersToExportedFile,
 			openContextInNewTabFromListItem: fnOpenContextInNewTabFromListItem,
-			getCustomizedTextFromApp: getCustomizedTextFromApp
+			getCustomizedTextFromApp: getCustomizedTextFromApp,
+			findCustomEmphasizedButton: fnFindCustomEmphasizedButton
 		};
 	}
 

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

@@ -228,7 +228,7 @@ sap.ui.define([
 
 		function fnAddToolbarButtonToContextMenu(sPathToItems, oFocusInfo, oToolbarControlsData, aItems, oButton, bStartsNewSection){
 			// Case 1: If button has the stable id, use it to find local id.
-			// Case 2: If the button was created using design time adaption, use the custom data "originalButtonId" to find local id. 
+			// Case 2: If the button was created using design time adaption, use the custom data "originalButtonId" to find local id.
 			var sButtonLocalId = oView.getLocalId(oButton.getId()) || oView.getLocalId(oButton.data("originalButtonId"));
 
 			var oHandlePromise = null;
@@ -254,6 +254,45 @@ sap.ui.define([
 			return false;
 		}
 
+		// Returns a raw entry object for a toolbar button child without writing to the model.
+		// Generates a key and registers the handler in mHandlers so clicks on sub-menu items
+		// resolve correctly via onContextMenu. The parent fnAddMenuItem Promise.all owns all
+		// child enabled-flag writes; no setProperty call is made here.
+		function fnGetToolbarButtonContextMenuEntry(oFocusInfo, oToolbarControlsData, oButton, bStartsSection) {
+			var sButtonLocalId = oView.getLocalId(oButton.getId()) || oView.getLocalId(oButton.data("originalButtonId"));
+
+			var oStandardControlData = oToolbarControlsData.standardActions.find(function(oControlData){
+				return oControlData.ID === sButtonLocalId;
+			});
+			var oBreakoutControlData = oConfiguration.findBreakoutActionByLocalId(oToolbarControlsData.breakoutActions, sButtonLocalId);
+
+			var oHandlePromise = null;
+			if (oStandardControlData) {
+				oHandlePromise = getHandlePromiseForStandardAction(oFocusInfo, oStandardControlData, oButton);
+			} else if (oBreakoutControlData) {
+				oHandlePromise = getHandlePromiseForBreakoutAction(oFocusInfo, oBreakoutControlData, oButton);
+			}
+
+			if (!oHandlePromise) {
+				return null;
+			}
+			iCreatedMenuItemsCounter++;
+			var sKey = "ContextMenuKey" + iCreatedMenuItemsCounter;
+			oHandlePromise.then(function(fnHandler) {
+				if (fnHandler) {
+					mHandlers[sKey] = fnHandler;
+				}
+			});
+			return {
+				text: oButton.getText(),
+				icon: oButton.getIcon(),
+				key: sKey,
+				enabled: false,
+				startsSection: bStartsSection,
+				handlerPromise: oHandlePromise
+			};
+		}
+
 		/**
 		 * 
 		 * Evaluates the menu items in a menu button and adds them to the context menu based on the following rules:
@@ -271,7 +310,11 @@ sap.ui.define([
 			var aChildContextMenuEntries = [];
 			aMenuItems.forEach(function (oMenuItem) {
 				var bStartsSectionOnSubMenu = oMenuItem.getStartsSection();
-				fnAddToolbarButtonToContextMenu(sItemsPath, oFocusInfo, oToolbarControlsData, aChildContextMenuEntries, oMenuItem, bStartsSectionOnSubMenu);
+				var oEntry = fnGetToolbarButtonContextMenuEntry(oFocusInfo, oToolbarControlsData, oMenuItem, bStartsSectionOnSubMenu);
+				if (oEntry) {
+					oEntry.startsSection = oEntry.startsSection && aChildContextMenuEntries.length > 0;
+					aChildContextMenuEntries.push(oEntry);
+				}
 			});
 
 			if (aChildContextMenuEntries.length === 1) {

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

@@ -169,6 +169,7 @@ sap.ui.define([
 					sMessageDescription = oResourceBundle.getText("ST_GENERIC_ERROR_SYSTEM_UNAVAILABLE_DESC");
 					break;
 				case 0:
+				case undefined:
 					// case when server being offline
 					/*adapted to have a reasonable processing for the Apply-Button -
 					 * workaround to not leave the page in case of apply */

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

@@ -73,12 +73,30 @@ sap.ui.define([
                 fnGetLabel
             );
 
+            // Seed current field values so the LLM can compute relative changes
+            // (e.g. "increase Delivery Date by 10 days", "increase Price by 20%").
+            if (oObjectPageContext) {
+                Object.keys(mFieldMapping).forEach(function(sPropertyName) {
+                    var oEntry = mFieldMapping[sPropertyName];
+                    if (!oEntry || oEntry.isCollection === true) {
+                        return;
+                    }
+                    var vCurrentValue = oObjectPageContext.getProperty(sPropertyName);
+                    if (vCurrentValue !== undefined && vCurrentValue !== null) {
+                        oEntry.currentValue = vCurrentValue;
+                    }
+                });
+            }
+
             return mFieldMapping;
         },
 
         /**
-         * Sends the user's free-text input to the AI service and returns the structured result.
-         * The AI service is accessed via oTemplateUtils.oServices.oFioriAIHandler.
+         * Sends the user's free-text input to the AI service using a two-prompt flow.
+         *
+         * First prompt sends field metadata without table row data. If the AI returns
+         * 'scnd_cll' (second-call flag), a second prompt is made with the current table
+         * row data (ISLM_Collection_Data) so the AI can reference existing rows.
          *
          * @param {string} sInputText - the user's free-text input from the EasyFill textarea
          * @param {object} mFieldMapping - the complete field mapping built by buildFieldMapping()
@@ -86,19 +104,135 @@ sap.ui.define([
          * @returns {Promise<object>} AI service result: { success: boolean, data: object }
          */
         submitToAI: async function(sInputText, mFieldMapping, oTemplateUtils) {
-            oLogger.debug("submitToAI: sending input to AI service");
+            oLogger.debug("submitToAI: starting two-prompt AI extraction flow");
             try {
-                var aiCallResult = await oTemplateUtils.oServices.oFioriAIHandler.fioriaiLib.EasyFill.extractFieldValuesFromText(
-                    sInputText,
-                    mFieldMapping
-                );
-                return aiCallResult;
+                var oEasyFill = oTemplateUtils.oServices.oFioriAIHandler.fioriaiLib.EasyFill;
+
+                // First prompt: send field metadata without table row data
+                var mFieldMappingWithoutTableRows = this.buildFieldMappingWithoutTableRows(mFieldMapping);
+                var oFirstResult = await oEasyFill.extractFieldValuesFromText(sInputText, mFieldMappingWithoutTableRows);
+                if (!oFirstResult.success) {
+                    return oFirstResult;
+                }
+
+                // If the AI signals that table row context is needed, run a second prompt
+                if ("scnd_cll" in oFirstResult.data) {
+                    oLogger.debug("submitToAI: second prompt required for table row edits");
+                    var oTableData = this.buildTableDataForSecondPrompt(oFirstResult.data, mFieldMapping);
+                    var mFilteredMetadata = this.filterFieldMetadataByFirstPromptResponse(oFirstResult.data, mFieldMapping);
+                    var oSecondResult = await oEasyFill.extractFieldValuesWithTableData(sInputText, mFilteredMetadata, oTableData);
+                    if (!oSecondResult.success) {
+                        return oSecondResult;
+                    }
+                    return { success: true, data: this.stripSecondPromptFlag(oSecondResult.data) };
+                }
+
+                // No second prompt needed: first prompt returned all field values
+                return { success: true, data: this.stripSecondPromptFlag(oFirstResult.data) };
             } catch (e) {
                 oLogger.error("submitToAI: AI call failed: " + (e && e.message));
                 return { success: false, data: {} };
             }
         },
 
+        /**
+         * Returns a copy of mFieldMapping where collection entries contain only
+         * { description, dataType, itemProperties, isCollection: true }, with
+         * currentItems removed. Used for the first AI prompt to avoid sending large
+         * table row payloads before it is known whether the AI needs them.
+         * itemProperties is preserved so the LLM knows the schema of each collection.
+         *
+         * @param {object} mFieldMapping - the complete field mapping
+         * @returns {object} field mapping with currentItems stripped from collection entries
+         */
+        buildFieldMappingWithoutTableRows: function(mFieldMapping) {
+            var mResult = {};
+            Object.keys(mFieldMapping).forEach(function(sFieldName) {
+                var oEntry = mFieldMapping[sFieldName];
+                if (oEntry && oEntry.isCollection === true) {
+                    mResult[sFieldName] = {
+                        description: oEntry.description,
+                        dataType: oEntry.dataType,
+                        itemProperties: oEntry.itemProperties,
+                        isCollection: true
+                    };
+                } else {
+                    mResult[sFieldName] = oEntry;
+                }
+            });
+            return mResult;
+        },
+
+        /**
+         * Builds the table data structure passed to the second AI prompt (ISLM_Collection_Data).
+         * Only includes tables that were mentioned in the first prompt response and have
+         * existing row data.
+         *
+         * @param {object} oFirstPromptData - the first prompt response data (may contain scnd_cll)
+         * @param {object} mFieldMapping - the complete field mapping (contains currentItems per table)
+         * @returns {object} table data: { [navProp]: { currentItems: array } }
+         */
+        buildTableDataForSecondPrompt: function(oFirstPromptData, mFieldMapping) {
+            var oTableData = {};
+            Object.keys(oFirstPromptData).forEach(function(sFieldName) {
+                if (sFieldName === "scnd_cll") { return; }
+                var oFieldMeta = mFieldMapping[sFieldName];
+                if (!oFieldMeta || oFieldMeta.isCollection !== true) { return; }
+                var aCurrentItems = oFieldMeta.currentItems;
+                if (Array.isArray(aCurrentItems) && aCurrentItems.length > 0) {
+                    oTableData[sFieldName] = { currentItems: aCurrentItems };
+                }
+            });
+            return oTableData;
+        },
+
+        /**
+         * Filters the field mapping to only include fields mentioned in the first prompt
+         * response. For collection fields, currentItems is excluded because table data is
+         * passed separately via ISLM_Collection_Data in the second prompt.
+         *
+         * @param {object} oFirstPromptData - the first prompt response data
+         * @param {object} mFieldMapping - the complete field mapping
+         * @returns {object} filtered field metadata for the second prompt
+         */
+        filterFieldMetadataByFirstPromptResponse: function(oFirstPromptData, mFieldMapping) {
+            var mResult = {};
+            Object.keys(oFirstPromptData).forEach(function(sFieldName) {
+                if (sFieldName === "scnd_cll") { return; }
+                var oFieldMeta = mFieldMapping[sFieldName];
+                if (oFieldMeta === undefined) { return; }
+                if (oFieldMeta.isCollection === true) {
+                    // Include collection metadata without currentItems
+                    var oWithoutCurrentItems = {};
+                    Object.keys(oFieldMeta).forEach(function(sKey) {
+                        if (sKey !== "currentItems") {
+                            oWithoutCurrentItems[sKey] = oFieldMeta[sKey];
+                        }
+                    });
+                    mResult[sFieldName] = oWithoutCurrentItems;
+                } else {
+                    mResult[sFieldName] = oFieldMeta;
+                }
+            });
+            return mResult;
+        },
+
+        /**
+         * Returns a copy of oData with the internal 'scnd_cll' flag key removed.
+         *
+         * @param {object} oData - field values that may contain the scnd_cll flag
+         * @returns {object} field values without the internal flag
+         */
+        stripSecondPromptFlag: function(oData) {
+            var oResult = {};
+            Object.keys(oData).forEach(function(sKey) {
+                if (sKey !== "scnd_cll") {
+                    oResult[sKey] = oData[sKey];
+                }
+            });
+            return oResult;
+        },
+
         /**
          * Converts date-like string values in the AI response to JavaScript Date objects,
          * based on the OData data type declared in the field mapping.

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

@@ -8,6 +8,11 @@ sap.ui.define([
     var sClassName = "lib.ai.EasyFill.EasyFillApplyHandler";
     var oLogger = new FeLogger(sClassName).getLogger();
 
+    // Maximum number of characters accepted as AI input.
+    // Keep in sync with EasyFillDialogController.MAX_INPUT_LENGTH and the TextArea maxLength in
+    // EasyFillDialog.fragment.xml.
+    var MAX_INPUT_LENGTH = 50000;
+
     /**
      * EasyFillApplyHandler
      *
@@ -98,8 +103,11 @@ sap.ui.define([
                 var mCollectionPropertyMap = (mCollectionState && mCollectionState.mCollectionProperties &&
                     mCollectionState.mCollectionProperties[sCollectionName]) || Object.create(null);
 
-                // Extract scalar values for ALL new row contexts — multiple row creation is supported
-                var aRowValues = aNewContexts.map(function(oNewContext) {
+                // Extract scalar values for ALL non-excluded new row contexts
+                var oExcludedNew = oTableStagingState.mExcludedNewRows && oTableStagingState.mExcludedNewRows[sCollectionName];
+                var aRowValues = aNewContexts.filter(function(_, i) {
+                    return !oExcludedNew || !oExcludedNew[i];
+                }).map(function(oNewContext) {
                     var oValues = Object.create(null);
                     Object.keys(mCollectionPropertyMap).forEach(function(sPropName) {
                         var vValue = oNewContext.getProperty && oNewContext.getProperty(sPropName);
@@ -132,7 +140,9 @@ sap.ui.define([
                 var aStagedRows = mStagedRowsByCollection[sCollectionName] || [];
                 var mCollectionPropertyMap = mCollectionState.mCollectionProperties[sCollectionName] || Object.create(null);
 
-                aStagedRows.forEach(function(oStagedRow) {
+                var oExcludedRows = oTableStagingState.mExcludedRows && oTableStagingState.mExcludedRows[sCollectionName];
+                aStagedRows.forEach(function(oStagedRow, iIndex) {
+                    if (oExcludedRows && oExcludedRows[iIndex]) { return; }
                     var oRealContext = oStagedRow.realContext;
                     var oTransientContext = oStagedRow.transientContext;
                     if (!oRealContext || !oTransientContext) {
@@ -192,9 +202,11 @@ sap.ui.define([
             if (bHasUpdates) {
                 return true;
             }
-            // Also return true if there are pending new row contexts
+            // Also return true if there are pending new row contexts that are not excluded
             return Object.keys((oTableStagingState && oTableStagingState.mPendingNewRowContexts) || {}).some(function(sCollectionName) {
-                return ((oTableStagingState.mPendingNewRowContexts[sCollectionName]) || []).length > 0;
+                var aContexts = (oTableStagingState.mPendingNewRowContexts[sCollectionName]) || [];
+                var oExcludedNew = oTableStagingState.mExcludedNewRows && oTableStagingState.mExcludedNewRows[sCollectionName];
+                return aContexts.some(function(_, i) { return !oExcludedNew || !oExcludedNew[i]; });
             });
         },
 
@@ -203,7 +215,7 @@ sap.ui.define([
          * Clears the dialog model properties, destroys table preview items,
          * and optionally clears the text area value.
          *
-         * @param {boolean} bRemoveTextAreaValue - if true, also clears the user input text area
+         * @param {boolean} bRemoveTextAreaValue - if true, also clears the user input text area and resets all file import state (sImportedFileText, file model properties)
          * @param {object} oDialogModel - the easyFillDialogModel JSONModel
          * @param {object} oController - MVC controller (used to byId controls)
          * @param {object} mCollectionUpdates - mutable collection updates map (cleared in place)
@@ -253,6 +265,9 @@ sap.ui.define([
                 var oTextArea = oController.byId("EasyFillInputTextArea");
                 if (oTextArea) { oTextArea.setValue(""); }
                 oDialogModel.setProperty("/isEasyFillButtonEnabled", false);
+                oDialogModel.setProperty("/hasEnteredText", false);
+                var oRb = oController.getView().getModel("i18n").getResourceBundle();
+                oDialogModel.setProperty("/remainingCharactersText", oRb.getText("EASYFILL_REMAINING_CHARACTERS", [MAX_INPUT_LENGTH]));
             }
 
             oLogger.debug("resetEasyFill: dialog state reset" + (bRemoveTextAreaValue ? " (including text area)" : ""));