Schema fixes

src/pages/dashboard/tracker.astro

@@ -4,7 +4,7 @@ import { Icon } from 'astro-icon/components';
 import Timer from '../../components/Timer.vue';
 import ManualEntry from '../../components/ManualEntry.vue';
 import { db } from '../../db';
-import { timeEntries, clients, members, tags, timeEntryTags, users } from '../../db/schema';
+import { timeEntries, clients, members, tags, users } from '../../db/schema';
 import { eq, desc, asc, and, sql, or, like } from 'drizzle-orm';
 import { formatTimeRange } from '../../lib/formatTime';
 
@@ -99,10 +99,12 @@ const entries = await db.select({
   entry: timeEntries,
   client: clients,
   user: users,
+  tag: tags,
 })
   .from(timeEntries)
   .leftJoin(clients, eq(timeEntries.clientId, clients.id))
   .leftJoin(users, eq(timeEntries.userId, users.id))
+  .leftJoin(tags, eq(timeEntries.tagId, tags.id))
   .where(and(...conditions))
   .orderBy(orderBy)
   .limit(pageSize)
@@ -112,9 +114,11 @@ const entries = await db.select({
 const runningEntry = await db.select({
   entry: timeEntries,
   client: clients,
+  tag: tags,
 })
   .from(timeEntries)
   .leftJoin(clients, eq(timeEntries.clientId, clients.id))
+  .leftJoin(tags, eq(timeEntries.tagId, tags.id))
   .where(and(
     eq(timeEntries.userId, user.id),
     sql`${timeEntries.endTime} IS NULL`
@@ -165,6 +169,7 @@ const paginationPages = getPaginationPages(page, totalPages);
             startTime: runningEntry.entry.startTime.getTime(),
             description: runningEntry.entry.description,
             clientId: runningEntry.entry.clientId,
+            tagId: runningEntry.tag?.id,
           } : null}
           clients={allClients.map(c => ({ id: c.id, name: c.name }))}
           tags={allTags.map(t => ({ id: t.id, name: t.name, color: t.color }))}