cherry commit from 99741fd

Author: cklei-carly

src/Filament/Resources/ContentResource.php

@@ -137,6 +137,7 @@ public static function getModelLabel(): string
     public static function getEloquentQuery(): Builder
     {
         return parent::getEloquentQuery()->with([
+            'latestNonDraftContentVersion', // To check the content is published or not
             'publishedVersions', // To get published version, and determine is published
             'documentType.templates', // For template use
             'parent', // To get parent title

src/Filament/Widgets/PageActivity.php

@@ -33,6 +33,7 @@ public function table(Table $table): Table
             ->emptyStateIcon(FilamentIcon::resolve('inspirecms::info'))
             ->emptyStateHeading(__('inspirecms::widgets.page_activity.empty_state.heading'))
             ->modifyQueryUsing(fn ($query) => $query->with([
+                'latestNonDraftContentVersion', // To check the content is published or not
                 'publishedVersions',
             ]))
             ->columns([
@@ -51,10 +52,18 @@ public function table(Table $table): Table
                 TextColumn::make('published_at')
                     ->label(__('inspirecms::resources/content.published_at.label'))
                     ->getStateUsing(function (Model $record) {
-                        return $record->getPublishedVersions()?->sortByDesc('pivot.published_at')?->first()?->pivot->published_at;
+                        if (($latestNonDraftContentVersion = $record->latestNonDraftContentVersion)) {
+                            // If the latest non-draft version exists, check if it is published
+                            if ($latestNonDraftContentVersion->publish_state === 'unpublish') {
+                                return null;
+                            }
+                        }
+
+                        return $record->getLatestPublishedTime();
                     })
-                    ->formatStateUsing(fn (?Carbon $state) => ($state && $state instanceof DateTimeInterface) ? $state->diffForHumans(now()) : null)
-                    ->tooltip(fn ($state) => ($state && $state instanceof DateTimeInterface) ? $state->toDateTimeString() : null)
+                    ->placeholder(__('inspirecms::inspirecms.n/a'))
+                    ->formatStateUsing(fn (?\Carbon\Carbon $state) => ($state && $state instanceof \DateTimeInterface) ? $state->diffForHumans(now()) : null)
+                    ->tooltip(fn ($state) => ($state && $state instanceof \DateTimeInterface) ? $state->toDateTimeString() : null)
                     ->width('5%'),
                 TextColumn::make('updated_at')
                     ->label(__('inspirecms::resources/content.updated_at.label'))

src/Models/Concerns/HasContentVersions.php

@@ -61,6 +61,16 @@ public function latestContentVersion()
         return $this->hasOne(InspireCmsConfig::getContentVersionModelClass(), 'content_id')->latestOfMany();
     }
 
+    public function latestNonDraftContentVersion()
+    {
+        return $this->hasOne(InspireCmsConfig::getContentVersionModelClass(), 'content_id')
+            ->ofMany([
+                'id' => 'MAX',
+            ], function ($query) {
+                $query->whereNot('publish_state', 'draft');
+            });
+    }
+
     public function getPublishedVersions()
     {
         if (! $this->relationLoaded('publishedVersions')) {
@@ -88,6 +98,15 @@ public function getLatestPublishedContentVersion()
     /** {@inheritDoc} */
     public function getPublishTime()
     {
+        // Handle case that:
+        // The content have published, but the latest version is not published (Step 1: 'unpublish', Step 2: 'draft')
+        if (($latestNonDraftContentVersion = $this->latestNonDraftContentVersion)) {
+            // If the latest non-draft version exists, check if it is published
+            if ($latestNonDraftContentVersion->publish_state === 'unpublish') {
+                return null;
+            }
+        }
+
         // If the publish date is in the future, it's not published
         return $this->getLatestPublishedContentVersion()?->pivot?->published_at;
     }

src/Models/Content.php

@@ -246,6 +246,12 @@ public function scopeWhereIsPublished($query, bool $condition = true)
                     'publishedVersions',
                     fn ($q) => $q->whereIsPublished()
                 )
+                // Handle case that:
+                // The content have published, but the latest version is not published (Step 1: 'unpublish', Step 2: 'draft')
+                ->whereHas(
+                    'latestNonDraftContentVersion',
+                    fn ($q) => $q->whereIsPublished()
+                )
                 ->whereNot('status', $unpublishOption->getValue());
 
         } else {
@@ -257,6 +263,10 @@ public function scopeWhereIsPublished($query, bool $condition = true)
                             'publishedVersions',
                             fn ($q) => $q->whereIsPublished()
                         )
+                        ->orWhereDoesntHave(
+                            'latestNonDraftContentVersion',
+                            fn ($q) => $q->whereIsPublished()
+                        )
                         ->orWhere('status', $unpublishOption->getValue())
                 );