Merge pull request #58 from opcodesio/bug/make-sure-new-log-file-identifiers-are-backwards-compatible

arukompas · web-flow · commit 93389df21537 · 2022-09-02T14:32:02.000+03:00
make sure the new log file identifiers are backwards compatible
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()

Original file line number	Diff line number	Diff line change
`@@ -49,9 +49,9 @@ public function mount()`
`49`	`49`	`{`
`50`	`50`	`$this->loadPreferences();`
`51`	`51`
`52`		`- if (! LogViewer::getFile($this->selectedFileIdentifier)) {`
`53`		`- $this->selectedFileIdentifier = null;`
`54`		`- }`
	`52`	`+ $file = LogViewer::getFile($this->selectedFileIdentifier);`
	`53`	`+`
	`54`	`+ $this->selectedFileIdentifier = $file?->identifier;`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`public function render()`