add id to alert banner

pelican-dev · Jan 17, 2025 · f3cb04b · f3cb04b
1 parent a22abb7
commit f3cb04b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/app/Livewire/AlertBanner.php b/app/Livewire/AlertBanner.php
@@ -5,23 +5,29 @@
 use Filament\Notifications\Concerns;
 use Filament\Support\Concerns\EvaluatesClosures;
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Str;
 
 final class AlertBanner implements Arrayable
 {
     use Concerns\HasBody;
     use Concerns\HasIcon;
+    use Concerns\HasId;
     use Concerns\HasStatus;
     use Concerns\HasTitle;
     use EvaluatesClosures;
 
-    public static function make(): static
+    public static function make(?string $id = null): static
     {
-        return new self();
+        $static = new self();
+        $static->id($id ?? Str::orderedUuid());
+
+        return $static;
     }
 
     public function toArray(): array
     {
         return [
+            'id' => $this->getId(),
             'title' => $this->getTitle(),
             'body' => $this->getBody(),
             'status' => $this->getStatus(),
@@ -33,6 +39,7 @@ public static function fromArray(array $data): static
     {
         $static = static::make();
 
+        $static->id($data['id']);
         $static->title($data['title']);
         $static->body($data['body']);
         $static->status($data['status']);

diff --git a/app/Livewire/AlertBannerContainer.php b/app/Livewire/AlertBannerContainer.php
@@ -17,7 +17,14 @@ public function mount(): void
 
     public function pullFromSession(): void
     {
-        $this->alertBanners = array_merge($this->alertBanners, session()->pull('alert-banners', []));
+        foreach (session()->pull('alert-banners', []) as $alertBanner) {
+            $this->alertBanners[$alertBanner['id']] = $alertBanner;
+        }
+    }
+
+    public function remove(string $id): void
+    {
+        unset($this->alertBanners[$id]);
     }
 
     public function render(): View

diff --git a/resources/views/livewire/alerts/alert-banner-container.blade.php b/resources/views/livewire/alerts/alert-banner-container.blade.php
@@ -1,5 +1,5 @@
 <div wire:poll.1s="pullFromSession" id="alert-banner-container" class="flex flex-col gap-4">
-    @foreach ($alertBanners as $alertBanner)
+    @foreach (array_values($alertBanners) as $alertBanner)
         @include('livewire.alerts.alert-banner', ['alertBanner' => $alertBanner])
     @endforeach
 </div>