From 21558dcf8bb71c2bd66585a0002ef69ab100c7ca Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Thu, 2 Jan 2025 16:26:26 -0800 Subject: [PATCH] Fix: add missing ngbdropdown for management lists on mobile --- src-ui/messages.xlf | 158 +++++++++--------- .../admin/trash/trash.component.scss | 4 + .../components/admin/trash/trash.component.ts | 7 +- .../correspondent-list.component.ts | 7 +- .../custom-fields/custom-fields.component.ts | 7 +- .../document-type-list.component.ts | 10 +- .../components/manage/mail/mail.component.ts | 3 +- .../storage-path-list.component.ts | 7 +- .../manage/tag-list/tag-list.component.ts | 7 +- .../manage/workflows/workflows.component.ts | 3 +- 10 files changed, 125 insertions(+), 88 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 3b1314a6d..e46c0b56a 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -256,7 +256,7 @@ src/app/components/admin/trash/trash.component.ts - 136 + 141 src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html @@ -2010,11 +2010,11 @@ src/app/components/admin/trash/trash.component.ts - 77 + 82 src/app/components/admin/trash/trash.component.ts - 106 + 111 src/app/components/admin/users-groups/users-groups.component.html @@ -2156,11 +2156,11 @@ Confirm delete src/app/components/admin/trash/trash.component.ts - 73 + 78 src/app/components/admin/trash/trash.component.ts - 100 + 105 src/app/components/manage/management-list/management-list.component.ts @@ -2175,18 +2175,18 @@ This operation will permanently delete this document. src/app/components/admin/trash/trash.component.ts - 74 + 79 This operation cannot be undone. src/app/components/admin/trash/trash.component.ts - 75 + 80 src/app/components/admin/trash/trash.component.ts - 104 + 109 src/app/components/admin/users-groups/users-groups.component.ts @@ -2198,15 +2198,15 @@ src/app/components/manage/custom-fields/custom-fields.component.ts - 98 + 103 src/app/components/manage/mail/mail.component.ts - 194 + 195 src/app/components/manage/mail/mail.component.ts - 285 + 286 src/app/components/manage/management-list/management-list.component.ts @@ -2214,21 +2214,21 @@ src/app/components/manage/workflows/workflows.component.ts - 130 + 131 Document deleted src/app/components/admin/trash/trash.component.ts - 84 + 89 Error deleting document src/app/components/admin/trash/trash.component.ts - 89 + 94 src/app/components/document-detail/document-detail.component.ts @@ -2239,56 +2239,56 @@ This operation will permanently delete the selected documents. src/app/components/admin/trash/trash.component.ts - 102 + 107 This operation will permanently delete all documents in the trash. src/app/components/admin/trash/trash.component.ts - 103 + 108 Document(s) deleted src/app/components/admin/trash/trash.component.ts - 114 + 119 Error deleting document(s) src/app/components/admin/trash/trash.component.ts - 121 + 126 Document restored src/app/components/admin/trash/trash.component.ts - 134 + 139 Error restoring document src/app/components/admin/trash/trash.component.ts - 144 + 149 Document(s) restored src/app/components/admin/trash/trash.component.ts - 154 + 159 Error restoring document(s) src/app/components/admin/trash/trash.component.ts - 160 + 165 @@ -2537,15 +2537,15 @@ src/app/components/manage/custom-fields/custom-fields.component.ts - 100 + 105 src/app/components/manage/mail/mail.component.ts - 196 + 197 src/app/components/manage/mail/mail.component.ts - 287 + 288 src/app/components/manage/management-list/management-list.component.ts @@ -2553,7 +2553,7 @@ src/app/components/manage/workflows/workflows.component.ts - 132 + 133 @@ -3280,7 +3280,7 @@ src/app/components/manage/custom-fields/custom-fields.component.ts - 80 + 85 @@ -3291,7 +3291,7 @@ src/app/components/manage/custom-fields/custom-fields.component.ts - 88 + 93 @@ -4124,7 +4124,7 @@ src/app/components/manage/storage-path-list/storage-path-list.component.ts - 61 + 66 @@ -4199,7 +4199,7 @@ src/app/components/manage/tag-list/tag-list.component.ts - 61 + 66 @@ -7897,28 +7897,28 @@ correspondent src/app/components/manage/correspondent-list/correspondent-list.component.ts - 56 + 61 correspondents src/app/components/manage/correspondent-list/correspondent-list.component.ts - 57 + 62 Last used src/app/components/manage/correspondent-list/correspondent-list.component.ts - 62 + 67 Do you really want to delete the correspondent ""? src/app/components/manage/correspondent-list/correspondent-list.component.ts - 88 + 93 @@ -7976,49 +7976,49 @@ Confirm delete field src/app/components/manage/custom-fields/custom-fields.component.ts - 96 + 101 This operation will permanently delete this field. src/app/components/manage/custom-fields/custom-fields.component.ts - 97 + 102 Deleted field src/app/components/manage/custom-fields/custom-fields.component.ts - 106 + 111 Error deleting field. src/app/components/manage/custom-fields/custom-fields.component.ts - 112 + 117 document type src/app/components/manage/document-type-list/document-type-list.component.ts - 52 + 58 document types src/app/components/manage/document-type-list/document-type-list.component.ts - 53 + 59 Do you really want to delete the document type ""? src/app/components/manage/document-type-list/document-type-list.component.ts - 60 + 66 @@ -8124,161 +8124,161 @@ Error retrieving mail accounts src/app/components/manage/mail/mail.component.ts - 107 + 108 Error retrieving mail rules src/app/components/manage/mail/mail.component.ts - 129 + 130 OAuth2 authentication success src/app/components/manage/mail/mail.component.ts - 137 + 138 OAuth2 authentication failed, see logs for details src/app/components/manage/mail/mail.component.ts - 148 + 149 Saved account "". src/app/components/manage/mail/mail.component.ts - 172 + 173 Error saving account. src/app/components/manage/mail/mail.component.ts - 184 + 185 Confirm delete mail account src/app/components/manage/mail/mail.component.ts - 192 + 193 This operation will permanently delete this mail account. src/app/components/manage/mail/mail.component.ts - 193 + 194 Deleted mail account src/app/components/manage/mail/mail.component.ts - 202 + 203 Error deleting mail account. src/app/components/manage/mail/mail.component.ts - 212 + 213 Processing mail account src/app/components/manage/mail/mail.component.ts - 223 + 224 Error processing mail account src/app/components/manage/mail/mail.component.ts - 226 + 227 Saved rule "". src/app/components/manage/mail/mail.component.ts - 242 + 243 Error saving rule. src/app/components/manage/mail/mail.component.ts - 253 + 254 Rule "" enabled. src/app/components/manage/mail/mail.component.ts - 269 + 270 Rule "" disabled. src/app/components/manage/mail/mail.component.ts - 270 + 271 Error toggling rule. src/app/components/manage/mail/mail.component.ts - 274 + 275 Confirm delete mail rule src/app/components/manage/mail/mail.component.ts - 283 + 284 This operation will permanently delete this mail rule. src/app/components/manage/mail/mail.component.ts - 284 + 285 Deleted mail rule src/app/components/manage/mail/mail.component.ts - 293 + 294 Error deleting mail rule. src/app/components/manage/mail/mail.component.ts - 302 + 303 Permissions updated src/app/components/manage/mail/mail.component.ts - 324 + 325 Error updating permissions src/app/components/manage/mail/mail.component.ts - 329 + 330 src/app/components/manage/management-list/management-list.component.ts @@ -8527,42 +8527,42 @@ storage path src/app/components/manage/storage-path-list/storage-path-list.component.ts - 55 + 60 storage paths src/app/components/manage/storage-path-list/storage-path-list.component.ts - 56 + 61 Do you really want to delete the storage path ""? src/app/components/manage/storage-path-list/storage-path-list.component.ts - 73 + 78 tag src/app/components/manage/tag-list/tag-list.component.ts - 55 + 60 tags src/app/components/manage/tag-list/tag-list.component.ts - 56 + 61 Do you really want to delete the tag ""? src/app/components/manage/tag-list/tag-list.component.ts - 72 + 77 @@ -8590,63 +8590,63 @@ Saved workflow "". src/app/components/manage/workflows/workflows.component.ts - 93 + 94 Error saving workflow. src/app/components/manage/workflows/workflows.component.ts - 101 + 102 Confirm delete workflow src/app/components/manage/workflows/workflows.component.ts - 128 + 129 This operation will permanently delete this workflow. src/app/components/manage/workflows/workflows.component.ts - 129 + 130 Deleted workflow src/app/components/manage/workflows/workflows.component.ts - 138 + 139 Error deleting workflow. src/app/components/manage/workflows/workflows.component.ts - 143 + 144 Enabled workflow src/app/components/manage/workflows/workflows.component.ts - 154 + 155 Disabled workflow src/app/components/manage/workflows/workflows.component.ts - 155 + 156 Error toggling workflow. src/app/components/manage/workflows/workflows.component.ts - 161 + 162 diff --git a/src-ui/src/app/components/admin/trash/trash.component.scss b/src-ui/src/app/components/admin/trash/trash.component.scss index e69de29bb..0c1f432aa 100644 --- a/src-ui/src/app/components/admin/trash/trash.component.scss +++ b/src-ui/src/app/components/admin/trash/trash.component.scss @@ -0,0 +1,4 @@ +// hide caret on mobile dropdown +.d-block.d-sm-none .dropdown-toggle::after { + display: none; +} diff --git a/src-ui/src/app/components/admin/trash/trash.component.ts b/src-ui/src/app/components/admin/trash/trash.component.ts index 6c60638ad..fcf43e1c1 100644 --- a/src-ui/src/app/components/admin/trash/trash.component.ts +++ b/src-ui/src/app/components/admin/trash/trash.component.ts @@ -1,7 +1,11 @@ import { Component, OnDestroy } from '@angular/core' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { Router } from '@angular/router' -import { NgbModal, NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap' +import { + NgbDropdownModule, + NgbModal, + NgbPaginationModule, +} from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { delay, takeUntil, tap } from 'rxjs' import { Document } from 'src/app/data/document' @@ -23,6 +27,7 @@ import { LoadingComponentWithPermissions } from '../../loading-component/loading PreviewPopupComponent, FormsModule, ReactiveFormsModule, + NgbDropdownModule, NgbPaginationModule, NgxBootstrapIconsModule, ], diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts index 95ea3e45b..62427f5b4 100644 --- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts +++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts @@ -1,7 +1,11 @@ import { NgClass, TitleCasePipe } from '@angular/common' import { Component } from '@angular/core' import { FormsModule, ReactiveFormsModule } from '@angular/forms' -import { NgbModal, NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap' +import { + NgbDropdownModule, + NgbModal, + NgbPaginationModule, +} from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { Correspondent } from 'src/app/data/correspondent' import { FILTER_HAS_CORRESPONDENT_ANY } from 'src/app/data/filter-rule-type' @@ -32,6 +36,7 @@ import { ManagementListComponent } from '../management-list/management-list.comp FormsModule, ReactiveFormsModule, NgClass, + NgbDropdownModule, NgbPaginationModule, NgxBootstrapIconsModule, ], diff --git a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.ts b/src-ui/src/app/components/manage/custom-fields/custom-fields.component.ts index ced70655c..476b09106 100644 --- a/src-ui/src/app/components/manage/custom-fields/custom-fields.component.ts +++ b/src-ui/src/app/components/manage/custom-fields/custom-fields.component.ts @@ -1,5 +1,9 @@ import { Component, OnInit } from '@angular/core' -import { NgbModal, NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap' +import { + NgbDropdownModule, + NgbModal, + NgbPaginationModule, +} from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { delay, takeUntil, tap } from 'rxjs' import { CustomField, DATA_TYPE_LABELS } from 'src/app/data/custom-field' @@ -27,6 +31,7 @@ import { LoadingComponentWithPermissions } from '../../loading-component/loading imports: [ PageHeaderComponent, IfPermissionsDirective, + NgbDropdownModule, NgbPaginationModule, NgxBootstrapIconsModule, ], diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts index a36748677..0bca3df1b 100644 --- a/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts +++ b/src-ui/src/app/components/manage/document-type-list/document-type-list.component.ts @@ -1,7 +1,11 @@ -import { TitleCasePipe } from '@angular/common' +import { NgClass, TitleCasePipe } from '@angular/common' import { Component } from '@angular/core' import { FormsModule, ReactiveFormsModule } from '@angular/forms' -import { NgbModal, NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap' +import { + NgbDropdownModule, + NgbModal, + NgbPaginationModule, +} from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { DocumentType } from 'src/app/data/document-type' import { FILTER_HAS_DOCUMENT_TYPE_ANY } from 'src/app/data/filter-rule-type' @@ -29,6 +33,8 @@ import { ManagementListComponent } from '../management-list/management-list.comp IfPermissionsDirective, FormsModule, ReactiveFormsModule, + NgClass, + NgbDropdownModule, NgbPaginationModule, NgxBootstrapIconsModule, ], diff --git a/src-ui/src/app/components/manage/mail/mail.component.ts b/src-ui/src/app/components/manage/mail/mail.component.ts index 1938f9a0b..b606a33c9 100644 --- a/src-ui/src/app/components/manage/mail/mail.component.ts +++ b/src-ui/src/app/components/manage/mail/mail.component.ts @@ -2,7 +2,7 @@ import { AsyncPipe } from '@angular/common' import { Component, OnDestroy, OnInit } from '@angular/core' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { ActivatedRoute } from '@angular/router' -import { NgbModal } from '@ng-bootstrap/ng-bootstrap' +import { NgbDropdownModule, NgbModal } from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { Subject, delay, first, takeUntil, tap } from 'rxjs' import { MailAccount, MailAccountType } from 'src/app/data/mail-account' @@ -39,6 +39,7 @@ import { ComponentWithPermissions } from '../../with-permissions/with-permission AsyncPipe, FormsModule, ReactiveFormsModule, + NgbDropdownModule, NgxBootstrapIconsModule, ], }) diff --git a/src-ui/src/app/components/manage/storage-path-list/storage-path-list.component.ts b/src-ui/src/app/components/manage/storage-path-list/storage-path-list.component.ts index 76a22748d..89a243324 100644 --- a/src-ui/src/app/components/manage/storage-path-list/storage-path-list.component.ts +++ b/src-ui/src/app/components/manage/storage-path-list/storage-path-list.component.ts @@ -1,7 +1,11 @@ import { NgClass, TitleCasePipe } from '@angular/common' import { Component } from '@angular/core' import { FormsModule, ReactiveFormsModule } from '@angular/forms' -import { NgbModal, NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap' +import { + NgbDropdownModule, + NgbModal, + NgbPaginationModule, +} from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { FILTER_HAS_STORAGE_PATH_ANY } from 'src/app/data/filter-rule-type' import { StoragePath } from 'src/app/data/storage-path' @@ -32,6 +36,7 @@ import { ManagementListComponent } from '../management-list/management-list.comp FormsModule, ReactiveFormsModule, NgClass, + NgbDropdownModule, NgbPaginationModule, NgxBootstrapIconsModule, ], diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts index b94718d4b..f0d7e7959 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-list.component.ts +++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.ts @@ -1,7 +1,11 @@ import { NgClass, TitleCasePipe } from '@angular/common' import { Component } from '@angular/core' import { FormsModule, ReactiveFormsModule } from '@angular/forms' -import { NgbModal, NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap' +import { + NgbDropdownModule, + NgbModal, + NgbPaginationModule, +} from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { FILTER_HAS_TAGS_ALL } from 'src/app/data/filter-rule-type' import { Tag } from 'src/app/data/tag' @@ -32,6 +36,7 @@ import { ManagementListComponent } from '../management-list/management-list.comp FormsModule, ReactiveFormsModule, NgClass, + NgbDropdownModule, NgbPaginationModule, NgxBootstrapIconsModule, ], 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 a74fd0232..8d6e0f008 100644 --- a/src-ui/src/app/components/manage/workflows/workflows.component.ts +++ b/src-ui/src/app/components/manage/workflows/workflows.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core' import { FormsModule, ReactiveFormsModule } from '@angular/forms' -import { NgbModal } from '@ng-bootstrap/ng-bootstrap' +import { NgbDropdownModule, NgbModal } from '@ng-bootstrap/ng-bootstrap' import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { delay, takeUntil, tap } from 'rxjs' import { Workflow } from 'src/app/data/workflow' @@ -26,6 +26,7 @@ import { LoadingComponentWithPermissions } from '../../loading-component/loading IfPermissionsDirective, FormsModule, ReactiveFormsModule, + NgbDropdownModule, NgxBootstrapIconsModule, ], })