From 292865b0f791c1266ccf1cb1312246a7866c1dc3 Mon Sep 17 00:00:00 2001 From: fs Date: Thu, 26 Mar 2026 09:14:25 +0100 Subject: [PATCH] fix(audit): update routes from admin/ to audit/ and fix module namespaces Routes in nav items, redirects, breadcrumbs, and JS data URLs all pointed to the old admin/ prefix from before the module was restructured. Also corrects use-statements still referencing core Domain\Taxonomy namespace instead of Module\Audit\Domain. Co-Authored-By: Claude Opus 4.6 (1M context) --- modules/audit/module.php | 8 ++++---- .../pages/audit/api-audit/index(default).phtml | 2 +- modules/audit/pages/audit/api-audit/purge().php | 10 +++++----- modules/audit/pages/audit/api-audit/view($id).php | 4 ++-- .../pages/audit/api-audit/view(default).phtml | 4 ++-- .../pages/audit/import-audit/index(default).phtml | 2 +- modules/audit/pages/audit/import-audit/purge().php | 10 +++++----- .../audit/pages/audit/import-audit/view($id).php | 4 ++-- .../pages/audit/import-audit/view(default).phtml | 6 +++--- .../pages/audit/system-audit/index(default).phtml | 2 +- modules/audit/pages/audit/system-audit/purge().php | 10 +++++----- .../audit/pages/audit/system-audit/view($id).php | 4 ++-- .../pages/audit/system-audit/view(default).phtml | 6 +++--- .../user-lifecycle-audit/index(default).phtml | 2 +- .../pages/audit/user-lifecycle-audit/purge().php | 10 +++++----- .../audit/user-lifecycle-audit/restore($id).php | 14 +++++++------- .../pages/audit/user-lifecycle-audit/view($id).php | 4 ++-- .../audit/user-lifecycle-audit/view(default).phtml | 12 ++++++------ .../audit/web/js/pages/admin-api-audit-index.js | 4 ++-- .../audit/web/js/pages/admin-import-audit-index.js | 4 ++-- .../audit/web/js/pages/admin-system-audit-index.js | 4 ++-- .../js/pages/admin-user-lifecycle-audit-index.js | 4 ++-- 22 files changed, 65 insertions(+), 65 deletions(-) diff --git a/modules/audit/module.php b/modules/audit/module.php index 5d0a34b..805dc6c 100644 --- a/modules/audit/module.php +++ b/modules/audit/module.php @@ -51,7 +51,7 @@ return [ 'key' => 'audit-api-audit', 'group' => 'admin-logs', 'label' => 'API audit', - 'path' => 'admin/api-audit', + 'path' => 'audit/api-audit', 'permission' => 'audit.api.view', 'order' => 200, ], @@ -59,7 +59,7 @@ return [ 'key' => 'audit-system-audit', 'group' => 'admin-logs', 'label' => 'System audit logs', - 'path' => 'admin/system-audit', + 'path' => 'audit/system-audit', 'permission' => 'audit.system.view', 'order' => 210, ], @@ -67,7 +67,7 @@ return [ 'key' => 'audit-import-audit', 'group' => 'admin-logs', 'label' => 'Import logs', - 'path' => 'admin/import-audit', + 'path' => 'audit/import-audit', 'permission' => 'audit.imports.view', 'order' => 220, ], @@ -75,7 +75,7 @@ return [ 'key' => 'audit-user-lifecycle-audit', 'group' => 'admin-logs', 'label' => 'User lifecycle logs', - 'path' => 'admin/user-lifecycle-audit', + 'path' => 'audit/user-lifecycle-audit', 'permission' => 'audit.user_lifecycle.view', 'order' => 230, ], diff --git a/modules/audit/pages/audit/api-audit/index(default).phtml b/modules/audit/pages/audit/api-audit/index(default).phtml index 7ab888f..cbf3333 100644 --- a/modules/audit/pages/audit/api-audit/index(default).phtml +++ b/modules/audit/pages/audit/api-audit/index(default).phtml @@ -24,7 +24,7 @@ ob_start(); method())) !== 'POST') { - Router::redirect('admin/api-audit'); + Router::redirect('audit/api-audit'); } $errorBag = formErrors(); if (!Session::checkCsrfToken()) { $errorBag->addGlobal(t('Form expired, please try again')); - flashFormErrors($errorBag, 'admin/api-audit', 'api_audit'); - Router::redirect('admin/api-audit'); + flashFormErrors($errorBag, 'audit/api-audit', 'api_audit'); + Router::redirect('audit/api-audit'); } $deleted = app(\MintyPHP\Module\Audit\Service\ApiAuditService::class)->purgeExpired(); -Flash::success(sprintf(t('%d API audit entries purged'), $deleted), 'admin/api-audit', 'api_audit_purged'); -Router::redirect('admin/api-audit'); +Flash::success(sprintf(t('%d API audit entries purged'), $deleted), 'audit/api-audit', 'api_audit_purged'); +Router::redirect('audit/api-audit'); diff --git a/modules/audit/pages/audit/api-audit/view($id).php b/modules/audit/pages/audit/api-audit/view($id).php index 18502e2..74381f3 100644 --- a/modules/audit/pages/audit/api-audit/view($id).php +++ b/modules/audit/pages/audit/api-audit/view($id).php @@ -11,8 +11,8 @@ Guard::requireAbility(\MintyPHP\Module\Audit\AuditAuthorizationPolicy::ABILITY_A $auditId = (int) ($id ?? 0); $auditLog = $auditId > 0 ? app(\MintyPHP\Module\Audit\Service\ApiAuditService::class)->find($auditId) : null; if (!$auditLog) { - Flash::error('API audit entry not found', 'admin/api-audit', 'api_audit_not_found'); - Router::redirect('admin/api-audit'); + Flash::error('API audit entry not found', 'audit/api-audit', 'api_audit_not_found'); + Router::redirect('audit/api-audit'); } Buffer::set('title', t('View API audit entry')); diff --git a/modules/audit/pages/audit/api-audit/view(default).phtml b/modules/audit/pages/audit/api-audit/view(default).phtml index 2320d81..304d4b6 100644 --- a/modules/audit/pages/audit/api-audit/view(default).phtml +++ b/modules/audit/pages/audit/api-audit/view(default).phtml @@ -53,14 +53,14 @@ $tokenTenantId = (int) ($auditLog['token_tenant_id'] ?? 0); t('Home'), 'path' => 'admin'], - ['label' => t('API audit logs'), 'path' => 'admin/api-audit'], + ['label' => t('API audit logs'), 'path' => 'audit/api-audit'], ['label' => t('View')], ]; require templatePath('partials/app-breadcrumb.phtml'); $titlebar = [ 'title' => t('View API audit entry'), - 'backHref' => 'admin/api-audit', + 'backHref' => 'audit/api-audit', 'backTitle' => t('Back'), ]; require templatePath('partials/app-details-titlebar.phtml'); diff --git a/modules/audit/pages/audit/import-audit/index(default).phtml b/modules/audit/pages/audit/import-audit/index(default).phtml index 7c22e56..4325402 100644 --- a/modules/audit/pages/audit/import-audit/index(default).phtml +++ b/modules/audit/pages/audit/import-audit/index(default).phtml @@ -24,7 +24,7 @@ ob_start(); method())) !== 'POST') { - Router::redirect('admin/import-audit'); + Router::redirect('audit/import-audit'); } $errorBag = formErrors(); if (!Session::checkCsrfToken()) { $errorBag->addGlobal(t('Form expired, please try again')); - flashFormErrors($errorBag, 'admin/import-audit', 'import_audit'); - Router::redirect('admin/import-audit'); + flashFormErrors($errorBag, 'audit/import-audit', 'import_audit'); + Router::redirect('audit/import-audit'); } $deleted = app(ImportAuditService::class)->purgeExpired(); -Flash::success(sprintf(t('%d import audit entries purged'), $deleted), 'admin/import-audit', 'import_audit_purged'); -Router::redirect('admin/import-audit'); +Flash::success(sprintf(t('%d import audit entries purged'), $deleted), 'audit/import-audit', 'import_audit_purged'); +Router::redirect('audit/import-audit'); diff --git a/modules/audit/pages/audit/import-audit/view($id).php b/modules/audit/pages/audit/import-audit/view($id).php index 6dfc29a..f4a91c7 100644 --- a/modules/audit/pages/audit/import-audit/view($id).php +++ b/modules/audit/pages/audit/import-audit/view($id).php @@ -11,8 +11,8 @@ Guard::requireAbility(\MintyPHP\Module\Audit\AuditAuthorizationPolicy::ABILITY_I $runId = (int) ($id ?? 0); $auditRun = $runId > 0 ? app(\MintyPHP\Module\Audit\Service\ImportAuditService::class)->find($runId) : null; if (!$auditRun) { - Flash::error(t('Import audit entry not found'), 'admin/import-audit', 'import_audit_not_found'); - Router::redirect('admin/import-audit'); + Flash::error(t('Import audit entry not found'), 'audit/import-audit', 'import_audit_not_found'); + Router::redirect('audit/import-audit'); } Buffer::set('title', t('View import audit entry')); diff --git a/modules/audit/pages/audit/import-audit/view(default).phtml b/modules/audit/pages/audit/import-audit/view(default).phtml index 12bfa04..076b376 100644 --- a/modules/audit/pages/audit/import-audit/view(default).phtml +++ b/modules/audit/pages/audit/import-audit/view(default).phtml @@ -1,5 +1,5 @@ t('Home'), 'path' => 'admin'], - ['label' => t('Import audit logs'), 'path' => 'admin/import-audit'], + ['label' => t('Import audit logs'), 'path' => 'audit/import-audit'], ['label' => t('View')], ]; require templatePath('partials/app-breadcrumb.phtml'); $titlebar = [ 'title' => t('View import audit entry'), - 'backHref' => 'admin/import-audit', + 'backHref' => 'audit/import-audit', 'backTitle' => t('Back'), ]; require templatePath('partials/app-details-titlebar.phtml'); diff --git a/modules/audit/pages/audit/system-audit/index(default).phtml b/modules/audit/pages/audit/system-audit/index(default).phtml index 558b2cb..a288dc1 100644 --- a/modules/audit/pages/audit/system-audit/index(default).phtml +++ b/modules/audit/pages/audit/system-audit/index(default).phtml @@ -25,7 +25,7 @@ ob_start(); method()) !== 'POST') { - Router::redirect('admin/system-audit'); + Router::redirect('audit/system-audit'); } $errorBag = formErrors(); if (!Session::checkCsrfToken()) { $errorBag->addGlobal(t('Form expired, please try again')); - flashFormErrors($errorBag, 'admin/system-audit', 'system_audit'); - Router::redirect('admin/system-audit'); + flashFormErrors($errorBag, 'audit/system-audit', 'system_audit'); + Router::redirect('audit/system-audit'); } $service = app(SystemAuditService::class); @@ -28,5 +28,5 @@ $service->record('admin.system_audit.purge', SystemAuditOutcome::Success->value, 'metadata' => ['deleted_count' => $deleted], ]); -Flash::success(sprintf(t('%d system audit entries purged'), $deleted), 'admin/system-audit', 'system_audit_purged'); -Router::redirect('admin/system-audit'); +Flash::success(sprintf(t('%d system audit entries purged'), $deleted), 'audit/system-audit', 'system_audit_purged'); +Router::redirect('audit/system-audit'); diff --git a/modules/audit/pages/audit/system-audit/view($id).php b/modules/audit/pages/audit/system-audit/view($id).php index 3acdc1e..5fdd96d 100644 --- a/modules/audit/pages/audit/system-audit/view($id).php +++ b/modules/audit/pages/audit/system-audit/view($id).php @@ -13,8 +13,8 @@ Guard::requireAbility(AuditAuthorizationPolicy::ABILITY_SYSTEM_AUDIT_VIEW); $auditId = (int) ($id ?? 0); $auditLog = $auditId > 0 ? app(SystemAuditService::class)->find($auditId) : null; if (!$auditLog) { - Flash::error(t('System audit entry not found'), 'admin/system-audit', 'system_audit_not_found'); - Router::redirect('admin/system-audit'); + Flash::error(t('System audit entry not found'), 'audit/system-audit', 'system_audit_not_found'); + Router::redirect('audit/system-audit'); } Buffer::set('title', t('View system audit entry')); diff --git a/modules/audit/pages/audit/system-audit/view(default).phtml b/modules/audit/pages/audit/system-audit/view(default).phtml index 4cc7fd7..43da6f8 100644 --- a/modules/audit/pages/audit/system-audit/view(default).phtml +++ b/modules/audit/pages/audit/system-audit/view(default).phtml @@ -1,5 +1,5 @@ t('Home'), 'path' => 'admin'], - ['label' => t('System audit logs'), 'path' => 'admin/system-audit'], + ['label' => t('System audit logs'), 'path' => 'audit/system-audit'], ['label' => t('View')], ]; require templatePath('partials/app-breadcrumb.phtml'); $titlebar = [ 'title' => t('View system audit entry'), - 'backHref' => 'admin/system-audit', + 'backHref' => 'audit/system-audit', 'backTitle' => t('Back'), ]; require templatePath('partials/app-details-titlebar.phtml'); diff --git a/modules/audit/pages/audit/user-lifecycle-audit/index(default).phtml b/modules/audit/pages/audit/user-lifecycle-audit/index(default).phtml index 7e7dd5f..aea2096 100644 --- a/modules/audit/pages/audit/user-lifecycle-audit/index(default).phtml +++ b/modules/audit/pages/audit/user-lifecycle-audit/index(default).phtml @@ -24,7 +24,7 @@ ob_start(); method())) !== 'POST') { - Router::redirect('admin/user-lifecycle-audit'); + Router::redirect('audit/user-lifecycle-audit'); } $errorBag = formErrors(); if (!Session::checkCsrfToken()) { $errorBag->addGlobal(t('Form expired, please try again')); - flashFormErrors($errorBag, 'admin/user-lifecycle-audit', 'user_lifecycle_audit'); - Router::redirect('admin/user-lifecycle-audit'); + flashFormErrors($errorBag, 'audit/user-lifecycle-audit', 'user_lifecycle_audit'); + Router::redirect('audit/user-lifecycle-audit'); } $deleted = app(\MintyPHP\Module\Audit\Service\UserLifecycleAuditService::class)->purgeExpired(); Flash::success( sprintf(t('%d user lifecycle audit entries purged'), $deleted), - 'admin/user-lifecycle-audit', + 'audit/user-lifecycle-audit', 'user_lifecycle_audit_purged' ); -Router::redirect('admin/user-lifecycle-audit'); +Router::redirect('audit/user-lifecycle-audit'); diff --git a/modules/audit/pages/audit/user-lifecycle-audit/restore($id).php b/modules/audit/pages/audit/user-lifecycle-audit/restore($id).php index 5bf47e9..f601f5c 100644 --- a/modules/audit/pages/audit/user-lifecycle-audit/restore($id).php +++ b/modules/audit/pages/audit/user-lifecycle-audit/restore($id).php @@ -14,12 +14,12 @@ $auditId = (int) ($id ?? 0); $errorBag = formErrors(); if (strtoupper((string) (requestInput()->method())) !== 'POST') { - Router::redirect('admin/user-lifecycle-audit'); + Router::redirect('audit/user-lifecycle-audit'); } if (!Session::checkCsrfToken()) { $errorBag->addGlobal(t('Form expired, please try again')); - flashFormErrors($errorBag, 'admin/user-lifecycle-audit', 'user_lifecycle_restore'); - Router::redirect('admin/user-lifecycle-audit'); + flashFormErrors($errorBag, 'audit/user-lifecycle-audit', 'user_lifecycle_restore'); + Router::redirect('audit/user-lifecycle-audit'); } $result = app(\MintyPHP\Service\User\UserLifecycleRestoreService::class)->restoreFromLifecycleAudit( @@ -40,9 +40,9 @@ if (!($result['ok'] ?? false)) { } else { $errorBag->addGlobal(t('User restore failed')); } - flashFormErrors($errorBag, "admin/user-lifecycle-audit/view/$auditId", 'user_lifecycle_restore'); - Router::redirect("admin/user-lifecycle-audit/view/$auditId"); + flashFormErrors($errorBag, "audit/user-lifecycle-audit/view/$auditId", 'user_lifecycle_restore'); + Router::redirect("audit/user-lifecycle-audit/view/$auditId"); } -Flash::success(t('User restored'), "admin/user-lifecycle-audit/view/$auditId", 'user_restored'); -Router::redirect("admin/user-lifecycle-audit/view/$auditId"); +Flash::success(t('User restored'), "audit/user-lifecycle-audit/view/$auditId", 'user_restored'); +Router::redirect("audit/user-lifecycle-audit/view/$auditId"); diff --git a/modules/audit/pages/audit/user-lifecycle-audit/view($id).php b/modules/audit/pages/audit/user-lifecycle-audit/view($id).php index 4ba8aac..8909186 100644 --- a/modules/audit/pages/audit/user-lifecycle-audit/view($id).php +++ b/modules/audit/pages/audit/user-lifecycle-audit/view($id).php @@ -17,8 +17,8 @@ $auditId = (int) ($id ?? 0); $auditService = app(\MintyPHP\Module\Audit\Service\UserLifecycleAuditService::class); $auditLog = $auditId > 0 ? $auditService->find($auditId) : null; if (!$auditLog) { - Flash::error(t('Lifecycle audit entry not found'), 'admin/user-lifecycle-audit', 'user_lifecycle_audit_not_found'); - Router::redirect('admin/user-lifecycle-audit'); + Flash::error(t('Lifecycle audit entry not found'), 'audit/user-lifecycle-audit', 'user_lifecycle_audit_not_found'); + Router::redirect('audit/user-lifecycle-audit'); } $snapshot = null; diff --git a/modules/audit/pages/audit/user-lifecycle-audit/view(default).phtml b/modules/audit/pages/audit/user-lifecycle-audit/view(default).phtml index 035c089..a3eeaec 100644 --- a/modules/audit/pages/audit/user-lifecycle-audit/view(default).phtml +++ b/modules/audit/pages/audit/user-lifecycle-audit/view(default).phtml @@ -1,7 +1,7 @@ t('Home'), 'path' => 'admin'], - ['label' => t('User lifecycle logs'), 'path' => 'admin/user-lifecycle-audit'], + ['label' => t('User lifecycle logs'), 'path' => 'audit/user-lifecycle-audit'], ['label' => t('View')], ]; require templatePath('partials/app-breadcrumb.phtml'); $titlebar = [ 'title' => t('View user lifecycle audit entry'), - 'backHref' => 'admin/user-lifecycle-audit', + 'backHref' => 'audit/user-lifecycle-audit', 'backTitle' => t('Back'), ]; require templatePath('partials/app-details-titlebar.phtml'); @@ -178,7 +178,7 @@ $isRestorable = $canRestore
-
+