fix(import-wizard): correct company ID field and add company_name warning

- Fix bug: enrichRowWithCompanyMatch was reading $row['id'] (person/opportunity ID)
  instead of $row['company_id'] (actual company ID)
- Add hasMappingWarnings() to detect multiple warning conditions
- Add hasCompanyNameWithoutId() to detect company_name without company_id mapping
- Add getMappingWarningsHtml() to generate dynamic modal content
- Extend existing warning modal to show both unique identifier and company warnings

Author: ManukMinasyan

app-modules/ImportWizard/src/Livewire/Concerns/HasColumnMapping.php

@@ -8,10 +8,19 @@
 use Illuminate\Support\Str;
 use Livewire\Attributes\Computed;
 use Relaticle\ImportWizard\Filament\Imports\BaseImporter;
-
-/** @property array<\Filament\Actions\Imports\ImportColumn> $importerColumns */
+use Relaticle\ImportWizard\Services\ColumnMatcher;
+use Relaticle\ImportWizard\Services\DataTypeInferencer;
+
+/**
+ * @property array<\Filament\Actions\Imports\ImportColumn> $importerColumns
+ *
+ * @phpstan-type InferredMapping array{field: string, confidence: float, type: string}
+ */
 trait HasColumnMapping
 {
+    /** @var array<string, array{field: string, confidence: float, type: string}> */
+    public array $inferredMappings = [];
+
     /** @return array<ImportColumn> */
     #[Computed]
     public function importerColumns(): array
@@ -30,18 +39,55 @@ protected function autoMapColumns(): void
             return;
         }
 
-        $csvHeadersLower = collect($this->csvHeaders)->mapWithKeys(
-            fn (string $header): array => [Str::lower($header) => $header]
-        );
+        $matcher = app(ColumnMatcher::class);
 
+        // Phase 1: Header matching
         $this->columnMap = collect($this->importerColumns)
-            ->mapWithKeys(function (ImportColumn $column) use ($csvHeadersLower): array {
-                $guesses = collect($column->getGuesses())->map(fn (string $g): string => Str::lower($g));
-                $match = $guesses->first(fn (string $guess): bool => $csvHeadersLower->has($guess));
+            ->mapWithKeys(function (ImportColumn $column) use ($matcher): array {
+                $match = $matcher->findMatchingHeader($this->csvHeaders, $column->getGuesses());
 
-                return [$column->getName() => $match !== null ? $csvHeadersLower->get($match) : ''];
+                return [$column->getName() => $match ?? ''];
             })
             ->toArray();
+
+        // Phase 2: Data type inference for unmapped CSV columns
+        $this->applyDataTypeInference();
+    }
+
+    /**
+     * Apply data type inference for CSV columns that weren't matched by headers.
+     */
+    protected function applyDataTypeInference(): void
+    {
+        $inferencer = app(DataTypeInferencer::class);
+        $this->inferredMappings = [];
+
+        $mappedHeaders = array_filter($this->columnMap);
+        $unmappedHeaders = array_diff($this->csvHeaders, $mappedHeaders);
+
+        foreach ($unmappedHeaders as $header) {
+            $sampleValues = $this->getColumnPreviewValues($header, 20);
+            $inference = $inferencer->inferType($sampleValues);
+
+            if ($inference['type'] === null) {
+                continue;
+            }
+
+            // Find first unmapped field that matches suggested fields
+            foreach ($inference['suggestedFields'] as $suggestedField) {
+                if (isset($this->columnMap[$suggestedField]) && $this->columnMap[$suggestedField] === '') {
+                    // Auto-apply the inference
+                    $this->columnMap[$suggestedField] = $header;
+                    $this->inferredMappings[$header] = [
+                        'field' => $suggestedField,
+                        'confidence' => $inference['confidence'],
+                        'type' => $inference['type'],
+                    ];
+
+                    break;
+                }
+            }
+        }
     }
 
     /** @return class-string<BaseImporter>|null */
@@ -123,4 +169,43 @@ protected function getMissingUniqueIdentifiersMessage(): string
 
         return $importerClass::getMissingUniqueIdentifiersMessage();
     }
+
+    protected function hasMappingWarnings(): bool
+    {
+        return ! $this->hasUniqueIdentifierMapped() || $this->hasCompanyNameWithoutId();
+    }
+
+    protected function hasCompanyNameWithoutId(): bool
+    {
+        $columns = collect($this->importerColumns)->keyBy(fn (ImportColumn $col): string => $col->getName());
+
+        if (! $columns->has('company_name') || ! $columns->has('company_id')) {
+            return false;
+        }
+
+        $hasCompanyName = isset($this->columnMap['company_name']) && $this->columnMap['company_name'] !== '';
+        $hasCompanyId = isset($this->columnMap['company_id']) && $this->columnMap['company_id'] !== '';
+
+        return $hasCompanyName && ! $hasCompanyId;
+    }
+
+    protected function getMappingWarningsHtml(): string
+    {
+        $warnings = [];
+
+        if (! $this->hasUniqueIdentifierMapped()) {
+            $warnings[] = '<strong>'.$this->getMissingUniqueIdentifiersMessage().'</strong>';
+        }
+
+        if ($this->hasCompanyNameWithoutId()) {
+            $warnings[] = '<strong>Company Name</strong> is mapped without <strong>Company Record ID</strong>. '.
+                'New companies will be created for each unique name in your CSV.';
+        }
+
+        $docsUrl = route('documentation.show', 'import').'#unique-identifiers';
+
+        return 'Please review the following before continuing:<br><br>'.
+            implode('<br><br>', $warnings).'<br><br>'.
+            '<a href="'.$docsUrl.'" target="_blank" class="text-primary-600 hover:underline">Learn more about imports</a>';
+    }
 }

app-modules/ImportWizard/src/Livewire/ImportWizard.php

@@ -17,6 +17,7 @@
 use Illuminate\Support\HtmlString;
 use Illuminate\Support\Str;
 use Illuminate\View\View;
+use Livewire\Attributes\Computed;
 use Livewire\Attributes\Locked;
 use Livewire\Attributes\Validate;
 use Livewire\Component;
@@ -140,8 +141,8 @@ public function nextStep(): void
             return;
         }
 
-        // Check for unique identifier mapping when leaving MAP step
-        if ($this->currentStep === self::STEP_MAP && ! $this->hasUniqueIdentifierMapped()) {
+        // Check for mapping warnings when leaving MAP step
+        if ($this->currentStep === self::STEP_MAP && $this->hasMappingWarnings()) {
             $this->mountAction('proceedWithoutUniqueIdentifiers');
 
             return;
@@ -531,6 +532,20 @@ public function getEntityLabel(): string
         return $entities[$this->entityType]['label'] ?? str($this->entityType)->title()->toString();
     }
 
+    /**
+     * Get human-readable labels for all mapped fields.
+     *
+     * @return array<string, string>
+     */
+    #[Computed]
+    public function fieldLabels(): array
+    {
+        return collect($this->columnMap)
+            ->filter()
+            ->mapWithKeys(fn ($_, string $field): array => [$field => $this->getFieldLabel($field)])
+            ->all();
+    }
+
     /**
      * Toggle column expansion in review step.
      */
@@ -577,20 +592,14 @@ public function proceedWithErrorsAction(): Action
 
     public function proceedWithoutUniqueIdentifiersAction(): Action
     {
-        $docsUrl = route('documentation.show', 'import').'#unique-identifiers';
-
         return Action::make('proceedWithoutUniqueIdentifiers')
-            ->label('Continue without mapping')
+            ->label('Continue anyway')
             ->icon(Heroicon::OutlinedExclamationTriangle)
             ->color('warning')
             ->requiresConfirmation()
-            ->modalHeading('Avoid creating duplicate records')
-            ->modalDescription(fn (): HtmlString => new HtmlString(
-                'To avoid creating duplicate records, make sure you include and map the following columns:<br><br>'.
-                '<strong>'.$this->getMissingUniqueIdentifiersMessage().'</strong><br><br>'.
-                '<a href="'.$docsUrl.'" target="_blank" class="text-primary-600 hover:underline">Learn more about unique identifiers</a>'
-            ))
-            ->modalSubmitActionLabel('Continue without mapping')
+            ->modalHeading('Review mapping before continuing')
+            ->modalDescription(fn (): HtmlString => new HtmlString($this->getMappingWarningsHtml()))
+            ->modalSubmitActionLabel('Continue anyway')
             ->modalCancelActionLabel('Go back')
             ->action(function (): void {
                 $this->advanceToNextStep();

app-modules/ImportWizard/src/Services/PreviewChunkService.php

@@ -229,7 +229,10 @@ private function applyCorrections(array $record, array $columnMap, array $correc
     {
         foreach ($corrections as $fieldName => $valueMappings) {
             $csvColumn = $columnMap[$fieldName] ?? null;
-            if ($csvColumn === null || ! isset($record[$csvColumn])) {
+            if ($csvColumn === null) {
+                continue;
+            }
+            if (! isset($record[$csvColumn])) {
                 continue;
             }
 
@@ -275,7 +278,7 @@ private function shouldEnrichWithCompanyMatch(string $importerClass): bool
      */
     private function enrichRowWithCompanyMatch(array $row, string $teamId): array
     {
-        $companyId = (string) ($row['id'] ?? '');
+        $companyId = (string) ($row['company_id'] ?? '');
         $companyName = (string) ($row['company_name'] ?? '');
         $emails = $this->extractEmailsFromRow($row);