uuid models support

config/enabled.php

@@ -24,4 +24,5 @@
     'users-2fa' => false,
     'users-oauth' => false,
     'permissions-management' => false,
+    'uuid-models-key-support' => false,
 ];

docs/content/1_docs/2_getting-started/3_configuration.md

@@ -27,6 +27,7 @@ return [
         'users-2fa' => false,
         'users-oauth' => false,
         'permissions-management' => false,
+        'uuid-models-key-support' => false,
     ],
 ];
 ```

migrations/optional/uuid-models-key-support/2023_07_28_114329_update_activity_log_subject_id_type.php

@@ -0,0 +1,52 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $connection = Schema::connection(config('activitylog.database_connection'));
+        $tableName = config('activitylog.table_name');
+
+        if ($connection->hasTable($tableName)) {
+            $connection->table(
+                $tableName,
+                function (Blueprint $table) use ($connection, $tableName) {
+                    if ($connection->hasColumn($tableName, 'subject_id')) {
+                        $table->string('subject_id', 36)->change();
+                    }
+                }
+            );
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        $connection = Schema::connection(config('activitylog.database_connection'));
+        $tableName = config('activitylog.table_name');
+
+        if ($connection->hasTable($tableName)) {
+            $connection->table(
+                $tableName,
+                function (Blueprint $table) use ($connection, $tableName) {
+                    if ($connection->hasColumn($tableName, 'subject_id')) {
+                        $table->bigInteger('subject_id')->change();
+                    }
+                }
+            );
+        }
+    }
+};

migrations/optional/uuid-models-key-support/2024_06_01_175319_update_mediables_mediable_id_type.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        $tableName = config('twill.mediables_table', 'twill_mediables');
+        if (Schema::hasTable($tableName)) {
+            Schema::table($tableName, function (Blueprint $table) use ($tableName) {
+                if (Schema::hasColumn($tableName, 'mediable_id')) {
+                    $table->string('mediable_id', 36)->change();
+                }
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        $tableName = config('twill.mediables_table', 'twill_mediables');
+        if (Schema::hasTable($tableName)) {
+            Schema::table($tableName, function (Blueprint $table) use ($tableName) {
+                if (Schema::hasColumn($tableName, 'mediable_id')) {
+                    $table->bigInteger('mediable_id')->change();
+                }
+            });
+        }
+    }
+};

migrations/optional/uuid-models-key-support/2024_06_01_175348_update_fileables_fileable_id_type.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        $tableName = config('twill.fileables_table', 'twill_fileables');
+        if (Schema::hasTable($tableName)) {
+            Schema::table($tableName, function (Blueprint $table) use ($tableName) {
+                if (Schema::hasColumn($tableName, 'fileable_id')) {
+                    $table->string('fileable_id', 36)->change();
+                }
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        $tableName = config('twill.fileables_table', 'twill_fileables');
+        if (Schema::hasTable($tableName)) {
+            Schema::table($tableName, function (Blueprint $table) use ($tableName) {
+                if (Schema::hasColumn($tableName, 'fileable_id')) {
+                    $table->bigInteger('fileable_id')->change();
+                }
+            });
+        }
+    }
+};

migrations/optional/uuid-models-key-support/2024_06_01_175430_update_related_subject_id_related_id_type.php

@@ -0,0 +1,44 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        $tableName = config('twill.related_table', 'twill_related');
+        if (Schema::hasTable($tableName)) {
+            Schema::table($tableName, function (Blueprint $table) use ($tableName) {
+                if (Schema::hasColumn($tableName, 'subject_id')) {
+                    $table->string('subject_id', 36)->change();
+                }
+                if (Schema::hasColumn($tableName, 'related_id')) {
+                    $table->string('related_id', 36)->change();
+                }
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        $tableName = config('twill.related_table', 'twill_related');
+        if (Schema::hasTable($tableName)) {
+            Schema::table($tableName, function (Blueprint $table) use ($tableName) {
+                if (Schema::hasColumn($tableName, 'subject_id')) {
+                    $table->bigInteger('subject_id')->change();
+                }
+                if (Schema::hasColumn($tableName, 'related_id')) {
+                    $table->bigInteger('related_id')->change();
+                }
+            });
+        }
+    }
+};

migrations/optional/uuid-models-key-support/2024_06_01_175500_update_blocks_blockable_id_type.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        $tableName = config('twill.blocks_table', 'twill_blocks');
+        if (Schema::hasTable($tableName)) {
+            Schema::table($tableName, function (Blueprint $table) use ($tableName) {
+                if (Schema::hasColumn($tableName, 'blockable_id')) {
+                    $table->string('blockable_id', 36)->change();
+                }
+            });
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        $tableName = config('twill.blocks_table', 'twill_blocks');
+        if (Schema::hasTable($tableName)) {
+            Schema::table($tableName, function (Blueprint $table) use ($tableName) {
+                if (Schema::hasColumn($tableName, 'blockable_id')) {
+                    $table->bigInteger('blockable_id')->change();
+                }
+            });
+        }
+    }
+};

src/Http/Controllers/Admin/AppSettingsController.php

@@ -33,7 +33,7 @@ protected function setUpController(): void
         }
     }
 
-    public function update(int|TwillModelContract $id, ?int $submoduleId = null): JsonResponse
+    public function update(int|string|TwillModelContract $id, int|string|null $submoduleId = null): JsonResponse
     {
         $model = AppSetting::findOrFail($id);
 
@@ -107,7 +107,7 @@ protected function getRepositoryClass($model): string
         return AppSettingsRepository::class;
     }
 
-    protected function form(?int $id, ?TwillModelContract $item = null): array
+    protected function form(int|string|null $id, ?TwillModelContract $item = null): array
     {
         $base = parent::form($id, $item);
 

src/Http/Controllers/Admin/FileLibraryController.php

@@ -106,7 +106,7 @@ public function filters(): TableFilters
         ]);
     }
 
-    public function index(?int $parentModuleId = null): mixed
+    public function index(int|string|null $parentModuleId = null): mixed
     {
         if ($this->request->has('except')) {
             $prependScope['exceptIds'] = $this->request->get('except');
@@ -172,7 +172,7 @@ protected function getRequestFilters(): array
     }
 
     /**
-     * @param int|null $parentModuleId
+     * @param int|string|null $parentModuleId
      * @return JsonResponse
      * @throws BindingResolutionException
      */

src/Http/Controllers/Admin/GroupController.php

@@ -93,14 +93,14 @@ protected function getBrowserItems($scopes = [])
         })->values();
     }
 
-    public function edit(int|TwillModelContract $id): mixed
+    public function edit(int|string|TwillModelContract $id): mixed
     {
         $this->authorizableOptions['edit'] = 'edit-group';
 
         return parent::edit($id);
     }
 
-    public function update(int|TwillModelContract $id, ?int $submoduleId = null): JsonResponse
+    public function update(int|string|TwillModelContract $id, int|string|null $submoduleId = null): JsonResponse
     {
         $this->authorizableOptions['edit'] = 'edit-group';
 

src/Http/Controllers/Admin/MediaLibraryController.php

@@ -106,7 +106,7 @@ public function filters(): TableFilters
         ]);
     }
 
-    public function index(?int $parentModuleId = null): array
+    public function index(int|string|null $parentModuleId = null): array
     {
         if ($this->request->has('except')) {
             $prependScope['exceptIds'] = $this->request->get('except');
@@ -150,7 +150,7 @@ protected function getRequestFilters(): array
     }
 
     /**
-     * @param int|null $parentModuleId
+     * @param int|string|null $parentModuleId
      * @return
      */
     public function store($parentModuleId = null)