rosslh/coolify
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "fix: S3 download and database restore output showing same content"

Browse source 
This reverts commit d07cc48369ac4beb0405823bf34aad02200e4a6f.
This commit is contained in:
Andras Bacsai 2025-11-02 16:52:32 +01:00
parent a5dafe785b
commit 226de35146
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Livewire/Project/Database/Import.php
View file

@ -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);

4
resources/views/livewire/project/database/import.blade.php
View file

@ -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>