Filter handle empty and not empty better (librenms#19756)

* Filter handle empty and not empty better
select filters allow none/any
pass value = 1 so the url is correctly updated
handle relationship empty/not empty filters more correctly

* Additional tests

Author: murrant

app/Models/Traits/Filterable.php

@@ -178,6 +178,14 @@ protected function applyRelationFilter(Builder $query, string $field, mixed $val
 
         $not = $config['not'] ?? false;
 
+        if ($config['null'] ?? false) {
+            $not
+                ? ($boolean === 'or' ? $query->orWhereHas($relation) : $query->whereHas($relation))
+                : ($boolean === 'or' ? $query->orWhereDoesntHave($relation) : $query->whereDoesntHave($relation));
+
+            return;
+        }
+
         // Callback to apply the logic inside the relationship scope
         $callback = function (Builder $q) use ($column, $value, $config): void {
             // When negating a relation (whereDoesntHave), we must use "positive" internal logic

html/build/assets/app-cKVbOGPL.js html/build/assets/app-BGqBXSzO.jshtml/build/assets/app-cKVbOGPL.js renamed to html/build/assets/app-BGqBXSzO.js

@@ -20,12 +20,12 @@
     "src": "html/fonts/glyphicons-halflings-regular.woff2"
   },
   "resources/js/app.js": {
-    "file": "assets/app-cKVbOGPL.js",
+    "file": "assets/app-BGqBXSzO.js",
     "name": "app",
     "src": "resources/js/app.js",
     "isEntry": true,
     "css": [
-      "assets/app-FZ2QWJRi.css"
+      "assets/app-CTohBva2.css"
     ],
     "assets": [
       "assets/glyphicons-halflings-regular-BUJKDMgK.eot",

html/build/assets/app-FZ2QWJRi.css html/build/assets/app-CTohBva2.csshtml/build/assets/app-FZ2QWJRi.css renamed to html/build/assets/app-CTohBva2.css

@@ -46,6 +46,8 @@ export default function filterBarComponent({
                 { v: "neq", s: "≠", l: "Is Not" },
                 { v: "in", s: "∈", l: "Is Any Of" },
                 { v: "not_in", s: "∉", l: "Is Not Any Of" },
+                { v: "is_empty", s: "∅", l: "None" },
+                { v: "is_not_empty", s: "∃", l: "Any" },
             ],
         },
 
@@ -345,8 +347,7 @@ export default function filterBarComponent({
 
             this.current = field;
             this.op = existing?.op || this.ops()[0].v;
-            this.value =
-                existing?.value ?? (this.isMulti() ? [] : "");
+            this.value = existing?.value ?? (this.isMulti() ? [] : "");
             this.display = existing?.display ?? this.value;
 
             this.snapshot = {

html/build/manifest.json

@@ -393,6 +393,32 @@ public function test_relation_neq_includes_records_with_no_relation(): void
         $this->assertContains('orphan-gw', $hostnames);
     }
 
+    public function test_relation_is_empty_finds_records_without_relationship(): void
+    {
+        $this->device(['hostname' => 'connected-gw'], 'London');
+        $this->device(['hostname' => 'unassigned-gw', 'location_id' => null]);
+
+        $results = FilterableDevice::applyFilters([
+            'location.location' => ['is_empty' => '1'],
+        ])->get();
+
+        $this->assertCount(1, $results);
+        $this->assertEquals('unassigned-gw', $results->first()->hostname);
+    }
+
+    public function test_relation_is_not_empty_finds_records_with_relationship(): void
+    {
+        $this->device(['hostname' => 'connected-gw'], 'Paris');
+        $this->device(['hostname' => 'unassigned-gw', 'location_id' => null]);
+
+        $results = FilterableDevice::applyFilters([
+            'location.location' => ['is_not_empty' => '1'],
+        ])->get();
+
+        $this->assertCount(1, $results);
+        $this->assertEquals('connected-gw', $results->first()->hostname);
+    }
+
     // -------------------------------------------------------------------------
     // applyFilterSearch helper
     // -------------------------------------------------------------------------