@sapui5/sap.suite.ui.generic.template 1.148.1 → 1.148.3

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

@@ -1,30 +1,12 @@
 sap.ui.define([
     "sap/suite/ui/generic/template/genericUtilities/FeLogger",
-    "sap/suite/ui/generic/template/genericUtilities/FeError",
-    "sap/ui/model/Filter",
-    "sap/ui/model/FilterOperator"
-], function(FeLogger, FeError, Filter, FilterOperator) {
+    "sap/suite/ui/generic/template/genericUtilities/FeError"
+], function(FeLogger, FeError) {
     "use strict";
 
     var sClassName = "lib.ai.EasyFill.EasyFillApplyHandler";
     var oLogger = new FeLogger(sClassName).getLogger();
 
-    /**
-     * Returns the first ValueListParameterInOut parameter matching the given local property name.
-     * Extracted as a module-level helper to avoid no-loop-func ESLint violations.
-     *
-     * @param {Array} aParameters - value-list Parameters array from OData annotations
-     * @param {string} sProperty - local property name to match
-     * @returns {object|undefined}
-     */
-    function fnFindValueListParameter(aParameters, sProperty) {
-        return aParameters.find(function(oParam) {
-            return oParam.RecordType === "com.sap.vocabularies.Common.v1.ValueListParameterInOut" &&
-                oParam.LocalDataProperty &&
-                oParam.LocalDataProperty.PropertyPath === sProperty;
-        });
-    }
-
     /**
      * EasyFillApplyHandler
      *
@@ -39,15 +21,17 @@ sap.ui.define([
          * Applies all AI-suggested scalar field values from the transient context to the live ObjectPage context.
          * Called when the user clicks "Confirm" in the EasyFill dialog.
          *
-         * 
+         *
          * Only properties present in the updatable lookup map are written back.
          * Collection (table) row values are copied from transient staging contexts to the
          * live row contexts only here, so the ObjectPage table updates only after confirm.
+         * New row creation is NOT done here — the caller must call createPendingNewRows separately
+         * because it requires CRUDManager access (draft-aware) that ApplyHandler does not hold.
          *
          * @param {object} oTransientContextForEasyFill - the transient OData context holding AI-suggested values
          * @param {object} oObjectPageContext - the live ObjectPage binding context to write values into
          * @param {object} mUpdatableLookupMap - map of { fieldName: value } for fields that are updatable
-         * @param {object} oTableStagingState - table staging state { mStagedRows }
+         * @param {object} oTableStagingState - table staging state { mStagedRows, mPendingNewRowContexts }
          * @param {object} mCollectionState - collection tracking state
          */
         applyAndSave: function(oTransientContextForEasyFill, oObjectPageContext, mUpdatableLookupMap, oTableStagingState, mCollectionState) {
@@ -93,6 +77,41 @@ sap.ui.define([
             oLogger.debug("applyAndSave: applied " + iCollectionApplied + " staged table value(s) to ObjectPage context");
         },
 
+        /**
+         * Extracts user-reviewed values from the pending new-row transient contexts.
+         * Returns a map of { navProperty: predefinedValues } ready to pass to CRUDManager.addEntry.
+         * The caller is responsible for discarding the transient contexts afterwards.
+         *
+         * @param {object} oTableStagingState - table staging state { mPendingNewRowContexts }
+         * @param {object} mCollectionState - collection tracking state (mCollectionProperties)
+         * @returns {object} map of { navProperty: plainValuesObject }
+         */
+        extractPendingNewRowValues: function(oTableStagingState, mCollectionState) {
+            var mNewRowValues = Object.create(null);
+            Object.keys((oTableStagingState && oTableStagingState.mPendingNewRowContexts) || {}).forEach(function(sCollectionName) {
+                var aNewContexts = oTableStagingState.mPendingNewRowContexts[sCollectionName] || [];
+                if (!aNewContexts.length) {
+                    return;
+                }
+                var mCollectionPropertyMap = (mCollectionState && mCollectionState.mCollectionProperties &&
+                    mCollectionState.mCollectionProperties[sCollectionName]) || Object.create(null);
+
+                // Extract scalar values set by the user during the preview (first new row only — cap is 1)
+                var oNewContext = aNewContexts[0];
+                var oValues = Object.create(null);
+                Object.keys(mCollectionPropertyMap).forEach(function(sPropName) {
+                    var vValue = oNewContext.getProperty && oNewContext.getProperty(sPropName);
+                    if (vValue !== undefined && vValue !== null && typeof vValue !== "object") {
+                        oValues[sPropName] = vValue;
+                    }
+                });
+                mNewRowValues[sCollectionName] = oValues;
+                oLogger.debug("extractPendingNewRowValues: extracted " + Object.keys(oValues).length +
+                    " value(s) for new row in '" + sCollectionName + "'");
+            });
+            return mNewRowValues;
+        },
+
         /**
          * Builds a collection updates map from the staged transient row contexts.
          * Only editable scalar properties whose staged value differs from the live row value are included.
@@ -154,157 +173,25 @@ sap.ui.define([
         },
 
         /**
-         * Returns whether any staged collection row currently differs from the live ObjectPage rows.
+         * Returns whether any staged collection row currently differs from the live ObjectPage rows,
+         * or whether any new rows are pending creation.
          *
-         * @param {object} oTableStagingState - table staging state { mStagedRows }
+         * @param {object} oTableStagingState - table staging state { mStagedRows, mPendingNewRowContexts }
          * @param {object} mCollectionState - collection tracking state
          * @returns {boolean}
          */
         hasStagedCollectionChanges: function(oTableStagingState, mCollectionState) {
             var mCollectionUpdates = this.buildStagedCollectionUpdates(oTableStagingState, mCollectionState);
-            return Object.keys(mCollectionUpdates).some(function(sCollectionName) {
+            var bHasUpdates = Object.keys(mCollectionUpdates).some(function(sCollectionName) {
                 return (mCollectionUpdates[sCollectionName] || []).length > 0;
             });
-        },
-
-        /**
-         * Validates each collection (table) row update by checking that value-help constrained
-         * properties contain values that exist in the corresponding value-help collection.
-         *
-         * Returns an array of validation error objects for any values that fail the check.
-         * If validation cannot be performed (e.g. missing metadata), the property is skipped
-         * and save is not blocked.
-         *
-         * @param {object} mCollectionUpdates - map of { navProperty: [ rowUpdate ] }
-         * @param {object} mCollectionState - collection tracking state: { mCollectionProperties, mCollectionEntityTypes, mCollectionRowContextsByPath, mCollectionRowContexts }
-         * @param {object} oObjectPageModel - the OData model (used to read value-help collections)
-         * @param {object} oRb - i18n resource bundle
-         * @param {object} oFieldCollector - EasyFillFieldCollector (used for isEditableByContextObject)
-         * @param {object} oGenericAnnotationHelper - GenericAnnotationHelper (used for isValueHelpTableAvailable)
-         * @returns {Promise<Array>} array of { collectionName, collectionLabel, rowLabel, rowIndex, rowPath, propertyName, propertyLabel }
-         */
-        validateCollectionUpdatesAgainstValueHelp: async function(mCollectionUpdates, mCollectionState, oObjectPageModel, oRb, oFieldCollector, oGenericAnnotationHelper) {
-            var oMetaModel = oObjectPageModel && oObjectPageModel.getMetaModel();
-            if (!oMetaModel) {
-                oLogger.warning("validateCollectionUpdatesAgainstValueHelp: no MetaModel available");
-                return [];
+            if (bHasUpdates) {
+                return true;
             }
-
-            var aValidationErrors = [];
-            var aCollectionNames = Object.keys(mCollectionUpdates || {});
-
-            for (var i = 0; i < aCollectionNames.length; i++) {
-                var sCollectionName = aCollectionNames[i];
-                var aRowUpdates = mCollectionUpdates[sCollectionName] || [];
-                var mCollectionPropertyMap = mCollectionState.mCollectionProperties[sCollectionName] || Object.create(null);
-                var oCollectionEntityType = mCollectionState.mCollectionEntityTypes[sCollectionName];
-
-                if (!oCollectionEntityType) { continue; }
-
-                // Use the field mapping description as the collection label in error messages
-                var sCollectionLabel = sCollectionName;
-
-                for (var j = 0; j < aRowUpdates.length; j++) {
-                    var oRowUpdate = aRowUpdates[j];
-                    var oResolvedRow = this._resolveCollectionRowContext(sCollectionName, oRowUpdate, mCollectionState);
-                    if (!oResolvedRow || !oResolvedRow.context) { continue; }
-
-                    var oRowContext = oResolvedRow.context;
-                    var oRowObject = oRowContext.getObject && oRowContext.getObject();
-                    var sRowLabel = oRb.getText("EASY_FILL_TABLE_ROW_LABEL", [String((oResolvedRow.rowIndex || 0) + 1)]);
-
-                    var aPropNames = Object.keys(oRowUpdate);
-                    for (var k = 0; k < aPropNames.length; k++) {
-                        var sPropertyName = aPropNames[k];
-                        if (sPropertyName === "_rowIndex" || sPropertyName === "_contextPath") { continue; }
-
-                        var oPropertyMeta = mCollectionPropertyMap[sPropertyName];
-                        // Skip non-editable properties — they cannot be written back
-                        if (!oPropertyMeta || !oFieldCollector.isEditableByContextObject(oPropertyMeta, oRowObject)) { continue; }
-
-                        // Only validate properties that have an associated value-help table
-                        if (!oGenericAnnotationHelper.isValueHelpTableAvailable(oPropertyMeta)) { continue; }
-
-                        var vUpdatedValue = oRowUpdate[sPropertyName];
-                        if (vUpdatedValue === null || vUpdatedValue === undefined || typeof vUpdatedValue === "object") { continue; }
-
-                        try {
-                            var sPropertyPath = oMetaModel.getODataProperty(oCollectionEntityType, sPropertyName, true);
-                            if (!sPropertyPath) { continue; }
-
-                            var oPropertyContext = oMetaModel.createBindingContext(sPropertyPath);
-                            var oValueLists = await oMetaModel.getODataValueLists(oPropertyContext);
-                            var oDefaultValueList = oValueLists && oValueLists[""];
-
-                            if (!oDefaultValueList || !oDefaultValueList.CollectionPath || !oDefaultValueList.CollectionPath.String) { continue; }
-
-                            // Resolve which value-list property maps to this local property
-                            var sValueListProperty = sPropertyName;
-                            if (Array.isArray(oDefaultValueList.Parameters)) {
-                                var oParameter = fnFindValueListParameter(oDefaultValueList.Parameters, sPropertyName);
-                                if (oParameter && oParameter.ValueListProperty && oParameter.ValueListProperty.String) {
-                                    sValueListProperty = oParameter.ValueListProperty.String;
-                                }
-                            }
-
-                            // Check that the AI-provided value exists in the value-help collection
-                            var bValueFound = await this._readValueListByEquality(
-                                oDefaultValueList.CollectionPath.String,
-                                sValueListProperty,
-                                vUpdatedValue,
-                                oObjectPageModel
-                            );
-
-                            if (!bValueFound) {
-                                aValidationErrors.push({
-                                    collectionName: sCollectionName,
-                                    collectionLabel: sCollectionLabel,
-                                    rowLabel: sRowLabel,
-                                    rowIndex: oResolvedRow.rowIndex,
-                                    rowPath: oRowContext.getPath && oRowContext.getPath(),
-                                    propertyName: sPropertyName,
-                                    propertyLabel: this._getPropertyLabel(oPropertyMeta) || sPropertyName
-                                });
-                                oLogger.warning("validateCollectionUpdatesAgainstValueHelp: invalid value for '" + sPropertyName + "' in row " + oResolvedRow.rowIndex);
-                            }
-                        } catch (e) {
-                            // If metadata or value list cannot be resolved, skip the check and do not block save
-                            oLogger.warning("validateCollectionUpdatesAgainstValueHelp: could not validate '" + sPropertyName + "': " + (e && e.message));
-                        }
-                    }
-                }
-            }
-
-            return aValidationErrors;
-        },
-
-        /**
-         * Updates the EasyFill dialog model to reflect the current table validation state.
-         * Sets hasTableValidationErrors and a human-readable summary message (up to 3 errors shown).
-         *
-         * @param {Array} aValidationErrors - array of validation error objects
-         * @param {object} oDialogModel - the easyFillDialogModel JSONModel
-         * @param {object} oRb - i18n resource bundle
-         */
-        applyTableValidationState: function(aValidationErrors, oDialogModel, oRb) {
-            if (!aValidationErrors || aValidationErrors.length === 0) {
-                oDialogModel.setProperty("/hasTableValidationErrors", false);
-                oDialogModel.setProperty("/tableValidationMessage", "");
-                return;
-            }
-
-            // Show up to 3 errors in the summary message to avoid overwhelming the user
-            var sSummary = aValidationErrors.slice(0, 3).map(function(oError) {
-                return oError.collectionLabel + " / " + oError.rowLabel + " / " + oError.propertyLabel;
-            }).join(", ");
-
-            oDialogModel.setProperty("/hasTableValidationErrors", true);
-            oDialogModel.setProperty(
-                "/tableValidationMessage",
-                oRb.getText("EASY_FILL_TABLE_VALIDATION_MESSAGE", [sSummary])
-            );
-
-            oLogger.warning("applyTableValidationState: " + aValidationErrors.length + " validation error(s) found");
+            // Also return true if there are pending new row contexts
+            return Object.keys((oTableStagingState && oTableStagingState.mPendingNewRowContexts) || {}).some(function(sCollectionName) {
+                return ((oTableStagingState.mPendingNewRowContexts[sCollectionName]) || []).length > 0;
+            });
         },
 
         /**
@@ -321,10 +208,18 @@ sap.ui.define([
          * @param {function} fnResetTransientContext - EasyFillFormRenderer.resetTransientContext
          */
         resetEasyFill: function(bRemoveTextAreaValue, oDialogModel, oController, mCollectionUpdates, oEasyFillLayoutMode, fnRevertStagedUpdates, fnResetTransientContext) {
-            // Destroy all rendered table preview sections
-            var oTablePreviewContainer = oController.byId("EasyFillTablePreviewContainer");
-            if (oTablePreviewContainer) {
-                oTablePreviewContainer.destroyItems();
+            // Remove dynamically-added table ObjectPageSections from the shared OPL
+            var sTableSectionMarker = "easyfillTableSection";
+            var oObjectPageLayout = oController.byId("EasyFillObjectPageLayout");
+            if (oObjectPageLayout) {
+                oObjectPageLayout.getSections().filter(function(oSection) {
+                    return oSection.getCustomData().some(function(oData) {
+                        return oData.getKey() === sTableSectionMarker;
+                    });
+                }).forEach(function(oSection) {
+                    oObjectPageLayout.removeSection(oSection);
+                    oSection.destroy();
+                });
             }
 
             // Revert any staged table row values back to original
@@ -343,11 +238,13 @@ sap.ui.define([
             oDialogModel.setProperty("/feedbackPressedDown", false);
             oDialogModel.setProperty("/isFullScreen", true);
             oDialogModel.setProperty("/hasTableUpdates", false);
-            oDialogModel.setProperty("/hasTableValidationErrors", false);
-            oDialogModel.setProperty("/tableValidationMessage", "");
+            oDialogModel.setProperty("/attemptedMultipleNewRows", false);
             oDialogModel.setProperty("/easyFillMode", oEasyFillLayoutMode.CondensedMode);
             oDialogModel.setProperty("/llmData", {});
             oDialogModel.setProperty("/sections", []);
+            oDialogModel.setProperty("/updatableFields", {});
+            oDialogModel.setProperty("/nonUpdatableFields", {});
+            oDialogModel.setProperty("/hasNonUpdatableFields", false);
 
             // Clear the mutable collection updates map in place
             Object.keys(mCollectionUpdates).forEach(function(sKey) {
@@ -391,54 +288,6 @@ sap.ui.define([
             return null;
         },
 
-        /**
-         * Checks whether a given value exists in a value-help collection via an OData $filter read.
-         * Returns true if the value is found or if the read fails (fail-open to not block save unexpectedly).
-         *
-         * @param {string} sCollectionPath - value-help entity set name
-         * @param {string} sValueListProperty - property name in the value-help to filter on
-         * @param {*} vValue - the value to look up
-         * @param {object} oObjectPageModel - the OData model
-         * @returns {Promise<boolean>}
-         */
-        _readValueListByEquality: function(sCollectionPath, sValueListProperty, vValue, oObjectPageModel) {
-            return new Promise(function(resolve) {
-                oObjectPageModel.read("/" + sCollectionPath, {
-                    filters: [
-                        new Filter({
-                            path: sValueListProperty,
-                            operator: FilterOperator.EQ,
-                            value1: vValue
-                        })
-                    ],
-                    success: function(oResponse) {
-                        // Value found if the filtered result set is non-empty
-                        resolve(!!(oResponse && Array.isArray(oResponse.results) && oResponse.results.length > 0));
-                    },
-                    error: function() {
-                        // On error, resolve true to not block save (fail-open)
-                        resolve(true);
-                    }
-                });
-            });
-        },
-
-        /**
-         * Extracts the display label for an OData property.
-         * Prefers Common.Label annotation, falls back to sap:label.
-         *
-         * @param {object} oPropertyMeta - OData property metadata
-         * @returns {string|null}
-         */
-        _getPropertyLabel: function(oPropertyMeta) {
-            if (!oPropertyMeta) { return null; }
-            var oLabel = oPropertyMeta["com.sap.vocabularies.Common.v1.Label"];
-            if (oLabel && oLabel.String) {
-                return oLabel.String;
-            }
-            return oPropertyMeta["sap:label"] || null;
-        },
-
         _isEditableProperty: function(oPropertyMeta, oRowObject) {
             if (!oPropertyMeta) {
                 return false;

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

@@ -2,8 +2,9 @@ sap.ui.define([
     "sap/ui/model/json/JSONModel",
     "sap/m/MessageToast",
     "sap/suite/ui/generic/template/genericUtilities/FeLogger",
-    "sap/suite/ui/generic/template/genericUtilities/FeError"
-], function(JSONModel, MessageToast, FeLogger, FeError) {
+    "sap/suite/ui/generic/template/genericUtilities/FeError",
+    "sap/ui/core/ResizeHandler"
+], function(JSONModel, MessageToast, FeLogger, FeError, ResizeHandler) {
     "use strict";
 
     var sClassName = "lib.ai.EasyFill.EasyFillDialogController";
@@ -58,12 +59,15 @@ sap.ui.define([
                 feedbackPressedDown: false,
                 isEasyFillButtonEnabled: false,
                 llmData: {},
+                updatableFields: {},
+                nonUpdatableFields: {},
+                hasNonUpdatableFields: false,
                 easyFillMode: oEasyFillLayoutMode.CondensedMode,
                 sections: [],
                 isFullScreen: true,
                 hasTableUpdates: false,
-                hasTableValidationErrors: false,
-                tableValidationMessage: ""
+                attemptedMultipleNewRows: false,
+                isSplitterPageMode: false
             };
 
             oController.getView().setModel(new JSONModel(oData), "easyFillDialogModel");
@@ -94,6 +98,34 @@ sap.ui.define([
                 true   // use view as parent
             ).then(function(oDialog) {
                 oDialog.open();
+
+                // Register a ResizeHandler on the ResponsiveSplitter
+                // The dialog is kept alive across opens so we must not register more than once.
+                if (!oDialog._easyFillResizeHandlerId) {
+                    oDialog.attachEventOnce("afterOpen", function() {
+                        // Locate the splitter by its stable fragment ID
+                        var oSplitter = oController.byId("EasyFillMainFlex") &&
+                            oController.byId("EasyFillMainFlex").findAggregatedObjects(true, function(o) {
+                                return o.isA("sap.ui.layout.ResponsiveSplitter");
+                            })[0];
+
+                        if (oSplitter) {
+                            var oDialogModel = oController.getView().getModel("easyFillDialogModel");
+                            // sapUiRSVisiblePaginator is added/removed by the splitter itself on resize
+                            oDialog._easyFillResizeHandlerId = ResizeHandler.register(oSplitter, function() {
+                                var bInPageMode = oSplitter.$().hasClass("sapUiRSVisiblePaginator");
+                                oDialogModel.setProperty("/isSplitterPageMode", bInPageMode);
+                                if (bInPageMode && !oDialogModel.getProperty("/isFullScreen")) {
+                                    // Reset fullscreen state so pane sizes are correct when dialog is widened again
+                                    oDialogModel.setProperty("/isFullScreen", true);
+                                    oController.byId("inputAreaSplitPane").getLayoutData().setSize("40%");
+                                    oController.byId("reviewAreaSplitPane").getLayoutData().setSize("60%");
+                                }
+                            });
+                        }
+                    });
+                }
+
                 oLogger.debug("openDialog: EasyFillDialog opened");
             });
         },
@@ -107,6 +139,8 @@ sap.ui.define([
             var oDialog = oController.byId("EasyFillDialog");
             if (oDialog && oDialog.isOpen()) {
                 oDialog.close();
+                // Reset page-mode flag so the button is visible on the next open
+                oController.getView().getModel("easyFillDialogModel").setProperty("/isSplitterPageMode", false);
                 oLogger.debug("closeDialog: EasyFillDialog closed");
             }
         },
@@ -131,10 +165,19 @@ sap.ui.define([
                 oController.getOwnerComponent().getEntitySet()
             );
             oDialogModel.setProperty("/easyFillMode", sSelectedKey);
-            var oLLMResult = oDialogModel.getProperty("/llmData");
+            var oLLMResult = oDialogModel.getProperty("/llmData") || {};
+            // Use stored updatable subset when available; fall back to full LLM result
+            // only when it is absent (e.g. before the first AI submit).
+            // Important: an empty map is a valid state (all fields are non-updatable)
+            // and must not trigger fallback, otherwise non-updatable fields appear as filled.
+            var oStoredUpdatable = oDialogModel.getProperty("/updatableFields");
+            var oUpdatableFields = (oStoredUpdatable !== undefined && oStoredUpdatable !== null)
+                ? oStoredUpdatable
+                : oLLMResult;
+            var oNonUpdatableFields = oDialogModel.getProperty("/nonUpdatableFields") || {};
             var aData = (sSelectedKey === oEasyFillLayoutMode.CondensedMode)
-                ? oFieldCollector.getSectionsForCondensedView(oLLMResult)
-                : oFieldCollector.getSectionsForObjectPageView(oEntityType, oLLMResult, oRb);
+                ? oFieldCollector.getSectionsForCondensedView(oLLMResult, oUpdatableFields, oNonUpdatableFields)
+                : oFieldCollector.getSectionsForObjectPageView(oEntityType, oLLMResult, oRb, oNonUpdatableFields);
             oDialogModel.setProperty("/sections", aData);
         },
 
@@ -253,10 +296,14 @@ sap.ui.define([
          */
         formatSectionTitle: function(sTitle, oController) {
             if (!sTitle) { return ""; }
+
+            var oResourceBundle = oController.getView().getModel("i18n").getResourceBundle();
+
+            // Handle i18n pattern in title
             var oMatch = sTitle.match(/\{@?i18n>([^}]+)\}/);
             if (oMatch) {
                 var sKey = oMatch[1];
-                return oController.getView().getModel("i18n").getResourceBundle().getText(sKey);
+                return oResourceBundle.getText(sKey);
             }
             return sTitle;
         },