From 1977d93af77c45fe2971ecc0fc53e25b7cf4a81e Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Wed, 8 Mar 2023 14:04:48 +1300
Subject: [PATCH] Use parent::buildForm in contact import dataSource screen

---
 CRM/Contact/Import/Form/DataSource.php | 29 ++------------------------
 CRM/Import/Form/DataSource.php         |  1 -
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/CRM/Contact/Import/Form/DataSource.php b/CRM/Contact/Import/Form/DataSource.php
index 3c65435a90..f39f485ea4 100644
--- a/CRM/Contact/Import/Form/DataSource.php
+++ b/CRM/Contact/Import/Form/DataSource.php
@@ -47,14 +47,8 @@ class CRM_Contact_Import_Form_DataSource extends CRM_Import_Form_DataSource {
    *
    * @throws \CRM_Core_Exception
    */
-  public function buildQuickForm() {
-
-    $this->assign('urlPath', 'civicrm/import/datasource');
-    $this->assign('urlPathVar', 'snippet=4&user_job_id=' . $this->get('user_job_id'));
-
-    $this->add('select', 'dataSource', ts('Data Source'), $this->getDataSources(), TRUE,
-      ['onchange' => 'buildDataSourceFormBlock(this.value);']
-    );
+  public function buildQuickForm(): void {
+    parent::buildQuickForm();
 
     // duplicate handling options
     $this->addRadio('onDuplicate', ts('For Duplicate Contacts'), [
@@ -64,9 +58,6 @@ class CRM_Contact_Import_Form_DataSource extends CRM_Import_Form_DataSource {
       CRM_Import_Parser::DUPLICATE_NOCHECK => ts('No Duplicate Checking'),
     ]);
 
-    $mappingArray = CRM_Core_BAO_Mapping::getMappings('Import Contact');
-    $this->addElement('select', 'savedMapping', ts('Saved Field Mapping'), ['' => ts('- select -')] + $mappingArray);
-
     $js = ['onClick' => "buildSubTypes();buildDedupeRules();"];
     // contact types option
     $contactTypeOptions = $contactTypeAttributes = [];
@@ -87,8 +78,6 @@ class CRM_Contact_Import_Form_DataSource extends CRM_Import_Form_DataSource {
     $this->addElement('select', 'contactSubType', ts('Subtype'));
     $this->addElement('select', 'dedupe_rule_id', ts('Dedupe Rule'));
 
-    CRM_Core_Form_Date::buildAllowedDateFormats($this);
-
     if (CRM_Utils_GeocodeProvider::getUsableClassName()) {
       $this->addElement('checkbox', 'doGeocodeAddress', ts('Geocode addresses during import?'));
     }
@@ -96,20 +85,6 @@ class CRM_Contact_Import_Form_DataSource extends CRM_Import_Form_DataSource {
     if (Civi::settings()->get('address_standardization_provider') === 'USPS') {
       $this->addElement('checkbox', 'disableUSPS', ts('Disable USPS address validation during import?'));
     }
-    $this->buildDataSourceFields();
-
-    $this->addButtons([
-      [
-        'type' => 'upload',
-        'name' => ts('Continue'),
-        'spacing' => '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;',
-        'isDefault' => TRUE,
-      ],
-      [
-        'type' => 'cancel',
-        'name' => ts('Cancel'),
-      ],
-    ]);
   }
 
   /**
diff --git a/CRM/Import/Form/DataSource.php b/CRM/Import/Form/DataSource.php
index 97bb1ebe3d..bf43361ccc 100644
--- a/CRM/Import/Form/DataSource.php
+++ b/CRM/Import/Form/DataSource.php
@@ -61,7 +61,6 @@ abstract class CRM_Import_Form_DataSource extends CRM_Import_Forms {
    */
   public function buildQuickForm() {
     $this->assign('errorMessage', $this->getErrorMessage());
-    $config = CRM_Core_Config::singleton();
 
     $this->assign('urlPath', 'civicrm/import/datasource');
     $this->assign('urlPathVar', 'snippet=4&user_job_id=' . $this->get('user_job_id'));
-- 
2.25.1