fix phone number duplication

Author: MikeAlhayek

CrestApps.OrchardCore.slnx

@@ -60,6 +60,7 @@
     <Project Path="src/Modules/CrestApps.OrchardCore.AzureAIInference/CrestApps.OrchardCore.AzureAIInference.csproj" />
     <Project Path="src/Modules/CrestApps.OrchardCore.ContentAccessControl/CrestApps.OrchardCore.ContentAccessControl.csproj" />
     <Project Path="src/Modules/CrestApps.OrchardCore.ContentTransfer/CrestApps.OrchardCore.ContentTransfer.csproj" />
+    <Project Path="src/Modules/CrestApps.OrchardCore.ContentTransfer.OpenXml/CrestApps.OrchardCore.ContentTransfer.OpenXml.csproj" />
     <Project Path="src/Modules/CrestApps.OrchardCore.DncRegistry/CrestApps.OrchardCore.DncRegistry.csproj" />
     <Project Path="src/Modules/CrestApps.OrchardCore.Ollama/CrestApps.OrchardCore.Ollama.csproj" />
     <Project Path="src/Modules/CrestApps.OrchardCore.Omnichannel.EventGrid/CrestApps.OrchardCore.Omnichannel.EventGrid.csproj" />

src/Abstractions/CrestApps.OrchardCore.ContentTransfer.Abstractions/ContentImportRowFilterBatchContext.cs

@@ -0,0 +1,30 @@
+using OrchardCore.ContentManagement.Metadata.Models;
+
+namespace CrestApps.OrchardCore.ContentTransfer;
+
+/// <summary>
+/// Context passed to <see cref="IContentImportRowFilter.PrepareBatchAsync(ContentImportRowFilterBatchContext)"/>
+/// so a filter can preload state for the next import batch.
+/// </summary>
+public sealed class ContentImportRowFilterBatchContext
+{
+    /// <summary>
+    /// Gets or sets the content type definition for the import.
+    /// </summary>
+    public ContentTypeDefinition ContentTypeDefinition { get; set; }
+
+    /// <summary>
+    /// Gets or sets the content transfer entry associated with the import.
+    /// </summary>
+    public ContentTransferEntry Entry { get; set; }
+
+    /// <summary>
+    /// Gets or sets the rows that will be evaluated in the current batch.
+    /// </summary>
+    public IReadOnlyList<ContentImportRowFilterContext> Rows { get; set; }
+
+    /// <summary>
+    /// Gets or sets the cancellation token for the current batch operation.
+    /// </summary>
+    public CancellationToken CancellationToken { get; set; }
+}

src/Abstractions/CrestApps.OrchardCore.ContentTransfer.Abstractions/ContentImportRowFilterContext.cs

@@ -32,4 +32,9 @@ public sealed class ContentImportRowFilterContext
     /// Gets or sets the row index (1-based).
     /// </summary>
     public int RowIndex { get; set; }
+
+    /// <summary>
+    /// Gets or sets the reason the row should be skipped.
+    /// </summary>
+    public string SkipReason { get; set; }
 }

src/Abstractions/CrestApps.OrchardCore.ContentTransfer.Abstractions/IContentImportRowFilter.cs

@@ -22,6 +22,13 @@ public interface IContentImportRowFilter
     /// </returns>
     Task<bool> InitializeAsync(ContentImportRowFilterInitContext context);
 
+    /// <summary>
+    /// Prepares filter state for the next import batch.
+    /// </summary>
+    /// <param name="context">The context containing the rows that are about to be evaluated.</param>
+    /// <returns>A task that completes when the batch state is ready.</returns>
+    Task PrepareBatchAsync(ContentImportRowFilterBatchContext context);
+
     /// <summary>
     /// Determines whether a row should be skipped during import.
     /// </summary>

src/Core/CrestApps.OrchardCore.ContentTransfer.Core/Services/ContentImportManager.cs

@@ -49,7 +49,7 @@ public async Task<IReadOnlyCollection<ImportColumn>> GetColumnsAsync(ImportConte
             if (part == null)
             {
                 part = partActivator.CreateInstance();
-                part.Weld(typePartDefinition.Name, part);
+                contentItem.Weld(typePartDefinition.Name, part);
             }
 
             var partHandlers = _contentImportHandlerResolver.GetPartHandlers(partName);
@@ -134,7 +134,7 @@ public async Task ImportAsync(ContentImportContext context)
             if (part == null)
             {
                 part = partActivator.CreateInstance();
-                part.Weld(typePartDefinition.Name, part);
+                context.ContentItem.Weld(typePartDefinition.Name, part);
             }
 
             foreach (var partFieldDefinition in typePartDefinition.PartDefinition.Fields)
@@ -182,7 +182,7 @@ public async Task ExportAsync(ContentExportContext context)
             if (part == null)
             {
                 part = partActivator.CreateInstance();
-                part.Weld(typePartDefinition.Name, part);
+                context.ContentItem.Weld(typePartDefinition.Name, part);
             }
 
             var partHandlers = _contentImportHandlerResolver.GetPartHandlers(partName);

src/Core/CrestApps.OrchardCore.Omnichannel.Core/Indexes/OmnichannelContactIndex.cs

@@ -17,11 +17,21 @@ public sealed class OmnichannelContactIndex : MapIndex
     /// </summary>
     public string PrimaryCellPhoneNumber { get; set; }
 
+    /// <summary>
+    /// Gets or sets the normalized primary cell phone number.
+    /// </summary>
+    public string NormalizedPrimaryCellPhoneNumber { get; set; }
+
     /// <summary>
     /// Gets or sets the primary home phone number.
     /// </summary>
     public string PrimaryHomePhoneNumber { get; set; }
 
+    /// <summary>
+    /// Gets or sets the normalized primary home phone number.
+    /// </summary>
+    public string NormalizedPrimaryHomePhoneNumber { get; set; }
+
     /// <summary>
     /// Gets or sets the primary email address.
     /// </summary>

src/CrestApps.Docs/docs/changelog/v2.0.0.md

@@ -111,11 +111,14 @@ Large parts of the reusable AI infrastructure are no longer implemented only ins
 - Azure AI Search index editors for **AI Documents** and **AI Memory** now normalize their built-in managed mappings on load and update so repeated edits do not keep appending duplicate `Content`, `Embedding`, and related managed fields, while custom mappings remain preserved
 - The **Clear saved AI memory** action in the current user's profile editor now uses Orchard Core's standard admin confirmation dialog and clears the user's saved memory entries by filtering the store's persisted records for the current user before removing the corresponding indexed AI memory documents
 - Content Transfer content-type settings now default **Allow Bulk Import** and **Allow Bulk Export** to enabled, so content types participate by default and can explicitly opt out by turning either setting off
-- Omnichannel contact import and export now map the first contact-method bag entries to workbook `Email`, `Cell Phone`, and `Phone` columns, also read and write `DoNotCall`, `DoNotCallUtc`, `DoNotSms`, `DoNotSmsUtc`, `DoNotEmail`, `DoNotEmailUtc`, `DoNotChat`, and `DoNotChatUtc` on `OmnichannelContactPart`, support duplicate-phone filtering during import, and can enforce national do-not-call registry checks through **Settings** -> **Import Content Settings**
+- Content Transfer now keeps CSV support in the base `CrestApps.OrchardCore.ContentTransfer` feature and moves optional `.xlsx` support into `CrestApps.OrchardCore.ContentTransfer.OpenXml`, with the import and export UI showing only the file extensions enabled by the current tenant feature set
+- Content Transfer now welds lazily created parts onto the parent content item during column discovery, import, and export so `.xlsx` exports no longer fail with a `System.Text.Json` node-cycle exception when a content item does not already materialize one of its configured parts
+- Omnichannel contact import and export now map the first contact-method bag entries to workbook `Email`, `Cell Phone`, and `Phone` columns, also read and write `DoNotCall`, `DoNotCallUtc`, `DoNotSms`, `DoNotSmsUtc`, `DoNotEmail`, `DoNotEmailUtc`, `DoNotChat`, and `DoNotChatUtc` on `OmnichannelContactPart`, advertise `true` and `false` for the `DoNot*` boolean columns, default duplicate-phone filtering to enabled, add skipped duplicate rows to the error export with a reason, batch-check duplicate phone numbers against both the import file and the existing Orchard contact records, fall back to legacy stored phone values when older tenants have not yet backfilled normalized-phone indexes, and can enforce national do-not-call registry checks through **Settings** -> **Import Content Settings**
 - Omnichannel contact definitions now enforce a fixed `ContactMethods` bag for content types that attach `OmnichannelContactPart`, while `OmnichannelContactPart` itself owns the contact-level Do-Not-Call, Do-Not-SMS, Do-Not-Email, and Do-Not-Chat compliance flags so omnichannel indexing, campaign actions, and activity loading all use one C#-controlled contact model
 - Omnichannel Management now declares the `OrchardCore.Flows` feature dependency required to render the enforced `ContactMethods` bag editor on content types that attach `OmnichannelContactPart`
 - Omnichannel contact type definitions now inject the named `ContactMethods` bag from Orchard's `IContentDefinitionHandler` build pipeline, ensuring the bag materializes whenever a content type attaches `OmnichannelContactPart` even before any stored definition repair runs
 - DNC registry provider configuration is now split into dedicated settings pages under **Settings** -> **DNC Registries** with separate **USA FTC Registry** and **Canada LNNTE-DNCL Registry** pages, and registry API keys are stored as protected values instead of being shown back in the UI
+- DNC registry settings navigation now only shows **USA FTC Registry** and **Canada LNNTE-DNCL Registry** when their matching provider features are enabled, which fixes the 404 links from the shared DNC settings menu
 - DNC registry providers now expose their shared contract through `CrestApps.OrchardCore.DncRegistry.Abstractions`, and Content Transfer row filters now use `InitializeAsync` to opt into an import while keeping import-scoped filtering state on the filter instance itself
 
 ### Typed AI deployments replace legacy deployment selectors
@@ -223,8 +226,9 @@ Review the current admin navigation after upgrade and update any operator docume
 ### Content Transfer module
 
 - added `CrestApps.OrchardCore.ContentTransfer`, `CrestApps.OrchardCore.ContentTransfer.Core`, and `CrestApps.OrchardCore.ContentTransfer.Abstractions`
+- added `CrestApps.OrchardCore.ContentTransfer.OpenXml` so Excel workbook support can be enabled separately from the base CSV transfer feature
 - added unit coverage for the imported content transfer services and Excel validation behavior
-- added module documentation for bulk Excel-based content import and export
+- added module documentation for bulk content import and export across CSV and optional OpenXml workbook formats
 
 ### Orchestrator-based AI execution