refactor: fix conflicts view when conflicted copies are already in trash (#2339)

2023-06-27 22:08:46 +05:30
parent f858f31492
commit d3378a704a
7 changed files with 102 additions and 35 deletions
--- a/packages/services/src/Domain/Item/ItemsClientInterface.ts
+++ b/packages/services/src/Domain/Item/ItemsClientInterface.ts
@@ -18,6 +18,7 @@ import {
  ItemsKeyInterface,
  ItemContent,
  DecryptedPayload,
+  AnyItemInterface,
 } from '@standardnotes/models'

 export interface ItemsClientInterface {
@@ -168,5 +169,6 @@ export interface ItemsClientInterface {
    iconString?: string,
  ): Promise<SmartView>

+  conflictsOf(uuid: string): AnyItemInterface[]
  numberOfNotesWithConflicts(): number
 }