From 1c571545a0a9734e2dc540b4196383a1a52a0cc6 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 8 Jul 2026 17:33:45 -0700 Subject: [PATCH] Some missed stuff from build failure --- .../saved-view-widget.component.html | 24 +++++++++---------- .../saved-view-widget.component.ts | 21 +++++++++------- .../bulk-editor/bulk-editor.component.ts | 6 ++--- .../document-card-large.component.ts | 2 +- .../document-card-small.component.ts | 2 +- .../filter-editor/filter-editor.component.ts | 6 ++--- .../file-drop/file-drop.component.ts | 4 ++-- .../custom-fields/custom-fields.component.ts | 6 ++--- .../document-attributes.component.ts | 4 ++-- .../management-list.component.ts | 6 ++--- .../saved-views/saved-views.component.ts | 8 +++---- .../manage/workflows/workflows.component.ts | 6 ++--- .../services/document-list-view.service.ts | 10 ++++---- src-ui/src/app/services/settings.service.ts | 4 ++-- 14 files changed, 56 insertions(+), 53 deletions(-) diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html index c724a9c86..0893faa58 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html @@ -33,7 +33,7 @@ - @if (loading && !documents.length) { + @if (loading && !documents().length) { @for (row of placeholderRows; track row) { @for (field of displayFields; track field; let j = $index) { @@ -52,7 +52,7 @@ @if (loading && !documents().length) {
- +
} @else { @switch (field) { @@ -131,23 +131,23 @@ } @else if (displayMode() === DisplayMode.SMALL_CARDS) {
- @if (loading && !documents.length) { + @if (loading && !documents().length) { @for (row of placeholderRows; track row) { + [displayFields]="displayFields()"> } } - @for (d of documents; track d.id; let i = $index) { + @for (d of documents(); track d.id; let i = $index) { }
- } @else if (displayMode === DisplayMode.LARGE_CARDS) { + } @else if (displayMode() === DisplayMode.LARGE_CARDS) {
- @if (loading && !documents.length) { + @if (loading && !documents().length) { @for (row of placeholderRows; track row) { } } - @for (d of documents; track d.id; let i = $index) { + @for (d of documents(); track d.id; let i = $index) { 0 ) { - this.displayFields = this.savedView.display_fields + this.displayFields.set(this.savedView.display_fields) } // filter by perms etc - this.displayFields = this.displayFields.filter( - (field) => - this.settingsService.allDisplayFields().find((f) => f.id === field) !== - undefined + this.displayFields.set( + this.displayFields().filter( + (field) => + this.settingsService + .allDisplayFields() + .find((f) => f.id === field) !== undefined + ) ) this.reload() @@ -179,8 +182,8 @@ export class SavedViewWidgetComponent } reload() { - this.loading = this.documents.length == 0 - this.show = true + this.loading.set(this.documents.length == 0) + this.show.set(true) this.documentService .listFiltered( 1, @@ -195,8 +198,8 @@ export class SavedViewWidgetComponent this.documents.set(result.results) this.count.set(result.count) this.savedViewService.setDocumentCount(this.savedView, result.count) - this.loading = false - this.show = true + this.loading.set(false) + this.show.set(true) }) } diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index a456ec2cb..a2fa4a8fd 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -1033,14 +1033,14 @@ export class BulkEditorComponent dialog.confirmClicked .pipe(takeUntil(this.unsubscribeNotifier)) .subscribe(() => { - dialog.loading = true + dialog.loading.set(true) dialog.buttonsEnabled = false this.shareLinkBundleService .createBundle(dialog.payload) .pipe(first()) .subscribe({ next: (result) => { - dialog.loading = false + dialog.loading.set(false) dialog.buttonsEnabled = false dialog.createdBundle = result dialog.copied = false @@ -1054,7 +1054,7 @@ export class BulkEditorComponent ) }, error: (error) => { - dialog.loading = false + dialog.loading.set(false) dialog.buttonsEnabled = true this.toastService.showError( $localize`Share link bundle creation is not available yet.`, diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts index 575079b06..213a41ba9 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts @@ -131,7 +131,7 @@ export class DocumentCardLargeComponent popoverHidden = true ngAfterViewInit(): void { - this.show = true + this.show.set(true) } get searchScoreClass() { diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts index 9aa667cfe..a8ecb797e 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts @@ -128,7 +128,7 @@ export class DocumentCardSmallComponent @ViewChild('popupPreview') popupPreview: PreviewPopupComponent ngAfterViewInit(): void { - this.show = true + this.show.set(true) } getIsThumbInverted() { diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts index b4e63317a..dc08d17ee 100644 --- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts @@ -1166,13 +1166,13 @@ export class FilterEditorComponent private maybeCompleteLoading() { this.loadingCount++ if (this.loadingCount == this.loadingCountTotal) { - this.loading = false - this.show = true + this.loading.set(false) + this.show.set(true) } } ngOnInit() { - this.loading = true + this.loading.set(true) if ( this.permissionsService.currentUserCan( PermissionAction.View, diff --git a/src-ui/src/app/components/file-drop/file-drop.component.ts b/src-ui/src/app/components/file-drop/file-drop.component.ts index 9a517b398..89b6ea3bf 100644 --- a/src-ui/src/app/components/file-drop/file-drop.component.ts +++ b/src-ui/src/app/components/file-drop/file-drop.component.ts @@ -39,7 +39,7 @@ export class FileDropComponent { return event.preventDefault() event.stopImmediatePropagation() - this.settings.globalDropzoneActive = true + this.settings.globalDropzoneActive.set(true) // allows transition setTimeout(() => { this.fileIsOver.set(true) @@ -56,7 +56,7 @@ export class FileDropComponent { if (!this.dragDropEnabled) return event?.preventDefault() event?.stopImmediatePropagation() - this.settings.globalDropzoneActive = false + this.settings.globalDropzoneActive.set(false) const ms = immediate ? 0 : 500 diff --git a/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts b/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts index 4b3253202..a53e7a59f 100644 --- a/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts +++ b/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.ts @@ -58,7 +58,7 @@ export class CustomFieldsComponent } reload() { - this.loading = true + this.loading.set(true) this.customFieldsService .listAll() .pipe( @@ -68,8 +68,8 @@ export class CustomFieldsComponent }) ) .subscribe(() => { - this.show = true - this.loading = false + this.show.set(true) + this.loading.set(false) }) } diff --git a/src-ui/src/app/components/manage/document-attributes/document-attributes.component.ts b/src-ui/src/app/components/manage/document-attributes/document-attributes.component.ts index f65694827..77c049a2e 100644 --- a/src-ui/src/app/components/manage/document-attributes/document-attributes.component.ts +++ b/src-ui/src/app/components/manage/document-attributes/document-attributes.component.ts @@ -189,8 +189,8 @@ export class DocumentAttributesComponent implements OnInit, OnDestroy { get activeHeaderLoading(): boolean { return ( - this.activeManagementList?.loading ?? - this.activeCustomFields?.loading ?? + this.activeManagementList?.loading() ?? + this.activeCustomFields?.loading() ?? false ) } diff --git a/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.ts b/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.ts index 01e4a8949..a49e5a84e 100644 --- a/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.ts @@ -245,7 +245,7 @@ export abstract class ManagementListComponent } reloadData(extraParams: { [key: string]: any } = null) { - this.loading = true + this.loading.set(true) this.currentExtraParams = extraParams this.clearSelection() this.service @@ -275,8 +275,8 @@ export abstract class ManagementListComponent } }, next: () => { - this.show = true - this.loading = false + this.show.set(true) + this.loading.set(false) }, }) } diff --git a/src-ui/src/app/components/manage/saved-views/saved-views.component.ts b/src-ui/src/app/components/manage/saved-views/saved-views.component.ts index 66cfd632b..4e4629c0b 100644 --- a/src-ui/src/app/components/manage/saved-views/saved-views.component.ts +++ b/src-ui/src/app/components/manage/saved-views/saved-views.component.ts @@ -79,7 +79,7 @@ export class SavedViewsComponent constructor() { super() - this.settings.organizingSidebarSavedViews = true + this.settings.organizingSidebarSavedViews.set(true) } ngOnInit(): void { @@ -87,7 +87,7 @@ export class SavedViewsComponent } private reloadViews(): void { - this.loading = true + this.loading.set(true) this.savedViewService .list(null, null, null, false, { full_perms: true }) .subscribe((r) => { @@ -97,12 +97,12 @@ export class SavedViewsComponent } ngOnDestroy(): void { - this.settings.organizingSidebarSavedViews = false + this.settings.organizingSidebarSavedViews.set(false) super.ngOnDestroy() } private initialize() { - this.loading = false + this.loading.set(false) this.emptyGroup(this.savedViewsGroup) let storeData = { diff --git a/src-ui/src/app/components/manage/workflows/workflows.component.ts b/src-ui/src/app/components/manage/workflows/workflows.component.ts index b1c7e7519..95d9f3d7a 100644 --- a/src-ui/src/app/components/manage/workflows/workflows.component.ts +++ b/src-ui/src/app/components/manage/workflows/workflows.component.ts @@ -46,7 +46,7 @@ export class WorkflowsComponent } reload() { - this.loading = true + this.loading.set(true) this.workflowService .listAll() .pipe( @@ -54,8 +54,8 @@ export class WorkflowsComponent tap((r) => this.workflows.set(r.results)) ) .subscribe(() => { - this.show = true - this.loading = false + this.show.set(true) + this.loading.set(false) }) } diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts index e7df204ab..57cb77792 100644 --- a/src-ui/src/app/services/document-list-view.service.ts +++ b/src-ui/src/app/services/document-list-view.service.ts @@ -197,7 +197,7 @@ export class DocumentListViewService { this.activeListViewState.displayFields = this.activeListViewState.displayFields.filter( (field) => - this.settings.allDisplayFields.find((f) => f.id === field) !== + this.settings.allDisplayFields().find((f) => f.id === field) !== undefined ) this.saveDocumentListView() @@ -371,9 +371,9 @@ export class DocumentListViewService { this.reload() } else if ( activeListViewState.sortField.indexOf('custom_field') === 0 && - this.settings.allDisplayFields.find( - (f) => f.id === activeListViewState.sortField - ) === undefined + this.settings + .allDisplayFields() + .find((f) => f.id === activeListViewState.sortField) === undefined ) { // e.g. field was deleted this.sortField = 'created' @@ -551,7 +551,7 @@ export class DocumentListViewService { this.activeListViewState.displayFields = this.displayFieldsInitialized ? fields?.filter( (field) => - this.settings.allDisplayFields.find((f) => f.id === field) !== + this.settings.allDisplayFields().find((f) => f.id === field) !== undefined ) : fields diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index 1b14024ef..66493de13 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -369,7 +369,7 @@ export class SettingsService { this.currentUser.set(uisettings.user) this.permissionsService.initialize( uisettings.permissions, - this.currentUser + this.currentUser() ) this.initializeDisplayFields() @@ -419,7 +419,7 @@ export class SettingsService { ) ) { this.customFieldsService.listAll().subscribe((r) => { - this.allDisplayFieldsSignal.set( + this.allDisplayFields.set( displayFields.concat( r.results.map((field) => { return {