From 5c05779bf6450df1e05b9b4429fb92fefa037db4 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 9 Dec 2022 15:05:06 +1300
Subject: [PATCH] Enotice fixes, consolidation on Import datasource forms

---
 CRM/Contact/Import/Form/DataSource.php        |  5 ---
 CRM/Import/Form/DataSource.php                |  2 -
 .../CRM/Contact/Import/Form/DataSource.tpl    | 40 +++++++++++--------
 templates/CRM/Import/Form/DataSource.tpl      |  2 +-
 4 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/CRM/Contact/Import/Form/DataSource.php b/CRM/Contact/Import/Form/DataSource.php
index ab86a3477780..cbe1ee659932 100644
--- a/CRM/Contact/Import/Form/DataSource.php
+++ b/CRM/Contact/Import/Form/DataSource.php
@@ -98,8 +98,6 @@ public function buildQuickForm() {
     ]);
 
     $mappingArray = CRM_Core_BAO_Mapping::getMappings('Import Contact');
-
-    $this->assign('savedMapping', $mappingArray);
     $this->addElement('select', 'savedMapping', ts('Saved Field Mapping'), ['' => ts('- select -')] + $mappingArray);
 
     $js = ['onClick' => "buildSubTypes();buildDedupeRules();"];
@@ -124,12 +122,9 @@ public function buildQuickForm() {
 
     CRM_Core_Form_Date::buildAllowedDateFormats($this);
 
-    $geoCode = FALSE;
     if (CRM_Utils_GeocodeProvider::getUsableClassName()) {
-      $geoCode = TRUE;
       $this->addElement('checkbox', 'doGeocodeAddress', ts('Geocode addresses during import?'));
     }
-    $this->assign('geoCode', $geoCode);
 
     $this->addElement('text', 'fieldSeparator', ts('Import Field Separator'), ['size' => 2]);
 
diff --git a/CRM/Import/Form/DataSource.php b/CRM/Import/Form/DataSource.php
index 7e04646bdcbc..ba837e1c2731 100644
--- a/CRM/Import/Form/DataSource.php
+++ b/CRM/Import/Form/DataSource.php
@@ -85,8 +85,6 @@ public function buildQuickForm() {
     $this->add('text', 'fieldSeparator', ts('Import Field Separator'), ['size' => 2], TRUE);
     $this->setDefaults(['fieldSeparator' => $config->fieldSeparator]);
     $mappingArray = CRM_Core_BAO_Mapping::getCreateMappingValues('Import ' . static::IMPORT_ENTITY);
-
-    $this->assign('savedMapping', $mappingArray);
     $this->add('select', 'savedMapping', ts('Saved Field Mapping'), ['' => ts('- select -')] + $mappingArray);
 
     if ($loadedMapping = $this->get('loadedMapping')) {
diff --git a/templates/CRM/Contact/Import/Form/DataSource.tpl b/templates/CRM/Contact/Import/Form/DataSource.tpl
index c09b930779ea..eb3c00a42603 100644
--- a/templates/CRM/Contact/Import/Form/DataSource.tpl
+++ b/templates/CRM/Contact/Import/Form/DataSource.tpl
@@ -33,20 +33,26 @@
   <div id="common-form-controls" class="form-item">
     <h3>{ts}Import Options{/ts}</h3>
     <table class="form-layout-compressed">
-      <tr class="crm-import-datasource-form-block-contactType">
-        <td class="label">{$form.contactType.label}</td>
-        <td>{$form.contactType.html} {help id='contact-type'}&nbsp;&nbsp;&nbsp;
-          <span id="contact-subtype">{$form.contactSubType.label}&nbsp;&nbsp;&nbsp;{$form.contactSubType.html} {help id='contact-sub-type'}</span>
-        </td>
-      </tr>
-      <tr class="crm-import-datasource-form-block-onDuplicate">
-        <td class="label">{$form.onDuplicate.label}</td>
-        <td>{$form.onDuplicate.html} {help id='dupes'}</td>
-      </tr>
-      <tr class="crm-import-datasource-form-block-dedupe">
-        <td class="label">{$form.dedupe_rule_id.label}</td>
-        <td><span id="contact-dedupe_rule_id">{$form.dedupe_rule_id.html}</span> {help id='id-dedupe_rule'}</td>
-      </tr>
+      {if array_key_exists('contactType', $form)}
+        <tr class="crm-import-datasource-form-block-contactType">
+          <td class="label">{$form.contactType.label}</td>
+          <td>{$form.contactType.html} {help id='contact-type'}{if array_key_exists('contactSubType', $form)}&nbsp;&nbsp;&nbsp;
+            <span id="contact-subtype">{$form.contactSubType.label}&nbsp;&nbsp;&nbsp;{$form.contactSubType.html} {help id='contact-sub-type'}{/if}</span>
+          </td>
+        </tr>
+      {/if}
+      {if array_key_exists('onDuplicate', $form)}
+        <tr class="crm-import-datasource-form-block-onDuplicate">
+          <td class="label">{$form.onDuplicate.label}</td>
+          <td>{$form.onDuplicate.html} {help id='dupes'}</td>
+        </tr>
+      {/if}
+      {if array_key_exists('dedupe_rule_id', $form)}
+        <tr class="crm-import-datasource-form-block-dedupe">
+          <td class="label">{$form.dedupe_rule_id.label}</td>
+          <td><span id="contact-dedupe_rule_id">{$form.dedupe_rule_id.html}</span> {help id='id-dedupe_rule'}</td>
+        </tr>
+      {/if}
       <tr class="crm-import-datasource-form-block-fieldSeparator">
         <td class="label">{$form.fieldSeparator.label}</td>
         <td>{$form.fieldSeparator.html} {help id='id-fieldSeparator'}</td>
@@ -56,7 +62,7 @@
         <td></td><td class="description">{ts}Select the format that is used for date fields in your import data.{/ts}</td>
       </tr>
 
-      {if $geoCode}
+      {if array_key_exists('doGeocodeAddress', $form)}
         <tr class="crm-import-datasource-form-block-doGeocodeAddress">
           <td class="label"></td>
           <td>{$form.doGeocodeAddress.html} {$form.doGeocodeAddress.label}<br />
@@ -68,7 +74,7 @@
         </tr>
       {/if}
 
-      {if $savedMapping}
+      {if array_key_exists('savedMapping', $form)}
         <tr class="crm-import-datasource-form-block-savedMapping">
           <td class="label"><label for="savedMapping">{$form.savedMapping.label}</label></td>
           <td>{$form.savedMapping.html}<br />
@@ -77,7 +83,7 @@
         </tr>
       {/if}
 
-      {if $form.disableUSPS}
+      {if array_key_exists('disableUSPS', $form)}
         <tr class="crm-import-datasource-form-block-disableUSPS">
           <td class="label"></td>
           <td>{$form.disableUSPS.html} <label for="disableUSPS">{$form.disableUSPS.label}</label><br />
diff --git a/templates/CRM/Import/Form/DataSource.tpl b/templates/CRM/Import/Form/DataSource.tpl
index c125ab8ec699..23fdcb965ab3 100644
--- a/templates/CRM/Import/Form/DataSource.tpl
+++ b/templates/CRM/Import/Form/DataSource.tpl
@@ -67,7 +67,7 @@
           <td>{$form.fieldSeparator.html}</td>
         </tr>
        <tr class="crm-import-uploadfile-form-block-date">{include file="CRM/Core/Date.tpl"}</tr>
-       {if $savedMapping}
+       {if array_key_exists('savedMapping', $form)}
          <tr class="crm-import-uploadfile-form-block-savedMapping">
            <td>{$form.savedMapping.label}</td>
            <td>{$form.savedMapping.html}<br />