From 66f7ae377398155481dedd727e80665c61c35ed3 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Thu, 25 Feb 2021 07:29:51 -0800 Subject: [PATCH 1/9] Remove redundant openDocuments and unused subscription --- .../app-frame/app-frame.component.ts | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts index ad4460f16..0709a83ca 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.ts +++ b/src-ui/src/app/components/app-frame/app-frame.component.ts @@ -1,4 +1,4 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { from, Observable, Subscription } from 'rxjs'; @@ -16,7 +16,7 @@ import { Meta } from '@angular/platform-browser'; templateUrl: './app-frame.component.html', styleUrls: ['./app-frame.component.scss'] }) -export class AppFrameComponent implements OnInit, OnDestroy { +export class AppFrameComponent implements OnInit { constructor ( public router: Router, @@ -26,7 +26,7 @@ export class AppFrameComponent implements OnInit, OnDestroy { public savedViewService: SavedViewService, private meta: Meta ) { - + } versionString = `${environment.appTitle} ${environment.version}` @@ -39,9 +39,9 @@ export class AppFrameComponent implements OnInit, OnDestroy { searchField = new FormControl('') - openDocuments: PaperlessDocument[] = [] - - openDocumentsSubscription: Subscription + get openDocuments(): PaperlessDocument[] { + return this.openDocumentsService.getOpenDocuments() + } searchAutoComplete = (text$: Observable) => text$.pipe( @@ -92,13 +92,6 @@ export class AppFrameComponent implements OnInit, OnDestroy { } ngOnInit() { - this.openDocuments = this.openDocumentsService.getOpenDocuments() - } - - ngOnDestroy() { - if (this.openDocumentsSubscription) { - this.openDocumentsSubscription.unsubscribe() - } } get displayName() { From 548b1ea7ecd8cde98c69ef2ab343093f85f9553c Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Thu, 25 Feb 2021 07:43:02 -0800 Subject: [PATCH 2/9] Allow closing individual documents from sidebar --- .../app-frame/app-frame.component.html | 7 +++- .../app-frame/app-frame.component.scss | 33 +++++++++++++++---- .../app-frame/app-frame.component.ts | 14 ++++++++ src-ui/src/theme_dark.scss | 4 +++ 4 files changed, 51 insertions(+), 7 deletions(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html index 5692d9f78..c59bc3e0a 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.html +++ b/src-ui/src/app/components/app-frame/app-frame.component.html @@ -92,9 +92,14 @@  {{d.title | documentTitle}} + + + + + -
  • +
  • diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss index b6181b364..efae6cdd4 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.scss +++ b/src-ui/src/app/components/app-frame/app-frame.component.scss @@ -62,16 +62,37 @@ flex-wrap: nowrap; } -.nav-item .nav-link-additional { - margin-top: 0.2rem; - margin-left: 0.25rem; - padding-top: 0.5rem; +.nav-item { + position: relative; - svg { - margin-bottom: 2px; + &:hover .close { + display: block; + } + + .close { + display: none; + position: absolute; + cursor: pointer; + opacity: 1; + top: 0; + padding: .25rem .3rem 0; + right: .4rem; + width: 1.8rem; + height: 100%; + } + + .nav-item .nav-link-additional { + margin-top: 0.2rem; + margin-left: 0.25rem; + padding-top: 0.5rem; + + svg { + margin-bottom: 2px; + } } } + /* * Navbar */ diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts index 0709a83ca..05b1f3f68 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.ts +++ b/src-ui/src/app/components/app-frame/app-frame.component.ts @@ -77,6 +77,20 @@ export class AppFrameComponent implements OnInit { this.router.navigate(['search'], {queryParams: {query: this.searchField.value}}) } + closeDocument(d: PaperlessDocument) { + this.closeMenu() + this.openDocumentsService.closeDocument(d) + + // TODO: is there a better way to do this? (taken from closeAll) + let route = this.activatedRoute + while (route.firstChild) { + route = route.firstChild + } + if (route.component == DocumentDetailComponent) { + this.router.navigate([""]) + } + } + closeAll() { this.closeMenu() this.openDocumentsService.closeAll() diff --git a/src-ui/src/theme_dark.scss b/src-ui/src/theme_dark.scss index 751ff2b15..11ea88c28 100644 --- a/src-ui/src/theme_dark.scss +++ b/src-ui/src/theme_dark.scss @@ -63,6 +63,10 @@ $border-color-dark-mode: #47494f; background-color: $bg-dark-mode; color: $text-color-dark-mode; border-color: $border-color-dark-mode $border-color-dark-mode $bg-dark-mode; + + .close { + background-color: inherit !important; + } } &:hover { From aadcc85e73c494e08d246ac7e984fa95004e1331 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Thu, 25 Feb 2021 07:48:48 -0800 Subject: [PATCH 3/9] fix forgot to remove class when nested nav-link-additional scss block --- src-ui/src/app/components/app-frame/app-frame.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss index efae6cdd4..7fa588e9e 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.scss +++ b/src-ui/src/app/components/app-frame/app-frame.component.scss @@ -81,7 +81,7 @@ height: 100%; } - .nav-item .nav-link-additional { + .nav-link-additional { margin-top: 0.2rem; margin-left: 0.25rem; padding-top: 0.5rem; From 57c9066f81399e194d2fc94c6c6a22f37321aeb7 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Fri, 26 Feb 2021 14:08:04 -0800 Subject: [PATCH 4/9] Closing should only navigate if closing current document --- src-ui/src/app/components/app-frame/app-frame.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts index 05b1f3f68..18e30b0cd 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.ts +++ b/src-ui/src/app/components/app-frame/app-frame.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { from, Observable, Subscription } from 'rxjs'; +import { from, Observable, Subscription, BehaviorSubject } from 'rxjs'; import { debounceTime, distinctUntilChanged, map, switchMap } from 'rxjs/operators'; import { PaperlessDocument } from 'src/app/data/paperless-document'; import { OpenDocumentsService } from 'src/app/services/open-documents.service'; @@ -86,7 +86,7 @@ export class AppFrameComponent implements OnInit { while (route.firstChild) { route = route.firstChild } - if (route.component == DocumentDetailComponent) { + if (route.component == DocumentDetailComponent && (route.params as BehaviorSubject).getValue()['id'] == d.id) { this.router.navigate([""]) } } From a26150ca405b412271be14e053e164f4fc228fed Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Fri, 26 Feb 2021 14:08:13 -0800 Subject: [PATCH 5/9] Hover state for close x button --- .../src/app/components/app-frame/app-frame.component.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss index 7fa588e9e..6fa0f6164 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.scss +++ b/src-ui/src/app/components/app-frame/app-frame.component.scss @@ -79,6 +79,14 @@ right: .4rem; width: 1.8rem; height: 100%; + + svg { + opacity: 50%; + } + + &:hover svg { + opacity: 100%; + } } .nav-link-additional { From 6ad14d63d6fd651565d06b51527646aab415ba22 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Fri, 26 Feb 2021 14:11:25 -0800 Subject: [PATCH 6/9] Consistency please --- src-ui/src/app/components/app-frame/app-frame.component.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.scss b/src-ui/src/app/components/app-frame/app-frame.component.scss index 6fa0f6164..0ce91f779 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.scss +++ b/src-ui/src/app/components/app-frame/app-frame.component.scss @@ -81,11 +81,11 @@ height: 100%; svg { - opacity: 50%; + opacity: 0.5; } &:hover svg { - opacity: 100%; + opacity: 1; } } From 8a648987986213c45b5156bc4c7eabcbe9891102 Mon Sep 17 00:00:00 2001 From: Michael Shamoon <4887959+nikonratm@users.noreply.github.com> Date: Fri, 26 Feb 2021 14:16:31 -0800 Subject: [PATCH 7/9] TypeScript fixes --- src-ui/src/app/components/app-frame/app-frame.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts index 18e30b0cd..91177fc54 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.ts +++ b/src-ui/src/app/components/app-frame/app-frame.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; -import { ActivatedRoute, Router } from '@angular/router'; +import { ActivatedRoute, Router, Params } from '@angular/router'; import { from, Observable, Subscription, BehaviorSubject } from 'rxjs'; import { debounceTime, distinctUntilChanged, map, switchMap } from 'rxjs/operators'; import { PaperlessDocument } from 'src/app/data/paperless-document'; @@ -86,7 +86,7 @@ export class AppFrameComponent implements OnInit { while (route.firstChild) { route = route.firstChild } - if (route.component == DocumentDetailComponent && (route.params as BehaviorSubject).getValue()['id'] == d.id) { + if (route.component == DocumentDetailComponent && (route.params as BehaviorSubject).getValue()['id'] == d.id) { this.router.navigate([""]) } } From 6db3f7023fbccb5e4b6f97e459a9011087b718fa Mon Sep 17 00:00:00 2001 From: jonaswinkler <17569239+jonaswinkler@users.noreply.github.com> Date: Fri, 26 Feb 2021 23:24:13 +0100 Subject: [PATCH 8/9] remove unused files --- src/clash.pdf | Bin 10862 -> 0 bytes src/tox.ini | 21 --------------------- 2 files changed, 21 deletions(-) delete mode 100644 src/clash.pdf delete mode 100644 src/tox.ini diff --git a/src/clash.pdf b/src/clash.pdf deleted file mode 100644 index 304fbe71785e0320b55414484ff07b4ebe558dd7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10862 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 uInXN Date: Sat, 27 Feb 2021 11:24:58 +0100 Subject: [PATCH 9/9] small changes --- .../src/app/components/app-frame/app-frame.component.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src-ui/src/app/components/app-frame/app-frame.component.ts b/src-ui/src/app/components/app-frame/app-frame.component.ts index 91177fc54..e360e7567 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.ts +++ b/src-ui/src/app/components/app-frame/app-frame.component.ts @@ -81,12 +81,11 @@ export class AppFrameComponent implements OnInit { this.closeMenu() this.openDocumentsService.closeDocument(d) - // TODO: is there a better way to do this? (taken from closeAll) - let route = this.activatedRoute + let route = this.activatedRoute.snapshot while (route.firstChild) { route = route.firstChild } - if (route.component == DocumentDetailComponent && (route.params as BehaviorSubject).getValue()['id'] == d.id) { + if (route.component == DocumentDetailComponent && route.params['id'] == d.id) { this.router.navigate([""]) } } @@ -95,8 +94,7 @@ export class AppFrameComponent implements OnInit { this.closeMenu() this.openDocumentsService.closeAll() - // TODO: is there a better way to do this? - let route = this.activatedRoute + let route = this.activatedRoute.snapshot while (route.firstChild) { route = route.firstChild }