Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use metadata for dataPatterns #15224

Merged
merged 1 commit into from
Sep 6, 2019
Merged

Use metadata for dataPatterns #15224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions CRM/Contact/Import/Form/MapField.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@ public function buildQuickForm() {
$defaults = [];
$mapperKeys = array_keys($this->_mapperFields);
$hasColumnNames = !empty($this->_columnNames);
$dataPatterns = $this->get('dataPatterns');
$hasLocationTypes = $this->get('fieldTypes');

$this->_location_types = ['Primary' => ts('Primary')] + CRM_Core_PseudoConstant::get('CRM_Core_DAO_Address', 'location_type_id');
Expand Down Expand Up @@ -404,7 +403,7 @@ public function buildQuickForm() {
$sel = &$this->addElement('hierselect', "mapper[$i]", ts('Mapper for Field %1', [1 => $i]), NULL);

if ($this->get('savedMapping')) {
list($defaults, $js) = $this->loadSavedMapping($processor, $mappingName, $i, $defaults, $js, $hasColumnNames, $dataPatterns);
list($defaults, $js) = $this->loadSavedMapping($processor, $mappingName, $i, $defaults, $js, $hasColumnNames);
}
else {
$js .= "swapOptions($formName, 'mapper[$i]', 0, 3, 'hs_mapper_0_');\n";
Expand All @@ -426,7 +425,7 @@ public function buildQuickForm() {
else {
// Otherwise guess the default from the form of the data
$defaults["mapper[$i]"] = [
$this->defaultFromData($dataPatterns, $i),
$this->defaultFromData($this->getDataPatterns(), $i),
// $defaultLocationType->id
0,
];
Expand Down Expand Up @@ -847,12 +846,11 @@ protected function saveMappingField($mapperKeys, array $saveMapping, string $cTy
* @param array $defaults
* @param string $js
* @param bool $hasColumnNames
* @param array $dataPatterns
*
* @return array
* @throws \CiviCRM_API3_Exception
*/
public function loadSavedMapping($processor, $mappingName, $i, $defaults, $js, $hasColumnNames, $dataPatterns) {
public function loadSavedMapping($processor, $mappingName, $i, $defaults, $js, $hasColumnNames) {
$formName = $processor->getFormName();
if (isset($mappingName[$i])) {
if ($mappingName[$i] != ts('- do not import -')) {
Expand All @@ -874,7 +872,7 @@ public function loadSavedMapping($processor, $mappingName, $i, $defaults, $js, $
$defaults["mapper[$i]"] = [$this->defaultFromColumnName($this->_columnNames[$i])];
}
else {
$defaults["mapper[$i]"] = [$this->defaultFromData($dataPatterns, $i)];
$defaults["mapper[$i]"] = [$this->defaultFromData($this->getDataPatterns(), $i)];
}
}
return [$defaults, $js];
Expand Down
1 change: 0 additions & 1 deletion CRM/Contact/Import/Parser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,6 @@ public function set($store, $mode = self::MODE_SUMMARY) {
$store->set('fields', $this->getSelectValues());
$store->set('fieldTypes', $this->getSelectTypes());

$store->set('dataPatterns', $this->getDataPatterns());
$store->set('columnCount', $this->_activeFieldCount);

$store->set('totalRowCount', $this->_totalCount);
Expand Down
5 changes: 1 addition & 4 deletions tests/phpunit/CRM/Contact/Import/Form/MapFieldTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,16 +376,13 @@ protected function loadSavedMapping($form, $mappingID, $columnNumber) {

$js = '';
$hasColumnNames = TRUE;
// @todo - can use metadata trait once https://github.com/civicrm/civicrm-core/pull/15018 is merged.
$dataPatterns = [];
$columnPatterns = [];
$processor = new CRM_Import_ImportProcessor();
$processor->setMappingID($mappingID);
$processor->setFormName('document.forms.MapField');
$processor->setMetadata($this->getContactImportMetadata());
$processor->setContactTypeByConstant(CRM_Import_Parser::CONTACT_INDIVIDUAL);

$return = $form->loadSavedMapping($processor, $mappingName, $columnNumber, $defaults, $js, $hasColumnNames, $dataPatterns, $columnPatterns);
$return = $form->loadSavedMapping($processor, $mappingName, $columnNumber, $defaults, $js, $hasColumnNames);
return ['defaults' => $return[0], 'js' => $return[1]];
}

Expand Down