Merge branch 'main' into rectoooor

GeniJaho · Mar 26, 2024 · 2a243b2 · 2a243b2
2 parents f02de5d + 46f1e5c
commit 2a243b2
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 39 deletions.
diff --git a/app/Filament/Resources/ItemResource.php b/app/Filament/Resources/ItemResource.php
@@ -25,9 +25,6 @@ public static function form(Form $form): Form
         return $form
             ->schema([
                 TextInput::make('name')
-                    ->required()
-                    ->maxLength(191),
-                TextInput::make('slug')
                     ->required()
                     ->unique(ignoreRecord: true)
                     ->maxLength(191),
@@ -50,10 +47,6 @@ public static function table(Table $table): Table
                     ->sortable()
                     ->toggleable()
                     ->numeric(),
-                TextColumn::make('slug')
-                    ->sortable()
-                    ->searchable()
-                    ->toggleable(isToggledHiddenByDefault: true),
                 TextColumn::make('created_at')
                     ->dateTime()
                     ->sortable()

diff --git a/app/Filament/Resources/TagResource.php b/app/Filament/Resources/TagResource.php
@@ -29,9 +29,6 @@ public static function form(Form $form): Form
                     ->required()
                     ->relationship(name: 'type', titleAttribute: 'name'),
                 TextInput::make('name')
-                    ->required()
-                    ->maxLength(191),
-                TextInput::make('slug')
                     ->required()
                     ->unique(ignoreRecord: true)
                     ->maxLength(191),
@@ -48,10 +45,6 @@ public static function table(Table $table): Table
                 TextColumn::make('name')
                     ->sortable()
                     ->searchable(),
-                TextColumn::make('slug')
-                    ->sortable()
-                    ->searchable()
-                    ->toggleable(isToggledHiddenByDefault: true),
                 TextColumn::make('type.name')
                     ->sortable()
                     ->searchable(),

diff --git a/database/factories/ItemFactory.php b/database/factories/ItemFactory.php
@@ -4,7 +4,6 @@
 
 use App\Models\Item;
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Support\Str;
 
 /**
  * @extends Factory<Item>
@@ -18,11 +17,8 @@ class ItemFactory extends Factory
      */
     public function definition(): array
     {
-        $name = fake()->unique()->sentence();
-
         return [
-            'name' => $name,
-            'slug' => Str::slug($name),
+            'name' => fake()->unique()->sentence(),
         ];
     }
 }
diff --git a/database/factories/TagFactory.php b/database/factories/TagFactory.php
@@ -5,7 +5,6 @@
 use App\Models\Tag;
 use App\Models\TagType;
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Support\Str;
 
 /**
  * @extends Factory<Tag>
@@ -19,12 +18,9 @@ class TagFactory extends Factory
      */
     public function definition(): array
     {
-        $word = $this->faker->unique()->word();
-
         return [
             'tag_type_id' => TagType::factory(),
-            'name' => $word,
-            'slug' => Str::slug($word),
+            'name' => fake()->unique()->word(),
         ];
     }
 }
diff --git a/database/migrations/2023_09_02_213052_create_tags_table.php b/database/migrations/2023_09_02_213052_create_tags_table.php
@@ -12,7 +12,6 @@ public function up(): void
             $table->id();
             $table->foreignId('tag_type_id')->constrained()->cascadeOnDelete();
             $table->string('name');
-            $table->string('slug')->unique();
             $table->timestamps();
         });
     }

diff --git a/database/migrations/2023_09_04_215634_create_items_table.php b/database/migrations/2023_09_04_215634_create_items_table.php
@@ -13,17 +13,8 @@ public function up(): void
     {
         Schema::create('items', function (Blueprint $table): void {
             $table->id();
-            $table->string('name');
-            $table->string('slug')->unique();
+            $table->string('name')->unique();
             $table->timestamps();
         });
     }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('items');
-    }
 };
diff --git a/database/migrations/2024_03_25_202428_make_name_unique_in_tags_and_items_tables.php b/database/migrations/2024_03_25_202428_make_name_unique_in_tags_and_items_tables.php
@@ -0,0 +1,15 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('tags', function (Blueprint $table) {
+            $table->unique('name');
+        });
+    }
+};
diff --git a/database/seeders/ItemSeeder.php b/database/seeders/ItemSeeder.php
@@ -4,7 +4,6 @@
 
 use App\Models\Item;
 use Illuminate\Database\Seeder;
-use Illuminate\Support\Str;
 
 class ItemSeeder extends Seeder
 {
@@ -339,7 +338,6 @@ private function format(array $items): array
     {
         return array_map(fn (string $item): array => [
             'name' => $item,
-            'slug' => Str::slug($item, dictionary: ['<' => 'lt', '>' => 'gt']),
             'created_at' => now(),
             'updated_at' => now(),
         ], $items);

diff --git a/database/seeders/TagSeeder.php b/database/seeders/TagSeeder.php
@@ -6,7 +6,6 @@
 use App\Models\TagType;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Seeder;
-use Illuminate\Support\Str;
 
 class TagSeeder extends Seeder
 {
@@ -31,7 +30,6 @@ private function format(array $tags, Model $type): array
     {
         return array_map(fn (string $tag): array => [
             'name' => $tag,
-            'slug' => Str::slug($tag),
             'tag_type_id' => $type->id,
             'created_at' => now(),
             'updated_at' => now(),