From 204b6aa1e089c3c18cdb459f779d4d8dadcd36db Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 23 Aug 2022 16:29:57 +1200
Subject: [PATCH] Simplify form rule by using shared code

---
 CRM/Member/Import/Form/MapField.php | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/CRM/Member/Import/Form/MapField.php b/CRM/Member/Import/Form/MapField.php
index ba6145ee0e..108b4e17ea 100644
--- a/CRM/Member/Import/Form/MapField.php
+++ b/CRM/Member/Import/Form/MapField.php
@@ -26,8 +26,8 @@ class CRM_Member_Import_Form_MapField extends CRM_Import_Form_MapField {
    * @throws \CRM_Core_Exception
    */
   public function buildQuickForm(): void {
-    $this->buildSavedMappingFields($this->getSubmittedValue('savedMapping'));
-    $this->addFormRule(array('CRM_Member_Import_Form_MapField', 'formRule'), $this);
+    $this->addSavedMappingFields();
+    $this->addFormRule(['CRM_Member_Import_Form_MapField', 'formRule'], $this);
 
     $options = $this->getFieldOptions();
     foreach ($this->getColumnHeaders() as $i => $columnHeader) {
@@ -108,29 +108,7 @@ class CRM_Member_Import_Form_MapField extends CRM_Import_Form_MapField {
         }
       }
     }
-
-    if (!empty($fields['saveMapping'])) {
-      $nameField = $fields['saveMappingName'] ?? NULL;
-      if (empty($nameField)) {
-        $errors['saveMappingName'] = ts('Name is required to save Import Mapping');
-      }
-      else {
-        if (CRM_Core_BAO_Mapping::checkMapping($nameField, CRM_Core_PseudoConstant::getKey('CRM_Core_BAO_Mapping', 'mapping_type_id', 'Import Membership'))) {
-          $errors['saveMappingName'] = ts('Duplicate Import Membership Mapping Name');
-        }
-      }
-    }
-
-    if (!empty($errors)) {
-      if (!empty($errors['saveMappingName'])) {
-        $_flag = 1;
-        $assignError = new CRM_Core_Page();
-        $assignError->assign('mappingDetailsError', $_flag);
-      }
-      return $errors;
-    }
-
-    return TRUE;
+    return $errors ?: TRUE;
   }
 
   /**
-- 
2.25.1