diff --git a/resources/views/livewire/project/shared/resource-operations.blade.php b/resources/views/livewire/project/shared/resource-operations.blade.php
index 255336d7de..7efa9b79bd 100644
--- a/resources/views/livewire/project/shared/resource-operations.blade.php
+++ b/resources/views/livewire/project/shared/resource-operations.blade.php
@@ -1,4 +1,4 @@
-
- Migrate resource
-
+
+
+ Migrate resource
+
+
@endif
diff --git a/resources/views/livewire/server/show.blade.php b/resources/views/livewire/server/show.blade.php
index f7844b3286..533a33858a 100644
--- a/resources/views/livewire/server/show.blade.php
+++ b/resources/views/livewire/server/show.blade.php
@@ -124,17 +124,37 @@
@if (isDev())
-
-
- {{ $server->isTransferredAway() ? 'Enable management' : 'Disable management' }}
-
+
+ @if ($server->isTransferredAway())
+
+
+
+
+ Enable management
+
+
+
+ @else
+
+
+
+
+ Disable management
+
+
+
+ @endif
+
@endif
@if ($server->isTransferredAway())
diff --git a/resources/views/livewire/server/transfer-import.blade.php b/resources/views/livewire/server/transfer-import.blade.php
index 16fab1a102..43a6661caf 100644
--- a/resources/views/livewire/server/transfer-import.blade.php
+++ b/resources/views/livewire/server/transfer-import.blade.php
@@ -29,12 +29,16 @@
Dry run
Checking…
-
- Import server
- Importing…
-
+
+
+
+ Import server
+ Importing…
+
+
+
diff --git a/resources/views/livewire/server/transfer.blade.php b/resources/views/livewire/server/transfer.blade.php
index 223cbfcd4e..901e65493c 100644
--- a/resources/views/livewire/server/transfer.blade.php
+++ b/resources/views/livewire/server/transfer.blade.php
@@ -50,12 +50,20 @@
label="Write ownership file on the host via SSH (optional)" />
-
- Transfer server
- Transferring…
-
+
+
+
+ Transfer server
+ Transferring…
+
+
+
@if (count($lastWarnings) > 0)
@@ -116,11 +124,16 @@
Disable automations after a manual import on the target.
-
- Mark transferred & disable automations
-
+
+
+
+ Mark transferred & disable automations
+
+
+
diff --git a/resources/views/livewire/source/github/change.blade.php b/resources/views/livewire/source/github/change.blade.php
index a85cd8e617..8f0a8cbbee 100644
--- a/resources/views/livewire/source/github/change.blade.php
+++ b/resources/views/livewire/source/github/change.blade.php
@@ -360,11 +360,11 @@
const selectedEndpoint = webhook_endpoint ? webhook_endpoint.trim() : '';
const customEndpoint = custom_webhook_endpoint ? custom_webhook_endpoint.trim() : '';
if (use_custom_webhook_endpoint && !customEndpoint) {
- alert('Please enter a custom webhook endpoint.');
+ window.toast('Error', { type: 'danger', description: 'Please enter a custom webhook endpoint.' });
return;
}
if (!use_custom_webhook_endpoint && !selectedEndpoint) {
- alert('Please enter a webhook endpoint.');
+ window.toast('Error', { type: 'danger', description: 'Please enter a webhook endpoint.' });
return;
}
let baseUrl = (use_custom_webhook_endpoint ? customEndpoint : selectedEndpoint).replace(/\/+$/, '');
diff --git a/resources/views/livewire/storage/resources.blade.php b/resources/views/livewire/storage/resources.blade.php
index cb4b7b8ced..dd8b004e4c 100644
--- a/resources/views/livewire/storage/resources.blade.php
+++ b/resources/views/livewire/storage/resources.blade.php
@@ -102,11 +102,16 @@
portal />
-
+
+
+
+
+
+
+
@endforeach
@@ -142,11 +147,16 @@
portal />
-
+
+
+
+
+
+
+
@endforeach
diff --git a/tests/Feature/ServerManagementOwnershipTest.php b/tests/Feature/ServerManagementOwnershipTest.php
index 45227cd9d9..7d908097eb 100644
--- a/tests/Feature/ServerManagementOwnershipTest.php
+++ b/tests/Feature/ServerManagementOwnershipTest.php
@@ -148,7 +148,8 @@ test('server overview shows a management button that matches the ownership state
Livewire::test(Show::class, ['server_uuid' => $this->server->uuid])
->assertSee('Disable management')
->assertDontSee('Enable management')
- ->call('toggleManagement')
+ ->assertDontSeeHtml('wire:confirm')
+ ->call('toggleManagement', '')
->assertSee('Enable management')
->assertDontSee('Disable management');
});
diff --git a/tests/Unit/NoNativeBrowserDialogsTest.php b/tests/Unit/NoNativeBrowserDialogsTest.php
new file mode 100644
index 0000000000..237a2bb610
--- /dev/null
+++ b/tests/Unit/NoNativeBrowserDialogsTest.php
@@ -0,0 +1,21 @@
+files()
+ ->in([__DIR__.'/../../resources/views', __DIR__.'/../../resources/js'])
+ ->name(['*.blade.php', '*.js']);
+
+ $offenders = [];
+ foreach ($files as $file) {
+ foreach (explode("\n", $file->getContents()) as $number => $line) {
+ if (preg_match('/wire:confirm|(?getRelativePathname().':'.($number + 1);
+ }
+ }
+ }
+
+ expect($offenders)->toBeEmpty();
+});