chore: apply rebase

Author: mckenziearts

app/Actions/Article/CreateArticleAction.php

@@ -5,56 +5,36 @@
 namespace App\Actions\Article;
 
 use App\Data\CreateArticleData;
-use App\Gamify\Points\ArticleCreated;
 use App\Models\Article;
-use App\Notifications\PostArticleToTelegram;
+use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Auth;
 
 final class CreateArticleAction
 {
     public function execute(CreateArticleData $articleData): Article
     {
-        if ($articleData->publishedAt) {
-            $articleData->publishedAt = new Carbon(
-                time: $articleData->publishedAt,
+        if ($articleData->published_at) {
+            $articleData->published_at = new Carbon(
+                time: $articleData->published_at,
                 tz: config('app.timezone')
             );
         }
 
+        /** @var User $author */
+        $author = Auth::user();
+
         /** @var Article $article */
         $article = Article::query()->create([
             'title' => $articleData->title,
-            'slug' => $articleData->title,
+            'slug' => $articleData->slug,
             'body' => $articleData->body,
-            'published_at' => $articleData->publishedAt,
-            'submitted_at' => $articleData->submittedAt,
-            'approved_at' => $articleData->approvedAt,
-            'show_toc' => $articleData->showToc,
-            'canonical_url' => $articleData->canonicalUrl,
-            'user_id' => Auth::id(),
+            'published_at' => $articleData->published_at,
+            'submitted_at' => $articleData->is_draft ? null : now(),
+            'canonical_url' => $articleData->canonical_url,
+            'user_id' => $author->id,
         ]);
 
-        if (collect($articleData->tags)->isNotEmpty()) {
-            $article->syncTags(tags: $articleData->tags);
-        }
-
-        if ($articleData->file) {
-            $article->addMedia($articleData->file->getRealPath())
-                ->toMediaCollection('media');
-        }
-
-        if ($article->isAwaitingApproval()) {
-            // Envoi de la notification sur le channel Telegram pour la validation de l'article.
-            Auth::user()?->notify(new PostArticleToTelegram($article));
-
-            session()->flash('status', __('notifications.article.created'));
-        }
-
-        if (Auth::user()?->hasAnyRole(['admin', 'moderator'])) {
-            givePoint(new ArticleCreated($article));
-        }
-
         return $article;
     }
 }

app/Data/CreateArticleData.php

@@ -5,7 +5,6 @@
 namespace App\Data;
 
 use Carbon\Carbon;
-use Illuminate\Http\UploadedFile;
 use Spatie\LaravelData\Data;
 
 final class CreateArticleData extends Data
@@ -14,12 +13,8 @@ public function __construct(
         public string $title,
         public string $slug,
         public string $body,
-        public string $showToc,
-        public string $canonicalUrl,
-        public ?Carbon $publishedAt,
-        public ?Carbon $submittedAt,
-        public ?Carbon $approvedAt,
-        public ?UploadedFile $file,
-        public array $tags = [],
+        public string $canonical_url,
+        public ?Carbon $published_at,
+        public bool $is_draft = false,
     ) {}
 }

app/Filament/Resources/ArticleResource.php

@@ -30,31 +30,12 @@ public static function table(Table $table): Table
                 TextColumn::make('title')
                     ->label('Titre')
                     ->sortable(),
-                TextColumn::make('status')
-                    ->getStateUsing(function ($record) {
-                        if ($record->approved_at) {
-                            return 'Approuver';
-                        } elseif ($record->declined_at) {
-                            return 'Décliner';
-                        } elseif ($record->submitted_at) {
-                            return 'Soumis';
-                        } else {
-                            return 'Brouillon';
-                        }
-                    })
-                    ->colors([
-                        'success' => 'Approuver',
-                        'danger' => 'Décliner',
-                        'warning' => 'Soumis',
-                        'default' => 'Brouillon',
-                    ])
-                    ->badge(),
-                TextColumn::make('submitted_at')
-                    ->label('Date de soumission')
-                    ->dateTime(),
                 TextColumn::make('user.name')
                     ->label('Auteur')
                     ->sortable(),
+                TextColumn::make('submitted_at')
+                    ->label('Date de soumission')
+                    ->dateTime(),
             ])
             ->filters([
                 Filter::make('submitted_at')->query(fn (Builder $query) => $query->whereNotNull('submitted_at'))->label('Soumis'),
@@ -90,9 +71,8 @@ public static function table(Table $table): Table
                             $record->declined_at = now();
                             $record->save();
                         }),
-                    Tables\Actions\DeleteAction::make('delete'),
+                    Tables\Actions\DeleteAction::make(),
                 ]),
-
             ])
             ->bulkActions([
                 Tables\Actions\BulkActionGroup::make([
@@ -105,8 +85,8 @@ public static function table(Table $table): Table
                         ->requiresConfirmation()
                         ->modalIcon('heroicon-s-check')
                         ->modalHeading('Approuver')
-                        ->modalSubheading('Voulez-vous vraiment approuver ces articles ?')
-                        ->modalButton('Confirmer'),
+                        ->modalDescription('Voulez-vous vraiment approuver ces articles ?')
+                        ->modalSubmitActionLabel('Confirmer'),
                     BulkAction::make('declined')
                         ->label('Décliner la sélection')
                         ->icon('heroicon-s-x-mark')
@@ -116,8 +96,8 @@ public static function table(Table $table): Table
                         ->requiresConfirmation()
                         ->modalIcon('heroicon-s-x-mark')
                         ->modalHeading('Décliner')
-                        ->modalSubheading('Voulez-vous vraiment décliner ces articles ?')
-                        ->modalButton('Confirmer'),
+                        ->modalDescription('Voulez-vous vraiment décliner ces articles ?')
+                        ->modalSubmitActionLabel('Confirmer'),
 
                     Tables\Actions\DeleteBulkAction::make(),
                 ]),

app/Gamify/Points/ArticleCreated.php renamed to app/Gamify/Points/ArticlePublished.php

@@ -7,7 +7,7 @@
 use App\Models\Article;
 use QCod\Gamify\PointType;
 
-final class ArticleCreated extends PointType
+final class ArticlePublished extends PointType
 {
     public int $points = 50;