Merge branch 'develop'

* develop:
  Revert "bugfix: invalid records for page activity"
  Revert "Fix styling"
  Fix styling

Author: cklei-carly

src/Filament/Widgets/PageActivity.php

@@ -14,7 +14,6 @@
 use SolutionForest\InspireCms\Helpers\FilamentResourceHelper;
 use SolutionForest\InspireCms\Helpers\UIHelper;
 use SolutionForest\InspireCms\InspireCmsConfig;
-use SolutionForest\InspireCms\Models\Scopes\ContentVersionDetailScope;
 
 class PageActivity extends BaseWidget
 {
@@ -61,18 +60,13 @@ protected function getRecordUrl(Model $record): ?string
 
     protected function getLatestUpdatePagesQuery(): Builder
     {
-        $query = InspireCmsConfig::getContentModelClass()::query();
+        $query = InspireCmsConfig::getContentModelClass()::with([
+            'publishedVersions',
+        ])->withoutGlobalScopes([
+            \SolutionForest\InspireCms\Support\Models\Scopes\NestableTreeDetailScope::class,
+        ]);
 
-        $model = $query->getModel();
-        $updatedAtColumn = $model->getUpdatedAtColumn();
-        return InspireCmsConfig::getContentModelClass()::query()
-            ->withoutGlobalScopes([
-                \SolutionForest\InspireCms\Support\Models\Scopes\NestableTreeDetailScope::class,
-            ])
-            ->withGlobalScope(ContentVersionDetailScope::class, new ContentVersionDetailScope)
-            ->orderByDesc('__latest_version_dt')
-            ->orderByDesc($model->qualifyColumn($updatedAtColumn))
-            ->take(static::$totalTakeLatest);
+        return $query->orderByDesc('updated_at')->take(static::$totalTakeLatest);
     }
 
     // region Table Configuration

src/Models/Scopes/ContentVersionDetailScope.php

@@ -26,10 +26,12 @@ public function apply($builder, Model $model)
             $t1Q = DB::table($related->getTable())
                 ->orderByDesc($recordCreationColumn) // sort by created_at desc
                 ->groupBy(
+                    $relatedFK, // group by content_id
                     $recordCreationColumn, // include the ordered column in GROUP BY
                 )
                 ->select([
                     DB::raw("MAX($relatedPK) AS latest_version_id"),
+                    $relatedFK,
                 ]);
 
             $t2_1TableName = '_cv_t2_publish';