@sapui5/sap.suite.ui.generic.template 1.151.0 → 1.152.0

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

@@ -1,7 +1,8 @@
 sap.ui.define([
     "sap/suite/ui/generic/template/genericUtilities/FeLogger",
-    "sap/suite/ui/generic/template/genericUtilities/FeError"
-], function(FeLogger, FeError) {
+    "sap/suite/ui/generic/template/genericUtilities/FeError",
+    "sap/suite/ui/generic/template/lib/ai/EasyFill/EasyFillFieldCollector"
+], function(FeLogger, FeError, EasyFillFieldCollector) {
     "use strict";
 
     var sClassName = "lib.ai.EasyFill.EasyFillApplyHandler";
@@ -45,7 +46,8 @@ sap.ui.define([
 
             // Copy each AI-suggested property value from the transient context to the live OP context
             for (var sProp in oTransientObject) {
-                if (sProp !== "__metadata" && mUpdatableLookupMap[sProp]) {
+                if (!Object.prototype.hasOwnProperty.call(oTransientObject, sProp)) { continue; }
+                if (sProp !== "__metadata" && Object.prototype.hasOwnProperty.call(mUpdatableLookupMap, sProp)) {
                     oObjectPageContext.setProperty(sProp, oTransientObject[sProp]);
                     iApplied++;
                 }
@@ -84,7 +86,7 @@ sap.ui.define([
          *
          * @param {object} oTableStagingState - table staging state { mPendingNewRowContexts }
          * @param {object} mCollectionState - collection tracking state (mCollectionProperties)
-         * @returns {object} map of { navProperty: plainValuesObject }
+         * @returns {object} map of { navProperty: plainValuesObject[] }
          */
         extractPendingNewRowValues: function(oTableStagingState, mCollectionState) {
             var mNewRowValues = Object.create(null);
@@ -96,18 +98,20 @@ sap.ui.define([
                 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;
-                    }
+                // Extract scalar values for ALL new row contexts — multiple row creation is supported
+                var aRowValues = aNewContexts.map(function(oNewContext) {
+                    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;
+                        }
+                    });
+                    return oValues;
                 });
-                mNewRowValues[sCollectionName] = oValues;
-                oLogger.debug("extractPendingNewRowValues: extracted " + Object.keys(oValues).length +
-                    " value(s) for new row in '" + sCollectionName + "'");
+                mNewRowValues[sCollectionName] = aRowValues;
+                oLogger.debug("extractPendingNewRowValues: extracted " + aRowValues.length +
+                    " new row(s) for '" + sCollectionName + "'");
             });
             return mNewRowValues;
         },
@@ -208,7 +212,6 @@ sap.ui.define([
          * @param {function} fnResetTransientContext - EasyFillFormRenderer.resetTransientContext
          */
         resetEasyFill: function(bRemoveTextAreaValue, oDialogModel, oController, mCollectionUpdates, oEasyFillLayoutMode, fnRevertStagedUpdates, fnResetTransientContext) {
-            // Remove dynamically-added table ObjectPageSections from the shared OPL
             var sTableSectionMarker = "easyfillTableSection";
             var oObjectPageLayout = oController.byId("EasyFillObjectPageLayout");
             if (oObjectPageLayout) {
@@ -222,13 +225,9 @@ sap.ui.define([
                 });
             }
 
-            // Revert any staged table row values back to original
             fnRevertStagedUpdates();
-
-            // Reset the transient context (discard all staged scalar AI values)
             fnResetTransientContext();
 
-            // Reset all dialog model properties to their initial state
             oDialogModel.setProperty("/isFormVisible", false);
             oDialogModel.setProperty("/isIllustrationVisible", true);
             oDialogModel.setProperty("/isSaveEnabled", false);
@@ -246,16 +245,13 @@ sap.ui.define([
             oDialogModel.setProperty("/nonUpdatableFields", {});
             oDialogModel.setProperty("/hasNonUpdatableFields", false);
 
-            // Clear the mutable collection updates map in place
             Object.keys(mCollectionUpdates).forEach(function(sKey) {
                 delete mCollectionUpdates[sKey];
             });
 
             if (bRemoveTextAreaValue) {
                 var oTextArea = oController.byId("EasyFillInputTextArea");
-                if (oTextArea) {
-                    oTextArea.setValue("");
-                }
+                if (oTextArea) { oTextArea.setValue(""); }
                 oDialogModel.setProperty("/isEasyFillButtonEnabled", false);
             }
 
@@ -289,30 +285,15 @@ sap.ui.define([
         },
 
         _isEditableProperty: function(oPropertyMeta, oRowObject) {
-            if (!oPropertyMeta) {
-                return false;
-            }
-            var sUpdatable = oPropertyMeta["sap:updatable"];
-            if (sUpdatable) {
-                return sUpdatable !== "false";
-            }
-            var oAnnotation = oPropertyMeta["com.sap.vocabularies.Common.v1.FieldControl"];
-            if (oAnnotation && oAnnotation["EnumMember"]) {
-                return oAnnotation["EnumMember"] !== "com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly";
-            }
-            var sFieldControl = oPropertyMeta["sap:field-control"];
-            if (sFieldControl) {
-                var iFieldControlValue = oRowObject && oRowObject[sFieldControl];
-                return iFieldControlValue !== 1;
-            }
-            return true;
+            return EasyFillFieldCollector.isEditableByContextObject(oPropertyMeta, oRowObject, undefined);
         },
 
         _isSupportedStagedValue: function(vValue) {
-            return vValue === null ||
-                vValue === undefined ||
+            return vValue !== undefined && (
+                vValue === null ||
                 typeof vValue !== "object" ||
-                vValue instanceof Date;
+                vValue instanceof Date
+            );
         },
 
         _areValuesEqual: function(vLeft, vRight) {

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

@@ -2,9 +2,8 @@ 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",
     "sap/ui/core/ResizeHandler"
-], function(JSONModel, MessageToast, FeLogger, FeError, ResizeHandler) {
+], function(JSONModel, MessageToast, FeLogger, ResizeHandler) {
     "use strict";
 
     var sClassName = "lib.ai.EasyFill.EasyFillDialogController";
@@ -76,57 +75,74 @@ sap.ui.define([
 
         /**
          * Loads the EasyFillDialog fragment (if not already loaded) and opens it.
-         * Registers all event handlers and formatters on the fragment controller object.
+         * Uses getDialogFragmentAsync with keepAlive=true so the fragment is cached
+         * across opens — the OPL and SmartForm controls persist between invocations.
+         * A concurrent-open guard prevents the duplicate-ID error when the button is
+         * pressed before the first load completes.
          *
-         * The dialog is kept alive after first open (not destroyed on close) so that the
-         * ObjectPageLayout and SmartForm structures are preserved between invocations.
-         *
-         * @param {object} oController - MVC controller
-         * @param {object} oTemplateUtils - FE template utilities (used for getDialogFragmentAsync)
-         * @param {object} oHandlers - map of event handler and formatter functions to bind to the fragment
-         * @returns {Promise<void>}
+         * @param {object} oController   - MVC controller
+         * @param {object} oTemplateUtils - FE template utilities
+         * @param {object} oHandlers     - event handler / formatter map
          */
-        openDialog: function(oController, oTemplateUtils, oHandlers) {
+        openDialog: async function(oController, oTemplateUtils, oHandlers) {
             var sFragmentName = "sap.suite.ui.generic.template.lib.ai.EasyFill.fragments.EasyFillDialog";
+            var oView = oController.getView();
 
-            return oTemplateUtils.oCommonUtils.getDialogFragmentAsync(
-                sFragmentName,
-                oHandlers,
-                "easyFillPopup",
-                undefined,
-                true,  // keep alive — do not destroy on close
-                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%");
-                                }
-                            });
-                        }
-                    });
+            // Guard: if a load is already in flight (concurrent button press) wait for it
+            if (oView._mEasyFillFragmentPromise) {
+                var oDialogPending;
+                try {
+                    oDialogPending = await oView._mEasyFillFragmentPromise;
+                } catch (e) {
+                    oLogger.error("openDialog: concurrent fragment load failed: " + e);
+                    return;
                 }
+                if (oDialogPending) { oDialogPending.open(); }
+                return;
+            }
+
+            // Store the in-flight promise before the first await so re-entrant calls
+            // hit the guard above instead of starting a second Fragment.load().
+            oView._mEasyFillFragmentPromise = oTemplateUtils.oCommonUtils.getDialogFragmentAsync(
+                sFragmentName, oHandlers, "easyFillPopup", undefined,
+                true,   // keepAlive — do not destroy on close
+                true    // use view as parent
+            );
+
+            var oDialog;
+            try {
+                oDialog = await oView._mEasyFillFragmentPromise;
+            } finally {
+                oView._mEasyFillFragmentPromise = null;  // always clear in-flight marker
+            }
 
-                oLogger.debug("openDialog: EasyFillDialog opened");
+            if (!oDialog) { return; }  // guard: load rejected, nothing to open
+
+            oDialog.open();
+
+            if (!oDialog._easyFillResizeHandlerId) {
+                this._registerResizeHandler(oController, oDialog);
+            }
+            oLogger.debug("openDialog: EasyFillDialog opened");
+        },
+
+        _registerResizeHandler: function(oController, oDialog) {
+            oDialog.attachEventOnce("afterOpen", function() {
+                var oSplitter = oController.byId("EasyFillMainFlex") &&
+                    oController.byId("EasyFillMainFlex").findAggregatedObjects(true, function(o) {
+                        return o.isA("sap.ui.layout.ResponsiveSplitter");
+                    })[0];
+                if (!oSplitter) { return; }
+                var oDialogModel = oController.getView().getModel("easyFillDialogModel");
+                oDialog._easyFillResizeHandlerId = ResizeHandler.register(oSplitter, function() {
+                    var bInPageMode = oSplitter.$().hasClass("sapUiRSVisiblePaginator");
+                    oDialogModel.setProperty("/isSplitterPageMode", bInPageMode);
+                    if (bInPageMode && !oDialogModel.getProperty("/isFullScreen")) {
+                        oDialogModel.setProperty("/isFullScreen", true);
+                        oController.byId("inputAreaSplitPane").getLayoutData().setSize("40%");
+                        oController.byId("reviewAreaSplitPane").getLayoutData().setSize("60%");
+                    }
+                });
             });
         },
 
@@ -158,27 +174,27 @@ sap.ui.define([
          * @param {object} oFieldCollector - EasyFillFieldCollector
          * @param {object} oEasyFillLayoutMode - EasyFillLayoutMode enum
          */
-        onSelectionChange: function(oEvent, oController, oTemplateUtils, oRb, oFieldCollector, oEasyFillLayoutMode) {
+        onSelectionChange: function(oEvent, oController, oFieldCollector, oEasyFillLayoutMode, oOPStructureMap) {
             var sSelectedKey = oEvent.getSource().getSelectedKey();
             var oDialogModel = oController.getView().getModel("easyFillDialogModel");
-            var oEntityType = oTemplateUtils.oCommonUtils.getMetaModelEntityType(
-                oController.getOwnerComponent().getEntitySet()
-            );
             oDialogModel.setProperty("/easyFillMode", sSelectedKey);
-            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 oStoredUpdatable    = oDialogModel.getProperty("/updatableFields")    || {};
             var oNonUpdatableFields = oDialogModel.getProperty("/nonUpdatableFields") || {};
-            var aData = (sSelectedKey === oEasyFillLayoutMode.CondensedMode)
-                ? oFieldCollector.getSectionsForCondensedView(oLLMResult, oUpdatableFields, oNonUpdatableFields)
-                : oFieldCollector.getSectionsForObjectPageView(oEntityType, oLLMResult, oRb, oNonUpdatableFields);
-            oDialogModel.setProperty("/sections", aData);
+
+            var aSections;
+            if (sSelectedKey === oEasyFillLayoutMode.CondensedMode) {
+                aSections = oFieldCollector.getSectionInfoForCondensedMode(oStoredUpdatable, oNonUpdatableFields);
+            } else if (oOPStructureMap) {
+                aSections = oFieldCollector.applyLLMResultToStructureMap(
+                    oOPStructureMap.fieldMap, oOPStructureMap.sections,
+                    oStoredUpdatable, oNonUpdatableFields
+                );
+            } else {
+                aSections = oFieldCollector.getSectionInfoForCondensedMode(oStoredUpdatable, oNonUpdatableFields);
+                oLogger.warning("onSelectionChange: oOPStructureMap not available");
+            }
+            oDialogModel.setProperty("/sections", aSections);
         },
 
         /**