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

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

@@ -47,23 +47,40 @@ sap.ui.define([
          * @param {object} oLLMData - flat map of { fieldName: aiValue } from the LLM response
          * @returns {boolean} always returns true (used as a formatter return value in XML)
          */
-        populateSmartFields: function(sId, aFields, sEasyFillMode, oController, oTransientContextForEasyFill, oObjectPageContext, mUpdatableLookupMap, oLLMData) {
+        populateSmartFields: function(sId, aFields, sEasyFillMode, oController, oTransientContextForEasyFill, oObjectPageContext, mUpdatableLookupMap, oLLMData, fnOnFieldChange) {
             var oObjectPageLayout = oController.byId("EasyFillObjectPageLayout");
             if (!oObjectPageLayout || !Array.isArray(aFields) || aFields.length === 0) {
                 return true;
             }
 
+            var sPreviouslyLabel = oController.getView().getModel("i18n").getResourceBundle().getText("EASY_FILL_PREVIOUSLY_LABEL");
+
             // Defer injection until after the SmartForm has rendered into the DOM
             setTimeout(function() {
                 var oTargetGroup = null;
 
                 // Walk the ObjectPageLayout section hierarchy to find the group
-                // matching the given CustomData "id" value
+                // matching the given CustomData "id" value.
+                // In condensed mode the SmartForm may be nested inside a wrapper VBox
+                // (used to prevent BlockLayout from placing the table side-by-side with
+                // the SmartForm on resize). We therefore check one level deeper when the
+                // direct block is not a SmartForm.
                 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")) {
-                                oBlock.getGroups().forEach(function(oGroup) {
+                                aSmartFormCandidates.push(oBlock);
+                            } else if (typeof oBlock.getItems === "function") {
+                                // Look one level inside (e.g. condensed-mode wrapper VBox)
+                                oBlock.getItems().forEach(function(oItem) {
+                                    if (oItem.isA("sap.ui.comp.smartform.SmartForm")) {
+                                        aSmartFormCandidates.push(oItem);
+                                    }
+                                });
+                            }
+                            aSmartFormCandidates.forEach(function(oSmartForm) {
+                                oSmartForm.getGroups().forEach(function(oGroup) {
                                     var oMatchedCustomData = oGroup.getCustomData().find(function(oData) {
                                         return oData.getKey() === "id" && oData.getValue() === sId;
                                     });
@@ -71,7 +88,7 @@ sap.ui.define([
                                         oTargetGroup = oGroup;
                                     }
                                 });
-                            }
+                            });
                         });
                     });
                 });
@@ -85,7 +102,7 @@ sap.ui.define([
                 oTargetGroup.destroyGroupElements();
 
                 aFields.forEach(function(sKey) {
-                    var bIsEditable = mUpdatableLookupMap && !!mUpdatableLookupMap[sKey];
+                    var bIsEditable = Object.prototype.hasOwnProperty.call(mUpdatableLookupMap || {}, sKey);
 
                     var oGroupElement = new GroupElement({
                         useHorizontalLayout: false
@@ -114,6 +131,56 @@ sap.ui.define([
                         }
                     });
 
+                    if (!bIsEditable) {
+                        // Keep read-only behavior, but render like an input field (v4-like visual parity)
+                        oSmartField.addStyleClass("sapUiEasyFillReadOnlyInputLike sapMInputBaseContentWrapper");
+                    }
+
+                    // Notify on user edits so SmartForm validity can re-gate the Confirm button.
+                    if (bIsEditable && typeof fnOnFieldChange === "function") {
+                        oSmartField.attachChange(fnOnFieldChange);
+
+                        // Validate AI-seeded values on initial load — mirrors ObjectPage behaviour.
+                        //
+                        // In the OP, validation triggers because when a user TYPES a value the browser
+                        // fires a change event which causes UI5 to call setExternalValue() on the inner
+                        // control's binding. setExternalValue() has no fast-path: it always calls
+                        // parseValue → validateValue → OData value-list lookup. If the lookup fails the
+                        // binding calls setInvalidValue() + checkDataState() → ManagedObject fires
+                        // validationError → inner control gets valueState="Error" (red mark).
+                        //
+                        // SmartForm.check() / SmartField.checkValuesValidity() do NOT work for
+                        // AI-seeded values because SmartField._checkErrors() contains a fast-path:
+                        //   if (!isControlDirty() && formattedModelValue === displayedValue) → skip
+                        // AI values always satisfy this (model = display = AI value, user never typed),
+                        // so _checkErrors() short-circuits to "valid" without the OData lookup.
+                        //
+                        // Fix: after innerControlsCreated, call setExternalValue() on the inner
+                        // control's own binding with the currently displayed value. This is exactly
+                        // the same path the OP uses when the user types. For async types (TextArrangement
+                        // with ValueList) the call starts the OData lookup:
+                        //   valid value   → resolves quietly, no red mark
+                        //   invalid value → rejects → setInvalidValue + checkDataState → red mark
+                        // Non-async types fall through to a plain fnOnFieldChange call because
+                        // SmartForm.check() already handles them correctly (no fast-path for sync).
+                        oSmartField.attachInnerControlsCreated(function() {
+                            var oInnerControl = oSmartField.getFirstInnerControl();
+                            if (oInnerControl && typeof oInnerControl.getValue === "function") {
+                                var oBinding = oInnerControl.getBinding("value");
+                                var oType = oBinding && typeof oBinding.getType === "function" && oBinding.getType();
+                                if (oType && oType.async && typeof oBinding.setExternalValue === "function") {
+                                    // setExternalValue replicates the "user typed this value" path:
+                                    // parseValue → validateValue → OData lookup → validationError/Success
+                                    Promise.resolve(oBinding.setExternalValue(oInnerControl.getValue()))
+                                        .catch(Function.prototype)
+                                        .finally(fnOnFieldChange);
+                                    return;
+                                }
+                            }
+                            fnOnFieldChange();
+                        });
+                    }
+
                     /**
                      * "Previously:" SmartField (read-only):
                      * - Only shown for editable fields to display the current OP value for comparison
@@ -125,10 +192,9 @@ sap.ui.define([
                         enabled: false,
                         contextEditable: false,
                         showLabel: false,
-                        visible: bIsEditable,
                         layoutData: new ColumnElementData({
                             cellsSmall: 9,
-                            cellsLarge: 10
+                            cellsLarge: 9
                         }),
                         editableChanged: function(oEvent) {
                             // Always keep the "previously" field read-only
@@ -138,33 +204,42 @@ sap.ui.define([
                         }
                     });
 
-                    if (bIsEditable) {
-                        // Editable fields: primary field uses transient context (AI value),
-                        // preview field uses original OP context (current value)
+                    if (oTransientContextForEasyFill) {
+                        // Primary field always uses transient context to show AI-proposed value.
+                        // Field editability is controlled by bIsEditable.
                         oSmartField.setBindingContext(oTransientContextForEasyFill);
-                        oSmartFieldPrev.setBindingContext(oObjectPageContext);
 
-                        // Set the AI-suggested value on the transient context for this field
-                        oTransientContextForEasyFill.setProperty(sKey, oLLMData[sKey]);
+                        // Only seed the transient context with the AI-suggested value on the first
+                        // population. On subsequent calls (e.g. mode switch), the transient context
+                        // already holds the current value — overwriting it would discard user edits.
+                        if (oTransientContextForEasyFill.getProperty(sKey) === undefined) {
+                            oTransientContextForEasyFill.setProperty(sKey, oLLMData[sKey]);
+                        }
                     } else {
-                        // Non-editable fields: bound to the original OP context, display only
+                        // Fallback: without transient context, bind to original OP context.
                         oSmartField.setBindingContext(oObjectPageContext);
                     }
 
+                    // Previous value is always shown from the original ObjectPage context.
+                    oSmartFieldPrev.setBindingContext(oObjectPageContext);
+
                     // Build the GroupElement: [label+primary SmartField] [Previously: label] [preview SmartField]
                     oGroupElement.addElement(oSmartField); // SmartField provides the label
                     oGroupElement.addElement(new Text({
-                        text: "Previously:",
-                        visible: bIsEditable,
+                        text: sPreviouslyLabel,
                         layoutData: new ColumnElementData({
                             cellsSmall: 3,
-                            cellsLarge: 2
+                            cellsLarge: 3
                         })
-                    }));
+                    }).addStyleClass("sapEasyFillPreviouslyLabel"));
                     oGroupElement.addElement(oSmartFieldPrev);
                     oTargetGroup.addGroupElement(oGroupElement);
                 });
 
+                // Trigger initial SmartForm validation now that all SmartFields are rendered
+                if (typeof fnOnFieldChange === "function") {
+                    fnOnFieldChange();
+                }
                 oLogger.debug("populateSmartFields: populated " + aFields.length + " fields for group '" + sId + "'");
             }, 0);