From 69de0e448fc8098b89fa1382c27d0d88c99b6600 Mon Sep 17 00:00:00 2001 From: Aman Harwara Date: Thu, 29 Jun 2023 17:54:38 +0530 Subject: [PATCH] fix: Fixed issue where Conflicts view is shown but the list is empty --- packages/models/src/Domain/Runtime/Collection/Collection.ts | 4 ++-- packages/snjs/lib/Services/Items/ItemManager.ts | 2 +- packages/utils/src/Domain/Uuid/UuidMap.ts | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/models/src/Domain/Runtime/Collection/Collection.ts b/packages/models/src/Domain/Runtime/Collection/Collection.ts index 8073fce12..31320f9dd 100644 --- a/packages/models/src/Domain/Runtime/Collection/Collection.ts +++ b/packages/models/src/Domain/Runtime/Collection/Collection.ts @@ -278,7 +278,7 @@ export abstract class Collection< this.typedMap[element.content_type] = array } - public numberOfItemsWithConflicts(): number { - return this.conflictMap.directMapSize + public uuidsOfItemsWithConflicts(): string[] { + return this.conflictMap.getAllDirectKeys() } } diff --git a/packages/snjs/lib/Services/Items/ItemManager.ts b/packages/snjs/lib/Services/Items/ItemManager.ts index dc5182158..ae0188778 100644 --- a/packages/snjs/lib/Services/Items/ItemManager.ts +++ b/packages/snjs/lib/Services/Items/ItemManager.ts @@ -1420,6 +1420,6 @@ export class ItemManager } public numberOfNotesWithConflicts(): number { - return this.collection.numberOfItemsWithConflicts() + return this.findItems(this.collection.uuidsOfItemsWithConflicts()).filter(Models.isNote).length } } diff --git a/packages/utils/src/Domain/Uuid/UuidMap.ts b/packages/utils/src/Domain/Uuid/UuidMap.ts index dea1c8916..5d0b4fa19 100644 --- a/packages/utils/src/Domain/Uuid/UuidMap.ts +++ b/packages/utils/src/Domain/Uuid/UuidMap.ts @@ -37,6 +37,10 @@ export class UuidMap { return this.directMap.get(uuid) || [] } + public getAllDirectKeys(): string[] { + return Array.from(this.directMap.keys()) + } + public getInverseRelationships(uuid: string): string[] { return this.inverseMap.get(uuid) || [] }