feat: update

retia-platform · May 8, 2024 · 1a3f13d · 1a3f13d
1 parent e765b71
commit 1a3f13d
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 28 deletions.
diff --git a/app/Enums/LogInstance.php b/app/Enums/LogInstance.php
@@ -69,7 +69,7 @@ public function badge(Log $log): string
         return match ($this) {
             self::ENGINE => '<span class="whitespace-nowrap rounded-full px-2.5 py-0.5 text-xs bg-gray-100 text-gray-600">engine</span>',
             self::DEVICE => '<span class="whitespace-nowrap rounded-full px-2.5 py-0.5 text-xs bg-orange-100 text-orange-600">'.$log->instance.'</span>',
-            default => '<span class="whitespace-nowrap rounded-full bg-gray-100 px-2.5 py-0.5 text-xs text-gray-600">unknown</span>',
+            default => '<span class="whitespace-nowrap rounded-full bg-gray-100 px-2.5 py-0.5 text-xs text-gray-600">'.$log->instance.'</span>',
         };
     }
 }
diff --git a/app/Livewire/Log/Index.php b/app/Livewire/Log/Index.php
@@ -115,7 +115,8 @@ public function filter(LogRepository $logRepository)
                 ($this->filters['category']['ospf'] ? $log->isOspfCategory() : false)
             ) && (
                 ($this->filters['instance']['engine'] ? $log->isEngineInstance() : false) ||
-                ($this->filters['instance']['device'] ? $log->isDeviceInstance() : false)
+                ($this->filters['instance']['device'] ? $log->isDeviceInstance() : false) ||
+                ($this->filters['instance']['device'] ? ! $log->isEngineInstance() && ! $log->isDeviceInstance() : false)
             ) && (
                 ($this->filters['severity']['info'] ? $log->isInfoSeverity() : false) ||
                 ($this->filters['severity']['warning'] ? $log->isWarningSeverity() : false) ||

diff --git a/composer.lock b/composer.lock
diff --git a/resources/views/livewire/log/index.blade.php b/resources/views/livewire/log/index.blade.php
@@ -35,7 +35,7 @@
                 <x-slot name="filters">
                     <livewire:components.table-filter-checkbox label="Engine" wire:model="filters.instance.engine" />
                     <livewire:components.table-filter-checkbox label="Device" wire:model="filters.instance.device" />
-                    <livewire:components.table-filter-checkbox label="Unknown" wire:model="filters.instance.unknown" />
+                    <livewire:components.table-filter-checkbox label="Other" wire:model="filters.instance.unknown" />
                 </x-slot>
             </x-table-filter-section>
         </x-slot>