diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index c35e4f6ea..87d97c01a 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -135,7 +135,6 @@ import localeSv from '@angular/common/locales/sv' import localeTr from '@angular/common/locales/tr' import localeUk from '@angular/common/locales/uk' import localeZh from '@angular/common/locales/zh' -import { LoadingDialogComponent } from './components/common/loading-dialog/loading-dialog.component' registerLocaleData(localeAf) registerLocaleData(localeAr) @@ -257,7 +256,6 @@ function initializeApp(settings: SettingsService) { CustomFieldsComponent, CustomFieldEditDialogComponent, CustomFieldsDropdownComponent, - LoadingDialogComponent, ], imports: [ BrowserModule, diff --git a/src-ui/src/app/components/common/loading-dialog/loading-dialog.component.html b/src-ui/src/app/components/common/loading-dialog/loading-dialog.component.html deleted file mode 100644 index 1247452e4..000000000 --- a/src-ui/src/app/components/common/loading-dialog/loading-dialog.component.html +++ /dev/null @@ -1,14 +0,0 @@ - - - diff --git a/src-ui/src/app/components/common/loading-dialog/loading-dialog.component.scss b/src-ui/src/app/components/common/loading-dialog/loading-dialog.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/src-ui/src/app/components/common/loading-dialog/loading-dialog.component.spec.ts b/src-ui/src/app/components/common/loading-dialog/loading-dialog.component.spec.ts deleted file mode 100644 index 3045242f6..000000000 --- a/src-ui/src/app/components/common/loading-dialog/loading-dialog.component.spec.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing' - -import { LoadingDialogComponent } from './loading-dialog.component' - -describe('LoadingDialogComponent', () => { - let component: LoadingDialogComponent - let fixture: ComponentFixture - - beforeEach(() => { - TestBed.configureTestingModule({ - declarations: [LoadingDialogComponent], - }) - fixture = TestBed.createComponent(LoadingDialogComponent) - component = fixture.componentInstance - fixture.detectChanges() - }) - - it('needs tests', () => { - expect(false).toBeTruthy() - }) -}) diff --git a/src-ui/src/app/components/common/loading-dialog/loading-dialog.component.ts b/src-ui/src/app/components/common/loading-dialog/loading-dialog.component.ts deleted file mode 100644 index 6d92f8d8a..000000000 --- a/src-ui/src/app/components/common/loading-dialog/loading-dialog.component.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { Component, Input } from '@angular/core' -import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' - -@Component({ - selector: 'pngx-loading-dialog', - templateUrl: './loading-dialog.component.html', - styleUrls: ['./loading-dialog.component.scss'], -}) -export class LoadingDialogComponent { - constructor(public activeModal: NgbActiveModal) {} - - @Input() - verb: string = $localize`Loading` - - @Input() - total: number - - @Input() - current: number -} diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html index 9883bb39b..af13a1428 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.html +++ b/src-ui/src/app/components/document-detail/document-detail.component.html @@ -15,7 +15,7 @@
-
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.scss b/src-ui/src/app/components/document-detail/document-detail.component.scss index 467e8941f..4e3880a15 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.scss +++ b/src-ui/src/app/components/document-detail/document-detail.component.scss @@ -20,10 +20,6 @@ top: 0 !important; background-color: gray !important; } - - ::ng-deep #printServiceDialog { - display: none !important; - } } ::ng-deep .ng-select-taggable { 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 6196911e1..b1fc40893 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 @@ -10,7 +10,6 @@ import { ActivatedRoute, Router } from '@angular/router' import { NgbDateStruct, NgbModal, - NgbModalRef, NgbNav, NgbNavChangeEvent, } from '@ng-bootstrap/ng-bootstrap' @@ -79,8 +78,6 @@ import { InvalidPDFException } from 'ngx-extended-pdf-viewer/lib/events/invalid- import { PagesLoadedEvent } from 'ngx-extended-pdf-viewer/lib/events/pages-loaded-event' import { NgxExtendedPdfViewerService } from 'ngx-extended-pdf-viewer' import { pdfDefaultOptions } from 'ngx-extended-pdf-viewer' -import { LoadingDialogComponent } from '../common/loading-dialog/loading-dialog.component' -import { ProgressBarEvent } from 'ngx-extended-pdf-viewer/lib/events/progress-bar-event' enum DocumentDetailNavIDs { Details = 1, @@ -159,8 +156,6 @@ export class DocumentDetailComponent previewZoomSetting: ZoomSetting = ZoomSetting.Width previewLoading: boolean = true - printLoadingModal: NgbModalRef - store: BehaviorSubject isDirty$: Observable unsubscribeNotifier: Subject = new Subject() @@ -844,29 +839,6 @@ export class DocumentDetailComponent this.printService.print() } - onBeforePrint(): void { - this.printLoadingModal = this.modalService.open(LoadingDialogComponent, { - backdrop: 'static', - }) - const loadingDialog = this.printLoadingModal - .componentInstance as LoadingDialogComponent - loadingDialog.verb = $localize`Processing page` - } - - onProgress(event: ProgressBarEvent): void { - if (event.type === 'print' && this.printLoadingModal) { - const loadingDialog = this.printLoadingModal - .componentInstance as LoadingDialogComponent - loadingDialog.current = event.page ?? 0 - loadingDialog.total = event.total - } - } - - onAfterPrint(): void { - this.printLoadingModal.close() - this.printLoadingModal = null - } - get showPermissions(): boolean { return ( this.permissionsService.currentUserCan(