Refactor filament casting: replace FilamentTitleCast with FilamentTypeTitleCast, enhance title transformation logic, adjust models and services, and update welcome.tsx UI styling.

Author: andrey-helldar

app/Casts/FilamentTitleCast.php

@@ -4,13 +4,10 @@
 
 namespace App\Casts;
 
-use App\Exceptions\UnknownFilamentTypeException;
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Str;
 
-use function report;
-
 class FilamentTitleCast implements CastsAttributes
 {
     public function get(Model $model, string $key, mixed $value, array $attributes): string
@@ -19,28 +16,15 @@ public function get(Model $model, string $key, mixed $value, array $attributes):
     }
 
     public function set(Model $model, string $key, mixed $value, array $attributes): string
-    {
-        if ($title = $this->perform($value)) {
-            return $title;
-        }
-
-        report(new UnknownFilamentTypeException($value));
-
-        return 'Unknown';
-    }
-
-    protected function perform(string $value): string
     {
         return Str::of($value)
-            ->replace(['Generic', 'Value'], '')
             ->replace(['High Speed', '@HS', ' HS'], '-HS', false)
             ->replace(['High Flow', '@HF', ' HF'], '-HF', false)
             ->replace(' plus', '+', false)
             ->replace('-silk', ' Silk', false)
             ->replace('-wood', ' Wood', false)
             ->before('@')
-            ->squish()
-            ->match('/([^\d][A-Z]{2,4}[+\-\s]?([A-Z]{2,4}|Silk|Wood)?)/')
+            ->replaceMatches('/(\d+.\d+\s?.+)/', '')
             ->replace(' CF', '-CF', false)
             ->squish()
             ->trim('-')

app/Casts/FilamentTypeTitleCast.php

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Casts;
+
+use App\Exceptions\UnknownFilamentTypeException;
+use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Str;
+
+use function report;
+
+class FilamentTypeTitleCast implements CastsAttributes
+{
+    public function get(Model $model, string $key, mixed $value, array $attributes): string
+    {
+        return $value;
+    }
+
+    public function set(Model $model, string $key, mixed $value, array $attributes): string
+    {
+        if ($title = $this->perform($value)) {
+            return $title;
+        }
+
+        report(new UnknownFilamentTypeException($value));
+
+        return 'Unknown';
+    }
+
+    protected function perform(string $value): string
+    {
+        return Str::of($value)
+            ->replace(['Generic', 'Value'], '')
+            ->replace(['High Speed', '@HS', ' HS'], '-HS', false)
+            ->replace(['High Flow', '@HF', ' HF'], '-HF', false)
+            ->replace(' plus', '+', false)
+            ->replace('-silk', ' Silk', false)
+            ->replace('-wood', ' Wood', false)
+            ->before('@')
+            ->squish()
+            ->match('/([^\d][A-Z]{2,4}[+\-\s]?([A-Z]{2,4}|Silk|Wood)?)/')
+            ->replace(' CF', '-CF', false)
+            ->squish()
+            ->trim('-')
+            ->replaceMatches('/([A-Z]{2})[\s-]?([A-Z]{3,})/', '$2-$1')
+            ->toString();
+    }
+}

app/Models/Filament.php

@@ -4,6 +4,7 @@
 
 namespace App\Models;
 
+use App\Casts\FilamentTitleCast;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
@@ -21,6 +22,13 @@ class Filament extends Model
         'title',
     ];
 
+    protected function casts(): array
+    {
+        return [
+            'title' => FilamentTitleCast::class,
+        ];
+    }
+
     public function vendor(): Relation
     {
         return $this->belongsTo(Vendor::class);

app/Models/FilamentType.php

@@ -4,7 +4,7 @@
 
 namespace App\Models;
 
-use App\Casts\FilamentTitleCast;
+use App\Casts\FilamentTypeTitleCast;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -20,7 +20,7 @@ class FilamentType extends Model
     protected function casts(): array
     {
         return [
-            'title' => FilamentTitleCast::class,
+            'title' => FilamentTypeTitleCast::class,
         ];
     }
 }

app/Services/OrcaSlicer/ImportService.php

@@ -4,7 +4,7 @@
 
 namespace App\Services\OrcaSlicer;
 
-use App\Casts\FilamentTitleCast;
+use App\Casts\FilamentTypeTitleCast;
 use App\Data\OrcaSlicer\FilamentData;
 use App\Data\OrcaSlicer\MachineData;
 use App\Data\OrcaSlicer\ProfileData;
@@ -111,7 +111,7 @@ protected function userFilament(User $user, Filament $filament, FilamentData $da
 
     protected function filamentType(string $name): FilamentType
     {
-        $cast = (new FilamentTitleCast)->set(new FilamentType, '', $name, []);
+        $cast = (new FilamentTypeTitleCast)->set(new FilamentType, '', $name, []);
 
         if ($model = $this->filamentTypes[$cast] ?? null) {
             return $model;

resources/js/pages/welcome.tsx

@@ -4,7 +4,7 @@ export default function Welcome({ settings }) {
     return (
             <>
                 <Head title="Welcome" />
-                <div className="flex min-h-screen flex-col items-center bg-[#FDFDFC] p-6 text-[#1b1b18] lg:justify-center lg:p-8 dark:bg-[#0a0a0a]">
+                <div className="flex min-h-screen flex-col items-center bg-[#EDEDFC] p-6 text-[#1b1b18] lg:justify-center lg:p-8 dark:bg-[#0a0a0a]">
                     <div className="flex w-full items-center justify-center opacity-100 transition-opacity duration-750 lg:grow starting:opacity-0">
                         <main className="flex w-full flex-col-reverse lg:max-w-4xl lg:flex-row">
                             <table class="w-full border-collapse border border-gray-400 bg-white text-sm dark:border-gray-500 dark:bg-gray-800">
@@ -29,8 +29,7 @@ export default function Welcome({ settings }) {
                                         Max Volumetric Speed
                                     </th>
                                     <th class="border border-gray-300 p-3 text-left font-semibold text-gray-900 dark:border-gray-600 dark:text-gray-200">
-                                        Nozzle Temperature<br />
-                                        (first / other layers)
+                                        Nozzle Temperature
                                     </th>
                                 </tr>
                                 </thead>
@@ -57,11 +56,7 @@ export default function Welcome({ settings }) {
                                                 { setting.filament_max_volumetric_speed }
                                             </td>
                                             <td class="border border-gray-300 p-3 text-left text-gray-900 dark:border-gray-600 dark:text-gray-200">
-                                                {
-                                                    setting.nozzle_temperature === setting.nozzle_temperature_initial_layer
-                                                            ? setting.nozzle_temperature
-                                                            : setting.nozzle_temperature_initial_layer + ' / ' + setting.nozzle_temperature
-                                                }
+                                                { setting.nozzle_temperature }
                                             </td>
                                         </tr>
                                 )) }