From 226de3514606192c1d6cc66326033dc20ae8f2c4 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Sun, 2 Nov 2025 16:52:32 +0100
Subject: [PATCH] Revert "fix: S3 download and database restore output showing
 same content"

This reverts commit d07cc48369ac4beb0405823bf34aad02200e4a6f.
---
 app/Livewire/Project/Database/Import.php                   | 6 +++---
 resources/views/livewire/project/database/import.blade.php | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Livewire/Project/Database/Import.php b/app/Livewire/Project/Database/Import.php
index 11902fe9d..fe30b6f67 100644
--- a/app/Livewire/Project/Database/Import.php
+++ b/app/Livewire/Project/Database/Import.php
@@ -263,7 +263,7 @@ public function runImport()
                     'container' => $this->container,
                     'serverId' => $this->server->id,
                 ]);
-                $this->dispatch('activityMonitor', $activity->id)->to('database-restore-monitor');
+                $this->dispatch('activityMonitor', $activity->id);
             }
         } catch (\Throwable $e) {
             return handleError($e, $this);
@@ -404,7 +404,7 @@ public function downloadFromS3()
             $this->s3DownloadedFile = $downloadPath;
             $this->filename = $downloadPath;
 
-            $this->dispatch('activityMonitor', $activity->id)->to('s3-download-monitor');
+            $this->dispatch('activityMonitor', $activity->id);
             $this->dispatch('info', 'Downloading file from S3. This may take a few minutes for large backups...');
         } catch (\Throwable $e) {
             $this->s3DownloadInProgress = false;
@@ -486,7 +486,7 @@ public function restoreFromS3()
                     's3DownloadedFile' => $this->s3DownloadedFile,
                     'resourceUuid' => $this->resource->uuid,
                 ]);
-                $this->dispatch('activityMonitor', $activity->id)->to('database-restore-monitor');
+                $this->dispatch('activityMonitor', $activity->id);
             }
         } catch (\Throwable $e) {
             return handleError($e, $this);
diff --git a/resources/views/livewire/project/database/import.blade.php b/resources/views/livewire/project/database/import.blade.php
index 865e5b460..be5b0f00a 100644
--- a/resources/views/livewire/project/database/import.blade.php
+++ b/resources/views/livewire/project/database/import.blade.php
@@ -150,7 +150,7 @@
                     <div x-show="s3DownloadInProgress" class="pt-2">
                         <div class="text-sm text-warning">Downloading from S3... This may take a few minutes for large
                             backups.</div>
-                        <livewire:activity-monitor key="s3-download-monitor" header="S3 Download Progress" :showWaiting="false" />
+                        <livewire:activity-monitor header="S3 Download Progress" :showWaiting="false" />
                     </div>
 
                     <div x-show="s3DownloadedFile && !s3DownloadInProgress" class="pt-2">
@@ -173,7 +173,7 @@
                 <x-forms.button class="w-full my-4" wire:click='runImport'>Restore Backup</x-forms.button>
             </div>
             <div class="container w-full mx-auto" x-show="$wire.importRunning">
-                <livewire:activity-monitor key="database-restore-monitor" header="Database Restore Output" :showWaiting="false" />
+                <livewire:activity-monitor header="Database Restore Output" :showWaiting="false" />
             </div>
         @else
             <div>Database must be running to restore a backup.</div>