diff --git a/src/DevelopmentSupport/Entities/ModuleStatus.php b/src/DevelopmentSupport/Entities/ModuleStatus.php index 6de6215..627e538 100644 --- a/src/DevelopmentSupport/Entities/ModuleStatus.php +++ b/src/DevelopmentSupport/Entities/ModuleStatus.php @@ -27,6 +27,7 @@ class ModuleStatus extends Model 'module', 'enabled', 'description', + 'version', 'sort_order', ]; diff --git a/src/Http/Controllers/ModuleControlController.php b/src/Http/Controllers/ModuleControlController.php index 427717d..c3b4bdd 100644 --- a/src/Http/Controllers/ModuleControlController.php +++ b/src/Http/Controllers/ModuleControlController.php @@ -32,6 +32,7 @@ class ModuleControlController extends Controller { $data = $request->validate([ 'description' => ['nullable', 'string', 'max:2000'], + 'version' => ['nullable', 'string', 'max:50'], 'sort_order' => ['nullable', 'integer', 'min:0', 'max:999999'], ]); diff --git a/src/Support/DatabaseModuleRegistry.php b/src/Support/DatabaseModuleRegistry.php index 4477cb9..f09433e 100644 --- a/src/Support/DatabaseModuleRegistry.php +++ b/src/Support/DatabaseModuleRegistry.php @@ -42,6 +42,7 @@ class DatabaseModuleRegistry ['module' => $module->getName()], [ 'enabled' => $module->isEnabled(), + 'version' => $this->moduleVersion($module), 'sort_order' => (int) $module->get('order', 0), ] ); @@ -60,6 +61,7 @@ class DatabaseModuleRegistry ->where('module', $module->getName()) ->value('enabled') ?? $module->isEnabled(), 'description' => $data['description'] ?? null, + 'version' => $data['version'] ?? null, 'sort_order' => (int) ($data['sort_order'] ?? 0), ] ); @@ -115,7 +117,9 @@ class DatabaseModuleRegistry 'alias' => $module->getAlias(), 'description' => $status?->description, 'disk_description' => $module->getDescription(), - 'version' => $this->moduleVersion($module), + 'version' => $this->databaseVersion($status) ?? $this->moduleVersion($module), + 'database_version' => $this->databaseVersion($status), + 'disk_version' => $this->moduleVersion($module), 'sort_order' => (int) ($status?->sort_order ?? $module->get('order', 0)), 'path' => $module->getPath(), 'requires' => $module->getRequires(), @@ -125,6 +129,13 @@ class DatabaseModuleRegistry ]; } + protected function databaseVersion(?ModuleStatus $status): ?string + { + $version = $status?->version; + + return is_string($version) && trim($version) !== '' ? trim($version) : null; + } + protected function moduleVersion(Module $module): ?string { $version = $module->get('version'); diff --git a/src/database/migrations/2026_07_01_000000_create_module_statuses_table.php b/src/database/migrations/2026_07_01_000000_create_module_statuses_table.php index 92c048a..6f26c7f 100644 --- a/src/database/migrations/2026_07_01_000000_create_module_statuses_table.php +++ b/src/database/migrations/2026_07_01_000000_create_module_statuses_table.php @@ -22,6 +22,7 @@ return new class extends Migration $table->string('module')->unique(); $table->boolean('enabled')->default(true); $table->text('description')->nullable(); + $table->string('version')->nullable(); $table->unsignedInteger('sort_order')->default(0); $table->timestamps(); }); diff --git a/src/database/migrations/2026_07_01_000100_add_database_metadata_to_module_statuses_table.php b/src/database/migrations/2026_07_01_000100_add_database_metadata_to_module_statuses_table.php index ada6d8b..c048cb3 100644 --- a/src/database/migrations/2026_07_01_000100_add_database_metadata_to_module_statuses_table.php +++ b/src/database/migrations/2026_07_01_000100_add_database_metadata_to_module_statuses_table.php @@ -19,8 +19,12 @@ return new class extends Migration $table->text('description')->nullable()->after('enabled'); } + if (! Schema::hasColumn('module_statuses', 'version')) { + $table->string('version')->nullable()->after('description'); + } + if (! Schema::hasColumn('module_statuses', 'sort_order')) { - $table->unsignedInteger('sort_order')->default(0)->after('description'); + $table->unsignedInteger('sort_order')->default(0)->after('version'); } }); } @@ -36,6 +40,10 @@ return new class extends Migration $table->dropColumn('sort_order'); } + if (Schema::hasColumn('module_statuses', 'version')) { + $table->dropColumn('version'); + } + if (Schema::hasColumn('module_statuses', 'description')) { $table->dropColumn('description'); } diff --git a/src/database/migrations/2026_07_01_000200_add_database_version_to_module_statuses_table.php b/src/database/migrations/2026_07_01_000200_add_database_version_to_module_statuses_table.php new file mode 100644 index 0000000..e2022a6 --- /dev/null +++ b/src/database/migrations/2026_07_01_000200_add_database_version_to_module_statuses_table.php @@ -0,0 +1,36 @@ +string('version')->nullable()->after('description'); + } + }); + } + + public function down(): void + { + if (! Schema::hasTable('module_statuses')) { + return; + } + + Schema::table('module_statuses', function (Blueprint $table): void { + if (Schema::hasColumn('module_statuses', 'version')) { + $table->dropColumn('version'); + } + }); + } +}; diff --git a/src/resources/views/index.blade.php b/src/resources/views/index.blade.php index 1b33529..a7722ae 100644 --- a/src/resources/views/index.blade.php +++ b/src/resources/views/index.blade.php @@ -71,12 +71,17 @@ @endif -
- {{ $module['description'] ?: 'No database description saved yet.' }} -
++ {{ $module['description'] ?: 'No database description saved yet.' }} +
++ @if ($module['disk_description']) +
Disk description: {{ $module['disk_description'] }}
@endif @@ -96,7 +101,12 @@- This description is stored in the module_statuses table only. It does not edit module.json. + Description, version, and sort order are stored in the module_statuses table only. This does not edit module.json.
{{ $message }}
- @enderror ++ Saved only in the database. Disk version: {{ $module['disk_version'] ?: '—' }} +
+ @error('version') +{{ $message }}
+ @enderror +{{ $message }}
+ @enderror +