Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-23 23:19:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

core: fix crash due to unsanitized sort options (#5324)

Browse Source 
Co-authored-by: Abdullah Atta <abdullahatta@streetwriters.co>
This commit is contained in:
Muhammad Ali
2024-05-04 23:26:58 +05:00
committed by GitHub
parent 8a9848634c
commit 159ce97e42
3 changed files with 66 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/core/src/collections/settings.ts
View File

@@ -134,11 +134,7 @@ export class Settings implements ICollection {
}
getGroupOptions(key: GroupingKey) {
const options = this.get(`groupOptions:${key}`);
// TODO: remove this check
if (key === "tags" && options.sortBy === "dateEdited")
options.sortBy = "dateModified";
return options;
return this.get(`groupOptions:${key}`);
}
setGroupOptions(key: GroupingKey, groupOptions: GroupOptions) {

33
packages/core/src/database/sql-collection.ts
View File

@@ -443,6 +443,7 @@ export class FilteredSelector<T extends Item> {
}
async grouped(options: GroupOptions) {
sanitizeSortOptions(this.type, options);
const count = await this.count();
return new VirtualizedGrouping<T>(
count,
@@ -466,6 +467,8 @@ export class FilteredSelector<T extends Item> {
}
async groups(options: GroupOptions) {
sanitizeSortOptions(this.type, options);
const fields: Array<
| AnyColumnWithTable<DatabaseSchema, keyof DatabaseSchema>
| AnyColumn<DatabaseSchema, keyof DatabaseSchema>
@@ -558,6 +561,8 @@ export class FilteredSelector<T extends Item> {
options: GroupOptions | SortOptions,
hasDueDate?: boolean
) {
sanitizeSortOptions(this.type, options);
const sortBy: Set<SortOptions["sortBy"]> = new Set();
if (isGroupOptions(options)) {
if (options.groupBy === "abc") sortBy.add("title");
@@ -612,7 +617,6 @@ export class FilteredSelector<T extends Item> {
);
}
}
return qb;
};
}
@@ -634,3 +638,30 @@ function isSortByDate(options: SortOptions | GroupOptions) {
options.sortBy === "dueDate"
);
}
const BASE_FIELDS: SortOptions["sortBy"][] = ["dateCreated", "dateModified"];
const VALID_SORT_OPTIONS: Record<
keyof DatabaseSchema,
SortOptions["sortBy"][]
> = {
reminders: ["dueDate", "title"],
tags: ["title"],
attachments: ["filename", "dateUploaded", "size"],
colors: ["title"],
notebooks: ["title"],
notes: ["title"],
content: [],
notehistory: [],
relations: [],
sessioncontent: [],
settings: [],
shortcuts: [],
vaults: []
};
function sanitizeSortOptions(type: keyof DatabaseSchema, options: SortOptions) {
const validFields = [...VALID_SORT_OPTIONS[type], ...BASE_FIELDS];
if (!validFields.includes(options.sortBy)) options.sortBy = validFields[0];
return options;
}