-
+
@foreach($apps as $app)
@include('item')
@endforeach
diff --git a/tests/Feature/AjaxPostEndpointsTest.php b/tests/Feature/AjaxPostEndpointsTest.php
index 29631df60..9e4f6357a 100644
--- a/tests/Feature/AjaxPostEndpointsTest.php
+++ b/tests/Feature/AjaxPostEndpointsTest.php
@@ -38,6 +38,45 @@ public function test_order_endpoint_persists_the_new_item_order(): void
$this->assertSame(1, (int) $first->fresh()->order);
}
+ public function test_order_endpoint_reorders_categories_including_the_home_tag(): void
+ {
+ $this->seed();
+
+ // The seeder creates the home dashboard tag at id 0; it is a valid
+ // category and must not be dropped as a "falsy" id.
+ $media = Item::factory()->create(['title' => 'Media', 'type' => 1, 'order' => 0]);
+ $work = Item::factory()->create(['title' => 'Work', 'type' => 1, 'order' => 1]);
+
+ $response = $this->post('/order', [
+ 'order' => [$work->id, '0', $media->id],
+ ]);
+
+ $response->assertStatus(200);
+
+ $this->assertSame(0, (int) $work->fresh()->order);
+ $this->assertSame(1, (int) Item::find(0)->order);
+ $this->assertSame(2, (int) $media->fresh()->order);
+ }
+
+ public function test_order_endpoint_skips_ids_that_no_longer_exist(): void
+ {
+ $this->seed();
+
+ $first = Item::factory()->create(['order' => 5]);
+ $second = Item::factory()->create(['order' => 9]);
+
+ $response = $this->post('/order', [
+ 'order' => [$second->id, 999999, $first->id],
+ ]);
+
+ $response->assertStatus(200);
+
+ // Positions are taken from the posted list, so the missing id leaves
+ // a gap rather than shifting the items after it.
+ $this->assertSame(0, (int) $second->fresh()->order);
+ $this->assertSame(2, (int) $first->fresh()->order);
+ }
+
public function test_appload_returns_null_for_the_none_selection(): void
{
$this->seed();
diff --git a/tests/Feature/DashTest.php b/tests/Feature/DashTest.php
index 8b52c0129..c8ece5f51 100644
--- a/tests/Feature/DashTest.php
+++ b/tests/Feature/DashTest.php
@@ -16,7 +16,7 @@ class DashTest extends TestCase
* Helpers
*/
- private function addPinnedItemWithTitleToDB($title)
+ private function addPinnedItemWithTitleToDB($title, $tagId = 0): Item
{
$item = Item::factory()
->create([
@@ -26,23 +26,21 @@ private function addPinnedItemWithTitleToDB($title)
ItemTag::factory()->create([
'item_id' => $item->id,
- 'tag_id' => 0,
+ 'tag_id' => $tagId,
]);
+
+ return $item;
}
- private function addTagWithTitleToDB($title)
+ private function addTagWithTitleToDB($title, array $attributes = []): Item
{
- Item::factory()
- ->create([
+ return Item::factory()
+ ->create($attributes + [
'title' => $title,
'type' => 1,
]);
}
- /**
- * Test Cases
- */
-
public function test_loads_empty_dash(): void
{
$this->seed();
@@ -89,17 +87,37 @@ public function test_dash_exposes_the_configured_default_tag(): void
Setting::where('key', 'treat_tags_as')->update(['value' => 'tags']);
Setting::where('key', 'default_tag')->update(['value' => 'home-dashboard']);
- Item::factory()->create([
- 'title' => 'Home',
- 'url' => 'home-dashboard',
- 'type' => 1,
- 'pinned' => 1,
- 'user_id' => 0,
- ]);
+ $this->addTagWithTitleToDB('Home', ['url' => 'home-dashboard', 'pinned' => 1, 'user_id' => 0]);
$response = $this->get('/');
$response->assertStatus(200);
$response->assertSee('data-default-tag="home-dashboard"', false);
}
+
+ public function test_categories_mode_renders_sortable_category_and_item_markup(): void
+ {
+ $this->seed();
+
+ Setting::where('key', 'treat_tags_as')->update(['value' => 'categories']);
+
+ $tag = $this->addTagWithTitleToDB('Media', ['url' => 'media', 'pinned' => 1, 'user_id' => 0]);
+ $app = $this->addPinnedItemWithTitleToDB('Plex', $tag->id);
+
+ $response = $this->get('/');
+
+ $response->assertStatus(200);
+ // The category block and the item inside it both carry the id that
+ // Sortable posts to /order.
+ $response->assertSee('class="category item-containerz" data-name="Media" data-id="' . $tag->id . '"', false);
+ $response->assertSee('data-name="Plex" data-id="' . $app->id . '"', false);
+ // The item is rendered inside its category block (what the nested
+ // per-category sortable relies on), and the title link opts out of
+ // native dragging so the category itself is the drag source.
+ $html = $response->getContent();
+ $categoryPos = strpos($html, 'data-id="' . $tag->id . '"');
+ $itemPos = strpos($html, 'data-id="' . $app->id . '"');
+ $this->assertLessThan($itemPos, $categoryPos);
+ $this->assertStringContainsString('