From 98e3c2955bbfdb7c255523b60da676ca1ebee21f Mon Sep 17 00:00:00 2001 From: Abdullah Atta Date: Tue, 26 Mar 2024 12:29:41 +0500 Subject: [PATCH] core: fix groups returning only 1 group --- packages/core/src/database/sql-collection.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/core/src/database/sql-collection.ts b/packages/core/src/database/sql-collection.ts index 6f63a65bd..4f5570151 100644 --- a/packages/core/src/database/sql-collection.ts +++ b/packages/core/src/database/sql-collection.ts @@ -460,7 +460,13 @@ export class FilteredSelector { "reminders.date", createUpcomingReminderTimeQuery().as("dueDate") ); - } else fields.push(options.sortBy); + } + + if (options.groupBy === "abc") fields.push("title"); + else if (options.sortBy === "title" && options.groupBy !== "none") + fields.push("dateCreated"); + else if (options.sortBy !== "dueDate") fields.push(options.sortBy); + return Array.from( groupArray( await this.filter