diff --git a/src-ui/src/app/components/app-frame/global-search/global-search.component.html b/src-ui/src/app/components/app-frame/global-search/global-search.component.html index 5fdf8b9a7..5fed3ffe9 100644 --- a/src-ui/src/app/components/app-frame/global-search/global-search.component.html +++ b/src-ui/src/app/components/app-frame/global-search/global-search.component.html @@ -9,16 +9,16 @@ autocomplete="off" spellcheck="false" [(ngModel)]="query" - (ngModelChange)="this.queryDebounce.next($event)" + (ngModelChange)="queryDebounce.next($event)" (keydown)="searchInputKeyDown($event)" ngbDropdownAnchor>
- @if (loading) { + @if (loading()) { }
- @if (query) { + @if (query()) { -

- @if (infoLink) { - Read more +

+ @if (infoLink()) { + Read more } } - @if (loading) { + @if (loading()) { } diff --git a/src-ui/src/app/components/common/page-header/page-header.component.ts b/src-ui/src/app/components/common/page-header/page-header.component.ts index 139ca538d..66cef548f 100644 --- a/src-ui/src/app/components/common/page-header/page-header.component.ts +++ b/src-ui/src/app/components/common/page-header/page-header.component.ts @@ -1,5 +1,5 @@ import { Clipboard } from '@angular/cdk/clipboard' -import { Component, Input, inject, signal } from '@angular/core' +import { Component, Input, inject, input, signal } from '@angular/core' import { Title } from '@angular/platform-browser' import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' @@ -16,83 +16,31 @@ export class PageHeaderComponent { private titleService = inject(Title) private clipboard = inject(Clipboard) - private titleSignal = signal('') - private idSignal = signal(undefined) - private subTitleSignal = signal('') - private infoSignal = signal(undefined) - private infoLinkSignal = signal(undefined) - private loadingSignal = signal(false) - private copiedSignal = signal(false) + readonly id = input(undefined) + readonly subTitle = input('') + readonly info = input(undefined) + readonly infoLink = input(undefined) + readonly loading = input(false) + readonly copied = signal(false) private copyTimeout: any - public get copied(): boolean { - return this.copiedSignal() - } - - public set copied(copied: boolean) { - this.copiedSignal.set(copied) - } + private readonly titleSignal = signal('') @Input() set title(title: string) { this.titleSignal.set(title) - this.titleService.setTitle(`${this.title} - ${environment.appTitle}`) + this.titleService.setTitle(`${title} - ${environment.appTitle}`) } get title() { return this.titleSignal() } - @Input() - get id(): number { - return this.idSignal() - } - - set id(id: number) { - this.idSignal.set(id) - } - - @Input() - get subTitle(): string { - return this.subTitleSignal() - } - - set subTitle(subTitle: string) { - this.subTitleSignal.set(subTitle) - } - - @Input() - get info(): string { - return this.infoSignal() - } - - set info(info: string) { - this.infoSignal.set(info) - } - - @Input() - get infoLink(): string { - return this.infoLinkSignal() - } - - set infoLink(infoLink: string) { - this.infoLinkSignal.set(infoLink) - } - - @Input() - get loading(): boolean { - return this.loadingSignal() - } - - set loading(loading: boolean) { - this.loadingSignal.set(loading) - } - public copyID() { - this.copied = this.clipboard.copy(this.id.toString()) + this.copied.set(this.clipboard.copy(this.id().toString())) clearTimeout(this.copyTimeout) this.copyTimeout = setTimeout(() => { - this.copied = false + this.copied.set(false) }, 3000) } } diff --git a/src-ui/src/app/components/common/share-links-dialog/share-links-dialog.component.html b/src-ui/src/app/components/common/share-links-dialog/share-links-dialog.component.html index e41a897a8..f13202cfd 100644 --- a/src-ui/src/app/components/common/share-links-dialog/share-links-dialog.component.html +++ b/src-ui/src/app/components/common/share-links-dialog/share-links-dialog.component.html @@ -1,15 +1,15 @@
- +
    - @if (!shareLinks || shareLinks.length === 0) { + @if (!shareLinks() || shareLinks().length === 0) {
  • No existing links
    • } - @for (link of shareLinks; track link) { + @for (link of shareLinks(); track link) {
  • @@ -19,10 +19,10 @@ }
    - Copied! + Copied!
    • }
@@ -44,7 +44,7 @@
- +
@@ -55,11 +55,11 @@ } -
- @if (!suggestions?.suggested_tags && !suggestions?.suggested_document_types && !suggestions?.suggested_correspondents) { + @if (!suggestions()?.suggested_tags && !suggestions()?.suggested_document_types && !suggestions()?.suggested_correspondents) {
No novel suggestions
} - @if (suggestions?.suggested_tags.length > 0) { + @if (suggestions()?.suggested_tags.length > 0) { Tags - @for (tag of suggestions.suggested_tags; track tag) { + @for (tag of suggestions().suggested_tags; track tag) { } } - @if (suggestions?.suggested_document_types.length > 0) { + @if (suggestions()?.suggested_document_types.length > 0) {
Document Types
- @for (type of suggestions.suggested_document_types; track type) { + @for (type of suggestions().suggested_document_types; track type) { } } - @if (suggestions?.suggested_correspondents.length > 0) { + @if (suggestions()?.suggested_correspondents.length > 0) {
Correspondents
- @for (correspondent of suggestions.suggested_correspondents; track correspondent) { + @for (correspondent of suggestions().suggested_correspondents; track correspondent) { } } diff --git a/src-ui/src/app/components/common/suggestions-dropdown/suggestions-dropdown.component.ts b/src-ui/src/app/components/common/suggestions-dropdown/suggestions-dropdown.component.ts index bbfb77204..5c4c54e06 100644 --- a/src-ui/src/app/components/common/suggestions-dropdown/suggestions-dropdown.component.ts +++ b/src-ui/src/app/components/common/suggestions-dropdown/suggestions-dropdown.component.ts @@ -1,10 +1,9 @@ import { Component, EventEmitter, - Input, Output, ViewChild, - signal, + input, } from '@angular/core' import { NgbDropdown, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' @@ -21,46 +20,10 @@ export class SuggestionsDropdownComponent { public popperOptions = pngxPopperOptions @ViewChild('dropdown') dropdown: NgbDropdown - private suggestionsSignal = signal(null) - private aiEnabledSignal = signal(false) - private loadingSignal = signal(false) - private disabledSignal = signal(false) - - @Input() - get suggestions(): DocumentSuggestions { - return this.suggestionsSignal() - } - - set suggestions(suggestions: DocumentSuggestions) { - this.suggestionsSignal.set(suggestions) - } - - @Input() - get aiEnabled(): boolean { - return this.aiEnabledSignal() - } - - set aiEnabled(aiEnabled: boolean) { - this.aiEnabledSignal.set(aiEnabled) - } - - @Input() - get loading(): boolean { - return this.loadingSignal() - } - - set loading(loading: boolean) { - this.loadingSignal.set(loading) - } - - @Input() - get disabled(): boolean { - return this.disabledSignal() - } - - set disabled(disabled: boolean) { - this.disabledSignal.set(disabled) - } + readonly suggestions = input(null) + readonly aiEnabled = input(false) + readonly loading = input(false) + readonly disabled = input(false) @Output() getSuggestions: EventEmitter = @@ -77,14 +40,14 @@ export class SuggestionsDropdownComponent { public clickSuggest(): void { if ( - this.disabled || - this.loading || - (this.suggestions && !this.aiEnabled) + this.disabled() || + this.loading() || + (this.suggestions() && !this.aiEnabled()) ) { return } - if (!this.suggestions) { + if (!this.suggestions()) { this.getSuggestions.emit(this) } else { this.dropdown?.toggle() @@ -93,9 +56,9 @@ export class SuggestionsDropdownComponent { get totalSuggestions(): number { return ( - this.suggestions?.suggested_correspondents?.length + - this.suggestions?.suggested_tags?.length + - this.suggestions?.suggested_document_types?.length || 0 + this.suggestions()?.suggested_correspondents?.length + + this.suggestions()?.suggested_tags?.length + + this.suggestions()?.suggested_document_types?.length || 0 ) } } diff --git a/src-ui/src/app/components/document-detail/document-history/document-history.component.html b/src-ui/src/app/components/document-detail/document-history/document-history.component.html index 01447ef03..0818efadf 100644 --- a/src-ui/src/app/components/document-detail/document-history/document-history.component.html +++ b/src-ui/src/app/components/document-detail/document-history/document-history.component.html @@ -1,17 +1,17 @@ -@if (loading) { +@if (loading()) {
} @else {
    - @if (entries.length === 0) { + @if (entries().length === 0) {
  • No entries found.
    • } @else { - @for (entry of entries; track entry.id) { + @for (entry of entries(); track entry.id) {
  • diff --git a/src-ui/src/app/components/document-detail/document-history/document-history.component.ts b/src-ui/src/app/components/document-detail/document-history/document-history.component.ts index a2bbede3c..b4a21270c 100644 --- a/src-ui/src/app/components/document-detail/document-history/document-history.component.ts +++ b/src-ui/src/app/components/document-detail/document-history/document-history.component.ts @@ -1,5 +1,5 @@ import { AsyncPipe, KeyValuePipe, TitleCasePipe } from '@angular/common' -import { Component, Input, OnInit, inject } from '@angular/core' +import { Component, Input, OnInit, inject, signal } from '@angular/core' import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { Observable, first, map, of, shareReplay } from 'rxjs' @@ -44,8 +44,8 @@ export class DocumentHistoryComponent implements OnInit { } } - public loading: boolean = true - public entries: AuditLogEntry[] = [] + readonly loading = signal(true) + readonly entries = signal([]) private readonly prettyNameCache = new Map>() @@ -55,10 +55,10 @@ export class DocumentHistoryComponent implements OnInit { private loadHistory(): void { if (this._documentId) { - this.loading = true + this.loading.set(true) this.documentService.getHistory(this._documentId).subscribe((entries) => { - this.entries = entries - this.loading = false + this.entries.set(entries) + this.loading.set(false) }) } } diff --git a/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.html b/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.html index 26b63fd56..fb7027dde 100644 --- a/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.html +++ b/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.html @@ -10,13 +10,13 @@
    - @if (loading) { + @if (loading()) {
    - } @else if (processedMails.length === 0) { + } @else if (processedMails().length === 0) { No processed email messages found. } @else {
    @@ -25,7 +25,7 @@
    - +
    @@ -37,7 +37,7 @@ - @for (mail of processedMails; track mail.id) { + @for (mail of processedMails(); track mail.id) {
    {{mail.status}} @@ -46,7 +46,7 @@
    - +
    @@ -82,7 +82,7 @@
    - +
    (undefined) - private processedMailsSignal = signal([]) - private loadingSignal = signal(true) - private toggleAllEnabledSignal = signal(false) - private selectedMailIdsSignal = signal>(new Set()) - - public get processedMails(): ProcessedMail[] { - return this.processedMailsSignal() - } - - public set processedMails(processedMails: ProcessedMail[]) { - this.processedMailsSignal.set(processedMails) - } - - public get loading(): boolean { - return this.loadingSignal() - } - - public set loading(loading: boolean) { - this.loadingSignal.set(loading) - } - - public get toggleAllEnabled(): boolean { - return this.toggleAllEnabledSignal() - } - - public set toggleAllEnabled(toggleAllEnabled: boolean) { - this.toggleAllEnabledSignal.set(toggleAllEnabled) - } - - public get selectedMailIds(): Set { - return this.selectedMailIdsSignal() - } + private readonly ruleSignal = signal(undefined) + readonly processedMails = signal([]) + readonly loading = signal(true) + readonly toggleAllEnabled = signal(false) + readonly selectedMailIds = signal>(new Set()) public page: number = 1 @@ -90,19 +62,19 @@ export class ProcessedMailDialogComponent implements OnInit { } private loadProcessedMails(): void { - this.loading = true + this.loading.set(true) this.clearSelection() this.processedMailService .list(this.page, 50, 'processed_at', true, { rule: this.rule.id }) .subscribe((result) => { - this.processedMails = result.results - this.loading = false + this.processedMails.set(result.results) + this.loading.set(false) }) } public deleteSelected(): void { this.processedMailService - .bulk_delete(Array.from(this.selectedMailIds)) + .bulk_delete(Array.from(this.selectedMailIds())) .subscribe(() => { this.toastService.showInfo($localize`Processed mail(s) deleted`) this.loadProcessedMails() @@ -112,23 +84,23 @@ export class ProcessedMailDialogComponent implements OnInit { public toggleAll(event: PointerEvent) { const selectedMailIds = new Set() if ((event.target as HTMLInputElement).checked) { - this.processedMails.forEach((mail) => selectedMailIds.add(mail.id)) - this.selectedMailIdsSignal.set(selectedMailIds) + this.processedMails().forEach((mail) => selectedMailIds.add(mail.id)) + this.selectedMailIds.set(selectedMailIds) } else { this.clearSelection() } } public clearSelection() { - this.toggleAllEnabled = false - this.selectedMailIdsSignal.set(new Set()) + this.toggleAllEnabled.set(false) + this.selectedMailIds.set(new Set()) } public toggleSelected(mail: ProcessedMail) { - const selectedMailIds = new Set(this.selectedMailIds) + const selectedMailIds = new Set(this.selectedMailIds()) selectedMailIds.has(mail.id) ? selectedMailIds.delete(mail.id) : selectedMailIds.add(mail.id) - this.selectedMailIdsSignal.set(selectedMailIds) + this.selectedMailIds.set(selectedMailIds) } }