diff --git a/.DS_Store b/.DS_Store index feca861..3ad040b 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/config/config.php b/config/config.php index 6dc4af6..ba7ecaa 100755 --- a/config/config.php +++ b/config/config.php @@ -220,4 +220,21 @@ return [ ], 'activator' => 'database', + + /* + |-------------------------------------------------------------------------- + | Module control admin UI + |-------------------------------------------------------------------------- + | + | These settings control the package-provided module management screens. + | The UI uses the database activator and the module_statuses table. + | + */ + 'admin' => [ + 'enabled' => true, + 'prefix' => 'admin/modules', + 'middleware' => ['web', 'auth'], + 'layout_component' => 'layouts.app', + 'hero_component' => 'wms.page-hero', + ], ]; diff --git a/src/Http/Controllers/ModuleControlController.php b/src/Http/Controllers/ModuleControlController.php new file mode 100644 index 0000000..c9cea4c --- /dev/null +++ b/src/Http/Controllers/ModuleControlController.php @@ -0,0 +1,56 @@ + $this->registry->all(), + ]); + } + + public function show(string $module): View + { + return view('modules-control::show', [ + 'module' => $this->registry->find($module), + ]); + } + + public function sync(): RedirectResponse + { + $this->registry->syncMissingStatuses(); + + return redirect() + ->route('modules.control.index') + ->with('status', 'Module database statuses synced.'); + } + + public function enable(string $module): RedirectResponse + { + $this->registry->enable($module); + + return redirect() + ->route('modules.control.index') + ->with('status', "{$module} enabled in the database."); + } + + public function disable(string $module): RedirectResponse + { + $this->registry->disable($module); + + return redirect() + ->route('modules.control.index') + ->with('status', "{$module} disabled in the database."); + } +} diff --git a/src/LaravelModulesServiceProvider.php b/src/LaravelModulesServiceProvider.php index 2c72fa5..3662c4e 100755 --- a/src/LaravelModulesServiceProvider.php +++ b/src/LaravelModulesServiceProvider.php @@ -15,7 +15,21 @@ class LaravelModulesServiceProvider extends ModulesServiceProvider { $this->registerNamespaces(); $this->registerModules(); + $this->loadMigrationsFrom(__DIR__.'/database/migrations'); + $this->loadViewsFrom(__DIR__.'/resources/views', 'modules-control'); + + $this->publishes([ + __DIR__.'/database/migrations' => database_path('migrations'), + ], 'modules-migrations'); + + $this->publishes([ + __DIR__.'/Database/Seeders' => database_path('seeders/vendor/modules'), + ], 'modules-seeders'); + + if ($this->app['config']->get('modules.admin.enabled', true)) { + $this->loadRoutesFrom(__DIR__.'/routes/web.php'); + } } /** @@ -26,6 +40,8 @@ class LaravelModulesServiceProvider extends ModulesServiceProvider $this->registerServices(); $this->setupStubPath(); $this->registerProviders(); + + $this->app->singleton(\mpba\Modules\Support\DatabaseModuleRegistry::class); } /** diff --git a/src/Support/DatabaseModuleRegistry.php b/src/Support/DatabaseModuleRegistry.php new file mode 100644 index 0000000..0bcb281 --- /dev/null +++ b/src/Support/DatabaseModuleRegistry.php @@ -0,0 +1,103 @@ +syncMissingStatuses(); + + $statuses = ModuleStatus::query() + ->get() + ->keyBy('module'); + + return collect($this->modules->all()) + ->sortBy(fn (Module $module) => $module->get('order', 0)) + ->map(function (Module $module) use ($statuses): array { + $status = $statuses->get($module->getName()); + + return [ + 'name' => $module->getName(), + 'alias' => $module->getAlias(), + 'description' => $module->getDescription(), + 'version' => $module->get('version'), + 'order' => $module->get('order', 0), + 'path' => $module->getPath(), + 'requires' => $module->getRequires(), + 'enabled' => (bool) ($status?->enabled ?? $module->isEnabled()), + 'status_record' => $status, + 'module' => $module, + ]; + }) + ->values(); + } + + public function find(string $name): array + { + $this->syncMissingStatuses(); + + /** @var Module $module */ + $module = $this->modules->findOrFail($name); + $status = ModuleStatus::query()->firstOrCreate( + ['module' => $module->getName()], + ['enabled' => $module->isEnabled()] + ); + + return [ + 'name' => $module->getName(), + 'alias' => $module->getAlias(), + 'description' => $module->getDescription(), + 'version' => $module->get('version'), + 'order' => $module->get('order', 0), + 'path' => $module->getPath(), + 'requires' => $module->getRequires(), + 'enabled' => (bool) $status->enabled, + 'status_record' => $status, + 'module' => $module, + ]; + } + + public function enable(string $name): void + { + $module = $this->modules->findOrFail($name); + + ModuleStatus::query()->updateOrCreate( + ['module' => $module->getName()], + ['enabled' => true] + ); + + $this->modules->enable($module->getName()); + } + + public function disable(string $name): void + { + $module = $this->modules->findOrFail($name); + + ModuleStatus::query()->updateOrCreate( + ['module' => $module->getName()], + ['enabled' => false] + ); + + $this->modules->disable($module->getName()); + } + + public function syncMissingStatuses(): void + { + foreach ($this->modules->all() as $module) { + ModuleStatus::query()->firstOrCreate( + ['module' => $module->getName()], + ['enabled' => $module->isEnabled()] + ); + } + } +} diff --git a/src/database/Seeders/ModuleStatusSeeder.php b/src/database/Seeders/ModuleStatusSeeder.php new file mode 100644 index 0000000..8cbdcac --- /dev/null +++ b/src/database/Seeders/ModuleStatusSeeder.php @@ -0,0 +1,71 @@ +readStatuses() as $module => $enabled) { + if (! is_string($module) || trim($module) === '') { + continue; + } + + ModuleStatus::query()->firstOrCreate( + ['module' => trim($module)], + ['enabled' => (bool) $enabled] + ); + } + } + + /** + * @return array + */ + private function readStatuses(): array + { + $path = $this->statusesFilePath(); + + if ($path === null) { + return []; + } + + $statuses = json_decode(File::get($path), true); + + if (! is_array($statuses)) { + return []; + } + + return $statuses; + } + + private function statusesFilePath(): ?string + { + $configuredPath = config('modules.activators.file.statuses-file'); + + $paths = array_filter(array_unique([ + is_string($configuredPath) ? $configuredPath : null, + base_path('modules_statuses.json'), + base_path('module_statuses.json'), + base_path('module_statues.json'), + ])); + + foreach ($paths as $path) { + if (File::exists($path)) { + return $path; + } + } + + return null; + } +} diff --git a/src/database/migrations/2026_04_20_000000_create_modules_table.php b/src/database/migrations/2026_04_20_000000_create_modules_table.php deleted file mode 100644 index 52c131b..0000000 --- a/src/database/migrations/2026_04_20_000000_create_modules_table.php +++ /dev/null @@ -1,33 +0,0 @@ -id(); - $table->string('module')->unique(); - $table->boolean('enabled')->default(true); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down(): void - { - Schema::dropIfExists('module_statuses'); - } -}; diff --git a/src/database/migrations/ModuleMigrator.php b/src/database/migrations/2026_07_01_000000_create_module_statuses_table.php similarity index 85% rename from src/database/migrations/ModuleMigrator.php rename to src/database/migrations/2026_07_01_000000_create_module_statuses_table.php index 5bca510..4afda4e 100644 --- a/src/database/migrations/ModuleMigrator.php +++ b/src/database/migrations/2026_07_01_000000_create_module_statuses_table.php @@ -1,5 +1,7 @@ id(); $table->string('module')->unique(); @@ -23,8 +27,6 @@ return new class extends Migration /** * Reverse the migrations. - * - * @return void */ public function down(): void { diff --git a/src/resources/views/index.blade.php b/src/resources/views/index.blade.php new file mode 100644 index 0000000..255f68c --- /dev/null +++ b/src/resources/views/index.blade.php @@ -0,0 +1,93 @@ +@include('modules-control::partials.layout-open', ['title' => 'Module Control']) + + +
+ @if (session('status')) +
+ {{ session('status') }} +
+ @endif + +
+
+

Installed modules

+

Status is read from and written to the database, not modules_statuses.json.

+
+ +
+ @csrf + +
+
+ +
+ + + + + + + + + + + + @forelse ($modules as $module) + + + + + + + + + + @empty + + + + @endforelse + +
ModuleDatabase RecordStatusActions
+
{{ $module['name'] }}
+
{{ $module['description'] ?: 'No description provided.' }}
+
{{ $module['path'] }}
+
+ @if ($module['status_record']) +
ID: {{ $module['status_record']->id }}
+
module: {{ $module['status_record']->module }}
+ @else + Missing + @endif +
+ @if ($module['enabled']) + Enabled + @else + Disabled + @endif + +
+ View + + @if ($module['enabled']) +
+ @csrf + +
+ @else +
+ @csrf + +
+ @endif +
+
No modules found on disk.
+
+
+@include('modules-control::partials.layout-close') diff --git a/src/resources/views/partials/layout-close.blade.php b/src/resources/views/partials/layout-close.blade.php new file mode 100644 index 0000000..a03c166 --- /dev/null +++ b/src/resources/views/partials/layout-close.blade.php @@ -0,0 +1 @@ +
diff --git a/src/resources/views/partials/layout-open.blade.php b/src/resources/views/partials/layout-open.blade.php new file mode 100644 index 0000000..079896a --- /dev/null +++ b/src/resources/views/partials/layout-open.blade.php @@ -0,0 +1 @@ + diff --git a/src/resources/views/show.blade.php b/src/resources/views/show.blade.php new file mode 100644 index 0000000..cdb6156 --- /dev/null +++ b/src/resources/views/show.blade.php @@ -0,0 +1,56 @@ +@include('modules-control::partials.layout-open', ['title' => $module['name'].' Module']) + + +
+
+
+
+
Module
+
{{ $module['name'] }}
+
+
+
Alias
+
{{ $module['alias'] }}
+
+
+
Version
+
{{ $module['version'] ?: '—' }}
+
+
+
Database enabled
+
{{ $module['enabled'] ? 'Yes' : 'No' }}
+
+
+
Path
+
{{ $module['path'] }}
+
+
+
Requires
+
+ {{ empty($module['requires']) ? 'None' : implode(', ', $module['requires']) }} +
+
+
+
+ +
+ Back + + @if ($module['enabled']) +
+ @csrf + +
+ @else +
+ @csrf + +
+ @endif +
+
+@include('modules-control::partials.layout-close') diff --git a/src/routes/web.php b/src/routes/web.php new file mode 100644 index 0000000..7127902 --- /dev/null +++ b/src/routes/web.php @@ -0,0 +1,15 @@ +prefix(config('modules.admin.prefix', 'admin/modules')) + ->name('modules.control.') + ->group(function (): void { + Route::get('/', [ModuleControlController::class, 'index'])->name('index'); + Route::post('/sync', [ModuleControlController::class, 'sync'])->name('sync'); + Route::get('/{module}', [ModuleControlController::class, 'show'])->name('show'); + Route::post('/{module}/enable', [ModuleControlController::class, 'enable'])->name('enable'); + Route::post('/{module}/disable', [ModuleControlController::class, 'disable'])->name('disable'); + });