From 107ef6fd814e36718ddfb0c3d5c8d9ffd0432085 Mon Sep 17 00:00:00 2001 From: Benjamin Takats Date: Wed, 18 Jan 2023 23:25:57 +0100 Subject: [PATCH] fixes #2 --- .../Controllers/Api/LanguageController.php | 15 +++++---- app/Providers/HorizonServiceProvider.php | 7 ++-- config/horizon.php | 32 +++++++++---------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/app/Http/Controllers/Api/LanguageController.php b/app/Http/Controllers/Api/LanguageController.php index 8e2a6507..d8a6d8e3 100644 --- a/app/Http/Controllers/Api/LanguageController.php +++ b/app/Http/Controllers/Api/LanguageController.php @@ -33,10 +33,10 @@ class LanguageController extends Controller ->get() ->map(function ($language) { $language->translatedCount = Translation::query() - ->where('language_id', $language['id']) - ->whereNotNull('value') - ->where('value', '<>', '') - ->count(); + ->where('language_id', $language['id']) + ->whereNotNull('value') + ->where('value', '<>', '') + ->count(); $language->toTranslate = Translation::query() ->where('language_id', $language['id']) ->count(); @@ -44,10 +44,13 @@ class LanguageController extends Controller }) ->toArray(); foreach ($array as $key => $item) { - $array[$key]['name'] = empty($item['name']) ? $item['language'] : $item['name']; + $translated = $item['translatedCount'] > 0 ? $item['translatedCount'] : 1; + $itemToTranslate = $item['toTranslate'] > 0 ? $item['toTranslate'] : 1; + + $array[$key]['name'] = empty($item['name']) ? $item['language'] : $item['name']; $array[$key]['description'] = $item['language'] === 'en' ? '100% translated' - : round($item['translatedCount'] ?? 1 / $item['toTranslate'] * 100).'% translated'; + : round($translated / $itemToTranslate * 100).'% translated'; } return response()->json($array); diff --git a/app/Providers/HorizonServiceProvider.php b/app/Providers/HorizonServiceProvider.php index 76c42e5c..b8029941 100644 --- a/app/Providers/HorizonServiceProvider.php +++ b/app/Providers/HorizonServiceProvider.php @@ -19,20 +19,17 @@ class HorizonServiceProvider extends HorizonApplicationServiceProvider // Horizon::routeMailNotificationsTo('example@example.com'); // Horizon::routeSlackNotificationsTo('slack-webhook-url', '#channel'); - // Horizon::night(); + Horizon::night(); } /** * Register the Horizon gate. - * * This gate determines who can access Horizon in non-local environments. */ protected function gate(): void { Gate::define('viewHorizon', function ($user) { - return in_array($user->email, [ - // - ]); + return $user->hasRole('super-admin'); }); } } diff --git a/config/horizon.php b/config/horizon.php index 56a3b6b5..a7692c47 100644 --- a/config/horizon.php +++ b/config/horizon.php @@ -99,12 +99,12 @@ return [ */ 'trim' => [ - 'recent' => 60, - 'pending' => 60, - 'completed' => 60, + 'recent' => 60, + 'pending' => 60, + 'completed' => 60, 'recent_failed' => 10080, - 'failed' => 10080, - 'monitored' => 10080, + 'failed' => 10080, + 'monitored' => 10080, ], /* @@ -135,7 +135,7 @@ return [ 'metrics' => [ 'trim_snapshots' => [ - 'job' => 24, + 'job' => 24, 'queue' => 24, ], ], @@ -181,23 +181,23 @@ return [ 'defaults' => [ 'supervisor-1' => [ - 'connection' => 'redis', - 'queue' => ['default'], - 'balance' => 'auto', + 'connection' => 'redis', + 'queue' => ['default'], + 'balance' => 'auto', 'maxProcesses' => 1, - 'maxTime' => 0, - 'maxJobs' => 0, - 'memory' => 128, - 'tries' => 1, - 'timeout' => 60, - 'nice' => 0, + 'maxTime' => 0, + 'maxJobs' => 0, + 'memory' => 128, + 'tries' => 1, + 'timeout' => 60, + 'nice' => 0, ], ], 'environments' => [ 'production' => [ 'supervisor-1' => [ - 'maxProcesses' => 10, + 'maxProcesses' => 10, 'balanceMaxShift' => 1, 'balanceCooldown' => 3, ],