From c6b7a8df8fa24d71c13c41e48a93ed951afa2125 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 20 Sep 2022 15:59:35 +1200
Subject: [PATCH] Fix missing labels in preview screen

---
 CRM/Import/Forms.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/CRM/Import/Forms.php b/CRM/Import/Forms.php
index aeddf0e3bd..e0ef962e28 100644
--- a/CRM/Import/Forms.php
+++ b/CRM/Import/Forms.php
@@ -660,8 +660,14 @@ class CRM_Import_Forms extends CRM_Core_Form {
   protected function getMappedFieldLabels(): array {
     $mapper = [];
     $parser = $this->getParser();
-    foreach ($this->getSubmittedValue('mapper') as $columnNumber => $mappedField) {
-      $mapper[$columnNumber] = $parser->getMappedFieldLabel($parser->getMappingFieldFromMapperInput((array) $mappedField, 0, $columnNumber));
+    $importMappings = $this->getUserJob()['metadata']['import_mappings'] ?? [];
+    if (empty($importMappings)) {
+      foreach ($this->getSubmittedValue('mapper') as $columnNumber => $mapping) {
+        $importMappings[] = $parser->getMappingFieldFromMapperInput((array) $mapping, 0, $columnNumber);
+      }
+    }
+    foreach ($importMappings as $columnNumber => $importMapping) {
+      $mapper[$columnNumber] = $parser->getMappedFieldLabel($importMapping);
     }
     return $mapper;
   }
-- 
2.25.1