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

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

@@ -52,9 +52,14 @@ sap.ui.define([
         var oTransientContextForEasyFill = null; // Transient OData context for staged AI scalar values
         var oObjectPageContext = null;            // Live ObjectPage binding context
         var oObjectPageModel = null;              // OData model of the ObjectPage
-        var mUpdatableLookupMap = {};             // { fieldName: value } for updatable fields only
+        var mUpdatableLookupMap = {};             // { fieldName: aiValue } updatable only
         var oRb = null;                           // i18n resource bundle
         var oAIPopoverRef = { popover: null };    // Mutable ref for lazy-loaded AINotice popover
+        // Built fresh on every AI submit by walking the rendered ObjectPage controls.
+        // Re-built each time so it reflects the latest edit-mode SmartField state,
+        // including extension fragment fields and custom fields.
+        var oOPStructureMap = null;
+        var mLiveEditable = null;
 
         // Collection state — tracks OData row contexts and property metadata for SmartTable collections
         var mCollectionState = {
@@ -67,6 +72,7 @@ sap.ui.define([
         };
 
         var mCollectionUpdates = Object.create(null); // { navProperty: [ rowUpdate ] } from AI response
+        var mRejectedNewRows = {};                     // { navProperty: "all"|"mixed" } — hoisted so mode-switch can access it
         var mLastFieldMapping = null;                  // retained so table sections can be re-rendered on mode switch
         var oTableStagingState = {
             mStagedRows: Object.create(null),
@@ -87,15 +93,11 @@ sap.ui.define([
             oRb = oController.getView().getModel("i18n").getResourceBundle();
             oObjectPageModel = oObjectPage.getModel();
 
-            // Initialize dialog model and deferred group once per view lifetime
             EasyFillDialogController.initDialogModel(oController, oObjectPageModel, EasyFillLayoutMode);
 
-            // Use the provided context override or fall back to the current OP binding context
             oObjectPageContext = oContext || oObjectPage.getBindingContext();
 
-            // Build the handler/formatter map that the dialog fragment binds to
             var oHandlers = _buildDialogHandlers();
-
             await EasyFillDialogController.openDialog(oController, oTemplateUtils, oHandlers);
         }
 
@@ -114,37 +116,23 @@ sap.ui.define([
                 // immediately on whatever SmartForms are currently in the DOM, and then
                 // again via fnOnFieldChange once the new SmartFields are rendered.
                 onSelectionChange: function(oEvent) {
-                    // Step 1: clean up table content injected for the CURRENT mode BEFORE the
-                    // model update. This ensures the OPL aggregation is free of manually-added
-                    // sections when the sections binding recreates controls for the new mode,
-                    // so getSections() in renderCollectionPreviews returns only bound sections.
                     var oOpl = oController.byId("EasyFillObjectPageLayout");
                     if (oOpl && mLastFieldMapping && Object.keys(mCollectionUpdates).length > 0) {
                         EasyFillTableRenderer.removeTableSections(oOpl);
                     }
 
-                    // Step 2: update model — this triggers the OPL sections binding to recreate
-                    // bound section controls for the new mode.
                     EasyFillDialogController.onSelectionChange(
-                        oEvent, oController, oTemplateUtils, oRb,
-                        EasyFillFieldCollector, EasyFillLayoutMode
+                        oEvent, oController,
+                        EasyFillFieldCollector, EasyFillLayoutMode, oOPStructureMap
                     );
+                    _populateAllVisibleGroups();
 
-                    // Step 3: re-render table previews for the new mode.
-                    // _removeTableSections is skipped inside renderCollectionPreviews because
-                    // bReuseStaging=true, since cleanup was already done in step 1 above.
                     if (mLastFieldMapping && Object.keys(mCollectionUpdates).length > 0) {
                         EasyFillTableRenderer.renderCollectionPreviews(
-                            mCollectionUpdates,
-                            mLastFieldMapping,
-                            [],
-                            oController,
-                            oRb,
-                            mCollectionState,
-                            oTableStagingState,
-                            oObjectPageModel,
-                            _validateFieldsAndUpdateConfirmState,
-                            true  // bReuseStaging — also skips re-cleanup (already done above)
+                            mCollectionUpdates, mLastFieldMapping, [],
+                            oController, oRb, mCollectionState, oTableStagingState,
+                            oObjectPageModel, _validateFieldsAndUpdateConfirmState,
+                            true, mRejectedNewRows
                         );
                     }
                     _validateFieldsAndUpdateConfirmState();
@@ -213,11 +201,6 @@ sap.ui.define([
                     EasyFillDialogController.closeDialog(oController);
                 },
 
-                // ── Field value formatter (binding expression builder) ────────────
-                formatFieldValue: function(sFieldName) {
-                    return "{" + sFieldName + "}";
-                },
-
                 // ── Submit user text to AI ────────────────────────────────────────
                 onEasyFillSubmitInputToAI: async function() {
                     await _handleAISubmit();
@@ -228,41 +211,6 @@ sap.ui.define([
                     _resetEasyFill(true);
                 },
 
-                // ── SmartForm group population formatter ──────────────────────────
-                populateSmartFields: function(sId, aFields, sEasyFillMode) {
-                    return EasyFillFormRenderer.populateSmartFields(
-                        sId, aFields, sEasyFillMode,
-                        oController,
-                        oTransientContextForEasyFill,
-                        oObjectPageContext,
-                        mUpdatableLookupMap,
-                        oDialogModel().getProperty("/llmData"),
-                        _validateFieldsAndUpdateConfirmState
-                    );
-                },
-
-                // ── Section visibility: hide SmartForm sections with no fields ──────────────
-                hasSectionFields: function(aFields, aChildren) {
-                    if (Array.isArray(aFields) && aFields.length > 0) {
-                        return true;
-                    }
-
-                    function hasFieldsInNode(oNode) {
-                        if (!oNode) {
-                            return false;
-                        }
-                        if (Array.isArray(oNode.fields) && oNode.fields.length > 0) {
-                            return true;
-                        }
-                        if (Array.isArray(oNode.children)) {
-                            return oNode.children.some(hasFieldsInNode);
-                        }
-                        return false;
-                    }
-
-                    return Array.isArray(aChildren) && aChildren.some(hasFieldsInNode);
-                },
-
                 // ── Fullscreen toggle ─────────────────────────────────────────────
                 onToggleFullScreen: function() {
                     EasyFillDialogController.onToggleFullScreen(oController);
@@ -286,8 +234,29 @@ sap.ui.define([
         async function _handleAISubmit() {
             var oModel = oDialogModel();
             oModel.setProperty("/isBusy", true);
-
-            // Build complete LLM field mapping (entity fields + collection fields)
+            try {
+
+            var sEntitySetName = oController.getOwnerComponent().getEntitySet();
+            var oEntityType = oTemplateUtils.oCommonUtils.getMetaModelEntityType(sEntitySetName);
+
+            // Walk the rendered ObjectPage to build structure map + editability in one pass.
+            // Uses findAggregatedObjects on the real FLP ObjectPage — confirmed approach:
+            // OP SmartFields created via AHModel.simplePath DO expose getBindingInfo("value").path.
+            // Walking up the parent chain gives section/group context without reading annotations.
+            // Fallback: if walk produces no fields (edge case), retains previous map.
+            // Single walk of the rendered ObjectPage — same proven approach as buildLiveEditabilityMap.
+            // Called here (in edit mode, after entity context resolves) so getBindingInfo("value").path
+            // is available. Produces section/group/field structure AND live editability in one pass.
+            // Annotation fallback kicks in automatically if rendered walk finds nothing.
+            var oFreshMap = EasyFillFieldCollector.buildObjectPageStructureMap(oObjectPage, oEntityType, oRb);
+            oOPStructureMap = oFreshMap;
+            mLiveEditable   = oFreshMap.liveEditable;
+
+            // Build complete LLM field mapping (entity fields + collection fields).
+            // All visible fields are sent to the LLM — including read-only ones —
+            // so the LLM can return suggestions for every field.
+            // mLiveEditable is used AFTER the LLM responds (in getUpdatableAndNonUpdatableFields)
+            // to classify returned fields as editable (Filled Fields) or read-only (Unfilled Fields).
             var mFieldMapping = EasyFillAIOrchestrator.buildFieldMapping(
                 oTemplateUtils, oController, oObjectPage, oObjectPageModel,
                 oObjectPageContext, EasyFillFieldCollector, mCollectionState
@@ -300,9 +269,6 @@ sap.ui.define([
                 oTemplateUtils
             );
 
-            // Reset editable fields tracker for fresh population
-            oModel.setProperty("/isBusy", false);
-
             // Convert date strings in AI response to JS Date objects
             EasyFillAIOrchestrator.formatDateValues(aiCallResult, mFieldMapping);
 
@@ -319,68 +285,49 @@ sap.ui.define([
                 var collectionFields = oSplitResult.collectionFields;
 
                 // Separate updatable from non-updatable fields
-                var sEntitySetName = oController.getOwnerComponent().getEntitySet();
-                var oEntityType = oTemplateUtils.oCommonUtils.getMetaModelEntityType(sEntitySetName);
                 var oMetaModel = oObjectPageModel.getMetaModel();
                 var oEntitySet = oMetaModel.getODataEntitySet(sEntitySetName);
                 var oSplit = EasyFillFieldCollector.getUpdatableAndNonUpdatableFields(
-                    simpleFields, oEntityType, oObjectPageContext, oEntitySet
+                    simpleFields, oEntityType, oObjectPageContext, oEntitySet, mLiveEditable
                 );
                 mUpdatableLookupMap = oSplit.updatableFields;
                 var mNonUpdatableFields = oSplit.nonUpdatableFields;
 
-                // Build section tree for selected view mode
-                var aData = (sSelectedKey === EasyFillLayoutMode.CondensedMode)
-                    ? EasyFillFieldCollector.getSectionsForCondensedView(simpleFields, mUpdatableLookupMap, mNonUpdatableFields)
-                    : EasyFillFieldCollector.getSectionsForObjectPageView(oEntityType, simpleFields, oRb, mNonUpdatableFields);
-
-                // Reset form (destroy previous SmartForm content + revert table staging)
-                // then create a fresh transient context for the new AI result.
-                // Restore the user's chosen layout mode afterwards because _resetEasyFill
-                // unconditionally resets it to CondensedMode — without this, renderCollectionPreviews
-                // would see the wrong mode and embed table sections inside the SmartForm SubSection
-                // instead of adding them as standalone OPL sections (OP mode) or vice-versa.
+                // Compute sections array for the selected view mode.
+                // Condensed: two flat groups from scratch.
+                // OP mode: O(fields) pass over the pre-built structure map — no annotation re-walk.
+                var aSections = (sSelectedKey === EasyFillLayoutMode.CondensedMode || !oOPStructureMap)
+                    ? EasyFillFieldCollector.getSectionInfoForCondensedMode(mUpdatableLookupMap, mNonUpdatableFields)
+                    : EasyFillFieldCollector.applyLLMResultToStructureMap(
+                        oOPStructureMap.fieldMap, oOPStructureMap.sections,
+                        mUpdatableLookupMap, mNonUpdatableFields
+                    );
+
                 _resetEasyFill();
                 oModel.setProperty("/easyFillMode", sSelectedKey);
                 oTransientContextForEasyFill = EasyFillFormRenderer.makeTransientContext(
                     null, oObjectPageModel, oController
                 );
 
-                // Update dialog model with section data and AI result.
-                // llmData must be set BEFORE sections so that when the sections binding fires
-                // and triggers the populateSmartFields formatter synchronously, the AI-suggested
-                // values are already available and can be written to the transient context.
-                oModel.setProperty("/llmData", simpleFields);
-                oModel.setProperty("/updatableFields", mUpdatableLookupMap);
-                oModel.setProperty("/nonUpdatableFields", mNonUpdatableFields);
-                oModel.setProperty("/sections", aData);
+                oModel.setProperty("/llmData",              simpleFields);
+                oModel.setProperty("/updatableFields",      mUpdatableLookupMap);
+                oModel.setProperty("/nonUpdatableFields",   mNonUpdatableFields);
+                oModel.setProperty("/sections",             aSections);
                 oModel.setProperty("/hasNonUpdatableFields", Object.keys(mNonUpdatableFields).length > 0);
-
-                // Show warning if AI attempted to add multiple new rows but only one was accepted
                 oModel.setProperty("/attemptedMultipleNewRows", oSplitResult.attemptedMultipleNewRows === true);
+                _populateAllVisibleGroups();
 
-                // Process collection/table updates
                 mCollectionUpdates = collectionFields;
                 mLastFieldMapping = mFieldMapping;
-                var mRejectedNewRows = oSplitResult.collectionsWithRejectedNewRows || {};
-                // hasTableUpdates is true when there are accepted updates OR rejected-only tables to show
+                mRejectedNewRows = oSplitResult.collectionsWithRejectedNewRows || {};
                 var bHasTableUpdates = Object.keys(mCollectionUpdates).length > 0 ||
                     Object.keys(mRejectedNewRows).length > 0;
                 oModel.setProperty("/hasTableUpdates", bHasTableUpdates);
 
-                // Render collection previews into the table preview container
                 EasyFillTableRenderer.renderCollectionPreviews(
-                    mCollectionUpdates,
-                    mFieldMapping,
-                    [],
-                    oController,
-                    oRb,
-                    mCollectionState,
-                    oTableStagingState,
-                    oObjectPageModel,
-                    _validateFieldsAndUpdateConfirmState,
-                    false,
-                    mRejectedNewRows
+                    mCollectionUpdates, mFieldMapping, [],
+                    oController, oRb, mCollectionState, oTableStagingState,
+                    oObjectPageModel, _validateFieldsAndUpdateConfirmState, false, mRejectedNewRows
                 );
 
                 _validateFieldsAndUpdateConfirmState();
@@ -397,6 +344,9 @@ sap.ui.define([
                 // AI call failed — show error illustration
                 oModel.setProperty("/stateType", "Error");
             }
+            } finally {
+                oModel.setProperty("/isBusy", false);
+            }
         }
 
         /**
@@ -417,41 +367,61 @@ sap.ui.define([
                 return true;
             }
 
-            // Collect one Promise<errorArray> per SmartForm found in the layout
-            var aCheckPromises = [];
-            oObjectPageLayout.getSections().forEach(function(oSection) {
-                oSection.getSubSections().forEach(function(oSubSection) {
-                    oSubSection.getBlocks().forEach(function(oBlock) {
-                        var aSmartFormCandidates = [];
-                        if (oBlock.isA("sap.ui.comp.smartform.SmartForm")) {
-                            aSmartFormCandidates.push(oBlock);
-                        } else if (typeof oBlock.getItems === "function") {
-                            // In condensed mode the SmartForm is nested inside a wrapper VBox;
-                            // look one level deeper to find it (mirrors EasyFillFormRenderer).
-                            oBlock.getItems().forEach(function(oItem) {
-                                if (oItem.isA("sap.ui.comp.smartform.SmartForm")) {
-                                    aSmartFormCandidates.push(oItem);
-                                }
-                            });
-                        }
-                        aSmartFormCandidates.forEach(function(oSmartForm) {
-                            // .catch(() => []) absorbs internal SmartField metadata-promise rejections
-                            // that fire when SmartFields are destroyed during a mode switch.
-                            aCheckPromises.push(
-                                Promise.resolve(oSmartForm.check()).catch(function() { return []; })
-                            );
-                        });
-                    });
-                });
+            var aCheckPromises = EasyFillFormRenderer.collectSmartForms(oObjectPageLayout).map(async function(oSmartForm) {
+                try { return await oSmartForm.check(); } catch (e) { return []; }
             });
 
-            // Resolve all checks in parallel; valid only when every SmartForm has no errors
             var aResults = await Promise.all(aCheckPromises);
             return aResults.every(function(aErrors) {
-                return Array.isArray(aErrors) && aErrors.length === 0;
+                // SmartForm.check() with validationMode="Async" resolves with an array of
+                // error objects when invalid, or [] / null / true when valid.
+                // Array.isArray guard handles the non-array zero-error sentinel.
+                return Array.isArray(aErrors) ? aErrors.length === 0 : !aErrors || aErrors === true;
             });
         }
 
+        /**
+         * Walks the current easyFillDialogModel>/sections array and calls
+         * EasyFillFormRenderer.populateGroupFields for every visible group that has
+         * activeFields. Deferred by setTimeout(0) so the sections= and groups= bindings
+         * have finished creating their controls before we try to find them.
+         */
+        function _populateAllVisibleGroups() {
+            setTimeout(function() {
+                var aSections = oDialogModel().getProperty("/sections") || [];
+                var oLLMData  = oDialogModel().getProperty("/llmData")  || {};
+                aSections.forEach(function(oSection) {
+                    if (!oSection.visible) { return; }
+                    (oSection.children || []).forEach(function(oGroup) {
+                        var aFields = Array.isArray(oGroup.aActiveFields) && oGroup.aActiveFields.length
+                            ? oGroup.aActiveFields : (oGroup.fields || []);
+                        if (!oGroup.visible || !aFields.length) { return; }
+                        EasyFillFormRenderer.populateGroupFields(
+                            oGroup.id, aFields,
+                            oController,
+                            oTransientContextForEasyFill,
+                            oObjectPageContext,
+                            mUpdatableLookupMap,
+                            oLLMData,
+                            _validateFieldsAndUpdateConfirmState
+                        );
+                    });
+                });
+            }, 0);
+        }
+
+        /**
+         * Destroys all GroupElements in every visible SmartForm group — called by _resetEasyFill.
+         */
+        function _destroyAllGroupElements() {
+            EasyFillFormRenderer.collectSmartForms(oController.byId("EasyFillObjectPageLayout"))
+                .forEach(function(oForm) {
+                    oForm.getGroups().forEach(function(oGroup) {
+                        oGroup.destroyGroupElements();
+                    });
+                });
+        }
+
         /**
          * Re-computes isSaveEnabled from the combined SmartForm and table SmartField validity
          * flag. Called as the single source of truth for the Confirm button state.
@@ -551,6 +521,10 @@ sap.ui.define([
          */
         function _resetEasyFill(bRemoveTextAreaValue) {
             mLastFieldMapping = null;
+            mRejectedNewRows  = {};
+            // mUpdatableLookupMap is NOT reset here — it is overwritten by the next AI submit
+            // and explicitly cleared by EasyFillApplyHandler.resetEasyFill on Clear All / Cancel
+            _destroyAllGroupElements();
             EasyFillApplyHandler.resetEasyFill(
                 !!bRemoveTextAreaValue,
                 oDialogModel(),
@@ -584,20 +558,14 @@ sap.ui.define([
 
             // Collect all editable SmartFields from the EasyFill dialog SmartForms
             var aEditableFields = [];
-            oObjectPageLayout.getSections().forEach(function(oSection) {
-                oSection.getSubSections().forEach(function(oSubSection) {
-                    oSubSection.getBlocks().forEach(function(oBlock) {
-                        if (oBlock.isA("sap.ui.comp.smartform.SmartForm")) {
-                            oBlock.getGroups().forEach(function(oGroup) {
-                                oGroup.getGroupElements().forEach(function(oGroupElement) {
-                                    oGroupElement.getElements().forEach(function(oElement) {
-                                        if (oElement.isA && oElement.isA("sap.ui.comp.smartfield.SmartField") && oElement.getEditable()) {
-                                            aEditableFields.push(oElement);
-                                        }
-                                    });
-                                });
-                            });
-                        }
+            EasyFillFormRenderer.collectSmartForms(oObjectPageLayout).forEach(function(oSmartForm) {
+                oSmartForm.getGroups().forEach(function(oGroup) {
+                    oGroup.getGroupElements().forEach(function(oGroupElement) {
+                        oGroupElement.getElements().forEach(function(oElement) {
+                            if (oElement.isA && oElement.isA("sap.ui.comp.smartfield.SmartField") && oElement.getEditable()) {
+                                aEditableFields.push(oElement);
+                            }
+                        });
                     });
                 });
             });
@@ -712,8 +680,10 @@ sap.ui.define([
          * CRUDManager.addEntry directly ensures the SmartTable binding is refreshed and side
          * effects are executed after the row is created — without that refresh the ObjectPage
          * table would not show the newly created row.
+         * Multiple new rows per table are created sequentially to avoid race conditions on
+         * the draft document.
          *
-         * @param {object} mNewRowValues - map of { navProperty: plainValuesObject }
+         * @param {object} mNewRowValues - map of { navProperty: plainValuesObject[] }
          * @returns {Promise<void>}
          */
         async function _createNewRows(mNewRowValues) {
@@ -729,13 +699,17 @@ sap.ui.define([
                 if (!oSmartTable) {
                     continue;
                 }
-                try {
-                    // bSuppressNavigation=true: stay on the OP (don't navigate to the new sub-item).
-                    // bIgnoreTableRefresh not passed (undefined/falsy): the SmartTable binding is
-                    // refreshed and side effects are executed so the new row becomes visible.
-                    await oTemplateUtils.oCommonEventHandlers.addEntry(oSmartTable, true, undefined, mNewRowValues[sNavProp]);
-                } catch (e) {
-                    // addEntry handles its own error messaging via CommonEventHandlers/CRUDManager
+                var aRowValues = mNewRowValues[sNavProp];
+                // aRowValues is now an array — iterate and create each row sequentially
+                if (!Array.isArray(aRowValues)) {
+                    aRowValues = [aRowValues];
+                }
+                for (var j = 0; j < aRowValues.length; j++) {
+                    try {
+                        await oTemplateUtils.oCommonEventHandlers.addEntry(oSmartTable, true, undefined, aRowValues[j]);
+                    } catch (e) {
+                        // addEntry handles its own error messaging via CommonEventHandlers/CRUDManager
+                    }
                 }
             }
         }