Merge pull request #4 from phhung1901/master

remove logs & hotfix
vuthaihoc · Jun 5, 2023 · f2236bd · f2236bd
2 parents 406e82e + 8f00557
commit f2236bd
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 19 deletions.
diff --git a/routes/orchid_addon.php b/routes/orchid_addon.php
@@ -1,5 +1,7 @@
 <?php
 
+use OrchidAddon\LogViewer;
+
 Route::post('advanced-relation', [\OrchidAddon\Http\Controllers\AdvancedRelationController::class, 'view'])
     ->name('platform.systems.advanced_relation');
 
@@ -25,5 +27,11 @@
     ->breadcrumbs(function (\Tabuna\Breadcrumbs\Trail $trail, $file_name) {
         return $trail
             ->parent('platform.logs')
-            ->push(decrypt($file_name));
+            ->push($file_name);
     });
+
+Route::get('logs/{file_name}/download', function ($file_name){
+    return response()->download(LogViewer::pathToLogFile($file_name));
+})->name('platform.logs.download');
+
+
diff --git a/src/LogViewer.php b/src/LogViewer.php
@@ -4,6 +4,8 @@
 namespace OrchidAddon;
 
 
+use Illuminate\Support\Facades\File;
+
 class LogViewer
 {
     private static string $file;
@@ -204,4 +206,13 @@ public static function getFiles(bool $basename = false, string $file_name = '')
         }
         return array_values($files);
     }
+
+
+    /**
+     * @param string $file_name
+     */
+    public static function deleteFile($file_name){
+        $fileLogPath = self::pathToLogFile($file_name);
+        File::delete($fileLogPath);
+    }
 }
diff --git a/src/Models/Log.php b/src/Models/Log.php
@@ -4,6 +4,7 @@
 namespace OrchidAddon\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Client\Request;
 use Orchid\Filters\Filterable;
 use Orchid\Screen\AsSource;
 use OrchidAddon\LogViewer;
@@ -30,4 +31,7 @@ protected function sushiShouldCache()
         return false;
     }
 
+    public function deleteLogFile($file_name){
+        LogViewer::deleteFile($file_name);
+    }
 }
diff --git a/src/Screens/Log/LogListScreen.php b/src/Screens/Log/LogListScreen.php
@@ -3,14 +3,14 @@
 namespace OrchidAddon\Screens\Log;
 
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\File;
 use Orchid\Screen\Actions\Button;
 use Orchid\Screen\Actions\DropDown;
 use Orchid\Screen\Actions\Link;
 use Orchid\Screen\Screen;
 use Orchid\Screen\TD;
 use Orchid\Support\Facades\Layout;
 use Orchid\Support\Facades\Toast;
-use OrchidAddon\LogViewer;
 use OrchidAddon\Models\Log;
 
 class LogListScreen extends Screen
@@ -72,37 +72,31 @@ public function layout(): iterable
                             ->icon('three-dots-vertical')
                             ->list([
                                 Link::make(__('Preview'))
-                                    ->route('platform.logs.preview', encrypt($log->file_name))
+                                    ->route('platform.logs.preview', $log->file_name)
                                     ->icon('eye'),
 
                                 Button::make(__('Delete'))
                                     ->icon('trash')
-                                    ->confirm()
+                                    ->confirm("Do you want to delete ?")
                                     ->method('remove', [
-                                        'file_name' => encrypt($log->file_name),
+                                        'file_name' => $log->file_name,
                                     ]),
-                                Button::make(__('Download'))
+                                Link::make(__('Download'))
                                     ->icon('cloud-download')
-                                    ->method('download', [
-                                        'file_name' => encrypt($log->file_name),
-                                    ]),
+                                    ->route('platform.logs.download', $log->file_name)
                             ]);
                     }),
             ])
         ];
     }
 
-    public function download(Request $request)
-    {
-        $file_name = decrypt($request->get('file_name'));
-        return response()->download(LogViewer::pathToLogFile($file_name));
-    }
-
     public function remove(Request $request)
     {
-        $file_name = decrypt($request->get('file_name'));
-        Log::where('file_name', $file_name)->delete();
+        $file_name = $request->get('file_name');
+        $log = Log::where('file_name', $file_name)->first();
+        if (!empty($log)){
+            $log->deleteLogFile($file_name);
+        }
         Toast::info(__('Log was removed'));
-
     }
 }
diff --git a/src/Screens/Log/LogPreviewScreen.php b/src/Screens/Log/LogPreviewScreen.php
@@ -15,7 +15,7 @@ class LogPreviewScreen extends Screen
      */
     public function query(string $file_name): iterable
     {
-        LogViewer::setFile(decrypt($file_name));
+        LogViewer::setFile($file_name);
         $logs = LogViewer::all();
 
         if (count($logs) <= 0) {