Fix activity log properties for Spatie v5 attribute_changes

[ht3aa]

Summary

The activity log Properties modal and detail page stopped showing changed attributes after upgrading to spatie/laravel-activitylog v5, which stores model diffs in the attribute_changes column. The dashboard only read properties, which is now reserved for custom withProperties() data.

Changes

• Merge attribute_changes with properties in ActivityLogController for the JSON properties endpoint and the Inertia show payload (legacy rows that still use properties for attributes/old remain supported).
• Add ActivityLogPropertiesTest covering the merge behavior.

Testing

• php artisan test --compact tests/Feature/ActivityLogPropertiesTest.php

Made with Cursor

[gemini-code-assist]

Code Review

This pull request updates the ActivityLogController to correctly merge Spatie v5 model attribute changes with custom properties, ensuring that legacy and new data formats are handled consistently. I have reviewed the changes and the accompanying feature test; the test case for merging overlapping keys should be updated to explicitly include a collision to verify the merge logic as described in the test name.

[gemini-code-assist]

The test name merges custom properties with attribute_changes with changes winning overlapping keys suggests it tests for key collisions, but the current implementation of the test does not have any overlapping keys between properties and attribute_changes. To make the test more robust and match its description, you should add an overlapping key to the properties array. This will ensure the merge precedence is correctly tested.

        'properties' => [
            'attributes' => ['title' => 'Should be overwritten'],
            'note' => 'extra',
        ],