An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
fix(traffic): show geo globe when country data becomes available (#12108)
Andras Bacsaic9cce7ea2bd6
diff --git a/resources/views/livewire/traffic/_geo.blade.php b/resources/views/livewire/traffic/_geo.blade.phpindex f47e0506bf..06f24bfee6 100644--- a/resources/views/livewire/traffic/_geo.blade.php+++ b/resources/views/livewire/traffic/_geo.blade.php@@ -50,10 +50,35 @@@else<div class="grid grid-cols-1 items-stretch gap-4 border-b border-neutral-200 p-4 lg:grid-cols-[2fr_3fr] dark:border-white/[0.07]">{{-- Interactive dotted globe (40%). wire:ignore so live-poll morphs never tear- down the WebGL canvas. --}}- <div wire:ignore class="flex items-center justify-center">+ down the WebGL canvas. Mounted via Alpine, not Livewire's script directive:+ it ran before the lazy-loaded canvas was in the DOM, and only once per+ component, so a globe inserted by a later render (no data -> data after a+ range change or live poll) never mounted either. Alpine's+ init()/destroy() run each time this element enters or leaves the DOM. --}}+ <div wire:ignore class="flex items-center justify-center"+ x-data="{+ controller: null,+ refreshCleanup: null,+ isDark() { return document.documentElement.classList.contains('dark'); },+ init() {+ const canvas = this.$refs.canvas;+ if (typeof window.mountTrafficGlobe !== 'function') { return; }+ this.controller = window.mountTrafficGlobe(canvas, @js($geoInit), this.isDark());+ // Expose for row-hover focus() from the Alpine list scope.+ canvas._trafficGlobe = this.controller;+ this.refreshCleanup = Livewire.on('refreshChartData-{!! $chartId !!}-status', payload => {+ const data = Array.isArray(payload) ? payload[0] : payload;+ if (data && Array.isArray(data.geo)) { this.controller.update(data.geo, this.isDark()); }+ });+ },+ destroy() {+ if (this.refreshCleanup) { this.refreshCleanup(); this.refreshCleanup = null; }+ if (this.controller) { this.controller.destroy(); this.controller = null; }+ if (this.$refs.canvas) { this.$refs.canvas._trafficGlobe = null; }+ },+ }"><div class="relative aspect-square w-full max-w-[320px]">- <canvas id="{!! $globeId !!}"+ <canvas id="{!! $globeId !!}" x-ref="canvas"class="h-full w-full [touch-action:none]"style="width: 100%; height: 100%;"></canvas></div>@@ -108,31 +133,5 @@{{ $attribution }}</p>@endif-- @script- <script>- (() => {- const canvas = document.getElementById('{!! $globeId !!}');- if (!canvas || typeof window.mountTrafficGlobe !== 'function') { return; }-- const isDark = () => document.documentElement.classList.contains('dark');- const controller = window.mountTrafficGlobe(canvas, @json($geoInit), isDark());- // Expose for row-hover focus() from the Alpine list scope.- canvas._trafficGlobe = controller;-- Livewire.on('refreshChartData-{!! $chartId !!}-status', payload => {- const data = Array.isArray(payload) ? payload[0] : payload;- if (data && Array.isArray(data.geo)) {- controller.update(data.geo, isDark());- }- });-- // Tear down the WebGL context when navigating away (wire:navigate).- document.addEventListener('livewire:navigating', () => {- if (canvas._trafficGlobe) { canvas._trafficGlobe.destroy(); canvas._trafficGlobe = null; }- }, { once: true });- })();- </script>- @endscript@endif</div>diff --git a/tests/Feature/TrafficAnalytics/GeoVisualizationTest.php b/tests/Feature/TrafficAnalytics/GeoVisualizationTest.phpindex bf239a743c..13e230d6a1 100644--- a/tests/Feature/TrafficAnalytics/GeoVisualizationTest.php+++ b/tests/Feature/TrafficAnalytics/GeoVisualizationTest.php@@ -114,3 +114,24 @@ it('shows a plain no-data state when no country data has been recorded', functio->assertSee('Countries')->assertSee('No country data for the selected range');});++it('mounts the globe from the element itself when country data arrives after the first render', function () {+ $server = bootGeoServer();++ $fake = new FakeGeoTrafficClient($server);+ $fake->responses = fakeGeoResponses([]);+ app()->bind(SentinelTrafficClient::class, fn () => $fake);++ $component = loadLazy(Livewire::test(Analytics::class))+ ->assertSee('No country data for the selected range');++ $fake->responses = fakeGeoResponses([+ ['value' => 'US', 'requests' => 600, 'bytes_out' => 15000],+ ]);++ // A @script block runs only once per component, so a globe inserted by a later+ // render never mounted. The mount must live on the element (Alpine x-data).+ $component->call('loadData')+ ->assertSeeHtml('id="global-analytics-globe" x-ref="canvas"')+ ->assertSeeHtml('window.mountTrafficGlobe(canvas');+});