dev/core#942 fix failure to render names for some activities #14223
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(Standard links)
|
pfigel
suggested changes
May 10, 2019
There was a problem hiding this comment.
I tested this locally and got an exception for contacts with activities without a target (see other comment for the likely reason).
Other than that, the target names don't seem to get rendered on the activity tab (both for single and bulk activities). Added/Assigned still works.
CRM/Activity/BAO/Activity.php
Outdated
| // the moment as the bulk activity stuff needs unravelling & test coverage. | ||
| foreach ($result as $id => $activity) { | ||
| // Note that for the non-bulk ones we might get them in one fetch since we 'kinda know' it won't be an insane number | ||
| if (!isset($activities[$id]['target_contact_count']) || !empty($activities[$id]['target_contact_count'])) { |
There was a problem hiding this comment.
I think this should be && - I'm getting "Expected one ActivityContact but found 0" for contacts with activities that have no target.
There was a problem hiding this comment.
@pfigel you are right - the outer function needs the target_contact_count set even when the inner one doesn't - There is a weird (read lack of) separation of concerns here.
I've switched to getting the counts for each activity with one simple group-by query, then using a with-acl api call to get the first name for each row with one or more targets.
This could lead to a mismatch - ie they see there are '4 more contacts' but they can't 'see' who they are. I think this is the right behaviour actually
eileenmcnaughton
force-pushed
the
5.14
branch
2 times, most recently
from
7bf822d
to
0bd654c
Compare
|
Tested with the latest changes, results:
Backtrace |
|
Thanks @pfigel I have fixed the bug on no activities that you (and the tests) picked up I think I'd rather leave the sort_name for a follow up. I want this to get a 5.13 drop sooner rather than later (my own local issues delayed me addressing this quicker) but the other can be a bit slower. Regarding the speed - it's good that the page you were testing was 50% faster. I would note that is something of a by-product since the main goal was to make it faster in cases the query was slow due to the unindexed joins - that was happening when there were lots of activities for a given contact - which is where we we seeing the tab performing extremely slowly |
| SELECT activity_id, count(*) as target_contact_count | ||
| FROM civicrm_activity_contact | ||
| INNER JOIN civicrm_contact c ON contact_id = c.id AND c.is_deleted = 0 | ||
| WHERE activity_id IN (' . implode(',', array_keys($result)) . ') |
There was a problem hiding this comment.
just thinking should this really be a param? not sure that you can actually inject anything but meh
There was a problem hiding this comment.
I tried but commaSeparatedInteger won't pass through in that way
- however it is definitely safe as they are the array keys from the api array
|
I have confirmed this fixes the last of Patrick's issues so adding merge on pass |
|
@eileenmcnaughton test fails look related |
eileenmcnaughton
force-pushed
the
5.14
branch
2 times, most recently
from
da3f655
to
04d547a
Compare
|
Ok turns out the use of sort_name was tested so no letting it slip - re-fixed |
Overview ---------------------------------------- Set limit for activity_contact retrieval to 0, allowing to retrieve more than 25 activity contacts when rendering the first 25 activities on the activity contact tab Before ----------------------------------------  After ----------------------------------------  Technical Details ---------------------------------------- This moves the logic for retrieving the target contacts back into the getActivities function. We are stil not wanting to bypass the ACLs so still using the api but strictly limiting the number of contacts we retrieve (at the cost of extra queries, but cheap ones). Some tests added on the Bulk Mail activity. Comments ----------------------------------------
|
Test fail unrelated |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
Set limit for activity_contact retrieval to 0, allowing to retrieve more than 25 activity contacts when rendering the first 25 activities on the activity contact tab
Before
After
Technical Details
This moves the logic for retrieving the target contacts back into the getActivities function. We are stil not wanting to bypass the ACLs so still using the
api but strictly limiting the number of contacts we retrieve (at the cost of extra queries, but cheap ones).
Some tests added on the Bulk Mail activity.
Comments
@pfigel I think some tests will fail now because I tweaked the test data to include a bulk mail type activity. However, let's see how it performs. I think we could reduce the cheap queries slightly but not doing a get-per-row on non-bulk but if there were an activity with many results that was of a different type it would still cause a slow down