- @if (auth()->user()->can('create', \Parallax\FilamentComments\Models\FilamentComment::class))
+ @if (auth()->user()->can('create', config('filament-comments.comment_model')))
{{ $this->form }}
-
+
@if(config('filament-comments.editor') === 'markdown')
- {{ Str::of($comment->comment)->markdown()->toHtmlString() }}
+ {{ Str::of($comment->comment)->markdown()->sanitizeHtml()->toHtmlString() }}
@else
- {{ Str::of($comment->comment)->toHtmlString() }}
+ {{ Str::of($comment->comment)->sanitizeHtml()->toHtmlString() }}
@endif
{{ __('filament-comments::filament-comments.comments.empty') }}
diff --git a/src/Actions/CommentsAction.php b/src/Actions/CommentsAction.php
index 5112c20..6f3bb3a 100644
--- a/src/Actions/CommentsAction.php
+++ b/src/Actions/CommentsAction.php
@@ -5,7 +5,6 @@
use Filament\Actions\Action;
use Filament\Support\Enums\MaxWidth;
use Illuminate\Contracts\View\View;
-use Parallax\FilamentComments\Models\FilamentComment;
class CommentsAction extends Action
{
diff --git a/src/FilamentCommentsServiceProvider.php b/src/FilamentCommentsServiceProvider.php
index a90b6d5..1f88f80 100644
--- a/src/FilamentCommentsServiceProvider.php
+++ b/src/FilamentCommentsServiceProvider.php
@@ -5,15 +5,12 @@
use Filament\Support\Assets\Asset;
use Filament\Support\Assets\Css;
use Filament\Support\Facades\FilamentAsset;
-use Illuminate\Filesystem\Filesystem;
use Illuminate\Support\Facades\Gate;
use Livewire\Livewire;
use Spatie\LaravelPackageTools\Commands\InstallCommand;
use Spatie\LaravelPackageTools\Package;
use Spatie\LaravelPackageTools\PackageServiceProvider;
use Parallax\FilamentComments\Livewire\CommentsComponent;
-use Parallax\FilamentComments\Models\FilamentComment;
-use Parallax\FilamentComments\Policies\FilamentCommentPolicy;
class FilamentCommentsServiceProvider extends PackageServiceProvider
{
@@ -55,7 +52,7 @@ public function packageBooted(): void
{
Livewire::component('comments', CommentsComponent::class);
- Gate::policy(config('filament-comments.comment_model'), config('filament-comments.model_policy', FilamentCommentPolicy::class));
+ Gate::policy(config('filament-comments.comment_model'), config('filament-comments.model_policy'));
FilamentAsset::register(
$this->getAssets(),
diff --git a/src/Infolists/Components/CommentsEntry.php b/src/Infolists/Components/CommentsEntry.php
index ab4d7c4..29270b6 100644
--- a/src/Infolists/Components/CommentsEntry.php
+++ b/src/Infolists/Components/CommentsEntry.php
@@ -3,7 +3,6 @@
namespace Parallax\FilamentComments\Infolists\Components;
use Filament\Infolists\Components\Entry;
-use Parallax\FilamentComments\Models\FilamentComment;
class CommentsEntry extends Entry
{
diff --git a/src/Livewire/CommentsComponent.php b/src/Livewire/CommentsComponent.php
index 021999d..ca98c13 100644
--- a/src/Livewire/CommentsComponent.php
+++ b/src/Livewire/CommentsComponent.php
@@ -2,15 +2,16 @@
namespace Parallax\FilamentComments\Livewire;
+use Filament\Facades\Filament;
use Filament\Forms;
use Filament\Forms\Concerns\InteractsWithForms;
use Filament\Forms\Contracts\HasForms;
use Filament\Forms\Form;
+use Filament\Notifications\Actions\Action;
use Filament\Notifications\Notification;
use Illuminate\Contracts\View\View;
use Illuminate\Database\Eloquent\Model;
use Livewire\Component;
-use Parallax\FilamentComments\Models\FilamentComment;
class CommentsComponent extends Component implements HasForms
{
@@ -31,25 +32,44 @@ public function form(Form $form): Form
return $form;
}
+ $schema = [];
+
+ if (config('filament-comments.notify_users')) {
+ $users = config('filament-comments.authenticatable')::query()
+ ->where(auth()->user()->getKeyName(), '!=', auth()->id())
+ ->pluck(config('filament-comments.user_name_attribute'), auth()->user()->getKeyName());
+ $schema[] = Forms\Components\Select::make('users_to_notify')
+ ->hiddenLabel()
+ ->placeholder(__('filament-comments::filament-comments.notify_users.placeholder'))
+ ->options($users)
+ ->multiple()
+ ->searchable()
+ ->preload();
+ }
+
if (config('filament-comments.editor') === 'markdown') {
- $editor = Forms\Components\MarkdownEditor::make('comment')
+ $schema[] = Forms\Components\MarkdownEditor::make('comment')
->hiddenLabel()
->required()
->placeholder(__('filament-comments::filament-comments.comments.placeholder'))
- ->toolbarButtons(config('filament-comments.toolbar_buttons'));
+ ->toolbarButtons(config('filament-comments.toolbar_buttons'))
+ ->fileAttachmentsDisk(config('filament-comments.editor_disk'))
+ ->fileAttachmentsDirectory(config('filament-comments.editor_directory'))
+ ->fileAttachmentsVisibility(config('filament-comments.editor_visibility'));
} else {
- $editor = Forms\Components\RichEditor::make('comment')
+ $schema[] = Forms\Components\RichEditor::make('comment')
->hiddenLabel()
->required()
->placeholder(__('filament-comments::filament-comments.comments.placeholder'))
->extraInputAttributes(['style' => 'min-height: 6rem'])
- ->toolbarButtons(config('filament-comments.toolbar_buttons'));
+ ->toolbarButtons(config('filament-comments.toolbar_buttons'))
+ ->fileAttachmentsDisk(config('filament-comments.editor_disk'))
+ ->fileAttachmentsDirectory(config('filament-comments.editor_directory'))
+ ->fileAttachmentsVisibility(config('filament-comments.editor_visibility'));
}
return $form
- ->schema([
- $editor,
- ])
+ ->schema($schema)
->statePath('data');
}
@@ -74,12 +94,33 @@ public function create(): void
->success()
->send();
+ if (config('filament-comments.notify_users')) {
+ $title = __('filament-comments::filament-comments.notify_users.notification_title', [
+ 'user' => auth()->user()[config('filament-comments.user_name_attribute')]
+ ]);
+ $viewAction = Action::make('view')
+ ->label(__('filament-comments::filament-comments.notify_users.notification_action'))
+ ->color('info')
+ ->url(Filament::getResourceUrl($this->record, 'view', ['action' => 'comments']))
+ ->extraAttributes(['wire:click' => '$dispatch(`close-modal`, JSON.parse(`{\u0022id\u0022:\u0022database-notifications\u0022}`))'])
+ ->close();
+ Notification::make()
+ ->title($title)
+ ->body($data['comment'])
+ ->icon(config('filament-comments.icons.action'))
+ ->iconColor('info')
+ ->actions([
+ $viewAction,
+ ])
+ ->sendToDatabase(config('filament-comments.authenticatable')::find($data['users_to_notify']));
+ }
+
$this->form->fill();
}
public function delete(int $id): void
{
- $comment = FilamentComment::find($id);
+ $comment = config('filament-comments.comment_model')::find($id);
if (!$comment) {
return;
diff --git a/src/Models/Traits/HasFilamentComments.php b/src/Models/Traits/HasFilamentComments.php
index 88252af..e63c80a 100644
--- a/src/Models/Traits/HasFilamentComments.php
+++ b/src/Models/Traits/HasFilamentComments.php
@@ -3,7 +3,6 @@
namespace Parallax\FilamentComments\Models\Traits;
use Illuminate\Database\Eloquent\Relations\HasMany;
-use Parallax\FilamentComments\Models\FilamentComment;
trait HasFilamentComments
{
diff --git a/src/Tables/Actions/CommentsAction.php b/src/Tables/Actions/CommentsAction.php
index 9b60967..90d0962 100644
--- a/src/Tables/Actions/CommentsAction.php
+++ b/src/Tables/Actions/CommentsAction.php
@@ -6,7 +6,6 @@
use Filament\Support\Enums\MaxWidth;
use Illuminate\Contracts\View\View;
use Illuminate\Database\Eloquent\Model;
-use Parallax\FilamentComments\Models\FilamentComment;
class CommentsAction extends Action
{