diff --git a/app/View/Components/Administration.php b/app/View/Components/Administration.php deleted file mode 100644 index a8df459..0000000 --- a/app/View/Components/Administration.php +++ /dev/null @@ -1,28 +0,0 @@ - 'fa-table-columns', 'always_shown' => true, 'show_notification_indicator' => false, - 'permission' => '' + 'permissions' => [''] ], 'analytics' => [ 'title' => 'Analytics', 'icon' => 'fa-chart-bar', 'always_shown' => false, 'show_notification_indicator' => false, - 'permission' => 'Can view Analytics page' + 'permissions' => ['Can view Analytics page'] ], 'tickets' => [ 'title' => 'Tickets', 'icon' => 'fa-ticket', 'always_shown' => false, 'show_notification_indicator' => false, - 'permission' => 'Can view Tickets page' + 'permissions' => ['Can view Tickets page'] ], 'kanban' => [ 'title' => 'Kanban Board', 'icon' => 'fa-clipboard-check', 'always_shown' => false, 'show_notification_indicator' => false, - 'permission' => 'Can view Kanban page' + 'permissions' => ['Can view Kanban page'] ], 'administration' => [ 'title' => 'Administration', 'icon' => 'fa-cogs', 'always_shown' => false, 'show_notification_indicator' => false, - 'permission' => 'Can view Administration page' + 'permissions' => [ + 'View all users', 'View company users', + 'View all companies', 'View own companies', + 'Manage ticket statuses', + 'Manage ticket types', + 'Manage ticket priorities', + 'View activity log' + ], + 'children' => [ + [ + 'title' => 'Manage users', + 'route' => 'administration.users', + 'icon' => 'fa-users', + 'always_shown' => false, + 'permissions' => ['View all users', 'View company users'] + ], + [ + 'title' => 'Manage companies', + 'route' => 'administration.companies', + 'icon' => 'fa-building', + 'always_shown' => false, + 'permissions' => ['View all companies', 'View own companies'] + ], + [ + 'title' => 'Manage statuses', + 'route' => 'administration.ticket-statuses', + 'icon' => 'fa-square-check', + 'always_shown' => false, + 'permissions' => ['Manage ticket statuses'] + ], + [ + 'title' => 'Manage types', + 'route' => 'administration.ticket-types', + 'icon' => 'fa-copy', + 'always_shown' => false, + 'permissions' => ['Manage ticket types'] + ], + [ + 'title' => 'Manage priorities', + 'route' => 'administration.ticket-priorities', + 'icon' => 'fa-arrow-up', + 'always_shown' => false, + 'permissions' => ['Manage ticket priorities'] + ], + [ + 'title' => 'Activity logs', + 'route' => 'administration.activity-logs', + 'icon' => 'fa-bell', + 'always_shown' => false, + 'permissions' => ['View activity log'] + ] + ] ], 'notifications' => [ 'title' => 'Notifications', 'icon' => 'fa-bell', 'always_shown' => true, 'show_notification_indicator' => true, - 'permission' => '' + 'permissions' => [''] ], ]; } diff --git a/database/help_desk.pgsql.sql b/database/help_desk.pgsql.sql index 54cbfb2..b0d058e 100644 --- a/database/help_desk.pgsql.sql +++ b/database/help_desk.pgsql.sql @@ -107,7 +107,6 @@ INSERT INTO permissions (id, name, guard_name, created_at, updated_at) VALUES (17, 'Can view Analytics page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'), (18, 'Can view Tickets page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'), (19, 'Can view Kanban page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'), -(20, 'Can view Administration page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'), (21, 'View all users', 'web', '2022-09-25 16:41:08', '2022-09-25 16:41:08'), (22, 'View company users', 'web', '2022-09-25 16:41:08', '2022-09-25 16:41:08'), (25, 'Manage ticket statuses', 'web', '2022-09-25 16:41:08', '2022-09-25 16:41:08'), @@ -144,7 +143,6 @@ INSERT INTO model_has_permissions (permission_id, model_type, model_id) VALUES (17, 'App\Models\User', 4), (18, 'App\Models\User', 4), (19, 'App\Models\User', 4), -(20, 'App\Models\User', 4), (21, 'App\Models\User', 4), (22, 'App\Models\User', 4), (25, 'App\Models\User', 4), @@ -178,7 +176,6 @@ INSERT INTO model_has_permissions (permission_id, model_type, model_id) VALUES (17, 'App\Models\User', 6), (18, 'App\Models\User', 6), (19, 'App\Models\User', 6), -(20, 'App\Models\User', 6), (22, 'App\Models\User', 6), (29, 'App\Models\User', 6), (30, 'App\Models\User', 6), diff --git a/database/help_desk.sql b/database/help_desk.sql index f97ebad..5906989 100644 --- a/database/help_desk.sql +++ b/database/help_desk.sql @@ -107,7 +107,6 @@ INSERT INTO `permissions` (`id`, `name`, `guard_name`, `created_at`, `updated_at (17, 'Can view Analytics page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'), (18, 'Can view Tickets page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'), (19, 'Can view Kanban page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'), -(20, 'Can view Administration page', 'web', '2022-09-25 16:32:37', '2022-09-25 16:32:37'), (21, 'View all users', 'web', '2022-09-25 16:41:08', '2022-09-25 16:41:08'), (22, 'View company users', 'web', '2022-09-25 16:41:08', '2022-09-25 16:41:08'), (25, 'Manage ticket statuses', 'web', '2022-09-25 16:41:08', '2022-09-25 16:41:08'), @@ -124,75 +123,74 @@ INSERT INTO `permissions` (`id`, `name`, `guard_name`, `created_at`, `updated_at (39, 'Update companies', 'web', '2022-09-25 17:19:38', '2022-09-25 17:19:38'), (40, 'Delete companies', 'web', '2022-09-25 17:19:38', '2022-09-25 17:19:38'); +TRUNCATE TABLE model_has_permissions; INSERT INTO `model_has_permissions` (`permission_id`, `model_type`, `model_id`) VALUES -(1, 'App\Models\User', 4), -(2, 'App\Models\User', 4), -(3, 'App\Models\User', 4), -(4, 'App\Models\User', 4), -(5, 'App\Models\User', 4), -(6, 'App\Models\User', 4), -(7, 'App\Models\User', 4), -(8, 'App\Models\User', 4), -(9, 'App\Models\User', 4), -(10, 'App\Models\User', 4), -(11, 'App\Models\User', 4), -(12, 'App\Models\User', 4), -(13, 'App\Models\User', 4), -(14, 'App\Models\User', 4), -(15, 'App\Models\User', 4), -(16, 'App\Models\User', 4), -(17, 'App\Models\User', 4), -(18, 'App\Models\User', 4), -(19, 'App\Models\User', 4), -(20, 'App\Models\User', 4), -(21, 'App\Models\User', 4), -(22, 'App\Models\User', 4), -(25, 'App\Models\User', 4), -(26, 'App\Models\User', 4), -(27, 'App\Models\User', 4), -(28, 'App\Models\User', 4), -(29, 'App\Models\User', 4), -(30, 'App\Models\User', 4), -(31, 'App\Models\User', 4), -(32, 'App\Models\User', 4), -(33, 'App\Models\User', 4), -(34, 'App\Models\User', 4), -(38, 'App\Models\User', 4), -(39, 'App\Models\User', 4), -(40, 'App\Models\User', 4), -(5, 'App\Models\User', 5), -(11, 'App\Models\User', 5), -(12, 'App\Models\User', 5), -(13, 'App\Models\User', 5), -(14, 'App\Models\User', 5), -(15, 'App\Models\User', 5), -(16, 'App\Models\User', 5), -(17, 'App\Models\User', 5), -(18, 'App\Models\User', 5), -(19, 'App\Models\User', 5), -(5, 'App\Models\User', 6), -(11, 'App\Models\User', 6), -(12, 'App\Models\User', 6), -(13, 'App\Models\User', 6), -(14, 'App\Models\User', 6), -(17, 'App\Models\User', 6), -(18, 'App\Models\User', 6), -(19, 'App\Models\User', 6), -(20, 'App\Models\User', 6), -(22, 'App\Models\User', 6), -(29, 'App\Models\User', 6), -(30, 'App\Models\User', 6), -(34, 'App\Models\User', 6), -(39, 'App\Models\User', 6), -(5, 'App\Models\User', 10), -(11, 'App\Models\User', 10), -(12, 'App\Models\User', 10), -(13, 'App\Models\User', 10), -(14, 'App\Models\User', 10), -(15, 'App\Models\User', 10), -(16, 'App\Models\User', 10), -(17, 'App\Models\User', 10), -(18, 'App\Models\User', 10), -(19, 'App\Models\User', 10); +(1, 'App\\Models\\User', 4), +(2, 'App\\Models\\User', 4), +(3, 'App\\Models\\User', 4), +(4, 'App\\Models\\User', 4), +(5, 'App\\Models\\User', 4), +(6, 'App\\Models\\User', 4), +(7, 'App\\Models\\User', 4), +(8, 'App\\Models\\User', 4), +(9, 'App\\Models\\User', 4), +(10, 'App\\Models\\User', 4), +(11, 'App\\Models\\User', 4), +(12, 'App\\Models\\User', 4), +(13, 'App\\Models\\User', 4), +(14, 'App\\Models\\User', 4), +(15, 'App\\Models\\User', 4), +(16, 'App\\Models\\User', 4), +(17, 'App\\Models\\User', 4), +(18, 'App\\Models\\User', 4), +(19, 'App\\Models\\User', 4), +(21, 'App\\Models\\User', 4), +(22, 'App\\Models\\User', 4), +(25, 'App\\Models\\User', 4), +(26, 'App\\Models\\User', 4), +(27, 'App\\Models\\User', 4), +(28, 'App\\Models\\User', 4), +(29, 'App\\Models\\User', 4), +(30, 'App\\Models\\User', 4), +(31, 'App\\Models\\User', 4), +(32, 'App\\Models\\User', 4), +(33, 'App\\Models\\User', 4), +(34, 'App\\Models\\User', 4), +(38, 'App\\Models\\User', 4), +(39, 'App\\Models\\User', 4), +(40, 'App\\Models\\User', 4), +(5, 'App\\Models\\User', 5), +(11, 'App\\Models\\User', 5), +(12, 'App\\Models\\User', 5), +(13, 'App\\Models\\User', 5), +(14, 'App\\Models\\User', 5), +(15, 'App\\Models\\User', 5), +(16, 'App\\Models\\User', 5), +(17, 'App\\Models\\User', 5), +(18, 'App\\Models\\User', 5), +(19, 'App\\Models\\User', 5), +(5, 'App\\Models\\User', 6), +(11, 'App\\Models\\User', 6), +(12, 'App\\Models\\User', 6), +(13, 'App\\Models\\User', 6), +(14, 'App\\Models\\User', 6), +(17, 'App\\Models\\User', 6), +(18, 'App\\Models\\User', 6), +(19, 'App\\Models\\User', 6), +(22, 'App\\Models\\User', 6), +(29, 'App\\Models\\User', 6), +(30, 'App\\Models\\User', 6), +(34, 'App\\Models\\User', 6), +(39, 'App\\Models\\User', 6), +(5, 'App\\Models\\User', 10), +(11, 'App\\Models\\User', 10), +(12, 'App\\Models\\User', 10), +(13, 'App\\Models\\User', 10), +(14, 'App\\Models\\User', 10), +(15, 'App\\Models\\User', 10), +(16, 'App\\Models\\User', 10), +(17, 'App\\Models\\User', 10), +(18, 'App\\Models\\User', 10), +(19, 'App\\Models\\User', 10); SET foreign_key_checks = 1; diff --git a/database/seeders/PermissionsSeeder.php b/database/seeders/PermissionsSeeder.php index c60ae1c..25dd8d8 100644 --- a/database/seeders/PermissionsSeeder.php +++ b/database/seeders/PermissionsSeeder.php @@ -28,7 +28,6 @@ class PermissionsSeeder extends Seeder 'Can view Analytics page', 'Can view Tickets page', 'Can view Kanban page', - 'Can view Administration page', 'View all users', 'View company users', 'Create users', diff --git a/public/docs/index.html b/public/docs/index.html index 4e46da7..dd83960b 100644 --- a/public/docs/index.html +++ b/public/docs/index.html @@ -54,7 +54,7 @@ - v1.4.2 + v1.4.3 @@ -91,6 +91,7 @@