Merge 1.x into fix-related-activity-log-type (resolve conflicts) - #25
Merged
Conversation
Add ->limit($window->cap) to related-row query to avoid loading all related rows into memory when only $window->cap activity entries are needed downstream. Matches existing cap on the activity-log query.
Deletes src/ActivityLogPlugin.php (Relaticle\ActivityLog\ActivityLogPlugin), the unused root-namespace duplicate of the canonical Relaticle\ActivityLog\Filament\ActivityLogPlugin. Removes related orphan warnings from installation and customization docs. Closes #13.
Replace store-wide flush() with per-subject key index. TimelineCache
now tracks cached keys in `{prefix}:{class}:{id}:index` and forget()
deletes only those keys plus the index entry, leaving sessions, queue
locks, and other application caches in the same store untouched.
Also updates docs to remove the "known limitation" callouts.
Fixes #12
Key never read by code. Buckets computed in ActivityLogLivewire::bucketFor. Update docs note to past-tense.
Support Laravel 13
fix: remove dead 'date_groups' config key (#10)
Remove orphan root-namespace ActivityLogPlugin
fix: cap related-row fetch in RelatedActivityLogSource (#14)
fix: scope TimelineCache::forget() to single subject (#12)
# Conflicts: # docs/content/6.troubleshooting/1.index.md
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
What
Merges latest
1.xinto thefix-related-activity-log-typebranch (PR #23) and resolves the merge conflict so PR #23 becomes mergeable.Conflict resolved
Single content conflict in
docs/content/6.troubleshooting/1.index.md:RelatedActivityLogSourceemitstype='activity_log'.type='related_activity_log', and its own commit had removed that troubleshooting entry (Closes #11).Resolution: kept the cache-invalidation entry (#12), dropped the obsolete #11 type-filter entry — the documented limitation no longer exists after the fix. All other files auto-merged cleanly.
Verification
type: 'related_activity_log'intact inRelatedActivityLogSourceActivityLogRendererfor the new typerelated_activity_log