Merge remote-tracking branch 'origin/feature/content_version_rollback_n_diff' into feature/content_version_rollback_n_diff

# Conflicts:
#	src/Livewire/ContentVersionHistory.php

Author: cklei-carly

resources/lang/en/resources/content-version.php

@@ -58,4 +58,4 @@
             ],
         ],
     ],
-];
+];

resources/lang/zh_TW/resources/content-version.php

@@ -58,4 +58,4 @@
             ],
         ],
     ],
-];
+];

src/Livewire/ContentVersionHistory.php

@@ -45,8 +45,9 @@ public function getTableRecordTitle(Model $record): ?string
     public function table(Table $table): Table
     {
         return $table
-            ->modifyQueryUsing(fn ($query) => $query
-                ->with(['publishLog', 'author'])
+            ->modifyQueryUsing(
+                fn ($query) => $query
+                    ->with(['publishLog', 'author'])
             )
             ->defaultSort('created_at', 'desc')
             ->heading('')
@@ -76,12 +77,12 @@ public function table(Table $table): Table
                         ]),
                         TextColumn::make('publish_state')
                             ->badge()
-                            ->getStateUsing(fn ($record) => !blank($record->publish_state) ? inspirecms_content_statuses()->getOption($record->publish_state) : null)
+                            ->getStateUsing(fn ($record) => ! blank($record->publish_state) ? inspirecms_content_statuses()->getOption($record->publish_state) : null)
                             ->formatStateUsing(fn ($state) => $state instanceof ContentStatusOption ? $state->getLabel() : null)
                             ->color(fn ($state) => $state instanceof ContentStatusOption ? $state->getColor() : 'gray')
                             ->placeholder(__('inspirecms::inspirecms.n/a'))
-                            ->icon(function ($state, ContentVersion|Model $record) {
-        
+                            ->icon(function ($state, ContentVersion | Model $record) {
+
                                 if (($unpublishOption = ContentStatusManifest::getOption('unpublish'))) {
                                     if ($state instanceof ContentStatusOption) {
                                         $state = $state->getValue();
@@ -96,7 +97,7 @@ public function table(Table $table): Table
                                 }
 
                                 return null;
-                            })
+                            }),
                     ]),
                 ]),
 
@@ -109,6 +110,7 @@ public function table(Table $table): Table
                         if (empty($state) || ! $state instanceof DateTimeInterface) {
                             return null;
                         }
+
                         return ' (' . $state->diffForHumans() . ')';
                     })
                     ->color('primary')
@@ -127,17 +129,18 @@ public function table(Table $table): Table
 
                         $record->avoid_to_clean = ! $record->avoid_to_clean;
                         $record->save();
-                        $record->refresh(); 
+                        $record->refresh();
 
                         $notificationConfig = $this->getAvoidToCleanNotificationConfig($record->avoid_to_clean);
                         $notificationTitle = $notificationConfig['title'] ?? null;
 
                         if (filled($notificationTitle)) {
-                            $action->successNotification(fn (Notification $notification) => $notification
-                                ->icon(FilamentIcon::resolve('inspirecms::warn'))
-                                ->title($notificationTitle)
-                                ->body($notificationConfig['body'] ?? null)
-                                ->status($notificationConfig['status'] ?? null)
+                            $action->successNotification(
+                                fn (Notification $notification) => $notification
+                                    ->icon(FilamentIcon::resolve('inspirecms::warn'))
+                                    ->title($notificationTitle)
+                                    ->body($notificationConfig['body'] ?? null)
+                                    ->status($notificationConfig['status'] ?? null)
                             );
                         }
                         $action->success();
@@ -189,7 +192,7 @@ public function table(Table $table): Table
                     ->placeholder('All States'),
                 TernaryFilter::make('avoid_to_clean')
                     ->label(__('inspirecms::resources/content-version.avoid_to_clean.label')),
-                    
+
             ]);
     }
 
@@ -205,6 +208,7 @@ protected function configureTableAction(TableAction $action): void
                 if (is_null($record)) {
                     return true;
                 }
+
                 return ! $record->exists && ! $record instanceof ContentVersion;
             });
 
@@ -250,7 +254,7 @@ protected function configureTableBulkAction(TableBulkAction $action): void
 
         $action
             ->hidden(function ($arguments) {
-                return ($this->getOwnerRecord()->isLocked() || $this->getOwnerRecord()->trashed());
+                return $this->getOwnerRecord()->isLocked() || $this->getOwnerRecord()->trashed();
             });
     }
 
@@ -277,13 +281,15 @@ protected function computeDiff($originalContent, $newContent)
                 return collect($newContent)
                     ->map(function ($item, $itemKey) use ($originalContent) {
                         $oldItem = $originalContent[$itemKey] ?? null;
+
                         return $this->computeDiff($oldItem, $item);
                     })
                     ->all();
-            } elseif (!is_array($newContent) && is_array($originalContent)) {
+            } elseif (! is_array($newContent) && is_array($originalContent)) {
                 return collect($originalContent)
                     ->map(function ($item, $itemKey) use ($newContent) {
                         $newItem = $newContent[$itemKey] ?? null;
+
                         return $this->computeDiff($item, $newItem);
                     })
                     ->all();
@@ -305,7 +311,7 @@ protected function computeDiff($originalContent, $newContent)
         } catch (\Exception $e) {
             return __('inspirecms::inspirecms.n/a');
         }
-    } 
+    }
 
     protected function getDiffKeysFromRecord(Model | ContentVersion $record): array
     {
@@ -338,7 +344,7 @@ protected function getAvoidToCleanActionConfigFromRecord(Model | ContentVersion
 
     protected function getAvoidToCleanNotificationConfig($newState)
     {
-        if (!is_bool($newState)) {
+        if (! is_bool($newState)) {
             return [];
         }
         // Now: avoid to clean = true
@@ -353,6 +359,7 @@ protected function getAvoidToCleanNotificationConfig($newState)
             $body = __('inspirecms::resources/content-version.buttons.toggle_avoid_to_clean.messages.wait_to_cleanup.body');
             $status = 'info';
         }
+
         return compact('title', 'body', 'status');
     }
 }