Add Server location to results and export (alexjustesen#1542)

Author: svenvg93

app/Filament/Exports/ResultExporter.php

@@ -36,6 +36,12 @@ public static function getColumns(): array
                     return $record->isp;
                 })
                 ->enabledByDefault(false),
+            ExportColumn::make('server_location')
+                ->label('Server Location')
+                ->state(function (Result $record): ?string {
+                    return $record->server_location;
+                })
+                ->enabledByDefault(false),
             ExportColumn::make('service'),
             ExportColumn::make('server_id')
                 ->label('Server ID')

app/Filament/Resources/ResultResource.php

@@ -102,6 +102,9 @@ public static function form(Form $form): Form
                             Forms\Components\Placeholder::make('isp')
                                 ->label('ISP')
                                 ->content(fn (Result $result): ?string => $result->isp),
+                            Forms\Components\Placeholder::make('server_location')
+                                ->label('Server Location')
+                                ->content(fn (Result $result): ?string => $result->server_location),
                             Forms\Components\Placeholder::make('server_host')
                                 ->content(fn (Result $result): ?string => $result->server_host),
                             Forms\Components\Checkbox::make('scheduled'),
@@ -148,6 +151,13 @@ public static function table(Table $table): Table
                     ->sortable(query: function (Builder $query, string $direction): Builder {
                         return $query->orderBy('data->isp', $direction);
                     }),
+                Tables\Columns\TextColumn::make('data.server.location')
+                    ->label('Server Location')
+                    ->toggleable()
+                    ->toggledHiddenByDefault()
+                    ->sortable(query: function (Builder $query, string $direction): Builder {
+                        return $query->orderBy('data->server->location', $direction);
+                    }),
                 Tables\Columns\TextColumn::make('data.server.name')
                     ->toggleable()
                     ->sortable(query: function (Builder $query, string $direction): Builder {

app/Models/Result.php

@@ -72,6 +72,7 @@ public function formatForInfluxDB2()
             'isp' => $this?->isp,
             'server_host' => $this?->server_host,
             'server_name' => $this?->server_name,
+            'server_location' => $this?->server_location,
             'scheduled' => $this->scheduled,
             'successful' => $this->status === ResultStatus::Completed,
             'packet_loss' => (float) $this->packet_loss,
@@ -228,6 +229,16 @@ protected function serverName(): Attribute
         );
     }
 
+    /**
+     * Get the result's server location.
+     */
+    protected function serverLocation(): Attribute
+    {
+        return Attribute::make(
+            get: fn () => Arr::get($this->data, 'server.location'),
+        );
+    }
+
     /**
      * Get the result's upload in bits.
      */