From 949b58b5ff09d2eed52e1a2b6d4830ee02c256ef Mon Sep 17 00:00:00 2001 From: SebastianMC <23032356+SebastianMC@users.noreply.github.com> Date: Thu, 24 Aug 2023 00:15:32 +0200 Subject: [PATCH 1/3] Bugfix in sorterByMetadataField - reverse order working correctly now - new unit tests --- src/custom-sort/custom-sort.spec.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/custom-sort/custom-sort.spec.ts b/src/custom-sort/custom-sort.spec.ts index 1a39df9..b5ba6c6 100644 --- a/src/custom-sort/custom-sort.spec.ts +++ b/src/custom-sort/custom-sort.spec.ts @@ -6,6 +6,7 @@ import { determineSortingGroup, FolderItemForSorting, matchGroupRegex, + sorterByMetadataField, SorterFn, Sorters } from './custom-sort'; From f48bc4d11fa6a313e08cb956b4be46b246ed5304 Mon Sep 17 00:00:00 2001 From: SebastianMC <23032356+SebastianMC@users.noreply.github.com> Date: Thu, 24 Aug 2023 00:16:10 +0200 Subject: [PATCH 2/3] Simplification of this.app ==> app - this is a globally exposed object --- src/custom-sort/custom-sort.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/custom-sort/custom-sort.ts b/src/custom-sort/custom-sort.ts index 8b56aec..98b8b26 100644 --- a/src/custom-sort/custom-sort.ts +++ b/src/custom-sort/custom-sort.ts @@ -431,8 +431,8 @@ export const determineFolderDatesIfNeeded = (folderItems: Array Object.assign({} as CustomSortGroup, group)) From 24355ff0a49f80e01974b1d9a511ffbc9a5a75df Mon Sep 17 00:00:00 2001 From: SebastianMC <23032356+SebastianMC@users.noreply.github.com> Date: Thu, 24 Aug 2023 00:35:19 +0200 Subject: [PATCH 3/3] Bugfix in sorterByMetadataField - reverse order working correctly now - fix in unit tests --- src/custom-sort/custom-sort.spec.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/custom-sort/custom-sort.spec.ts b/src/custom-sort/custom-sort.spec.ts index b5ba6c6..92c6927 100644 --- a/src/custom-sort/custom-sort.spec.ts +++ b/src/custom-sort/custom-sort.spec.ts @@ -2235,7 +2235,7 @@ describe('CustomSortOrder.byMetadataFieldAlphabeticalReverse', () => { expect(result2).toBe(SORT_FIRST_GOES_LATER) expect(result3).toBe(SORT_ITEMS_ARE_EQUAL) }) - it('should put the item with metadata earlier if the second one has no metadata ', () => { + it('should put the item with metadata below the second one w/o metadata (this is reverse order)', () => { // given const itemA: Partial = { metadataFieldValue: '15', @@ -2251,8 +2251,8 @@ describe('CustomSortOrder.byMetadataFieldAlphabeticalReverse', () => { const result2: number = sorter(itemB as FolderItemForSorting, itemA as FolderItemForSorting) // then - expect(result1).toBe(SORT_FIRST_GOES_EARLIER) - expect(result2).toBe(SORT_FIRST_GOES_LATER) + expect(result1).toBe(SORT_FIRST_GOES_LATER) + expect(result2).toBe(SORT_FIRST_GOES_EARLIER) }) it('should correctly fallback to alphabetical reverse if no metadata on both items', () => { // given