From 7d1ca8500619d314b8c185ff066d19cd78c54255 Mon Sep 17 00:00:00 2001
From: KodeStar <kode@audiosilo.app>
Date: Thu, 27 Aug 2026 20:01:18 +0100
Subject: [PATCH 1/3] Offer the Home dashboard as a default tag option

In tags mode the taglist already renders the root tag (id 0) as a
'Home Dashboard' chip under the 0-dash slug, and tiles tagged only to
the root carry tag-0-dash, so auto-selecting it on load works. The
default_tag dropdown just never offered it because both the edit and
display code paths filtered on id > 0.

Move the option list into Setting::defaultTagOptions(), used by both
paths, and put the root tag first followed by the pinned tags as before.

Fixes #1589
---
 app/Setting.php                               | 37 +++++++++++++-----
 tests/Feature/DashTest.php                    | 17 +++++++++
 .../database/seeders/SettingsSeederTest.php   | 38 +++++++++++++++++++
 3 files changed, 82 insertions(+), 10 deletions(-)

diff --git a/app/Setting.php b/app/Setting.php
index 74532ef70..81d231394 100644
--- a/app/Setting.php
+++ b/app/Setting.php
@@ -124,11 +124,7 @@ public function getListValueAttribute()
                     if ($this->key === 'search_provider') {
                         $options = Search::providers()->pluck('name', 'id')->toArray();
                     } elseif ($this->key === 'default_tag') {
-                        $options = [];
-                        $tags = Item::where('type', 1)->where('id', '>', 0)->pinned()->orderBy('title', 'asc')->get();
-                        foreach ($tags as $tag) {
-                            $options[$tag->tag_url] = $tag->title;
-                        }
+                        $options = self::defaultTagOptions();
                     }
                     $value = (array_key_exists($this->value, $options))
                         ? __($options[$this->value])
@@ -197,11 +193,7 @@ public function getEditValueAttribute()
                 if ($this->key === 'search_provider') {
                     $options = Search::providers()->pluck('name', 'id');
                 } elseif ($this->key === 'default_tag') {
-                    $options = ['' => 'app.options.none'];
-                    $tags = Item::where('type', 1)->where('id', '>', 0)->pinned()->orderBy('title', 'asc')->get();
-                    foreach ($tags as $tag) {
-                        $options[$tag->tag_url] = $tag->title;
-                    }
+                    $options = ['' => 'app.options.none'] + self::defaultTagOptions();
                 }
                 $value = '<select name="value" class="form-control">';
                 foreach ($options as $key => $opt) {
@@ -311,4 +303,29 @@ public static function user()
     {
         return User::currentUser();
     }
+
+    /**
+     * Tags that can be picked as the default tag, keyed by the slug the
+     * dashboard taglist uses (the value stored in the setting).
+     *
+     * Mirrors the taglist rendered in "tags" mode: the Home dashboard (root
+     * tag, id 0) first, then every pinned tag alphabetically.
+     *
+     * @return array<string, string>
+     */
+    public static function defaultTagOptions(): array
+    {
+        $options = [];
+
+        if ($home = Item::find(0)) {
+            $options[$home->tag_url] = $home->title;
+        }
+
+        $tags = Item::where('type', 1)->where('id', '>', 0)->pinned()->orderBy('title', 'asc')->get();
+        foreach ($tags as $tag) {
+            $options[$tag->tag_url] = $tag->title;
+        }
+
+        return $options;
+    }
 }
diff --git a/tests/Feature/DashTest.php b/tests/Feature/DashTest.php
index 8b52c0129..ca259aa3c 100644
--- a/tests/Feature/DashTest.php
+++ b/tests/Feature/DashTest.php
@@ -102,4 +102,21 @@ public function test_dash_exposes_the_configured_default_tag(): void
         $response->assertStatus(200);
         $response->assertSee('data-default-tag="home-dashboard"', false);
     }
+
+    public function test_tags_mode_renders_the_home_dashboard_chip_matching_the_default_tag_slug(): void
+    {
+        $this->seed();
+
+        Setting::where('key', 'treat_tags_as')->update(['value' => 'tags']);
+        Setting::where('key', 'default_tag')->update(['value' => '0-dash']);
+
+        $this->addPinnedItemWithTitleToDB('Home Item');
+
+        $response = $this->get('/');
+
+        $response->assertStatus(200);
+        $response->assertSee('data-default-tag="0-dash"', false);
+        $response->assertSee('data-tag="tag-0-dash"', false);
+        $response->assertSee('class="item-container tag-0-dash"', false);
+    }
 }
diff --git a/tests/Unit/database/seeders/SettingsSeederTest.php b/tests/Unit/database/seeders/SettingsSeederTest.php
index afed4bc65..77da22c3c 100644
--- a/tests/Unit/database/seeders/SettingsSeederTest.php
+++ b/tests/Unit/database/seeders/SettingsSeederTest.php
@@ -79,4 +79,42 @@ public function test_default_tag_edit_value_lists_all_tags_and_a_none_option():
         // The unpinned tag is excluded.
         $this->assertStringNotContainsString('value="archive"', $editValue);
     }
+
+    public function test_default_tag_edit_value_offers_the_home_dashboard_first(): void
+    {
+        $this->seed();
+
+        Item::factory()->create([
+            'title' => 'Media',
+            'url' => 'media',
+            'type' => 1,
+            'pinned' => 1,
+            'user_id' => 0,
+        ]);
+
+        $setting = Setting::where('key', 'default_tag')->first();
+        $editValue = $setting->edit_value;
+
+        // The root tag (id 0) is what the dashboard taglist renders as the
+        // "Home Dashboard" chip, under the "0-dash" slug; its title is a
+        // translation key and must be rendered translated.
+        $this->assertStringContainsString('value="0-dash"', $editValue);
+        $this->assertStringContainsString('>' . __('app.dashboard') . '</option>', $editValue);
+
+        // It is listed right after "none", ahead of the user's own tags.
+        $this->assertLessThan(
+            strpos($editValue, 'value="media"'),
+            strpos($editValue, 'value="0-dash"')
+        );
+    }
+
+    public function test_default_tag_list_value_shows_the_home_dashboard_when_selected(): void
+    {
+        $this->seed();
+
+        $setting = Setting::where('key', 'default_tag')->first();
+        $setting->value = '0-dash';
+
+        $this->assertSame(__('app.dashboard'), $setting->list_value);
+    }
 }

From 385ae7363944595d944bb97139f68c0bfcaa97a4 Mon Sep 17 00:00:00 2001
From: KodeStar <kode@audiosilo.app>
Date: Thu, 27 Aug 2026 20:02:27 +0100
Subject: [PATCH 2/3] Persist the default tag in the list_value test

list_value re-fetches the stored setting rather than reading the model
attribute, so the test has to write the value to the DB.
---
 tests/Unit/database/seeders/SettingsSeederTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/Unit/database/seeders/SettingsSeederTest.php b/tests/Unit/database/seeders/SettingsSeederTest.php
index 77da22c3c..daf33dc8e 100644
--- a/tests/Unit/database/seeders/SettingsSeederTest.php
+++ b/tests/Unit/database/seeders/SettingsSeederTest.php
@@ -112,8 +112,9 @@ public function test_default_tag_list_value_shows_the_home_dashboard_when_select
     {
         $this->seed();
 
+        // list_value re-reads the stored value, so it has to be persisted.
+        Setting::where('key', 'default_tag')->update(['value' => '0-dash']);
         $setting = Setting::where('key', 'default_tag')->first();
-        $setting->value = '0-dash';
 
         $this->assertSame(__('app.dashboard'), $setting->list_value);
     }

From cda97c10c024c0923d7f97b74cc720fc4c3667f9 Mon Sep 17 00:00:00 2001
From: KodeStar <kode@audiosilo.app>
Date: Fri, 28 Aug 2026 10:15:49 +0100
Subject: [PATCH 3/3] Share the taglist query and simplify defaultTagOptions

- Item::taglist() scope (home tag plus pinned tags) replaces the two
  identical closures in ItemController::dash and the hand-rolled copy in
  Setting::defaultTagOptions, which now needs one query and a pluck.
- Fold the home-dashboard assertions into the existing dropdown test
  instead of duplicating its setup.
---
 app/Http/Controllers/ItemController.php       |  8 ++----
 app/Item.php                                  | 11 ++++++++
 app/Setting.php                               | 24 +++++------------
 tests/Feature/DashTest.php                    |  3 ++-
 .../database/seeders/SettingsSeederTest.php   | 26 +++----------------
 5 files changed, 26 insertions(+), 46 deletions(-)

diff --git a/app/Http/Controllers/ItemController.php b/app/Http/Controllers/ItemController.php
index fe3df13ce..81349c945 100644
--- a/app/Http/Controllers/ItemController.php
+++ b/app/Http/Controllers/ItemController.php
@@ -50,9 +50,7 @@ public function dash(Request $request): View
             } elseif ($treat_tags_as == 'tags') {
                 $data['apps'] = Item::with('parents')->where('type', 0)->pinned()->orderBy('order', 'asc')->get();
                 $data['all_apps'] = Item::where('type', 0)->orderBy('order', 'asc')->get();
-                $data['taglist'] = Item::where('id', 0)->orWhere(function ($query) {
-                    $query->where('type', 1)->pinned();
-                })->orderBy('order', 'asc')->get();
+                $data['taglist'] = Item::taglist()->orderBy('order', 'asc')->get();
             } else {
                 $data['apps'] = Item::whereHas('parents', function ($query) {
                     $query->where('id', 0);
@@ -70,9 +68,7 @@ public function dash(Request $request): View
             } elseif ($treat_tags_as == 'tags') {
                 $data['apps'] = Item::with('parents')->where('type', 0)->pinned()->orderBy('order', 'asc')->get();
                 $data['all_apps'] = Item::where('type', 0)->orderBy('order', 'asc')->get();
-                $data['taglist'] = Item::where('id', 0)->orWhere(function ($query) {
-                    $query->where('type', 1)->pinned();
-                })->orderBy('order', 'asc')->get();
+                $data['taglist'] = Item::taglist()->orderBy('order', 'asc')->get();
             } else {
                 $data['apps'] = Item::whereHas('parents', function ($query) {
                     $query->where('id', 0);
diff --git a/app/Item.php b/app/Item.php
index c64208895..e0d96cae0 100644
--- a/app/Item.php
+++ b/app/Item.php
@@ -122,6 +122,17 @@ public function scopePinned(Builder $query): Builder
         return $query->where('pinned', 1);
     }
 
+    /**
+     * Scope a query to the tags shown in the dashboard taglist: the home
+     * dashboard (root tag, id 0) plus every pinned tag.
+     */
+    public function scopeTaglist(Builder $query): Builder
+    {
+        return $query->where('id', 0)->orWhere(function (Builder $query) {
+            $query->where('type', 1)->pinned();
+        });
+    }
+
     public static function checkConfig($config)
     {
         // die(print_r($config));
diff --git a/app/Setting.php b/app/Setting.php
index 81d231394..bfa4dd1f1 100644
--- a/app/Setting.php
+++ b/app/Setting.php
@@ -305,27 +305,17 @@ public static function user()
     }
 
     /**
-     * Tags that can be picked as the default tag, keyed by the slug the
-     * dashboard taglist uses (the value stored in the setting).
-     *
-     * Mirrors the taglist rendered in "tags" mode: the Home dashboard (root
-     * tag, id 0) first, then every pinned tag alphabetically.
+     * Tags offered by the default_tag setting, keyed by their taglist slug:
+     * the home dashboard first, then the pinned tags by title.
      *
      * @return array<string, string>
      */
     public static function defaultTagOptions(): array
     {
-        $options = [];
-
-        if ($home = Item::find(0)) {
-            $options[$home->tag_url] = $home->title;
-        }
-
-        $tags = Item::where('type', 1)->where('id', '>', 0)->pinned()->orderBy('title', 'asc')->get();
-        foreach ($tags as $tag) {
-            $options[$tag->tag_url] = $tag->title;
-        }
-
-        return $options;
+        return Item::taglist()
+            ->get()
+            ->sortBy(fn (Item $tag) => $tag->id === 0 ? '' : $tag->title)
+            ->pluck('title', 'tag_url')
+            ->toArray();
     }
 }
diff --git a/tests/Feature/DashTest.php b/tests/Feature/DashTest.php
index ca259aa3c..0dc30accd 100644
--- a/tests/Feature/DashTest.php
+++ b/tests/Feature/DashTest.php
@@ -103,7 +103,7 @@ public function test_dash_exposes_the_configured_default_tag(): void
         $response->assertSee('data-default-tag="home-dashboard"', false);
     }
 
-    public function test_tags_mode_renders_the_home_dashboard_chip_matching_the_default_tag_slug(): void
+    public function test_dash_can_default_to_the_home_dashboard_tag(): void
     {
         $this->seed();
 
@@ -115,6 +115,7 @@ public function test_tags_mode_renders_the_home_dashboard_chip_matching_the_defa
         $response = $this->get('/');
 
         $response->assertStatus(200);
+        // The stored slug matches the chip and the tile class the JS filters on.
         $response->assertSee('data-default-tag="0-dash"', false);
         $response->assertSee('data-tag="tag-0-dash"', false);
         $response->assertSee('class="item-container tag-0-dash"', false);
diff --git a/tests/Unit/database/seeders/SettingsSeederTest.php b/tests/Unit/database/seeders/SettingsSeederTest.php
index daf33dc8e..03b167d28 100644
--- a/tests/Unit/database/seeders/SettingsSeederTest.php
+++ b/tests/Unit/database/seeders/SettingsSeederTest.php
@@ -78,32 +78,14 @@ public function test_default_tag_edit_value_lists_all_tags_and_a_none_option():
 
         // The unpinned tag is excluded.
         $this->assertStringNotContainsString('value="archive"', $editValue);
-    }
-
-    public function test_default_tag_edit_value_offers_the_home_dashboard_first(): void
-    {
-        $this->seed();
-
-        Item::factory()->create([
-            'title' => 'Media',
-            'url' => 'media',
-            'type' => 1,
-            'pinned' => 1,
-            'user_id' => 0,
-        ]);
 
-        $setting = Setting::where('key', 'default_tag')->first();
-        $editValue = $setting->edit_value;
-
-        // The root tag (id 0) is what the dashboard taglist renders as the
-        // "Home Dashboard" chip, under the "0-dash" slug; its title is a
-        // translation key and must be rendered translated.
+        // The root tag (id 0) is what the taglist renders as the "Home
+        // Dashboard" chip, under the "0-dash" slug; its title is a
+        // translation key and is rendered translated, right after "none".
         $this->assertStringContainsString('value="0-dash"', $editValue);
         $this->assertStringContainsString('>' . __('app.dashboard') . '</option>', $editValue);
-
-        // It is listed right after "none", ahead of the user's own tags.
         $this->assertLessThan(
-            strpos($editValue, 'value="media"'),
+            strpos($editValue, 'value="home-dashboard"'),
             strpos($editValue, 'value="0-dash"')
         );
     }