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

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

@@ -1,5 +1,6 @@
 sap.ui.define([
     "sap/ui/comp/smartfield/SmartField",
+    "sap/m/Button",
     "sap/m/GenericTag",
     "sap/m/MessageStrip",
     "sap/m/Text",
@@ -16,8 +17,8 @@ sap.ui.define([
     "sap/uxap/ObjectPageSubSection",
     "sap/ui/core/CustomData",
     "sap/suite/ui/generic/template/genericUtilities/FeLogger",
-    "sap/suite/ui/generic/template/genericUtilities/FeError"
-], function(SmartField, GenericTag, MessageStrip, Text, Title, Table, Column, ColumnListItem, VBox, HBox, ScrollContainer, SegmentedButton, SegmentedButtonItem, ObjectPageSection, ObjectPageSubSection, CustomData, FeLogger, FeError) {
+    "sap/suite/ui/generic/template/lib/ai/EasyFill/EasyFillFieldCollector"
+], function(SmartField, Button, GenericTag, MessageStrip, Text, Title, Table, Column, ColumnListItem, VBox, HBox, ScrollContainer, SegmentedButton, SegmentedButtonItem, ObjectPageSection, ObjectPageSubSection, CustomData, FeLogger, EasyFillFieldCollector) {
     "use strict";
 
     var sClassName = "lib.ai.EasyFill.EasyFillTableRenderer";
@@ -39,14 +40,8 @@ sap.ui.define([
      * 1. Creates transient OData row contexts for preview rendering.
      * 2. Creates a "Previous Values" read-only table and a "New Values" editable SmartField table.
      * 3. Renders a SegmentedButton toggle between the two views.
-     * 4. Injects each collection as an ObjectPageSection into the shared EasyFillObjectPageLayout
-     *    so the OPL header and anchor bar remain visible while scrolling through table content.
+     * 4. Injects each collection as an ObjectPageSection into the shared EasyFillObjectPageLayout.
      * 5. Provides reset logic to discard staged values if the user cancels.
-     *
-     * Create mode:
-     * - Rows without _rowIndex or _contextPath are treated as new rows.
-     * - New rows are rendered as editable SmartField rows highlighted with "Information" row highlight.
-     * - Transient contexts for new rows are stored in oTableStagingState.mPendingNewRowContexts.
      * - On confirm, EasyFillApplyHandler activates these contexts via submitChanges.
      * - Only one new row per table is created (extra new rows are suppressed upstream).
      */
@@ -78,10 +73,6 @@ sap.ui.define([
                 return;
             }
 
-            // Remove previously injected table content before re-rendering.
-            // On mode switch (bReuseStaging=true) cleanup is done BEFORE the model update
-            // in onSelectionChange, so we skip it here to avoid operating on the already-fresh OPL.
-            // On first render (bReuseStaging=false) we do the cleanup here.
             if (!bReuseStaging) {
                 this._removeTableSections(oObjectPageLayout);
             }
@@ -108,7 +99,7 @@ sap.ui.define([
             // Bound sections always have a "easyFillDialogModel" binding context; manually-added
             // ones never do, so there is no ambiguity.
             var oFilledFieldsSubSection = null;  // condensed mode: add table as block inside here
-            var oUnfilledFieldsSection   = null;  // OP mode: insert standalone section before this
+            var oUnfilledFieldsSection  = null;  // OP mode: insert standalone section before this
             oObjectPageLayout.getSections().forEach(function(oSection) {
                 var oCtx = oSection.getBindingContext("easyFillDialogModel");
                 if (!oCtx) { return; }
@@ -127,32 +118,26 @@ sap.ui.define([
 
             // iInsertOffset keeps multiple consecutive tables in the correct order when
             // inserting standalone sections before the Unfilled Fields section (OP mode).
+            // iBaseInsertIndex is captured ONCE before any insertions so it does not shift
+            // as tables are added — each table is inserted at base + offset, not re-queried.
+            var iBaseInsertIndex = oUnfilledFieldsSection
+                ? oObjectPageLayout.indexOfSection(oUnfilledFieldsSection) : -1;
             var iInsertOffset = 0;
-
             var that = this;
             var oRejected = mCollectionsWithRejectedNewRows || {};
 
-            // Render "all rejected" tables: AI only proposed new rows, creation not allowed.
-            // These collections have no entry in mCollectionUpdates so they need their own loop.
             Object.keys(oRejected).forEach(function(sCollectionName) {
-                if (oRejected[sCollectionName] !== "all") {
-                    return; // "mixed" is handled below alongside the diff table
-                }
+                if (oRejected[sCollectionName] !== "all") { return; }
                 var oCollectionMeta = mFieldMapping[sCollectionName];
                 var sTitle = (oCollectionMeta && oCollectionMeta.description) || sCollectionName;
-                var oStrip = new MessageStrip({
-                    text: oRb.getText("EASY_FILL_TABLE_NEW_ROW_NOT_ALLOWED"),
-                    type: "Warning",
-                    showIcon: true
-                });
+                var oStrip = new MessageStrip({ text: oRb.getText("EASY_FILL_TABLE_NEW_ROW_NOT_ALLOWED"), type: "Warning", showIcon: true });
                 var oNotifVBox = new VBox({ items: [oStrip] });
                 oNotifVBox.addCustomData(new CustomData({ key: sTableSectionMarker, value: "true" }));
                 var oNotifSubSection = new ObjectPageSubSection({ title: sTitle, titleUppercase: false, blocks: [oNotifVBox] });
                 var oNotifSection = new ObjectPageSection({ title: sTitle, titleUppercase: false, subSections: [oNotifSubSection] });
                 oNotifSection.addCustomData(new CustomData({ key: sTableSectionMarker, value: "true" }));
-                if (oUnfilledFieldsSection) {
-                    var iRejectedAt = oObjectPageLayout.indexOfSection(oUnfilledFieldsSection);
-                    oObjectPageLayout.insertSection(oNotifSection, iRejectedAt + iInsertOffset);
+                if (iBaseInsertIndex >= 0) {
+                    oObjectPageLayout.insertSection(oNotifSection, iBaseInsertIndex + iInsertOffset);
                     iInsertOffset++;
                 } else {
                     oObjectPageLayout.addSection(oNotifSection);
@@ -162,100 +147,136 @@ sap.ui.define([
 
             Object.keys(mCollectionUpdates).forEach(function(sCollectionName) {
                 var oCollectionMeta = mFieldMapping[sCollectionName];
-                if (!oCollectionMeta || !oCollectionMeta.itemProperties) {
-                    return;
-                }
-
+                if (!oCollectionMeta || !oCollectionMeta.itemProperties) { return; }
                 var aPropertyNames = Object.keys(oCollectionMeta.itemProperties || {});
-                if (!aPropertyNames.length) {
-                    return;
-                }
-                var aPreviewRows = (oTableStagingState.mStagedRows[sCollectionName] || []).filter(function(oStagedRow) {
-                    return oStagedRow.isPreviewVisible;
-                });
+                if (!aPropertyNames.length) { return; }
+
+                var aPreviewRows = (oTableStagingState.mStagedRows[sCollectionName] || []).filter(function(r) { return r.isPreviewVisible; });
                 var aNewRows = oTableStagingState.mPendingNewRowContexts[sCollectionName] || [];
                 var bHasUneditableChanges = aPreviewRows.some(function(oPreviewRow) {
-                    return oPreviewRow.update && that._hasUneditableCollectionChanges(oPreviewRow.update, sCollectionName, {
-                        context: oPreviewRow.realContext,
-                        rowIndex: oPreviewRow.rowIndex
-                    }, mCollectionState);
+                    return oPreviewRow.update && that._hasUneditableCollectionChanges(oPreviewRow.update, sCollectionName, { context: oPreviewRow.realContext, rowIndex: oPreviewRow.rowIndex }, mCollectionState);
                 });
-                if (!aPreviewRows.length && !aNewRows.length) {
-                    return;
-                }
+                if (!aPreviewRows.length && !aNewRows.length) { return; }
 
                 var iExistingRowCount = aPreviewRows.length;
                 var iNewRowCount = aNewRows.length;
                 var iTotalCount = iExistingRowCount + iNewRowCount;
 
-                // Previous values table (read-only, initially hidden) — only existing rows
-                var aPreviousRows = aPreviewRows.map(function(oPreviewRow) {
-                    return that._buildCollectionPreviewRowFromContext(aPropertyNames, oPreviewRow.realContext);
-                });
+                var aPreviousRows = aPreviewRows.map(function(r) { return that._buildCollectionPreviewRowFromContext(aPropertyNames, r.realContext); });
                 var oPreviousTable = that._createPreviewTable(aPropertyNames, oCollectionMeta.itemProperties, aPreviousRows);
                 oPreviousTable.setVisible(false);
 
-                // New values table (editable SmartFields, initially visible)
-                // Includes both updated existing rows and new rows
-                var oNewTable = that._createEditableNewTable(
-                    aPropertyNames,
-                    oCollectionMeta.itemProperties,
-                    aPreviewRows,
-                    aNewRows,
-                    sCollectionName,
-                    mCollectionState,
-                    fnOnTableFieldChange
-                );
+                var aItemMetaOut = [];
+                var oNewTable = that._createEditableNewTable(aPropertyNames, oCollectionMeta.itemProperties, aPreviewRows, aNewRows, sCollectionName, mCollectionState, fnOnTableFieldChange, aItemMetaOut);
+
+                // "Exclude Changes" button — disabled until at least 1 active (non-excluded) row is checked
+                var oExcludeButton = new Button({
+                    text: oRb.getText("EASY_FILL_EXCLUDE_ROW_BUTTON"),
+                    type: "Ghost",
+                    enabled: false
+                });
+
+                // Re-evaluate button enabled state whenever a checkbox changes
+                function refreshExcludeButtonState() {
+                    var bAnyActiveChecked = aItemMetaOut.some(function(oMeta) {
+                        if (!oMeta.item.isSelected()) { return false; }
+                        var oExcludedSet = oMeta.isNew
+                            ? oTableStagingState.mExcludedNewRows[sCollectionName]
+                            : oTableStagingState.mExcludedRows[sCollectionName];
+                        return !oExcludedSet || !oExcludedSet[oMeta.index];
+                    });
+                    oExcludeButton.setEnabled(bAnyActiveChecked);
+                }
 
-                var oReadonlyTag = bHasUneditableChanges
-                    ? new GenericTag({
-                        text: oRb.getText("EASYFILL_TABLE_READONLY_TAG"),
-                        status: "Warning"
-                    }).addStyleClass("sapUiTinyMarginBegin")
-                    : null;
+                // Re-apply excluded row visual state after re-render (e.g. Condensed ↔ OP mode switch).
+                // mExcludedRows/mExcludedNewRows survive the mode switch but new controls are created fresh.
+                aItemMetaOut.forEach(function(oMeta) {
+                    var mTarget = oMeta.isNew ? oTableStagingState.mExcludedNewRows : oTableStagingState.mExcludedRows;
+                    var oExcludedSet = mTarget && mTarget[sCollectionName];
+                    if (!oExcludedSet || !oExcludedSet[oMeta.index]) { return; }
+
+                    oMeta.item.addStyleClass("sapEasyFillExcludedRow");
+                    oMeta.item.getCells().forEach(function(oCell) {
+                        if (oCell.isA && oCell.isA("sap.ui.comp.smartfield.SmartField")) {
+                            oCell.setEditable(false);
+                            oCell.setEnabled(false);
+                        }
+                    });
+                });
 
-                var sCollectionName_label = oCollectionMeta.description || sCollectionName;
-                var oTitleControl = new Title({ text: sCollectionName_label + " (" + iTotalCount + ")", titleStyle: "H4" });
+                var oActualTable = oNewTable.getContent && oNewTable.getContent()[0];
+                if (oActualTable) {
+                    oActualTable.attachSelectionChange(function(oEvent) {
+                        if (oEvent.getParameter("selectAll")) {
+                            aItemMetaOut.forEach(function(oMeta) {
+                                var oExcludedSet = oMeta.isNew
+                                    ? oTableStagingState.mExcludedNewRows[sCollectionName]
+                                    : oTableStagingState.mExcludedRows[sCollectionName];
+                                if (oExcludedSet && oExcludedSet[oMeta.index]) {
+                                    oMeta.item.setSelected(false);
+                                }
+                            });
+                        }
+                        refreshExcludeButtonState();
+                    });
+                }
+
+                oExcludeButton.attachPress(function() {
+                    aItemMetaOut.forEach(function(oMeta) {
+                        if (!oMeta.item.isSelected()) { return; }
+                        var mTarget = oMeta.isNew ? oTableStagingState.mExcludedNewRows : oTableStagingState.mExcludedRows;
+                        var oExcludedSet = mTarget[sCollectionName];
+                        if (oExcludedSet && oExcludedSet[oMeta.index]) { return; } // already excluded
+
+                        if (!mTarget[sCollectionName]) { mTarget[sCollectionName] = Object.create(null); }
+                        mTarget[sCollectionName][oMeta.index] = true;
+
+                        oMeta.item.addStyleClass("sapEasyFillExcludedRow");
+                        oMeta.item.getCells().forEach(function(oCell) {
+                            if (oCell.isA && oCell.isA("sap.ui.comp.smartfield.SmartField")) {
+                                oCell.setEditable(false);
+                                oCell.setEnabled(false);
+                            }
+                        });
+                        oMeta.item.setSelected(false);
+                    });
+
+                    oExcludeButton.setEnabled(false);
+                    if (typeof fnOnTableFieldChange === "function") { fnOnTableFieldChange(); }
+                });
+
+                var oReadonlyTag = bHasUneditableChanges ? new GenericTag({ text: oRb.getText("EASYFILL_TABLE_READONLY_TAG"), status: "Warning" }).addStyleClass("sapUiTinyMarginBegin") : null;
+                var sLabel = oCollectionMeta.description || sCollectionName;
+                var oTitleControl = new Title({ text: sLabel + " (" + iTotalCount + ")", titleStyle: "H4" });
 
-                // Toggle button between "Previous" and "New" views
                 var oSegmentedButton = new SegmentedButton({
-                    selectedKey: "new",
-                    width: "auto",
+                    selectedKey: "new", width: "auto",
                     items: [
                         new SegmentedButtonItem({ key: "previous", text: oRb.getText("EASY_FILL_TABLE_VIEW_PREVIOUS"), width: "auto" }),
-                        new SegmentedButtonItem({ key: "new", text: oRb.getText("EASY_FILL_TABLE_VIEW_NEW"), width: "auto" })
+                        new SegmentedButtonItem({ key: "new",      text: oRb.getText("EASY_FILL_TABLE_VIEW_NEW"),      width: "auto" })
                     ],
                     selectionChange: function() {
                         var sKey = oSegmentedButton.getSelectedKey();
                         oPreviousTable.setVisible(sKey === "previous");
                         oNewTable.setVisible(sKey === "new");
-                        if (oReadonlyTag) {
-                            oReadonlyTag.setVisible(sKey === "new");
-                        }
-                        oTitleControl.setText(sCollectionName_label + " (" + (sKey === "previous" ? iExistingRowCount : iTotalCount) + ")");
+                        oExcludeButton.setVisible(sKey === "new");
+                        if (oReadonlyTag) { oReadonlyTag.setVisible(sKey === "new"); }
+                        oTitleControl.setText(sLabel + " (" + (sKey === "previous" ? iExistingRowCount : iTotalCount) + ")");
                     }
                 });
-                var aRightItems = oReadonlyTag ? [oReadonlyTag, oSegmentedButton] : [oSegmentedButton];
+
+                var oLeftGroup  = new HBox({ alignItems: "Center", items: oReadonlyTag ? [oTitleControl, oReadonlyTag] : [oTitleControl] });
+                var oRightGroup = new HBox({ alignItems: "Center", items: [oExcludeButton, oSegmentedButton] });
                 var oHeader = new HBox({
-                    justifyContent: "SpaceBetween",
-                    alignItems: "Center",
-                    wrap: "Wrap",
-                    items: [oTitleControl].concat(aRightItems)
+                    justifyContent: "SpaceBetween", alignItems: "Center", wrap: "Wrap",
+                    items: [oLeftGroup, oRightGroup]
                 }).addStyleClass("sapUiSmallMarginTop sapUiSmallMarginBottom");
 
-                var oTableVBox = new VBox({
-                    items: [oHeader, oPreviousTable, oNewTable]
-                }).addStyleClass("sapSmartTemplatesObjectPageEasyFillTableSection");
+                var oTableVBox = new VBox({ items: [oHeader, oPreviousTable, oNewTable] })
+                    .addStyleClass("sapSmartTemplatesObjectPageEasyFillTableSection");
 
-                // "mixed" rejection: AI also proposed new rows but creation is not allowed.
-                // Show a warning strip after the toggle header, before the tables.
                 if (oRejected[sCollectionName] === "mixed") {
-                    var oRejectionStrip = new MessageStrip({
-                        text: oRb.getText("EASY_FILL_TABLE_NEW_ROW_NOT_ALLOWED"),
-                        type: "Warning",
-                        showIcon: true
-                    });
-                    oTableVBox.insertItem(oRejectionStrip, 1); // after toggle header, before tables
+                    oTableVBox.insertItem(new MessageStrip({ text: oRb.getText("EASY_FILL_TABLE_NEW_ROW_NOT_ALLOWED"), type: "Warning", showIcon: true }), 1);
                 }
 
                 if (bIsCondensedMode && oFilledFieldsSubSection) {
@@ -269,12 +290,9 @@ sap.ui.define([
 
                     // Check if a wrapper VBox already exists (multiple collections: re-use it)
                     var aExistingBlocks = oFilledFieldsSubSection.getBlocks();
-                    var oExistingWrapper = aExistingBlocks.find(function(oBlock) {
-                        return oBlock.getCustomData && oBlock.getCustomData().some(function(oData) {
-                            return oData.getKey() === sCondensedWrapperMarker;
-                        });
+                    var oExistingWrapper = aExistingBlocks.find(function(b) {
+                        return b.getCustomData && b.getCustomData().some(function(d) { return d.getKey() === sCondensedWrapperMarker; });
                     });
-
                     if (oExistingWrapper) {
                         // Append the new table VBox to the already-created wrapper
                         oExistingWrapper.addItem(oTableVBox);
@@ -283,13 +301,8 @@ sap.ui.define([
                         // place them inside a new wrapper VBox alongside the table VBox,
                         // and add the wrapper as the sole block.
                         var aOriginalBlocks = aExistingBlocks.slice();
-                        aOriginalBlocks.forEach(function(oBlock) {
-                            oFilledFieldsSubSection.removeBlock(oBlock);
-                        });
-                        var oWrapper = new VBox({
-                            width: "100%",
-                            items: aOriginalBlocks.concat([oTableVBox])
-                        });
+                        aOriginalBlocks.forEach(function(b) { oFilledFieldsSubSection.removeBlock(b); });
+                        var oWrapper = new VBox({ width: "100%", items: aOriginalBlocks.concat([oTableVBox]) });
                         oWrapper.addCustomData(new CustomData({ key: sCondensedWrapperMarker, value: "true" }));
                         oFilledFieldsSubSection.addBlock(oWrapper);
                     }
@@ -298,24 +311,14 @@ sap.ui.define([
                     // Wrap in a standalone ObjectPageSection so the anchor bar shows the table
                     // name. Insert just before the Unfilled Fields section (if present) so the
                     // order is: annotation sections → table sections → Unfilled Fields.
-                    var oSubSection = new ObjectPageSubSection({
-                        title: sCollectionName_label,
-                        titleUppercase: false,
-                        showTitle: false,
-                        blocks: [oTableVBox]
-                    });
-                    var oOpSection = new ObjectPageSection({
-                        title: sCollectionName_label,
-                        titleUppercase: false,
-                        subSections: [oSubSection]
-                    });
+                    var oSubSection = new ObjectPageSubSection({ title: sLabel, titleUppercase: false, showTitle: false, blocks: [oTableVBox] });
+                    var oOpSection  = new ObjectPageSection({ title: sLabel, titleUppercase: false, subSections: [oSubSection] });
                     oOpSection.addCustomData(new CustomData({ key: sTableSectionMarker, value: "true" }));
-
-                    if (oUnfilledFieldsSection) {
-                        // Use indexOfSection on the live control — this is the actual aggregation
-                        // index regardless of how many manually-added sections are mixed in.
-                        var iInsertAt = oObjectPageLayout.indexOfSection(oUnfilledFieldsSection);
-                        oObjectPageLayout.insertSection(oOpSection, iInsertAt + iInsertOffset);
+                    if (iBaseInsertIndex >= 0) {
+                        // Use the base index captured before any insertions — not re-queried.
+                        // This prevents the second+ table from overshooting past Unfilled Fields
+                        // because indexOfSection(oUnfilledFieldsSection) shifts as tables are added.
+                        oObjectPageLayout.insertSection(oOpSection, iBaseInsertIndex + iInsertOffset);
                         iInsertOffset++;
                     } else {
                         oObjectPageLayout.addSection(oOpSection);
@@ -374,17 +377,16 @@ sap.ui.define([
         // ─── Private Helpers ─────────────────────────────────────────────────────
 
         /**
-         * Removes all ObjectPageSections that were dynamically added by renderCollectionPreviews.
-         * Identified by the custom data marker key set during creation.
+         * Removes all ObjectPageSections and condensed-mode wrapper VBoxes that were
+         * dynamically added by renderCollectionPreviews. Identified by the custom data
+         * marker keys set during creation.
          *
          * @param {sap.uxap.ObjectPageLayout} oObjectPageLayout
          */
         _removeTableSections: function(oObjectPageLayout) {
             // OP mode: remove marked standalone ObjectPageSections.
             oObjectPageLayout.getSections().filter(function(oSection) {
-                return oSection.getCustomData().some(function(oData) {
-                    return oData.getKey() === sTableSectionMarker;
-                });
+                return oSection.getCustomData().some(function(oData) { return oData.getKey() === sTableSectionMarker; });
             }).forEach(function(oSection) {
                 oObjectPageLayout.removeSection(oSection);
                 oSection.destroy();
@@ -395,22 +397,14 @@ sap.ui.define([
             oObjectPageLayout.getSections().forEach(function(oSection) {
                 oSection.getSubSections().forEach(function(oSubSec) {
                     oSubSec.getBlocks().filter(function(oBlock) {
-                        return oBlock.getCustomData && oBlock.getCustomData().some(function(oData) {
-                            return oData.getKey() === sCondensedWrapperMarker;
-                        });
+                        return oBlock.getCustomData && oBlock.getCustomData().some(function(d) { return d.getKey() === sCondensedWrapperMarker; });
                     }).forEach(function(oWrapper) {
                         // Separate original (non-table) items from table VBox items
                         var aItems = oWrapper.getItems().slice();
                         aItems.forEach(function(oItem) {
-                            var bIsTableVBox = oItem.getCustomData && oItem.getCustomData().some(function(oData) {
-                                return oData.getKey() === sTableSectionMarker;
-                            });
+                            var bIsTableVBox = oItem.getCustomData && oItem.getCustomData().some(function(d) { return d.getKey() === sTableSectionMarker; });
                             oWrapper.removeItem(oItem);
-                            if (bIsTableVBox) {
-                                oItem.destroy();
-                            } else {
-                                oSubSec.addBlock(oItem); // restore SmartForm
-                            }
+                            if (bIsTableVBox) { oItem.destroy(); } else { oSubSec.addBlock(oItem); } // restore SmartForm
                         });
                         oSubSec.removeBlock(oWrapper);
                         oWrapper.destroy();
@@ -571,9 +565,10 @@ sap.ui.define([
          * @param {string} sCollectionName - navigation property name (used to look up property metadata)
          * @param {object} mCollectionState - collection tracking state (used to get property metadata)
          * @param {function} fnOnTableFieldChange - callback when a cell value changes
+         * @param {Array} [aItemMetaOut] - optional collector: receives { item, isNew, index } per row
          * @returns {sap.m.ScrollContainer} ScrollContainer wrapping the table with horizontal scrolling enabled
          */
-        _createEditableNewTable: function(aPropertyNames, oItemProperties, aPreviewRows, aNewRowContexts, sCollectionName, mCollectionState, fnOnTableFieldChange) {
+        _createEditableNewTable: function(aPropertyNames, oItemProperties, aPreviewRows, aNewRowContexts, sCollectionName, mCollectionState, fnOnTableFieldChange, aItemMetaOut) {
             var aColumns = aPropertyNames.map(function(sPropName) {
                 return new Column({
                     header: new Text({
@@ -587,7 +582,7 @@ sap.ui.define([
             var that = this;
 
             // Rows for existing rows with AI-proposed updates
-            var aExistingItems = aPreviewRows.map(function(oPreviewRow) {
+            var aExistingItems = aPreviewRows.map(function(oPreviewRow, iIndex) {
                 var oContext = oPreviewRow.transientContext;
                 var oRowObject = oPreviewRow.realContext && oPreviewRow.realContext.getObject && oPreviewRow.realContext.getObject();
 
@@ -631,6 +626,11 @@ sap.ui.define([
                 if (oContext) {
                     oItem.setBindingContext(oContext);
                 }
+
+                if (Array.isArray(aItemMetaOut)) {
+                    aItemMetaOut.push({ item: oItem, isNew: false, index: iIndex });
+                }
+
                 return oItem;
             });
 
@@ -638,7 +638,7 @@ sap.ui.define([
             // sEntitySetName is set explicitly on SmartField so it can resolve OData metadata
             // even though it lives inside a plain sap.m.Table (not a SmartTable).
             var sEntitySetName = (oEntitySet && oEntitySet.name) || sCollectionName;
-            var aNewItems = (aNewRowContexts || []).map(function(oNewContext) {
+            var aNewItems = (aNewRowContexts || []).map(function(oNewContext, iIndex) {
                 var aCells = aPropertyNames.map(function(sPropName) {
                     if (!oNewContext) {
                         return new Text({ text: "" });
@@ -668,17 +668,24 @@ sap.ui.define([
                     });
                     return oSmartField;
                 });
+
                 var oItem = new ColumnListItem({
                     cells: aCells,
                     highlight: "Information"
                 });
                 oItem.setBindingContext(oNewContext);
+
+                if (Array.isArray(aItemMetaOut)) {
+                    aItemMetaOut.push({ item: oItem, isNew: true, index: iIndex });
+                }
+
                 return oItem;
             });
 
             var oTable = new Table({
                 columns: aColumns,
                 items: aExistingItems.concat(aNewItems),
+                mode: "MultiSelect",
                 fixedLayout: false,
                 autoPopinMode: false
             }).addStyleClass("sapSmartTemplatesObjectPageEasyFillTablePreview");
@@ -751,6 +758,12 @@ sap.ui.define([
             Object.keys((oTableStagingState && oTableStagingState.mPendingNewRowContexts) || {}).forEach(function(sCollectionName) {
                 delete oTableStagingState.mPendingNewRowContexts[sCollectionName];
             });
+            Object.keys((oTableStagingState && oTableStagingState.mExcludedRows) || {}).forEach(function(sCollectionName) {
+                delete oTableStagingState.mExcludedRows[sCollectionName];
+            });
+            Object.keys((oTableStagingState && oTableStagingState.mExcludedNewRows) || {}).forEach(function(sCollectionName) {
+                delete oTableStagingState.mExcludedNewRows[sCollectionName];
+            });
         },
 
         /**
@@ -860,63 +873,16 @@ sap.ui.define([
         },
 
         /**
-         * Checks whether a collection property is editable given the current row data object.
-         * Delegates to the same annotation checks used in EasyFillFieldCollector.isEditableByContextObject.
-         * Duplicated here to keep TableRenderer self-contained (no circular dependency).
+         * Delegates property editability check to EasyFillFieldCollector.isEditableByContextObject —
+         * the single authoritative implementation shared across all EasyFill modules.
          *
          * @param {object} oPropertyMeta - OData property metadata
          * @param {object} oRowObject - plain row data object
+         * @param {object} oEntitySet - OData entity set metadata
          * @returns {boolean}
          */
         _isEditableProperty: function(oPropertyMeta, oRowObject, oEntitySet) {
-            if (!oPropertyMeta) {
-                return false;
-            }
-
-            // Check entity-set-level sap:updatable (entire entity set is read-only)
-            if (oEntitySet) {
-                var sEntitySetUpdatable = oEntitySet["sap:updatable"];
-                if (sEntitySetUpdatable === "false") {
-                    return false;
-                }
-                // sap:updatable-path: resolved against the row context object (boolean property)
-                var sEntitySetUpdatablePath = oEntitySet["sap:updatable-path"];
-                if (sEntitySetUpdatablePath && oRowObject) {
-                    var bUpdatableFromPath = oRowObject[sEntitySetUpdatablePath];
-                    if (bUpdatableFromPath === false || bUpdatableFromPath === "false") {
-                        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";
-            }
-            // Dynamic FieldControl via Path (e.g. { "Path": "SomeField_fc" })
-            // FieldControl values: 0=Hidden, 1=ReadOnly, 3=Optional, 7=Mandatory
-            if (oAnnotation && oAnnotation["Path"]) {
-                var iDynamicFieldControl = oRowObject && oRowObject[oAnnotation["Path"]];
-                if (iDynamicFieldControl !== undefined && iDynamicFieldControl !== null) {
-                    return iDynamicFieldControl !== 0 && iDynamicFieldControl !== 1;
-                }
-            }
-            // Check "sap:field-control" dynamic path (value 1 = read-only)
-            // If the _fc property is defined in metadata but its runtime value is absent from
-            // the row object (not fetched / not in $select), treat as non-editable (safe fallback).
-            var sFieldControl = oPropertyMeta["sap:field-control"];
-            if (sFieldControl) {
-                if (!oRowObject || !(sFieldControl in oRowObject)) {
-                    return false;
-                }
-                var iFieldControlValue = oRowObject[sFieldControl];
-                return iFieldControlValue !== 0 && iFieldControlValue !== 1;
-            }
-            return true;
+            return EasyFillFieldCollector.isEditableByContextObject(oPropertyMeta, oRowObject, oEntitySet);
         },
 
         /**