Skip to content

SearchKit - Fix deep joins to custom fields #36418

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

Open
colemanw wants to merge 1 commit into
base: master
Choose a base branch
from
+85 −2
Open

SearchKit - Fix deep joins to custom fields #36418

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
4 changes: 2 additions & 2 deletions ext/search_kit/ang/crmSearchAdmin.module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,9 @@
if (Array.isArray(condition)) {
condition.forEach((ref, side) => {
if (side !== 1 && typeof ref === 'string') {
if (ref.includes('.')) {
if (ref.includes(join.alias + '.')) {
condition[side] = ref.replace(join.alias + '.', alias + '.');
} else if (prefix.length && !ref.includes('"') && !ref.includes("'")) {
} else if (prefix.length && !ref.startsWith(prefix + '.') && !ref.includes('"') && !ref.includes("'")) {
condition[side] = prefix + '.' + ref;
}
}
Expand Down
83 changes: 83 additions & 0 deletions tests/phpunit/api/v4/Custom/ContactCustomJoinTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,87 @@ public function testJoinWithCustomFieldComparedToCoreFieldInOnClause(): void {
$this->assertNull($result[2]['activity.id']);
}

/**
* Tests custom entityRef field on joined entity in explicit join clause.
*/
public function testJoinWithCustomFieldOnJoinedEntity(): void {
$this->createTestRecord('CustomGroup', [
'name' => 'Activity_fields',
'title' => 'Activity_fields',
'extends' => 'Activity',
'extends_entity_column_value:name' => ['Meeting'],
]);
$this->createTestRecord('CustomField', [
'name' => 'Org',
'label' => 'Org',
'custom_group_id.name' => 'Activity_fields',
'html_type' => 'EntityRef',
'data_type' => 'EntityReference',
'fk_entity' => 'Organization',
]);
$org = $this->createTestRecord('Contact', [
'contact_type' => 'Organization',
'organization_name' => 'Test Organization',
]);
$target = $this->createTestRecord('Contact', [
'contact_type' => 'Individual',
'first_name' => 'Test',
'last_name' => 'Target',
]);
$this->createTestRecord('Activity', [
'activity_type_id:name' => 'Meeting',
'subject' => 'Test Meeting',
'target_contact_id' => [$target['id']],
'Activity_fields.Org' => $org['id'],
]);

$result = civicrm_api4('Contact', 'get', [
'checkPermissions' => FALSE,
'select' => [
'id',
'Contact_ActivityContact_Activity_01.subject',
'Contact_ActivityContact_Activity_01_Activity_Organization_Org_01.organization_name',
],
'where' => [
['id', '=', $target['id']],
],
'join' => [
[
'Activity AS Contact_ActivityContact_Activity_01',
'INNER',
'ActivityContact',
[
'id',
'=',
'Contact_ActivityContact_Activity_01.contact_id',
],
[
'Contact_ActivityContact_Activity_01.record_type_id:name',
'=',
'"Activity Targets"',
],
[
'Contact_ActivityContact_Activity_01.activity_type_id:name',
'=',
'"Meeting"',
],
],
[
'Organization AS Contact_ActivityContact_Activity_01_Activity_Organization_Org_01',
'INNER',
[
'Contact_ActivityContact_Activity_01.Activity_fields.Org',
'=',
'Contact_ActivityContact_Activity_01_Activity_Organization_Org_01.id',
],
],
],
]);

$this->assertCount(1, $result);
$this->assertEquals($target['id'], $result[0]['id']);
$this->assertSame('Test Meeting', $result[0]['Contact_ActivityContact_Activity_01.subject']);
$this->assertSame('Test Organization', $result[0]['Contact_ActivityContact_Activity_01_Activity_Organization_Org_01.organization_name']);
}

}