Skip to content

Feature/lar 111 create edit discussion #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Actions/Discussion/ConvertDiscussionToThreadAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ final class ConvertDiscussionToThreadAction
public function execute(Discussion $discussion): Thread
{
return DB::transaction(function () use ($discussion) {
$thread = Thread::create([
$thread = Thread::query()->create([
'title' => $discussion->title,
'slug' => $discussion->slug,
'body' => $discussion->body,
Expand Down
29 changes: 29 additions & 0 deletions app/Actions/Discussion/CreateOrUpdateDiscussionAction.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?php

declare(strict_types=1);

namespace App\Actions\Discussion;

use App\Gamify\Points\DiscussionCreated;
use App\Models\Discussion;
use Illuminate\Support\Facades\DB;

final class CreateOrUpdateDiscussionAction
{
public function handle(array $formValues, ?int $discussionId = null): Discussion
{
return DB::transaction(function () use ($formValues, $discussionId) {
/** @var Discussion $discussion */
$discussion = Discussion::query()->updateOrCreate(
['id' => $discussionId],
$formValues
);

if (! $discussionId) {
givePoint(new DiscussionCreated($discussion));
}

return $discussion;
});
}
}
7 changes: 5 additions & 2 deletions app/Actions/Discussion/NotifyUsersOfThreadConversion.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@ public function execute(Thread $thread): void
{
$usersToNotify = $thread->replies()->pluck('user_id')->unique()->toArray();

User::whereIn('id', $usersToNotify)->get()->each->notify(new ThreadConvertedByCreator($thread));
User::query()->whereIn('id', $usersToNotify)
->get()
->each
->notify(new ThreadConvertedByCreator($thread));

if (Auth::check() && Auth::user()->isAdmin()) {
if (Auth::check() && (Auth::user()?->isAdmin() || Auth::user()?->isModerator())) {
$thread->user->notify(new ThreadConvertedByAdmin($thread));
}
}
Expand Down
148 changes: 148 additions & 0 deletions app/Livewire/Components/Slideovers/DiscussionForm.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
<?php

declare(strict_types=1);

namespace App\Livewire\Components\Slideovers;

use App\Actions\Discussion\CreateOrUpdateDiscussionAction;
use App\Exceptions\UnverifiedUserException;
use App\Livewire\Traits\WithAuthenticatedUser;
use App\Models\Discussion;
use Filament\Forms;
use Filament\Forms\Concerns\InteractsWithForms;
use Filament\Forms\Contracts\HasForms;
use Filament\Forms\Form;
use Filament\Notifications\Notification;
use Illuminate\Contracts\View\View;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Blade;
use Illuminate\Support\HtmlString;
use Illuminate\Support\Str;
use Laravelcm\LivewireSlideOvers\SlideOverComponent;

/**
* @property Form $form
*/
final class DiscussionForm extends SlideOverComponent implements HasForms
{
use InteractsWithForms;
use WithAuthenticatedUser;

public ?Discussion $discussion = null;

public ?array $data = [];

public function mount(?int $discussionId = null): void
{
// @phpstan-ignore-next-line
$this->discussion = $discussionId
? Discussion::query()->findOrFail($discussionId)
: new Discussion;

$this->form->fill(array_merge(
$this->discussion->toArray(),
['user_id' => $this->discussion->user_id ?? Auth::id()]
));
}

public function form(Form $form): Form
{
return $form
->schema([
Forms\Components\Hidden::make('user_id'),
Forms\Components\TextInput::make('title')
->label(__('validation.attributes.title'))
->helperText(__('pages/discussion.min_discussion_length'))
->required()
->live(onBlur: true)
->afterStateUpdated(function (string $operation, $state, Forms\Set $set): void {
$set('slug', Str::slug($state));
})
->minLength(10),
Forms\Components\Hidden::make('slug'),
Forms\Components\Select::make('tags')
->multiple()
->relationship(
name: 'tags',
titleAttribute: 'name',
modifyQueryUsing: fn ($query) => $query->whereJsonContains('concerns', 'discussion')
)
->required()
->minItems(1)
->maxItems(3)
->preload(),
Forms\Components\MarkdownEditor::make('body')
->toolbarButtons([
'blockquote',
'bold',
'bulletList',
'codeBlock',
'link',
])
->label(__('validation.attributes.content'))
->maxHeight('18.25rem')
->required()
->minLength(20),
Forms\Components\Placeholder::make('')
->content(fn () => new HtmlString(Blade::render(<<<'Blade'
<x-torchlight />
Blade))),
])
->statePath('data')
->model($this->discussion);
}

public function save(): void
{
// @phpstan-ignore-next-line
if (! Auth::user()->hasVerifiedEmail()) {
throw new UnverifiedUserException(
message: __('notifications.exceptions.unverified_user')
);
}

if ($this->discussion?->id) {
$this->authorize('update', $this->discussion);
}

$this->validate();

$discussion = app(CreateOrUpdateDiscussionAction::class)->handle(
formValues : $this->form->getState(),
discussionId: $this->discussion?->id
);

$this->form->model($discussion)->saveRelationships();

Notification::make()
->title(
$this->discussion?->id
? __('notifications.discussion.updated')
: __('notifications.discussion.created'),
)
->success()
->send();

$this->redirect(route('discussions.show', ['discussion' => $discussion]), navigate: true);
}

public static function panelMaxWidth(): string
{
return '2xl';
}

public static function closePanelOnEscape(): bool
{
return false;
}

public static function closePanelOnClickAway(): bool
{
return false;
}

public function render(): View
{
return view('livewire.components.slideovers.discussion-form');
}
}
51 changes: 0 additions & 51 deletions app/Livewire/Discussions/Create.php

This file was deleted.

73 changes: 0 additions & 73 deletions app/Livewire/Discussions/Edit.php

This file was deleted.

5 changes: 2 additions & 3 deletions app/Livewire/Discussions/Subscribe.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

use App\Models\Discussion;
use App\Models\Subscribe as SubscribeModel;
use App\Policies\DiscussionPolicy;
use Filament\Notifications\Notification;
use Illuminate\Contracts\View\View;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
Expand All @@ -27,7 +26,7 @@ final class Subscribe extends Component

public function subscribe(): void
{
$this->authorize(DiscussionPolicy::SUBSCRIBE, $this->discussion);
$this->authorize('subscribe', $this->discussion);

$subscribe = new SubscribeModel;
$subscribe->uuid = Uuid::uuid4()->toString();
Expand All @@ -46,7 +45,7 @@ public function subscribe(): void

public function unsubscribe(): void
{
$this->authorize(DiscussionPolicy::UNSUBSCRIBE, $this->discussion);
$this->authorize('unsubscribe', $this->discussion);

$this->discussion->subscribes()
->where('user_id', Auth::id())
Expand Down
32 changes: 0 additions & 32 deletions app/Livewire/Modals/ConvertDiscussion.php

This file was deleted.

Loading
Loading