ZHAW/BA_TTS_Annotation_Plattform
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: update sorting functionality to use dynamic columns from dataset_entry

Browse Source
This commit is contained in:
averel10
2026-03-13 14:41:18 +01:00
parent 7cb9c26a15
commit 3c3176b746
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/actions/get-dataset-entries.ts
View File

@@ -2,9 +2,10 @@
import db from '@/lib/db'; import db from '@/lib/db';
import { dataset_entry } from '@/lib/model/dataset_entry'; import { dataset_entry } from '@/lib/model/dataset_entry';
import { count, eq, and, like, asc, desc, SQL } from 'drizzle-orm'; import { count, eq, and, like, asc, desc, getTableColumns } from 'drizzle-orm';
const ENTRIES_PER_PAGE = 20; const ENTRIES_PER_PAGE = 20;
const SORT_COLUMNS = getTableColumns(dataset_entry);
interface FilterParams { interface FilterParams {
speakerId?: string; speakerId?: string;
@@ -15,7 +16,7 @@ interface FilterParams {
} }
interface SortParams { interface SortParams {
sortBy?: keyof typeof dataset_entry; sortBy?: keyof typeof SORT_COLUMNS;
sortOrder?: 'asc' | 'desc'; sortOrder?: 'asc' | 'desc';
} }
@@ -53,14 +54,10 @@ export async function getDatasetEntries(
const whereClause = and(...conditions); const whereClause = and(...conditions);
// Build sort clause // Build sort clause
let sortColumn: SQL | undefined;
const sortFn = sort?.sortOrder === 'desc' ? desc : asc; const sortFn = sort?.sortOrder === 'desc' ? desc : asc;
const sortColumn = sort?.sortBy && sort.sortBy in SORT_COLUMNS
if (sort?.sortBy && (sort.sortBy in dataset_entry)) { ? sortFn(SORT_COLUMNS[sort.sortBy as keyof typeof SORT_COLUMNS])
sortColumn = sortFn(dataset_entry[sort.sortBy as keyof typeof dataset_entry]); : asc(dataset_entry.externalId);
} else {
sortColumn = asc(dataset_entry.externalId); // Default sort
}
const entries = await db const entries = await db
.select() .select()