Prevent dirty check lost on document close & reopen

src-ui/src/app/components/document-detail/document-detail.component.ts

@@ -103,23 +103,9 @@ export class DocumentDetailComponent implements OnInit, DirtyComponent {
       this.downloadOriginalUrl = this.documentsService.getDownloadUrl(this.documentId, true)
       if (this.openDocumentService.getOpenDocument(this.documentId)) {
         this.updateComponent(this.openDocumentService.getOpenDocument(this.documentId))
-      } else {
+      }
       this.documentsService.get(this.documentId).subscribe(doc => {
-          this.openDocumentService.openDocument(doc)
-          this.updateComponent(doc)
-        }, error => {this.router.navigate(['404'])})
-      }
-    })
-
-  }
-
-  updateComponent(doc: PaperlessDocument) {
-    this.document = doc
-    this.documentsService.getMetadata(doc.id).subscribe(result => {
-      this.metadata = result
-    })
-    this.title = this.documentTitlePipe.transform(doc.title)
-
+        // Initialize dirtyCheck
         this.store = new BehaviorSubject({
           title: doc.title,
           content: doc.content,
@@ -130,15 +116,27 @@ export class DocumentDetailComponent implements OnInit, DirtyComponent {
           tags: doc.tags
         })
 
-    this.storeSub = this.store.asObservable().subscribe(state => {
-      this.documentForm.patchValue(state, { emitEvent: false })
-    })
-
-    // Initialize dirtyCheck
         this.isDirty$ = dirtyCheck(this.documentForm, this.store.asObservable())
         this.isDirty$.subscribe(dirty => {
           this.openDocumentService.setDirty(this.document.id, dirty)
         })
+        
+        if (!this.openDocumentService.getOpenDocument(this.documentId)) {
+          this.openDocumentService.openDocument(doc)
+          this.updateComponent(doc)
+        }
+      }, error => {this.router.navigate(['404'])})
+    })
+
+  }
+
+  updateComponent(doc: PaperlessDocument) {
+    this.document = doc
+    this.documentsService.getMetadata(doc.id).subscribe(result => {
+      this.metadata = result
+    })
+    this.title = this.documentTitlePipe.transform(doc.title)
+    this.documentForm.patchValue(doc)
   }
 
   createDocumentType() {