@memberjunction/ng-entity-viewer 6.1.4 → 6.2.0-edge.1

package/dist/lib/view-types/renderers/grid-view-renderer.component.js

@@ -1,23 +1,92 @@
 import { Component, Input, Output, EventEmitter, ViewEncapsulation, ViewChild, ChangeDetectorRef, inject } from '@angular/core';
-import { LogError, CompositeKey } from '@memberjunction/core';
+import { LogError, CompositeKey, RunView, RecordMergeRequest } from '@memberjunction/core';
+import { RecordComparisonService, } from '@memberjunction/ng-record-merge';
 import { UUIDsEqual } from '@memberjunction/global';
 import { BaseAngularComponent } from '@memberjunction/ng-base-types';
-import { buildPkString, buildCompositeKey } from '../../utils/record.util';
+import { BuildPkString, BuildCompositeKey } from '../../utils/record.util';
 import * as i0 from "@angular/core";
 import * as i1 from "@memberjunction/ng-list-management";
-import * as i2 from "../../entity-data-grid/entity-data-grid.component";
-import * as i3 from "../../confirm-dialog/confirm-dialog.component";
+import * as i2 from "@memberjunction/ng-record-merge";
+import * as i3 from "@memberjunction/ng-ui-components";
+import * as i4 from "../../entity-data-grid/entity-data-grid.component";
+import * as i5 from "../../confirm-dialog/confirm-dialog.component";
 const _c0 = ["grid"];
 const _c1 = () => ({});
 function GridViewRendererComponent_Conditional_2_Template(rf, ctx) { if (rf & 1) {
     const _r1 = i0.ɵɵgetCurrentView();
-    i0.ɵɵelementStart(0, "mj-list-management-dialog", 4);
+    i0.ɵɵelementStart(0, "mj-list-management-dialog", 6);
     i0.ɵɵlistener("complete", function GridViewRendererComponent_Conditional_2_Template_mj_list_management_dialog_complete_0_listener($event) { i0.ɵɵrestoreView(_r1); const ctx_r1 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r1.onListManagementComplete($event)); })("cancel", function GridViewRendererComponent_Conditional_2_Template_mj_list_management_dialog_cancel_0_listener() { i0.ɵɵrestoreView(_r1); const ctx_r1 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r1.onListManagementCancel()); });
     i0.ɵɵelementEnd();
 } if (rf & 2) {
     const ctx_r1 = i0.ɵɵnextContext();
     i0.ɵɵproperty("Provider", ctx_r1.Provider)("visible", ctx_r1.showListManagementDialog)("config", ctx_r1.listManagementConfig);
 } }
+function GridViewRendererComponent_Conditional_4_Conditional_11_Template(rf, ctx) { if (rf & 1) {
+    i0.ɵɵelementStart(0, "p", 12);
+    i0.ɵɵtext(1);
+    i0.ɵɵelementEnd();
+} if (rf & 2) {
+    const ctx_r1 = i0.ɵɵnextContext(2);
+    i0.ɵɵadvance();
+    i0.ɵɵtextInterpolate(ctx_r1.mergeState.DependencyNote);
+} }
+function GridViewRendererComponent_Conditional_4_Template(rf, ctx) { if (rf & 1) {
+    const _r3 = i0.ɵɵgetCurrentView();
+    i0.ɵɵelementStart(0, "mj-dialog", 7);
+    i0.ɵɵlistener("Close", function GridViewRendererComponent_Conditional_4_Template_mj_dialog_Close_0_listener() { i0.ɵɵrestoreView(_r3); const ctx_r1 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r1.onMergeCancelled()); });
+    i0.ɵɵelementStart(1, "div", 8)(2, "span");
+    i0.ɵɵtext(3, "Keep");
+    i0.ɵɵelementEnd();
+    i0.ɵɵelementStart(4, "button", 9);
+    i0.ɵɵlistener("click", function GridViewRendererComponent_Conditional_4_Template_button_click_4_listener() { i0.ɵɵrestoreView(_r3); const ctx_r1 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r1.onSurvivorChange("left")); });
+    i0.ɵɵtext(5);
+    i0.ɵɵelementEnd();
+    i0.ɵɵelementStart(6, "button", 9);
+    i0.ɵɵlistener("click", function GridViewRendererComponent_Conditional_4_Template_button_click_6_listener() { i0.ɵɵrestoreView(_r3); const ctx_r1 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r1.onSurvivorChange("right")); });
+    i0.ɵɵtext(7);
+    i0.ɵɵelementEnd();
+    i0.ɵɵelementStart(8, "span", 10);
+    i0.ɵɵtext(9);
+    i0.ɵɵelementEnd()();
+    i0.ɵɵelementStart(10, "mj-record-merge-panel", 11);
+    i0.ɵɵlistener("MergeConfirmed", function GridViewRendererComponent_Conditional_4_Template_mj_record_merge_panel_MergeConfirmed_10_listener($event) { i0.ɵɵrestoreView(_r3); const ctx_r1 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r1.onMergeConfirmed($event)); })("MergeCancelled", function GridViewRendererComponent_Conditional_4_Template_mj_record_merge_panel_MergeCancelled_10_listener() { i0.ɵɵrestoreView(_r3); const ctx_r1 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r1.onMergeCancelled()); });
+    i0.ɵɵelementEnd();
+    i0.ɵɵconditionalCreate(11, GridViewRendererComponent_Conditional_4_Conditional_11_Template, 2, 1, "p", 12);
+    i0.ɵɵelementEnd();
+} if (rf & 2) {
+    const ctx_r1 = i0.ɵɵnextContext();
+    i0.ɵɵproperty("Visible", true)("Closeable", !ctx_r1.mergeState.IsMerging);
+    i0.ɵɵadvance(4);
+    i0.ɵɵproperty("variant", ctx_r1.mergeState.Config.SurvivorSide === "left" ? "primary" : "secondary")("disabled", ctx_r1.mergeState.IsMerging);
+    i0.ɵɵattribute("aria-checked", ctx_r1.mergeState.Config.SurvivorSide === "left");
+    i0.ɵɵadvance();
+    i0.ɵɵtextInterpolate(ctx_r1.mergeState.Config.LeftLabel);
+    i0.ɵɵadvance();
+    i0.ɵɵproperty("variant", ctx_r1.mergeState.Config.SurvivorSide === "right" ? "primary" : "secondary")("disabled", ctx_r1.mergeState.IsMerging);
+    i0.ɵɵattribute("aria-checked", ctx_r1.mergeState.Config.SurvivorSide === "right");
+    i0.ɵɵadvance();
+    i0.ɵɵtextInterpolate(ctx_r1.mergeState.Config.RightLabel);
+    i0.ɵɵadvance(2);
+    i0.ɵɵtextInterpolate1("", ctx_r1.mergeLoserLabel, " will be deleted; its linked records move to the record you keep.");
+    i0.ɵɵadvance();
+    i0.ɵɵproperty("Fields", ctx_r1.mergeState.Fields)("Config", ctx_r1.mergeState.Config)("MergeEnabled", !ctx_r1.mergeState.IsMerging)("IsMerging", ctx_r1.mergeState.IsMerging);
+    i0.ɵɵadvance();
+    i0.ɵɵconditional(ctx_r1.mergeState.DependencyNote ? 11 : -1);
+} }
+function GridViewRendererComponent_Conditional_5_Template(rf, ctx) { if (rf & 1) {
+    const _r4 = i0.ɵɵgetCurrentView();
+    i0.ɵɵelementStart(0, "div", 5)(1, "span", 13);
+    i0.ɵɵtext(2);
+    i0.ɵɵelementEnd();
+    i0.ɵɵelementStart(3, "button", 14);
+    i0.ɵɵlistener("click", function GridViewRendererComponent_Conditional_5_Template_button_click_3_listener() { i0.ɵɵrestoreView(_r4); const ctx_r1 = i0.ɵɵnextContext(); return i0.ɵɵresetView(ctx_r1.onDismissMergeNotice()); });
+    i0.ɵɵelement(4, "i", 15);
+    i0.ɵɵelementEnd()();
+} if (rf & 2) {
+    const ctx_r1 = i0.ɵɵnextContext();
+    i0.ɵɵadvance(2);
+    i0.ɵɵtextInterpolate(ctx_r1.mergeNotice);
+} }
 /**
  * GridViewRendererComponent
  * -------------------------
@@ -87,7 +156,15 @@ export class GridViewRendererComponent extends BaseAngularComponent {
      * Optional full-result-set fetcher supplied by the host, forwarded to the grid's ExportDataProvider
      * so exports cover every matching row rather than just the loaded page (bug C1).
      */
-    exportDataProvider = null;
+    ExportDataProvider = null;
+    /** @deprecated Use {@link ExportDataProvider}. */
+    set exportDataProvider(value) {
+        this.ExportDataProvider = value;
+    }
+    /** @deprecated Use {@link ExportDataProvider}. */
+    get exportDataProvider() {
+        return this.ExportDataProvider;
+    }
     /** Primary-key string of the currently selected record, if any. */
     selectedRecordId = null;
     /** Active filter text — passed through for the grid's cell highlighting. */
@@ -175,38 +252,62 @@ export class GridViewRendererComponent extends BaseAngularComponent {
     // Effective binding accessors — seed grid inputs from config + defaults
     // ================================================================
     /** Effective toolbar visibility — defaults to `true` when not set in config. */
-    get effectiveShowToolbar() {
+    get EffectiveShowToolbar() {
         return this.config.showToolbar ?? true;
     }
+    /** @deprecated Use {@link EffectiveShowToolbar}. */
+    get effectiveShowToolbar() {
+        return this.EffectiveShowToolbar;
+    }
     /**
      * Grid search defaults OFF when hosted in entity-viewer. The container already owns
      * `filterText` ("Filter records..."). Opt in with `toolbarConfig.showSearch: true`.
      */
-    get effectiveShowSearch() {
+    get EffectiveShowSearch() {
         return this.config.toolbarConfig?.showSearch ?? false;
     }
+    /** @deprecated Use {@link EffectiveShowSearch}. */
+    get effectiveShowSearch() {
+        return this.EffectiveShowSearch;
+    }
     /** Effective selection mode — defaults to `'checkbox'` when not set in config. */
-    get effectiveSelectionMode() {
+    get EffectiveSelectionMode() {
         return this.config.selectionMode ?? 'checkbox';
     }
+    /** @deprecated Use {@link EffectiveSelectionMode}. */
+    get effectiveSelectionMode() {
+        return this.EffectiveSelectionMode;
+    }
     /** Effective add-to-list button visibility — defaults to `true` when not set in config. */
-    get effectiveShowAddToListButton() {
+    get EffectiveShowAddToListButton() {
         return this.config.showAddToListButton ?? true;
     }
+    /** @deprecated Use {@link EffectiveShowAddToListButton}. */
+    get effectiveShowAddToListButton() {
+        return this.EffectiveShowAddToListButton;
+    }
     /** Effective pager visibility — defaults to `true` when not set in config. */
-    get effectiveShowPager() {
+    get EffectiveShowPager() {
         return this.config.showPager ?? true;
     }
+    /** @deprecated Use {@link EffectiveShowPager}. */
+    get effectiveShowPager() {
+        return this.EffectiveShowPager;
+    }
     /** Effective page size — config wins, else the generic `pageSize` input, else the grid's own default. */
-    get effectivePageSize() {
+    get EffectivePageSize() {
         return this.config.pageSize ?? this.pageSize ?? 100;
     }
+    /** @deprecated Use {@link EffectivePageSize}. */
+    get effectivePageSize() {
+        return this.EffectivePageSize;
+    }
     /**
      * Effective RunViewParams for the grid. Uses `config.params` when supplied; otherwise builds a
      * minimal dynamic-view params object from {@link entity}. Returns `null` when no entity is known
      * yet (the grid renders empty until the host provides one).
      */
-    get effectiveParams() {
+    get EffectiveParams() {
         if (this.config.params) {
             return this.config.params;
         }
@@ -215,6 +316,10 @@ export class GridViewRendererComponent extends BaseAngularComponent {
         }
         return null;
     }
+    /** @deprecated Use {@link EffectiveParams}. */
+    get effectiveParams() {
+        return this.EffectiveParams;
+    }
     // ================================================================
     // Navigation + generic coordination output mapping
     // ================================================================
@@ -222,24 +327,32 @@ export class GridViewRendererComponent extends BaseAngularComponent {
      * Row single-click → {@link recordSelected}. Extracts the raw record (`event.row`) so the host
      * builds the composite key itself, matching the other renderers.
      */
-    onAfterRowClick(event) {
+    OnAfterRowClick(event) {
         if (event.row) {
             this.recordSelected.emit(event.row);
         }
     }
+    /** @deprecated Use {@link OnAfterRowClick}. */
+    onAfterRowClick(event) {
+        return this.OnAfterRowClick(event);
+    }
     /** Row double-click → {@link recordOpened} (NAVIGATION), emitting the raw record object. */
-    onAfterRowDoubleClick(event) {
+    OnAfterRowDoubleClick(event) {
         if (event.row) {
             this.recordOpened.emit(event.row);
         }
     }
+    /** @deprecated Use {@link OnAfterRowDoubleClick}. */
+    onAfterRowDoubleClick(event) {
+        return this.OnAfterRowDoubleClick(event);
+    }
     /**
      * Sort change → both generic coordination channels:
      *  1. {@link dataRequest} with the generic `sort` shape so the host re-loads with a new OrderBy.
      *  2. persists the sort into `config.gridState.sortSettings` and emits {@link configChanged} so
      *     the grid's sort survives view reloads via the opaque config channel.
      */
-    onAfterSort(event) {
+    OnAfterSort(event) {
         const sort = (event.newSortState ?? []).map((s) => ({ field: s.field, direction: s.direction }));
         this.dataRequest.emit({ sort });
         const gridState = { ...(this.config.gridState ?? {}) };
@@ -247,47 +360,71 @@ export class GridViewRendererComponent extends BaseAngularComponent {
         this.config = { ...this.config, gridState };
         this.configChanged.emit(this.config);
     }
+    /** @deprecated Use {@link OnAfterSort}. */
+    onAfterSort(event) {
+        return this.OnAfterSort(event);
+    }
     /**
      * Generic grid-state change (column resize / reorder / visibility) → merge the grid's updated
      * {@link ViewGridState} into the opaque config and emit {@link configChanged}; the host persists
      * the blob verbatim. No `dataRequest` here — column changes don't alter the loaded record set.
      */
-    onGridStateChanged(event) {
+    OnGridStateChanged(event) {
         this.config = { ...this.config, gridState: event.gridState };
         this.configChanged.emit(this.config);
     }
+    /** @deprecated Use {@link OnGridStateChanged}. */
+    onGridStateChanged(event) {
+        return this.OnGridStateChanged(event);
+    }
     /**
      * Selection change → kept INTERNAL. The grid drives its own add-to-list from the selection, so the
      * wrapper has no need to surface it. We intentionally do not bubble selection anywhere.
      */
-    onSelectionChange(_selectedKeys) {
+    OnSelectionChange(_selectedKeys) {
         // No-op: selection is internal to the grid + this wrapper's add-to-list. It never bubbles up.
     }
+    /** @deprecated Use {@link OnSelectionChange}. */
+    onSelectionChange(_selectedKeys) {
+        return this.OnSelectionChange(_selectedKeys);
+    }
     /**
      * Foreign-key link click → {@link openRelatedRecordRequested} (NAVIGATION). Maps the grid's
      * {@link ForeignKeyClickEvent} (which carries the related entity + the FK value) onto the generic
      * {@link ViewRelatedRecordNavigation} the container forwards to the outer app for routing. The
      * related entity name is taken from the event when present, else resolved from the metadata by ID.
      */
-    onForeignKeyClick(event) {
+    OnForeignKeyClick(event) {
         const entityName = event.relatedEntityName ?? this.resolveEntityNameById(event.relatedEntityId);
         if (!entityName) {
             return;
         }
         this.openRelatedRecordRequested.emit({ entityName, recordKey: event.recordId });
     }
+    /** @deprecated Use {@link OnForeignKeyClick}. */
+    onForeignKeyClick(event) {
+        return this.OnForeignKeyClick(event);
+    }
     /** New button → {@link createRecordRequested} (NAVIGATION) — opening the create form is routing. */
-    onNewButtonClick() {
+    OnNewButtonClick() {
         this.createRecordRequested.emit();
     }
+    /** @deprecated Use {@link OnNewButtonClick}. */
+    onNewButtonClick() {
+        return this.OnNewButtonClick();
+    }
     /**
      * Pager navigation → generic {@link dataRequest}. Maps the grid's {@link PageChangeEvent}
      * (`PageNumber` is already 1-based, `PageSize`) onto the generic `{ page, pageSize }` shape the
      * host honors against its own RunView.
      */
-    onPageChange(event) {
+    OnPageChange(event) {
         this.dataRequest.emit({ page: event.PageNumber, pageSize: event.PageSize });
     }
+    /** @deprecated Use {@link OnPageChange}. */
+    onPageChange(event) {
+        return this.OnPageChange(event);
+    }
     // ================================================================
     // Self-contained: Refresh
     // ================================================================
@@ -296,9 +433,13 @@ export class GridViewRendererComponent extends BaseAngularComponent {
      * generic container ↔ plug-in coordination (a data-access request), NOT a feature event surfaced
      * to the outer app.
      */
-    onRefreshButtonClick() {
+    OnRefreshButtonClick() {
         this.dataRequest.emit(this.currentPageDataRequest());
     }
+    /** @deprecated Use {@link OnRefreshButtonClick}. */
+    onRefreshButtonClick() {
+        return this.OnRefreshButtonClick();
+    }
     // ================================================================
     // Export: handled entirely by mj-entity-data-grid (its onExportClick opens its own export dialog
     // via ExportService). This wrapper intentionally does NOT host an export dialog — doing so produced
@@ -313,7 +454,7 @@ export class GridViewRendererComponent extends BaseAngularComponent {
      * changes itself — nothing bubbles up. Mirrors the config construction the legacy host did in
      * `data-explorer-dashboard`'s `onAddToListRequested()`.
      */
-    onAddToListRequested(event) {
+    OnAddToListRequested(event) {
         const entity = event.entityInfo ?? this.entity;
         if (!entity || !event.records || event.records.length === 0) {
             return;
@@ -339,18 +480,30 @@ export class GridViewRendererComponent extends BaseAngularComponent {
         this.showListManagementDialog = true;
         this.cdr.detectChanges();
     }
+    /** @deprecated Use {@link OnAddToListRequested}. */
+    onAddToListRequested(event) {
+        return this.OnAddToListRequested(event);
+    }
     /** List-management dialog completed (membership changes applied) → tear down state. */
-    onListManagementComplete(_result) {
+    OnListManagementComplete(_result) {
         this.showListManagementDialog = false;
         this.listManagementConfig = null;
         this.cdr.detectChanges();
     }
+    /** @deprecated Use {@link OnListManagementComplete}. */
+    onListManagementComplete(_result) {
+        return this.OnListManagementComplete(_result);
+    }
     /** List-management dialog cancelled → tear down state. */
-    onListManagementCancel() {
+    OnListManagementCancel() {
         this.showListManagementDialog = false;
         this.listManagementConfig = null;
         this.cdr.detectChanges();
     }
+    /** @deprecated Use {@link OnListManagementCancel}. */
+    onListManagementCancel() {
+        return this.OnListManagementCancel();
+    }
     /**
      * Resolve a human-friendly display name for a record using the entity's NameField, falling back to
      * the composite-key string. Mirrors the legacy host's display-name resolution.
@@ -362,7 +515,7 @@ export class GridViewRendererComponent extends BaseAngularComponent {
                 return String(nameValue);
             }
         }
-        return buildPkString(record, entity) || 'Unknown';
+        return BuildPkString(record, entity) || 'Unknown';
     }
     /**
      * Build the record-id strings used by list membership matching, in the compact form `MJ: List Details`
@@ -385,7 +538,7 @@ export class GridViewRendererComponent extends BaseAngularComponent {
      * Delete button → stage the records and open the Generic confirm dialog. The actual delete happens
      * in {@link onDeleteConfirmed} after the user confirms — nothing bubbles up.
      */
-    onDeleteButtonClick(records) {
+    OnDeleteButtonClick(records) {
         if (!records || records.length === 0) {
             return;
         }
@@ -395,13 +548,17 @@ export class GridViewRendererComponent extends BaseAngularComponent {
         this.showDeleteConfirm = true;
         this.cdr.detectChanges();
     }
+    /** @deprecated Use {@link OnDeleteButtonClick}. */
+    onDeleteButtonClick(records) {
+        return this.OnDeleteButtonClick(records);
+    }
     /**
      * Delete confirmed → delete each staged record through the MJ entity layer
      * (`ProviderToUse.GetEntityObject(name, compositeKey, user)` → `Delete`), checking the boolean
      * result and surfacing failures via {@link LogError}. After deletion, re-request the current page
      * so the host reloads. Self-contained — no feature event leaves the wrapper.
      */
-    async onDeleteConfirmed() {
+    async OnDeleteConfirmed() {
         this.showDeleteConfirm = false;
         const entity = this.entity;
         const records = this.pendingDeleteRecords;
@@ -413,7 +570,7 @@ export class GridViewRendererComponent extends BaseAngularComponent {
         const provider = this.ProviderToUse;
         const user = provider.CurrentUser;
         for (const record of records) {
-            const key = buildCompositeKey(record, entity);
+            const key = BuildCompositeKey(record, entity);
             try {
                 // The (name, key, user) overload instantiates AND loads in one call (throws if it can't load).
                 const obj = await provider.GetEntityObject(entity.Name, key, user);
@@ -435,12 +592,344 @@ export class GridViewRendererComponent extends BaseAngularComponent {
         }
         this.cdr.detectChanges();
     }
+    /** @deprecated Use {@link OnDeleteConfirmed}. */
+    async onDeleteConfirmed() {
+        return this.OnDeleteConfirmed();
+    }
     /** Delete cancelled → discard the staged records and close the confirm dialog. */
-    onDeleteCancelled() {
+    OnDeleteCancelled() {
         this.showDeleteConfirm = false;
         this.pendingDeleteRecords = [];
         this.cdr.detectChanges();
     }
+    /** @deprecated Use {@link OnDeleteCancelled}. */
+    onDeleteCancelled() {
+        return this.OnDeleteCancelled();
+    }
+    // ================================================================
+    // Record merge
+    // ================================================================
+    /**
+     * The in-flight merge, or null when the panel is closed. Holds everything the panel needs
+     * plus the dependency preview, so the panel itself stays a pure presentation component.
+     */
+    mergeState = null;
+    /** A one-line status shown under the grid — why a merge was refused, or how one ended. */
+    mergeNotice = null;
+    /** Auto-dismiss timer for {@link mergeNotice}; cleared whenever the notice is replaced. */
+    mergeNoticeTimer = null;
+    /**
+     * How long a merge notice stays up before dismissing itself. The banner is fixed-position over
+     * the whole application, so leaving it until the next merge pins it across navigation and every
+     * other record the user visits afterwards.
+     */
+    static MERGE_NOTICE_TIMEOUT_MS = 8000;
+    comparison = inject(RecordComparisonService);
+    ngOnDestroy() {
+        // The notice's auto-dismiss outlives the view otherwise, and fires detectChanges on a
+        // destroyed component.
+        if (this.mergeNoticeTimer) {
+            clearTimeout(this.mergeNoticeTimer);
+            this.mergeNoticeTimer = null;
+        }
+    }
+    /** Dismiss the merge notice from its own close button. */
+    OnDismissMergeNotice() {
+        this.setMergeNotice(null);
+        this.cdr.detectChanges();
+    }
+    /** @deprecated Use {@link OnDismissMergeNotice}. */
+    onDismissMergeNotice() {
+        return this.OnDismissMergeNotice();
+    }
+    /**
+     * Set (or clear) the merge notice, replacing any pending auto-dismiss. Every write to
+     * `mergeNotice` goes through here so a notice cannot outlive its timer or strand an old one.
+     */
+    setMergeNotice(message) {
+        if (this.mergeNoticeTimer) {
+            clearTimeout(this.mergeNoticeTimer);
+            this.mergeNoticeTimer = null;
+        }
+        this.mergeNotice = message;
+        if (message) {
+            this.mergeNoticeTimer = setTimeout(() => {
+                this.mergeNoticeTimer = null;
+                this.mergeNotice = null;
+                this.cdr.detectChanges();
+            }, GridViewRendererComponent.MERGE_NOTICE_TIMEOUT_MS);
+        }
+    }
+    /**
+     * Show the Merge button only where merging can actually succeed: the entity opts in and the
+     * user can both update the survivor and delete the loser.
+     */
+    get effectiveShowMergeButton() {
+        const entity = this.entity;
+        const user = this.ProviderToUse?.CurrentUser;
+        if (!entity?.AllowRecordMerge || !user)
+            return false;
+        const permissions = entity.GetUserPermisions(user);
+        return !!permissions && permissions.CanUpdate && permissions.CanDelete;
+    }
+    /** The record that will be deleted, named so the user sees the choice before confirming. */
+    get mergeLoserLabel() {
+        const config = this.mergeState?.Config;
+        if (!config)
+            return '';
+        return config.SurvivorSide === 'left' ? config.RightLabel : config.LeftLabel;
+    }
+    /**
+     * The grid asked to merge the selected rows. Compare them, preview what will move, and open
+     * the panel — nothing is written until the user confirms.
+     */
+    async OnMergeRequested(event) {
+        this.setMergeNotice(null);
+        try {
+            await this.prepareMerge(event);
+        }
+        catch (err) {
+            // A transport failure in any pre-flight query must not leave the user with nothing.
+            this.setMergeNotice(`Could not prepare the merge: ${err instanceof Error ? err.message : String(err)}`);
+            this.cdr.detectChanges();
+        }
+    }
+    /** @deprecated Use {@link OnMergeRequested}. */
+    async onMergeRequested(event) {
+        return this.OnMergeRequested(event);
+    }
+    /** The user chose which record survives; differing fields default to that record's values. */
+    OnSurvivorChange(side) {
+        if (!this.mergeState || this.mergeState.IsMerging)
+            return;
+        this.mergeState.Config = { ...this.mergeState.Config, SurvivorSide: side };
+        for (const field of this.mergeState.Fields) {
+            if (!field.IsReadOnly)
+                field.SelectedSide = side;
+        }
+        this.cdr.detectChanges();
+    }
+    /** @deprecated Use {@link OnSurvivorChange}. */
+    onSurvivorChange(side) {
+        return this.OnSurvivorChange(side);
+    }
+    async prepareMerge(event) {
+        const entity = event.entityInfo ?? this.entity;
+        if (!entity)
+            return;
+        // The merge panel is two-sided by construction, so n > 2 has nowhere to render.
+        if (event.records.length !== 2) {
+            this.setMergeNotice('Select exactly two records to merge.');
+            this.cdr.detectChanges();
+            return;
+        }
+        // Composite-key safe: the grid renders arbitrary entities, so never assume one key column.
+        const keys = event.records.map(r => CompositeKey.FromEntityRecord(entity, r));
+        if (keys.some(k => k.KeyValuePairs.length === 0 || k.KeyValuePairs.some(kv => kv.Value == null || kv.Value === ''))) {
+            this.setMergeNotice('Could not read the primary key of the selected records.');
+            this.cdr.detectChanges();
+            return;
+        }
+        // The merge panel's config is string-keyed, so keys travel through it as compact segments.
+        const [left, right] = keys.map(k => k.ToCompactURLSegment());
+        // Subtype records: the merge re-points only the keys that target this entity, then the loser's
+        // delete follows the shared key into the parent row, whose own references never moved.
+        if (entity.ParentID) {
+            this.setMergeNotice(`${entity.DisplayName} records extend a parent type; merging subtype records is not supported yet.`);
+            this.cdr.detectChanges();
+            return;
+        }
+        const childRows = await this.hasIsAChildRows(entity, keys);
+        if (childRows === null) {
+            this.setMergeNotice('Could not verify whether the selected records have subtype rows, so the merge was not started.');
+            this.cdr.detectChanges();
+            return;
+        }
+        if (childRows) {
+            this.setMergeNotice(`${entity.DisplayName} records that another app extends (shared-key subtype rows) cannot be merged yet — ` +
+                'the merge would collide on the shared key. Merge them from the extending app instead.');
+            this.cdr.detectChanges();
+            return;
+        }
+        const result = await this.comparison.GetRecordComparison({
+            EntityName: entity.Name,
+            Keys: keys.map(k => ({
+                KeyValuePairs: k.KeyValuePairs.map(kv => ({ FieldName: kv.FieldName, Value: String(kv.Value) })),
+            })),
+        }, this.ProviderToUse);
+        if (!result.Success || !result.Output) {
+            this.setMergeNotice(result.ErrorMessage ?? 'Could not compare the selected records.');
+            this.cdr.detectChanges();
+            return;
+        }
+        this.mergeState = {
+            Config: {
+                EntityName: entity.Name,
+                LeftRecordID: left,
+                RightRecordID: right,
+                SurvivorSide: 'left',
+                LeftLabel: this.labelFor(event.records[0], entity, keys[0]),
+                RightLabel: this.labelFor(event.records[1], entity, keys[1]),
+            },
+            Fields: result.Output.Fields.map(delta => ({
+                FieldName: delta.FieldName,
+                DisplayLabel: delta.DisplayName,
+                LeftValue: delta.Cells[0]?.Value,
+                RightValue: delta.Cells[1]?.Value,
+                HasConflict: delta.Differs,
+                SelectedSide: 'left',
+                // What the ORM will refuse to write — keys, AllowUpdateAPI = 0, timestamps. A field the
+                // metadata does not know cannot be written either.
+                IsReadOnly: entity.FieldByName(delta.FieldName)?.ReadOnly ?? true,
+                DataType: 'string',
+            })),
+            IsMerging: false,
+            DependencyNote: await this.describeDependencies(entity, keys),
+            Entity: entity,
+            Keys: keys,
+        };
+        this.cdr.detectChanges();
+    }
+    /** The user confirmed: merge, then reload the page so the loser disappears from the grid. */
+    async OnMergeConfirmed(event) {
+        if (!this.mergeState)
+            return;
+        this.mergeState.IsMerging = true;
+        this.cdr.detectChanges();
+        const survivorIsLeft = event.Config.SurvivorSide === 'left';
+        const [leftKey, rightKey] = this.mergeState.Keys;
+        const survivor = survivorIsLeft ? leftKey : rightKey;
+        const loser = survivorIsLeft ? rightKey : leftKey;
+        const request = new RecordMergeRequest();
+        request.EntityName = event.Config.EntityName;
+        request.SurvivingRecordCompositeKey = survivor;
+        request.RecordsToMerge = [loser];
+        request.FieldMap = this.buildFieldMap(event, survivorIsLeft);
+        try {
+            const result = await this.ProviderToUse.MergeRecords(request);
+            this.mergeState = null;
+            this.setMergeNotice(result.Success ? 'Records merged.' : `Merge failed: ${result.OverallStatus}`);
+            if (result.Success) {
+                this.dataRequest.emit(this.currentPageDataRequest());
+            }
+        }
+        catch (err) {
+            this.mergeState = null;
+            this.setMergeNotice(`Merge failed: ${err instanceof Error ? err.message : String(err)}`);
+        }
+        this.cdr.detectChanges();
+    }
+    /** @deprecated Use {@link OnMergeConfirmed}. */
+    async onMergeConfirmed(event) {
+        return this.OnMergeConfirmed(event);
+    }
+    /** Merge cancelled → close the panel, write nothing. */
+    OnMergeCancelled() {
+        this.mergeState = null;
+        this.cdr.detectChanges();
+    }
+    /** @deprecated Use {@link OnMergeCancelled}. */
+    onMergeCancelled() {
+        return this.OnMergeCancelled();
+    }
+    /**
+     * Fields whose resolution has to travel, and only those: the survivor already holds the value
+     * for any field resolved to its own side.
+     *
+     * The distinction that matters is "the user did not change this" versus "the user chose the
+     * blank side". Both arrive as an absent value, so deciding from the value alone drops a real
+     * resolution — the survivor silently keeps its old value on the one operation where someone is
+     * reconciling two records field by field, and the loser is gone afterwards. So the skip is
+     * decided from WHICH SIDE was chosen, and a chosen blank is written through as null.
+     */
+    buildFieldMap(event, survivorIsLeft) {
+        const map = [];
+        for (const field of event.ResolvedFields) {
+            if (field.IsReadOnly || !field.HasConflict)
+                continue;
+            // Resolved to the survivor's own side — nothing to write, whatever the value is.
+            if (field.SelectedSide !== 'custom' && (field.SelectedSide === 'left') === survivorIsLeft)
+                continue;
+            const chosen = field.SelectedSide === 'custom'
+                ? field.CustomValue
+                : (survivorIsLeft ? field.RightValue : field.LeftValue);
+            // A chosen blank is a clear, not a no-op. Normalize undefined to null so the transport
+            // carries an explicit value rather than an absent one.
+            map.push({ FieldName: field.FieldName, Value: chosen === undefined ? null : chosen });
+        }
+        return map;
+    }
+    /**
+     * True when any of these records has a row in an IS-A child entity, null when that could not be
+     * determined (a child view the user cannot read answers `Success: false`, which must not pass
+     * for "no rows"). `MergeRecords` has no subtype handling: the child rows share the parent's key,
+     * so merging would collide. Refuse rather than half-merge.
+     */
+    async hasIsAChildRows(entity, keys) {
+        const children = entity.ChildEntities;
+        if (children.length === 0)
+            return false;
+        // An IS-A child shares its parent's key SEMANTICALLY; nothing requires it to share the column
+        // NAME. `CompositeKey.ToWhereClause()` emits the parent's names, so filtering a child view
+        // with it fails wherever the names differ — and a failed probe refuses the merge, which would
+        // disable merge for that entity permanently. Pair each key's values onto the child's own PK
+        // columns instead, the way the platform's own child discovery does
+        // (SQLServerDataProvider.BuildChildDiscoverySQL).
+        const probes = children
+            .map(child => ({ child, filter: this.buildChildKeyFilter(child, keys) }))
+            .filter((probe) => probe.filter !== null);
+        if (probes.length === 0)
+            return false;
+        const results = await RunView.FromMetadataProvider(this.ProviderToUse).RunViews(probes.map(({ child, filter }) => ({
+            EntityName: child.Name,
+            ExtraFilter: filter,
+            Fields: child.PrimaryKeys.map(f => f.Name),
+            ResultType: 'simple',
+            MaxRows: 1,
+        })));
+        if (results.some(r => !r.Success))
+            return null;
+        return results.some(r => r.Results.length > 0);
+    }
+    /**
+     * `(childPk = v1) OR (childPk = v2)` against one child entity, built from the parent's key
+     * VALUES and the child's own key COLUMN NAMES, paired positionally because an IS-A child shares
+     * its parent's key by design. Null when the child's key arity differs, which means it does not
+     * share the key and cannot hold a subtype row for these records.
+     */
+    buildChildKeyFilter(child, keys) {
+        const childPkFields = child.PrimaryKeys;
+        if (childPkFields.length === 0 || keys.some(k => k.KeyValuePairs.length !== childPkFields.length)) {
+            return null;
+        }
+        const clauses = keys.map(key => childPkFields
+            .map((field, i) => `[${field.Name}] = '${String(key.KeyValuePairs[i].Value ?? '').replace(/'/g, "''")}'`)
+            .join(' AND '));
+        return clauses.map(c => `(${c})`).join(' OR ');
+    }
+    /**
+     * How many linked records will move to the survivor — the thing users most want to know.
+     *
+     * Indexes `counts[0]` / `counts[1]` directly: `onMergeRequested` refuses anything other than
+     * exactly two records before reaching here, and the merge panel's config is two-sided by
+     * construction, so this is only ever called with a pair. Widen both together.
+     */
+    async describeDependencies(entity, keys) {
+        try {
+            const counts = await Promise.all(keys.map(key => this.ProviderToUse.GetRecordDependencies(entity.Name, key)));
+            return `Linked records that would move to the survivor: ${counts[0].length} on the left, ${counts[1].length} on the right.`;
+        }
+        catch (err) {
+            LogError(`Could not load merge dependencies for ${entity.Name}: ${err instanceof Error ? err.message : String(err)}`);
+            return null;
+        }
+    }
+    /** A human label for a row — its name field when it has one, else its key. */
+    labelFor(row, entity, key) {
+        const nameField = entity.NameField?.Name;
+        const name = nameField ? String(row[nameField] ?? '') : '';
+        return name || key.ToCompactURLSegment();
+    }
     // ================================================================
     // Helpers
     // ================================================================
@@ -473,21 +962,27 @@ export class GridViewRendererComponent extends BaseAngularComponent {
         } if (rf & 2) {
             let _t;
             i0.ɵɵqueryRefresh(_t = i0.ɵɵloadQuery()) && (ctx.grid = _t.first);
-        } }, inputs: { entity: "entity", records: "records", exportDataProvider: "exportDataProvider", selectedRecordId: "selectedRecordId", filterText: "filterText", config: "config", AutoLoadEntityActions: "AutoLoadEntityActions", totalRecordCount: "totalRecordCount", page: "page", pageSize: "pageSize", isLoading: "isLoading" }, outputs: { recordSelected: "recordSelected", recordOpened: "recordOpened", configChanged: "configChanged", dataRequest: "dataRequest", configureRequested: "configureRequested", openRelatedRecordRequested: "openRelatedRecordRequested", createRecordRequested: "createRecordRequested" }, standalone: false, features: [i0.ɵɵInheritDefinitionFeature], decls: 4, vars: 22, consts: [["grid", ""], [3, "AfterRowClick", "AfterRowDoubleClick", "AfterSort", "GridStateChanged", "SelectionChange", "NewButtonClick", "RefreshButtonClick", "DeleteButtonClick", "AddToListRequested", "ForeignKeyClick", "PageChange", "ManageColumnsRequested", "Provider", "Data", "ExportDataProvider", "Params", "FilterText", "GridState", "Height", "AllowLoad", "AutoLoadEntityActions", "ShowToolbar", "ShowSearch", "ToolbarConfig", "SelectionMode", "ShowAddToListButton", "ShowPager", "PageSize", "TotalRowCount", "PagerPageNumber"], [3, "Provider", "visible", "config"], ["Title", "Delete Records", "DetailMessage", "This action cannot be undone.", "ConfirmText", "Delete", "ConfirmStyle", "danger", "Icon", "fa-solid fa-trash", 3, "Confirmed", "Cancelled", "IsOpen", "Message"], [3, "complete", "cancel", "Provider", "visible", "config"]], template: function GridViewRendererComponent_Template(rf, ctx) { if (rf & 1) {
+        } }, inputs: { entity: "entity", records: "records", ExportDataProvider: "ExportDataProvider", exportDataProvider: "exportDataProvider", selectedRecordId: "selectedRecordId", filterText: "filterText", config: "config", AutoLoadEntityActions: "AutoLoadEntityActions", totalRecordCount: "totalRecordCount", page: "page", pageSize: "pageSize", isLoading: "isLoading" }, outputs: { recordSelected: "recordSelected", recordOpened: "recordOpened", configChanged: "configChanged", dataRequest: "dataRequest", configureRequested: "configureRequested", openRelatedRecordRequested: "openRelatedRecordRequested", createRecordRequested: "createRecordRequested" }, standalone: false, features: [i0.ɵɵInheritDefinitionFeature], decls: 6, vars: 25, consts: [["grid", ""], [3, "AfterRowClick", "AfterRowDoubleClick", "AfterSort", "GridStateChanged", "SelectionChange", "NewButtonClick", "RefreshButtonClick", "DeleteButtonClick", "AddToListRequested", "ForeignKeyClick", "PageChange", "ManageColumnsRequested", "MergeRecordsRequested", "Provider", "Data", "ExportDataProvider", "Params", "FilterText", "GridState", "Height", "AllowLoad", "AutoLoadEntityActions", "ShowToolbar", "ShowSearch", "ToolbarConfig", "SelectionMode", "ShowAddToListButton", "ShowPager", "PageSize", "TotalRowCount", "PagerPageNumber", "ShowMergeButton"], [3, "Provider", "visible", "config"], ["Title", "Delete Records", "DetailMessage", "This action cannot be undone.", "ConfirmText", "Delete", "ConfirmStyle", "danger", "Icon", "fa-solid fa-trash", 3, "Confirmed", "Cancelled", "IsOpen", "Message"], ["Size", "lg", 3, "Visible", "Closeable"], ["role", "status", 1, "mj-ev-merge-notice"], [3, "complete", "cancel", "Provider", "visible", "config"], ["Size", "lg", 3, "Close", "Visible", "Closeable"], ["role", "radiogroup", "aria-label", "Record to keep", 1, "mj-ev-merge-survivor"], ["type", "button", "mjButton", "", "size", "sm", "role", "radio", 3, "click", "variant", "disabled"], [1, "mj-ev-merge-survivor-note"], [3, "MergeConfirmed", "MergeCancelled", "Fields", "Config", "MergeEnabled", "IsMerging"], [1, "mj-ev-merge-deps"], [1, "mj-ev-merge-notice-text"], ["type", "button", "title", "Dismiss", "aria-label", "Dismiss", 1, "mj-ev-merge-notice-dismiss", 3, "click"], [1, "fa-solid", "fa-xmark"]], template: function GridViewRendererComponent_Template(rf, ctx) { if (rf & 1) {
             i0.ɵɵelementStart(0, "mj-entity-data-grid", 1, 0);
-            i0.ɵɵlistener("AfterRowClick", function GridViewRendererComponent_Template_mj_entity_data_grid_AfterRowClick_0_listener($event) { return ctx.onAfterRowClick($event); })("AfterRowDoubleClick", function GridViewRendererComponent_Template_mj_entity_data_grid_AfterRowDoubleClick_0_listener($event) { return ctx.onAfterRowDoubleClick($event); })("AfterSort", function GridViewRendererComponent_Template_mj_entity_data_grid_AfterSort_0_listener($event) { return ctx.onAfterSort($event); })("GridStateChanged", function GridViewRendererComponent_Template_mj_entity_data_grid_GridStateChanged_0_listener($event) { return ctx.onGridStateChanged($event); })("SelectionChange", function GridViewRendererComponent_Template_mj_entity_data_grid_SelectionChange_0_listener($event) { return ctx.onSelectionChange($event); })("NewButtonClick", function GridViewRendererComponent_Template_mj_entity_data_grid_NewButtonClick_0_listener() { return ctx.onNewButtonClick(); })("RefreshButtonClick", function GridViewRendererComponent_Template_mj_entity_data_grid_RefreshButtonClick_0_listener() { return ctx.onRefreshButtonClick(); })("DeleteButtonClick", function GridViewRendererComponent_Template_mj_entity_data_grid_DeleteButtonClick_0_listener($event) { return ctx.onDeleteButtonClick($event); })("AddToListRequested", function GridViewRendererComponent_Template_mj_entity_data_grid_AddToListRequested_0_listener($event) { return ctx.onAddToListRequested($event); })("ForeignKeyClick", function GridViewRendererComponent_Template_mj_entity_data_grid_ForeignKeyClick_0_listener($event) { return ctx.onForeignKeyClick($event); })("PageChange", function GridViewRendererComponent_Template_mj_entity_data_grid_PageChange_0_listener($event) { return ctx.onPageChange($event); })("ManageColumnsRequested", function GridViewRendererComponent_Template_mj_entity_data_grid_ManageColumnsRequested_0_listener() { return ctx.configureRequested.emit(); });
+            i0.ɵɵlistener("AfterRowClick", function GridViewRendererComponent_Template_mj_entity_data_grid_AfterRowClick_0_listener($event) { return ctx.onAfterRowClick($event); })("AfterRowDoubleClick", function GridViewRendererComponent_Template_mj_entity_data_grid_AfterRowDoubleClick_0_listener($event) { return ctx.onAfterRowDoubleClick($event); })("AfterSort", function GridViewRendererComponent_Template_mj_entity_data_grid_AfterSort_0_listener($event) { return ctx.onAfterSort($event); })("GridStateChanged", function GridViewRendererComponent_Template_mj_entity_data_grid_GridStateChanged_0_listener($event) { return ctx.onGridStateChanged($event); })("SelectionChange", function GridViewRendererComponent_Template_mj_entity_data_grid_SelectionChange_0_listener($event) { return ctx.onSelectionChange($event); })("NewButtonClick", function GridViewRendererComponent_Template_mj_entity_data_grid_NewButtonClick_0_listener() { return ctx.onNewButtonClick(); })("RefreshButtonClick", function GridViewRendererComponent_Template_mj_entity_data_grid_RefreshButtonClick_0_listener() { return ctx.onRefreshButtonClick(); })("DeleteButtonClick", function GridViewRendererComponent_Template_mj_entity_data_grid_DeleteButtonClick_0_listener($event) { return ctx.onDeleteButtonClick($event); })("AddToListRequested", function GridViewRendererComponent_Template_mj_entity_data_grid_AddToListRequested_0_listener($event) { return ctx.onAddToListRequested($event); })("ForeignKeyClick", function GridViewRendererComponent_Template_mj_entity_data_grid_ForeignKeyClick_0_listener($event) { return ctx.onForeignKeyClick($event); })("PageChange", function GridViewRendererComponent_Template_mj_entity_data_grid_PageChange_0_listener($event) { return ctx.onPageChange($event); })("ManageColumnsRequested", function GridViewRendererComponent_Template_mj_entity_data_grid_ManageColumnsRequested_0_listener() { return ctx.configureRequested.emit(); })("MergeRecordsRequested", function GridViewRendererComponent_Template_mj_entity_data_grid_MergeRecordsRequested_0_listener($event) { return ctx.onMergeRequested($event); });
             i0.ɵɵelementEnd();
             i0.ɵɵconditionalCreate(2, GridViewRendererComponent_Conditional_2_Template, 1, 3, "mj-list-management-dialog", 2);
             i0.ɵɵelementStart(3, "mj-ev-confirm-dialog", 3);
             i0.ɵɵlistener("Confirmed", function GridViewRendererComponent_Template_mj_ev_confirm_dialog_Confirmed_3_listener() { return ctx.onDeleteConfirmed(); })("Cancelled", function GridViewRendererComponent_Template_mj_ev_confirm_dialog_Cancelled_3_listener() { return ctx.onDeleteCancelled(); });
             i0.ɵɵelementEnd();
+            i0.ɵɵconditionalCreate(4, GridViewRendererComponent_Conditional_4_Template, 12, 16, "mj-dialog", 4);
+            i0.ɵɵconditionalCreate(5, GridViewRendererComponent_Conditional_5_Template, 5, 1, "div", 5);
         } if (rf & 2) {
-            i0.ɵɵproperty("Provider", ctx.Provider)("Data", ctx.records)("ExportDataProvider", ctx.exportDataProvider)("Params", ctx.effectiveParams)("FilterText", ctx.filterText ?? "")("GridState", ctx.config.gridState ?? null)("Height", "auto")("AllowLoad", false)("AutoLoadEntityActions", ctx.AutoLoadEntityActions)("ShowToolbar", ctx.effectiveShowToolbar)("ShowSearch", ctx.effectiveShowSearch)("ToolbarConfig", ctx.config.toolbarConfig ?? i0.ɵɵpureFunction0(21, _c1))("SelectionMode", ctx.effectiveSelectionMode)("ShowAddToListButton", ctx.effectiveShowAddToListButton)("ShowPager", ctx.effectiveShowPager)("PageSize", ctx.effectivePageSize)("TotalRowCount", ctx.totalRecordCount ?? 0)("PagerPageNumber", ctx.page ?? 1);
+            i0.ɵɵproperty("Provider", ctx.Provider)("Data", ctx.records)("ExportDataProvider", ctx.exportDataProvider)("Params", ctx.effectiveParams)("FilterText", ctx.filterText ?? "")("GridState", ctx.config.gridState ?? null)("Height", "auto")("AllowLoad", false)("AutoLoadEntityActions", ctx.AutoLoadEntityActions)("ShowToolbar", ctx.effectiveShowToolbar)("ShowSearch", ctx.effectiveShowSearch)("ToolbarConfig", ctx.config.toolbarConfig ?? i0.ɵɵpureFunction0(24, _c1))("SelectionMode", ctx.effectiveSelectionMode)("ShowAddToListButton", ctx.effectiveShowAddToListButton)("ShowPager", ctx.effectiveShowPager)("PageSize", ctx.effectivePageSize)("TotalRowCount", ctx.totalRecordCount ?? 0)("PagerPageNumber", ctx.page ?? 1)("ShowMergeButton", ctx.effectiveShowMergeButton);
             i0.ɵɵadvance(2);
             i0.ɵɵconditional(ctx.listManagementConfig ? 2 : -1);
             i0.ɵɵadvance();
             i0.ɵɵproperty("IsOpen", ctx.showDeleteConfirm)("Message", ctx.deleteConfirmMessage);
-        } }, dependencies: [i1.ListManagementDialogComponent, i2.EntityDataGridComponent, i3.ConfirmDialogComponent], styles: ["\n      :host {\n        display: block;\n        height: 100%;\n      }\n    "], encapsulation: 2 });
+            i0.ɵɵadvance();
+            i0.ɵɵconditional(ctx.mergeState ? 4 : -1);
+            i0.ɵɵadvance();
+            i0.ɵɵconditional(ctx.mergeNotice ? 5 : -1);
+        } }, dependencies: [i1.ListManagementDialogComponent, i2.RecordMergePanelComponent, i3.MJDialogComponent, i3.MJButtonDirective, i4.EntityDataGridComponent, i5.ConfirmDialogComponent], styles: ["\n      :host {\n        display: block;\n        height: 100%;\n      }\n\n      .mj-ev-merge-survivor {\n        display: flex;\n        flex-wrap: wrap;\n        align-items: center;\n        gap: 8px;\n        margin-bottom: 12px;\n        font-size: var(--mj-text-sm);\n        color: var(--mj-text-secondary);\n      }\n\n      .mj-ev-merge-survivor-note {\n        color: var(--mj-text-muted);\n      }\n\n      .mj-ev-merge-deps {\n        margin: 0;\n        font-size: var(--mj-text-xs);\n        color: var(--mj-text-muted);\n      }\n\n      .mj-ev-merge-notice {\n        position: fixed;\n        bottom: 16px;\n        left: 50%;\n        transform: translateX(-50%);\n        z-index: 1001;\n        padding: 8px 14px;\n        border: 1px solid var(--mj-border-subtle);\n        border-radius: var(--mj-radius-md);\n        background: var(--mj-bg-surface-elevated);\n        color: var(--mj-text-primary);\n        font-size: var(--mj-text-sm);\n        box-shadow: var(--mj-shadow-md);\n        display: flex;\n        align-items: center;\n        gap: 10px;\n      }\n\n      .mj-ev-merge-notice-dismiss {\n        flex-shrink: 0;\n        background: none;\n        border: none;\n        padding: 0 2px;\n        cursor: pointer;\n        color: var(--mj-text-muted);\n        font-size: var(--mj-text-sm);\n        line-height: 1;\n      }\n\n      .mj-ev-merge-notice-dismiss:hover {\n        color: var(--mj-text-primary);\n      }\n    "], encapsulation: 2 });
 }
 (() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(GridViewRendererComponent, [{
         type: Component,
@@ -524,6 +1019,8 @@ export class GridViewRendererComponent extends BaseAngularComponent {
       (ForeignKeyClick)="onForeignKeyClick($event)"
       (PageChange)="onPageChange($event)"
       (ManageColumnsRequested)="configureRequested.emit()"
+      [ShowMergeButton]="effectiveShowMergeButton"
+      (MergeRecordsRequested)="onMergeRequested($event)"
     >
     </mj-entity-data-grid>
 
@@ -556,11 +1053,54 @@ export class GridViewRendererComponent extends BaseAngularComponent {
       (Cancelled)="onDeleteCancelled()"
     >
     </mj-ev-confirm-dialog>
-  `, styles: ["\n      :host {\n        display: block;\n        height: 100%;\n      }\n    "] }]
+
+    <!-- Self-contained merge panel (Generic) — owned by this wrapper, never bubbles up.
+         Lives inside the @if so the panel rebuilds its comparison (ngOnInit) per request. -->
+    @if (mergeState) {
+      <mj-dialog [Visible]="true" Size="lg" [Closeable]="!mergeState.IsMerging" (Close)="onMergeCancelled()">
+        <div class="mj-ev-merge-survivor" role="radiogroup" aria-label="Record to keep">
+          <span>Keep</span>
+          <button type="button" mjButton size="sm" role="radio"
+            [variant]="mergeState.Config.SurvivorSide === 'left' ? 'primary' : 'secondary'"
+            [attr.aria-checked]="mergeState.Config.SurvivorSide === 'left'"
+            [disabled]="mergeState.IsMerging"
+            (click)="onSurvivorChange('left')">{{ mergeState.Config.LeftLabel }}</button>
+          <button type="button" mjButton size="sm" role="radio"
+            [variant]="mergeState.Config.SurvivorSide === 'right' ? 'primary' : 'secondary'"
+            [attr.aria-checked]="mergeState.Config.SurvivorSide === 'right'"
+            [disabled]="mergeState.IsMerging"
+            (click)="onSurvivorChange('right')">{{ mergeState.Config.RightLabel }}</button>
+          <span class="mj-ev-merge-survivor-note">{{ mergeLoserLabel }} will be deleted; its linked records move to the record you keep.</span>
+        </div>
+        <mj-record-merge-panel
+          [Fields]="mergeState.Fields"
+          [Config]="mergeState.Config"
+          [MergeEnabled]="!mergeState.IsMerging"
+          [IsMerging]="mergeState.IsMerging"
+          (MergeConfirmed)="onMergeConfirmed($event)"
+          (MergeCancelled)="onMergeCancelled()"
+        >
+        </mj-record-merge-panel>
+        @if (mergeState.DependencyNote) {
+          <p class="mj-ev-merge-deps">{{ mergeState.DependencyNote }}</p>
+        }
+      </mj-dialog>
+    }
+    @if (mergeNotice) {
+      <div class="mj-ev-merge-notice" role="status">
+        <span class="mj-ev-merge-notice-text">{{ mergeNotice }}</span>
+        <button type="button" class="mj-ev-merge-notice-dismiss" (click)="onDismissMergeNotice()" title="Dismiss" aria-label="Dismiss">
+          <i class="fa-solid fa-xmark"></i>
+        </button>
+      </div>
+    }
+  `, styles: ["\n      :host {\n        display: block;\n        height: 100%;\n      }\n\n      .mj-ev-merge-survivor {\n        display: flex;\n        flex-wrap: wrap;\n        align-items: center;\n        gap: 8px;\n        margin-bottom: 12px;\n        font-size: var(--mj-text-sm);\n        color: var(--mj-text-secondary);\n      }\n\n      .mj-ev-merge-survivor-note {\n        color: var(--mj-text-muted);\n      }\n\n      .mj-ev-merge-deps {\n        margin: 0;\n        font-size: var(--mj-text-xs);\n        color: var(--mj-text-muted);\n      }\n\n      .mj-ev-merge-notice {\n        position: fixed;\n        bottom: 16px;\n        left: 50%;\n        transform: translateX(-50%);\n        z-index: 1001;\n        padding: 8px 14px;\n        border: 1px solid var(--mj-border-subtle);\n        border-radius: var(--mj-radius-md);\n        background: var(--mj-bg-surface-elevated);\n        color: var(--mj-text-primary);\n        font-size: var(--mj-text-sm);\n        box-shadow: var(--mj-shadow-md);\n        display: flex;\n        align-items: center;\n        gap: 10px;\n      }\n\n      .mj-ev-merge-notice-dismiss {\n        flex-shrink: 0;\n        background: none;\n        border: none;\n        padding: 0 2px;\n        cursor: pointer;\n        color: var(--mj-text-muted);\n        font-size: var(--mj-text-sm);\n        line-height: 1;\n      }\n\n      .mj-ev-merge-notice-dismiss:hover {\n        color: var(--mj-text-primary);\n      }\n    "] }]
     }], null, { entity: [{
             type: Input
         }], records: [{
             type: Input
+        }], ExportDataProvider: [{
+            type: Input
         }], exportDataProvider: [{
             type: Input
         }], selectedRecordId: [{
@@ -597,7 +1137,7 @@ export class GridViewRendererComponent extends BaseAngularComponent {
             type: ViewChild,
             args: ['grid']
         }] }); })();
-(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(GridViewRendererComponent, { className: "GridViewRendererComponent", filePath: "src/lib/view-types/renderers/grid-view-renderer.component.ts", lineNumber: 187 }); })();
+(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassDebugInfo(GridViewRendererComponent, { className: "GridViewRendererComponent", filePath: "src/lib/view-types/renderers/grid-view-renderer.component.ts", lineNumber: 289 }); })();
 /**
  * Tree-shaking guard. Force-references this renderer so bundlers (ESBuild/Vite) don't drop the
  * component in builds that only mount it dynamically via the ClassFactory/descriptor. Mirrors the