Merge pull request #58 from opcodesio/bug/make-sure-new-log-file-iden…

…tifiers-are-backwards-compatible make sure the new log file identifiers are backwards compatible
opcodesio · Sep 2, 2022 · 93389df · 93389df
2 parents 8c9cd25 + 8047931
commit 93389df
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/routes/web.php b/routes/web.php
@@ -10,10 +10,12 @@
         Route::get('/', function () {
             LogViewer::auth();
 
+            $selectedFile = LogViewer::getFile(request()->query('file', ''));
+
             return view('log-viewer::index', [
                 'jsPath' => __DIR__.'/../public/app.js',
                 'cssPath' => __DIR__.'/../public/app.css',
-                'selectedFileIdentifier' => request()->query('file', ''),
+                'selectedFileIdentifier' => $selectedFile?->identifier,
             ]);
         })->name('blv.index');
 

diff --git a/src/Http/Livewire/LogList.php b/src/Http/Livewire/LogList.php
@@ -49,9 +49,9 @@ public function mount()
     {
         $this->loadPreferences();
 
-        if (! LogViewer::getFile($this->selectedFileIdentifier)) {
-            $this->selectedFileIdentifier = null;
-        }
+        $file = LogViewer::getFile($this->selectedFileIdentifier);
+
+        $this->selectedFileIdentifier = $file?->identifier;
     }
 
     public function render()