feat: Added a conflict resolution dialog and a Conflicts view for easier management of conflicts (#2337)

2023-06-25 14:27:51 +05:30
parent 49d43fd14b
commit e0e9249334
48 changed files with 1201 additions and 94 deletions
--- a/packages/services/src/Domain/Item/ItemCounter.ts
+++ b/packages/services/src/Domain/Item/ItemCounter.ts
@@ -23,7 +23,7 @@ export class ItemCounter implements ItemCounterInterface {

        continue
      }
-      if (item.content_type === ContentType.Note) {
+      if (item.content_type === ContentType.Note && !item.conflictOf) {
        counts.notes++

        continue
--- a/packages/services/src/Domain/Item/ItemsClientInterface.ts
+++ b/packages/services/src/Domain/Item/ItemsClientInterface.ts
@@ -167,4 +167,6 @@ export interface ItemsClientInterface {
    predicate: PredicateInterface<T>,
    iconString?: string,
  ): Promise<SmartView>
+
+  numberOfNotesWithConflicts(): number
 }