rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix conflicts count not taking into account exclusive vault mode (#2505)

Browse Source
This commit is contained in:
Aman Harwara
2023-09-21 20:04:05 +05:30
committed by GitHub
parent 40d45d2484
commit e36c36f401
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/models/src/Domain/Runtime/Display/ItemDisplayController.ts
View File

@@ -31,6 +31,10 @@ export class ItemDisplayController<I extends DisplayItem, O extends AnyDisplayOp
return this.sortedItems return this.sortedItems
} }
public hasExclusiveVaultOptions(): boolean {
return this.vaultOptions ? !isExclusionaryOptionsValue(this.vaultOptions.getOptions()) : false
}
public getDisplayOptions(): DisplayControllerDisplayOptions & O { public getDisplayOptions(): DisplayControllerDisplayOptions & O {
return this.options return this.options
} }

8
packages/snjs/lib/Services/Items/ItemManager.ts
View File

@@ -875,7 +875,13 @@ export class ItemManager extends Services.AbstractService implements Services.It
} }
public numberOfNotesWithConflicts(): number { public numberOfNotesWithConflicts(): number {
return this.findItems(this.collection.uuidsOfItemsWithConflicts()).filter(Models.isNote).length const uuids = this.collection.uuidsOfItemsWithConflicts()
const items = this.navigationDisplayController.hasExclusiveVaultOptions()
? this.navigationDisplayController
.items()
.filter((item) => Models.isNote(item) && this.collection.uuidsOfItemsWithConflicts().includes(item.uuid))
: this.findItems(uuids)
return items.length
} }
getItemLinkedFiles(item: Models.DecryptedItemInterface): Models.FileItem[] { getItemLinkedFiles(item: Models.DecryptedItemInterface): Models.FileItem[] {