Botble 7 compatible

Author: sangnguyenplus

plugin.json

@@ -5,6 +5,6 @@
     "provider": "Botble\\LogViewer\\Providers\\LogViewerServiceProvider",
     "author": "Botble Technologies",
     "url": "https://botble.com",
-    "version": "1.2.0",
+    "version": "1.3.0",
     "description": "Provides a log viewer for Botble CMS"
 }

src/Providers/LogViewerServiceProvider.php

@@ -2,11 +2,15 @@
 
 namespace Botble\LogViewer\Providers;
 
+use Botble\Base\Facades\DashboardMenu;
+use Botble\Base\Facades\PanelSectionManager;
+use Botble\Base\PanelSections\Manager;
+use Botble\Base\PanelSections\PanelSectionItem;
+use Botble\Base\PanelSections\System\SystemPanelSection;
 use Botble\LogViewer\LogViewer;
 use Illuminate\Routing\Events\RouteMatched;
 use Botble\Base\Supports\Helper;
 use Botble\Base\Traits\LoadAndPublishDataTrait;
-use Event;
 use Illuminate\Support\ServiceProvider;
 use Botble\LogViewer\Contracts;
 use Botble\LogViewer\Utilities;
@@ -62,16 +66,31 @@ public function boot()
             ->loadMigrations()
             ->publishAssets();
 
-        Event::listen(RouteMatched::class, function () {
-            dashboard_menu()->registerItem([
-                'id'          => 'cms-plugin-system-logs',
-                'priority'    => 7,
-                'parent_id'   => 'cms-core-platform-administration',
-                'name'        => 'plugins/log-viewer::log-viewer.menu_name',
-                'icon'        => null,
-                'url'         => route('log-viewer::logs.index'),
-                'permissions' => ['logs.index'],
-            ]);
-        });
+        if (version_compare('7.0.0', get_core_version(), '>=')) {
+            $this->app['events']->listen(RouteMatched::class, function () {
+                DashboardMenu::registerItem([
+                    'id' => 'cms-plugin-log-viewer',
+                    'priority' => 7,
+                    'parent_id' => 'cms-core-platform-administration',
+                    'name' => 'plugins/log-viewer::log-viewer.system_logs',
+                    'icon' => null,
+                    'url' => route('log-viewer::logs.index'),
+                    'permissions' => ['log-viewer::logs.index'],
+                ]);
+            });
+        } else {
+            PanelSectionManager::group('system')->beforeRendering(function (Manager $manager) {
+                $manager
+                    ->registerItem(
+                        SystemPanelSection::class,
+                        fn() => PanelSectionItem::make('system.log-viewer')
+                            ->setTitle(trans('plugins/log-viewer::log-viewer.system_logs'))
+                            ->withDescription(trans('plugins/log-viewer::log-viewer.system_logs_description'))
+                            ->withIcon('ti ti-report')
+                            ->withPriority(9980)
+                            ->withRoute('log-viewer::logs.index')
+                    );
+            });
+        }
     }
 }

src/Tables/StatsTable.php

@@ -8,26 +8,12 @@
 
 class StatsTable extends Table
 {
-    /**
-     * Make a stats table instance.
-     *
-     * @param array $data
-     * @param LogLevelsContract $levels
-     * @param string|null $locale
-     * @return StatsTable
-     */
-    public static function make(array $data, LogLevelsContract $levels, $locale = null)
+    public static function make(array $data, LogLevelsContract $levels, string $locale = null): static
     {
         return new self($data, $levels, $locale);
     }
 
-    /**
-     * Get json chart data.
-     *
-     * @param string|null $locale
-     * @return array|false|string
-     */
-    public function totalsJson($locale = null)
+    public function totalsJson(string $locale = null): bool|array|string
     {
         $this->setLocale($locale);
 
@@ -46,13 +32,7 @@ public function totalsJson($locale = null)
         return json_encode(array_values($json), JSON_PRETTY_PRINT);
     }
 
-    /**
-     * Prepare table header.
-     *
-     * @param array $data
-     * @return array
-     */
-    protected function prepareHeader(array $data)
+    protected function prepareHeader(array $data): array
     {
         return array_merge_recursive(
             [
@@ -63,13 +43,7 @@ protected function prepareHeader(array $data)
         );
     }
 
-    /**
-     * Prepare table rows.
-     *
-     * @param array $data
-     * @return array
-     */
-    protected function prepareRows(array $data)
+    protected function prepareRows(array $data): array
     {
         $rows = [];
 
@@ -80,13 +54,7 @@ protected function prepareRows(array $data)
         return $rows;
     }
 
-    /**
-     * Prepare table footer.
-     *
-     * @param array $data
-     * @return array
-     */
-    protected function prepareFooter(array $data)
+    protected function prepareFooter(array $data): array
     {
         $footer = [];