Adjust order of checks in detectSaveConflicts

tkleinke · tkleinke · commit 9baa7c9fdd5e · 2024-03-14T09:16:42.000+01:00
diff --git a/desktop/src/app/components/docedit/docedit.component.ts b/desktop/src/app/components/docedit/docedit.component.ts
@@ -401,8 +401,8 @@ export class DoceditComponent {
         const conflictsBeforeSave: string[] = documentBeforeSave._conflicts;
         const conflictsAfterSave: string[] = documentAfterSave._conflicts;
 
-        if (!conflictsBeforeSave && conflictsAfterSave && conflictsAfterSave.length >= 1) return true;
         if (!conflictsAfterSave) return false;
+        if (!conflictsBeforeSave && conflictsAfterSave?.length) return true;
 
         return conflictsAfterSave.find(isNot(includedIn(conflictsBeforeSave))) !== undefined;
     }

Original file line number	Diff line number	Diff line change
`@@ -401,8 +401,8 @@ export class DoceditComponent {`
`401`	`401`	`const conflictsBeforeSave: string[] = documentBeforeSave._conflicts;`
`402`	`402`	`const conflictsAfterSave: string[] = documentAfterSave._conflicts;`
`403`	`403`
`404`		`- if (!conflictsBeforeSave && conflictsAfterSave && conflictsAfterSave.length >= 1) return true;`
`405`	`404`	`if (!conflictsAfterSave) return false;`
	`405`	`+ if (!conflictsBeforeSave && conflictsAfterSave?.length) return true;`
`406`	`406`
`407`	`407`	`return conflictsAfterSave.find(isNot(includedIn(conflictsBeforeSave))) !== undefined;`
`408`	`408`	`}`