Update Availability Map widget to not use Service state_name variable (librenms#17716)

L8SE · laf · web-flow · commit ceb3abe706df · 2025-05-30T15:10:20.000+02:00
* Fix : inconsistent label in getServiceLabel

* Update AvailabilityMapController.php

---------

Co-authored-by: Neil Lathwood &lt;gh+n@laf.io&gt;
diff --git a/app/Http/Controllers/Widgets/AvailabilityMapController.php b/app/Http/Controllers/Widgets/AvailabilityMapController.php
@@ -164,7 +164,7 @@ private function getServices(): array
                 'status' => $service->service_status,
                 'link' => Url::deviceUrl($service->device),
                 'tooltip' => $this->getServiceTooltip($service),
-                'label' => $this->getServiceLabel($service, $state_name),
+                'label' => $this->getServiceLabel($service),
                 'labelClass' => $class,
             ];
         }
@@ -210,13 +210,13 @@ private function getDeviceLabel(Device $device, string $state_name): string
         }
     }
 
-    private function getServiceLabel(Service $service, string $state_name): string
+    private function getServiceLabel(Service $service): string
     {
         if ($this->getSettings()['color_only_select'] == 1) {
             return '';
         }
 
-        return $service->service_type . ' - ' . __($state_name);
+        return empty($service->service_name) ? $service->service_type : $service->service_name;
     }
 
     private function getDeviceTooltip(Device $device, string $state_name): string

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ private function getServices(): array`
`164`	`164`	`'status' => $service->service_status,`
`165`	`165`	`'link' => Url::deviceUrl($service->device),`
`166`	`166`	`'tooltip' => $this->getServiceTooltip($service),`
`167`		`- 'label' => $this->getServiceLabel($service, $state_name),`
	`167`	`+ 'label' => $this->getServiceLabel($service),`
`168`	`168`	`'labelClass' => $class,`
`169`	`169`	`];`
`170`	`170`	`}`
`@@ -210,13 +210,13 @@ private function getDeviceLabel(Device $device, string $state_name): string`
`210`	`210`	`}`
`211`	`211`	`}`
`212`	`212`
`213`		`- private function getServiceLabel(Service $service, string $state_name): string`
	`213`	`+ private function getServiceLabel(Service $service): string`
`214`	`214`	`{`
`215`	`215`	`if ($this->getSettings()['color_only_select'] == 1) {`
`216`	`216`	`return '';`
`217`	`217`	`}`
`218`	`218`
`219`		`- return $service->service_type . ' - ' . __($state_name);`
	`219`	`+ return empty($service->service_name) ? $service->service_type : $service->service_name;`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`private function getDeviceTooltip(Device $device, string $state_name): string`