+
+
-
-
-
- @if (renderAsPlainText) {
-
- }
- @if (requiresPassword) {
-
-
-
- }
-
+
+
+
+
+
+
+ @if (hasNext()) {
+
+ }
+ @if (!hasNext()) {
+
+ }
+
+
+
+
+
+
+ @if (!metadata) {
+
+ }
+ @if (getContentType() === 'application/pdf') {
+ @if (!useNativePdfViewer ) {
+
+ } @else {
+
+ }
+ }
+ @if (renderAsPlainText) {
+
+ }
+ @if (showPasswordField) {
+
+
+
+ }
+
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts
index 1492c3e0e..51a77fb91 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts
@@ -255,9 +255,6 @@ describe('DocumentDetailComponent', () => {
router = TestBed.inject(Router)
activatedRoute = TestBed.inject(ActivatedRoute)
- jest
- .spyOn(activatedRoute, 'paramMap', 'get')
- .mockReturnValue(of(convertToParamMap({ id: 3 })))
openDocumentsService = TestBed.inject(OpenDocumentsService)
documentService = TestBed.inject(DocumentService)
modalService = TestBed.inject(NgbModal)
@@ -295,6 +292,17 @@ describe('DocumentDetailComponent', () => {
expect(navigateSpy).toHaveBeenCalledWith(['documents', 3, 'notes'])
})
+ it('should forward id without section to details', () => {
+ const navigateSpy = jest.spyOn(router, 'navigate')
+ jest
+ .spyOn(activatedRoute, 'paramMap', 'get')
+ .mockReturnValue(of(convertToParamMap({ id: 3 })))
+ fixture.detectChanges()
+ expect(navigateSpy).toHaveBeenCalledWith(['documents', 3, 'details'], {
+ replaceUrl: true,
+ })
+ })
+
it('should update title after debounce', fakeAsync(() => {
initNormally()
component.titleInput.value = 'Foo Bar'
@@ -320,6 +328,7 @@ describe('DocumentDetailComponent', () => {
})
it('should load already-opened document via param', () => {
+ initNormally()
jest.spyOn(documentService, 'get').mockReturnValueOnce(of(doc))
jest.spyOn(openDocumentsService, 'getOpenDocument').mockReturnValue(doc)
jest.spyOn(customFieldsService, 'listAll').mockReturnValue(
@@ -400,8 +409,11 @@ describe('DocumentDetailComponent', () => {
})
it('should 404 on invalid id', () => {
- jest.spyOn(documentService, 'get').mockReturnValueOnce(of(null))
const navigateSpy = jest.spyOn(router, 'navigate')
+ jest
+ .spyOn(activatedRoute, 'paramMap', 'get')
+ .mockReturnValue(of(convertToParamMap({ id: 999, section: 'details' })))
+ jest.spyOn(documentService, 'get').mockReturnValueOnce(of(null))
fixture.detectChanges()
expect(navigateSpy).toHaveBeenCalledWith(['404'], { replaceUrl: true })
})
@@ -936,11 +948,33 @@ describe('DocumentDetailComponent', () => {
expect(refreshSpy).toHaveBeenCalled()
})
+ it('should get suggestions', () => {
+ const suggestionsSpy = jest.spyOn(documentService, 'getSuggestions')
+ suggestionsSpy.mockReturnValue(of({ tags: [1, 2] }))
+ initNormally()
+ expect(suggestionsSpy).toHaveBeenCalled()
+ expect(component.suggestions).toEqual({ tags: [1, 2] })
+ })
+
+ it('should show error if needed for get suggestions', () => {
+ const suggestionsSpy = jest.spyOn(documentService, 'getSuggestions')
+ const errorSpy = jest.spyOn(toastService, 'showError')
+ suggestionsSpy.mockImplementationOnce(() =>
+ throwError(() => new Error('failed to get suggestions'))
+ )
+ initNormally()
+ expect(suggestionsSpy).toHaveBeenCalled()
+ expect(errorSpy).toHaveBeenCalled()
+ })
+
it('should warn when open document does not match doc retrieved from backend on init', () => {
const modalSpy = jest.spyOn(modalService, 'open')
const openDoc = Object.assign({}, doc)
// simulate a document being modified elsewhere and db updated
doc.modified = new Date()
+ jest
+ .spyOn(activatedRoute, 'paramMap', 'get')
+ .mockReturnValue(of(convertToParamMap({ id: 3, section: 'details' })))
jest.spyOn(documentService, 'get').mockReturnValueOnce(of(doc))
jest.spyOn(openDocumentsService, 'getOpenDocument').mockReturnValue(openDoc)
jest.spyOn(customFieldsService, 'listAll').mockReturnValue(
@@ -951,12 +985,13 @@ describe('DocumentDetailComponent', () => {
})
)
fixture.detectChanges() // calls ngOnInit
- expect(modalSpy).toHaveBeenCalledWith(ConfirmDialogComponent, {
- backdrop: 'static',
- })
+ expect(modalSpy).toHaveBeenCalledWith(ConfirmDialogComponent)
})
function initNormally() {
+ jest
+ .spyOn(activatedRoute, 'paramMap', 'get')
+ .mockReturnValue(of(convertToParamMap({ id: 3, section: 'details' })))
jest
.spyOn(documentService, 'get')
.mockReturnValueOnce(of(Object.assign({}, doc)))
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index 83057b8cd..16eb9599c 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -33,6 +33,7 @@ import {
map,
debounceTime,
distinctUntilChanged,
+ filter,
} from 'rxjs/operators'
import { DocumentSuggestions } from 'src/app/data/document-suggestions'
import {
@@ -257,6 +258,13 @@ export class DocumentDetailComponent
this.route.paramMap
.pipe(
+ filter((paramMap) => {
+ // only init when changing docs & section is set
+ return (
+ +paramMap.get('id') !== this.documentId &&
+ paramMap.get('section')?.length > 0
+ )
+ }),
takeUntil(this.unsubscribeNotifier),
switchMap((paramMap) => {
const documentId = +paramMap.get('id')
@@ -295,15 +303,12 @@ export class DocumentDetailComponent
new Date(doc.modified) > new Date(openDocument.modified) &&
!this.modalService.hasOpenModals()
) {
- let modal = this.modalService.open(ConfirmDialogComponent, {
- backdrop: 'static',
- })
+ let modal = this.modalService.open(ConfirmDialogComponent)
modal.componentInstance.title = $localize`Document changes detected`
modal.componentInstance.messageBold = $localize`The version of this document in your browser session appears older than the existing version.`
modal.componentInstance.message = $localize`Saving the document here may overwrite other changes that were made. To restore the existing version, discard your changes or close the document.`
- modal.componentInstance.cancelBtnCaption = $localize`Ok`
- modal.componentInstance.cancelBtnClass = 'btn-primary'
- modal.componentInstance.btnClass = 'visually-hidden'
+ modal.componentInstance.cancelBtnClass = 'visually-hidden'
+ modal.componentInstance.btnCaption = $localize`Ok`
}
if (this.documentForm.dirty) {
@@ -425,11 +430,14 @@ export class DocumentDetailComponent
updateComponent(doc: Document) {
this.document = doc
this.requiresPassword = false
- // this.customFields = doc.custom_fields.concat([])
this.updateFormForCustomFields()
this.documentsService
.getMetadata(doc.id)
- .pipe(first())
+ .pipe(
+ first(),
+ takeUntil(this.unsubscribeNotifier),
+ takeUntil(this.docChangeNotifier)
+ )
.subscribe({
next: (result) => {
this.metadata = result
@@ -450,7 +458,11 @@ export class DocumentDetailComponent
) {
this.documentsService
.getSuggestions(doc.id)
- .pipe(first(), takeUntil(this.unsubscribeNotifier))
+ .pipe(
+ first(),
+ takeUntil(this.unsubscribeNotifier),
+ takeUntil(this.docChangeNotifier)
+ )
.subscribe({
next: (result) => {
this.suggestions = result