From 00b212b79d75e62d6536c288292fee004b5fad21 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Mon, 2 Nov 2026 19:09:56 -0800 Subject: [PATCH] Replace alllll these --- src-ui/src/app/app.component.spec.ts | 2 - .../admin/config/config.component.spec.ts | 2 - .../admin/config/config.component.ts | 4 +- .../admin/logs/logs.component.spec.ts | 2 - .../admin/settings/settings.component.spec.ts | 2 - .../admin/settings/settings.component.ts | 4 +- .../admin/tasks/tasks.component.spec.ts | 2 - .../components/admin/tasks/tasks.component.ts | 4 +- .../admin/trash/trash.component.spec.ts | 2 - .../components/admin/trash/trash.component.ts | 4 +- .../users-groups.component.spec.ts | 2 - .../users-groups/users-groups.component.ts | 4 +- .../app-frame/app-frame.component.spec.ts | 2 - .../app-frame/app-frame.component.ts | 4 +- .../global-search.component.spec.ts | 2 - .../global-search/global-search.component.ts | 4 +- .../toasts-dropdown.component.spec.ts | 6 +- .../toasts-dropdown.component.ts | 4 +- .../chat/chat/chat.component.spec.ts | 7 +- .../components/chat/chat/chat.component.ts | 4 +- .../clearable-badge.component.spec.ts | 6 +- .../clearable-badge.component.ts | 4 +- .../confirm-button.component.spec.ts | 7 +- .../confirm-button.component.ts | 4 +- ...-versions-confirm-dialog.component.spec.ts | 6 +- ...ge-as-versions-confirm-dialog.component.ts | 4 +- .../merge-confirm-dialog.component.spec.ts | 8 +- .../merge-confirm-dialog.component.ts | 4 +- ...d-removal-confirm-dialog.component.spec.ts | 6 +- ...ssword-removal-confirm-dialog.component.ts | 4 +- .../rotate-confirm-dialog.component.spec.ts | 6 +- .../rotate-confirm-dialog.component.ts | 4 +- .../custom-fields-dropdown.component.spec.ts | 2 - .../custom-fields-dropdown.component.ts | 4 +- ...om-fields-query-dropdown.component.spec.ts | 2 - .../custom-fields-query-dropdown.component.ts | 4 +- .../dates-dropdown.component.spec.ts | 2 - .../dates-dropdown.component.ts | 6 +- ...custom-field-edit-dialog.component.spec.ts | 2 - .../custom-field-edit-dialog.component.ts | 4 +- .../group-edit-dialog.component.spec.ts | 2 - .../tag-edit-dialog.component.spec.ts | 2 - .../user-edit-dialog.component.spec.ts | 2 - .../workflow-edit-dialog.component.ts | 4 +- .../email-document-dialog.component.spec.ts | 7 +- .../email-document-dialog.component.ts | 3 +- .../filterable-dropdown.component.spec.ts | 3 +- .../filterable-dropdown.component.ts | 4 +- .../toggleable-dropdown-button.component.ts | 4 +- .../common/input/check/check.component.ts | 4 +- .../input/color/color.component.spec.ts | 2 - .../common/input/color/color.component.ts | 4 +- .../custom-fields-values.component.ts | 4 +- .../common/input/date/date.component.spec.ts | 6 +- .../common/input/date/date.component.ts | 4 +- .../document-link.component.spec.ts | 3 +- .../document-link/document-link.component.ts | 4 +- .../input/entries/entries.component.spec.ts | 8 +- .../common/input/entries/entries.component.ts | 4 +- .../input/monetary/monetary.component.ts | 4 +- .../common/input/number/number.component.ts | 4 +- .../input/password/password.component.spec.ts | 8 +- .../input/password/password.component.ts | 4 +- .../common/input/select/select.component.ts | 4 +- .../common/input/tags/tags.component.spec.ts | 2 - .../common/input/tags/tags.component.ts | 4 +- .../common/input/text/text.component.ts | 4 +- .../input/textarea/textarea.component.ts | 4 +- .../common/input/url/url.component.spec.ts | 8 +- .../common/input/url/url.component.ts | 4 +- .../page-header/page-header.component.spec.ts | 3 +- .../page-header/page-header.component.ts | 4 +- .../pdf-editor/pdf-editor.component.spec.ts | 3 +- .../common/pdf-editor/pdf-editor.component.ts | 4 +- ...missions-filter-dropdown.component.spec.ts | 2 - .../permissions-filter-dropdown.component.ts | 4 +- .../permissions-select.component.spec.ts | 6 +- .../permissions-select.component.ts | 4 +- .../preview-popup.component.spec.ts | 2 - .../preview-popup/preview-popup.component.ts | 4 +- .../profile-edit-dialog.component.spec.ts | 2 - .../profile-edit-dialog.component.ts | 4 +- ...share-link-bundle-dialog.component.spec.ts | 6 +- .../share-link-bundle-dialog.component.ts | 4 +- .../share-links-dialog.component.spec.ts | 8 +- .../share-links-dialog.component.ts | 4 +- .../suggestions-dropdown.component.spec.ts | 7 +- .../suggestions-dropdown.component.ts | 4 +- .../system-status-dialog.component.spec.ts | 6 +- .../system-status-dialog.component.ts | 4 +- .../common/toast/toast.component.spec.ts | 3 +- .../common/toast/toast.component.ts | 4 +- .../common/toasts/toasts.component.spec.ts | 3 +- .../common/toasts/toasts.component.ts | 8 +- .../upload-status-tray.component.spec.ts | 2 - .../upload-status-tray.component.ts | 4 +- .../dashboard/dashboard.component.spec.ts | 2 - .../dashboard/dashboard.component.ts | 4 +- .../saved-view-widget.component.spec.ts | 2 - .../saved-view-widget.component.ts | 4 +- .../upload-file-widget.component.spec.ts | 2 - .../upload-file-widget.component.ts | 4 +- .../widget-frame/widget-frame.component.ts | 4 +- .../document-barcodes.component.spec.ts | 6 +- .../document-barcodes.component.ts | 4 +- .../document-detail.component.spec.ts | 7 +- .../document-detail.component.ts | 4 +- .../document-history.component.spec.ts | 7 +- .../document-history.component.ts | 2 - ...ocument-version-dropdown.component.spec.ts | 8 +- .../document-version-dropdown.component.ts | 4 +- .../metadata-collapse.component.spec.ts | 6 +- .../metadata-collapse.component.ts | 4 +- .../bulk-editor/bulk-editor.component.spec.ts | 3 +- .../bulk-editor/bulk-editor.component.ts | 4 +- ...ustom-fields-bulk-edit-dialog.component.ts | 4 +- .../document-card-large.component.spec.ts | 2 - .../document-card-large.component.ts | 4 +- .../document-card-small.component.spec.ts | 7 +- .../document-card-small.component.ts | 4 +- .../document-list.component.spec.ts | 7 +- .../document-list/document-list.component.ts | 4 +- .../filter-editor.component.spec.ts | 2 - .../filter-editor/filter-editor.component.ts | 4 +- .../document-notes.component.spec.ts | 2 - .../document-notes.component.ts | 4 +- .../custom-fields.component.spec.ts | 2 - .../custom-fields/custom-fields.component.ts | 4 +- .../document-attributes.component.spec.ts | 4 +- .../document-attributes.component.ts | 4 +- .../correspondent-list.component.spec.ts | 2 - .../correspondent-list.component.ts | 4 +- .../document-type-list.component.spec.ts | 2 - .../document-type-list.component.ts | 4 +- .../management-list.component.spec.ts | 2 - .../storage-path-list.component.spec.ts | 2 - .../storage-path-list.component.ts | 4 +- .../tag-list/tag-list.component.spec.ts | 2 - .../tag-list/tag-list.component.ts | 4 +- .../manage/mail/mail.component.spec.ts | 2 - .../components/manage/mail/mail.component.ts | 4 +- .../processed-mail-dialog.component.spec.ts | 7 +- .../processed-mail-dialog.component.ts | 4 +- .../saved-views/saved-views.component.spec.ts | 2 - .../saved-views/saved-views.component.ts | 8 +- .../share-link-bundle-list.component.spec.ts | 6 +- .../share-link-bundle-list.component.ts | 8 +- .../share-link-list.component.spec.ts | 7 +- .../share-link-list.component.ts | 4 +- .../share-links/share-links.component.spec.ts | 8 +- .../workflows/workflows.component.spec.ts | 2 - .../manage/workflows/workflows.component.ts | 4 +- .../not-found/not-found.component.spec.ts | 8 +- .../not-found/not-found.component.ts | 4 +- .../app/guards/dirty-saved-view.guard.spec.ts | 7 +- src-ui/src/main.ts | 317 +----------------- 156 files changed, 200 insertions(+), 756 deletions(-) diff --git a/src-ui/src/app/app.component.spec.ts b/src-ui/src/app/app.component.spec.ts index d93534d80f..bd81eebaeb 100644 --- a/src-ui/src/app/app.component.spec.ts +++ b/src-ui/src/app/app.component.spec.ts @@ -3,7 +3,6 @@ import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { Router, RouterModule } from '@angular/router' import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap' -import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { provideUiTour, TourNgBootstrap, @@ -47,7 +46,6 @@ describe('AppComponent', () => { ToastsComponent, FileDropComponent, TourNgBootstrap, - NgxBootstrapIconsModule.pick(allIcons), ], providers: [ PermissionsGuard, diff --git a/src-ui/src/app/components/admin/config/config.component.spec.ts b/src-ui/src/app/components/admin/config/config.component.spec.ts index 650761c7dd..0da90f7da7 100644 --- a/src-ui/src/app/components/admin/config/config.component.spec.ts +++ b/src-ui/src/app/components/admin/config/config.component.spec.ts @@ -6,7 +6,6 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { BrowserModule } from '@angular/platform-browser' import { NgbModule } from '@ng-bootstrap/ng-bootstrap' import { NgSelectModule } from '@ng-select/ng-select' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of, throwError } from 'rxjs' import { ConfigCategory, @@ -39,7 +38,6 @@ describe('ConfigComponent', () => { NgSelectModule, FormsModule, ReactiveFormsModule, - NgxBootstrapIconsModule.pick(allIcons), ConfigComponent, TextComponent, SelectComponent, diff --git a/src-ui/src/app/components/admin/config/config.component.ts b/src-ui/src/app/components/admin/config/config.component.ts index 6894a50be3..1923677c64 100644 --- a/src-ui/src/app/components/admin/config/config.component.ts +++ b/src-ui/src/app/components/admin/config/config.component.ts @@ -9,7 +9,6 @@ import { } from '@angular/forms' import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap' import { DirtyComponent, dirtyCheck } from '@ngneat/dirty-check-forms' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { BehaviorSubject, Observable, @@ -17,6 +16,7 @@ import { first, takeUntil, } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { ConfigCategory, ConfigOption, @@ -52,7 +52,7 @@ import { LoadingComponentWithPermissions } from '../../loading-component/loading NgbNavModule, FormsModule, ReactiveFormsModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class ConfigComponent diff --git a/src-ui/src/app/components/admin/logs/logs.component.spec.ts b/src-ui/src/app/components/admin/logs/logs.component.spec.ts index c458804ce8..9f525a1735 100644 --- a/src-ui/src/app/components/admin/logs/logs.component.spec.ts +++ b/src-ui/src/app/components/admin/logs/logs.component.spec.ts @@ -8,7 +8,6 @@ import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { BrowserModule, By } from '@angular/platform-browser' import { NgbModule, NgbNavLink } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of, throwError } from 'rxjs' import { LogService } from 'src/app/services/rest/log.service' import { PageHeaderComponent } from '../../common/page-header/page-header.component' @@ -40,7 +39,6 @@ describe('LogsComponent', () => { imports: [ BrowserModule, NgbModule, - NgxBootstrapIconsModule.pick(allIcons), LogsComponent, PageHeaderComponent, CommonModule, diff --git a/src-ui/src/app/components/admin/settings/settings.component.spec.ts b/src-ui/src/app/components/admin/settings/settings.component.spec.ts index d64ea2a9b3..645b97f10a 100644 --- a/src-ui/src/app/components/admin/settings/settings.component.spec.ts +++ b/src-ui/src/app/components/admin/settings/settings.component.spec.ts @@ -15,7 +15,6 @@ import { NgbNavLink, } from '@ng-bootstrap/ng-bootstrap' import { NgSelectModule } from '@ng-select/ng-select' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { provideUiTour } from 'ngx-ui-tour-ng-bootstrap' import { of, throwError } from 'rxjs' import { routes } from 'src/app/app-routing.module' @@ -133,7 +132,6 @@ describe('SettingsComponent', () => { ReactiveFormsModule, NgbAlertModule, NgSelectModule, - NgxBootstrapIconsModule.pick(allIcons), NgbModalModule, DragDropModule, SettingsComponent, diff --git a/src-ui/src/app/components/admin/settings/settings.component.ts b/src-ui/src/app/components/admin/settings/settings.component.ts index 886e47ad6f..3f65e2cb50 100644 --- a/src-ui/src/app/components/admin/settings/settings.component.ts +++ b/src-ui/src/app/components/admin/settings/settings.component.ts @@ -23,7 +23,6 @@ import { NgbPopoverModule, } from '@ng-bootstrap/ng-bootstrap' import { DirtyComponent, dirtyCheck } from '@ngneat/dirty-check-forms' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { TourService } from 'ngx-ui-tour-ng-bootstrap' import { BehaviorSubject, @@ -34,6 +33,7 @@ import { takeUntil, tap, } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { Group } from 'src/app/data/group' import { SystemStatus, @@ -135,7 +135,7 @@ const sidebarItemLabels: Record = { ReactiveFormsModule, NgbNavModule, NgbPopoverModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class SettingsComponent diff --git a/src-ui/src/app/components/admin/tasks/tasks.component.spec.ts b/src-ui/src/app/components/admin/tasks/tasks.component.spec.ts index 026f5c0624..3b2c58f63e 100644 --- a/src-ui/src/app/components/admin/tasks/tasks.component.spec.ts +++ b/src-ui/src/app/components/admin/tasks/tasks.component.spec.ts @@ -10,7 +10,6 @@ import { By } from '@angular/platform-browser' import { Router } from '@angular/router' import { RouterTestingModule } from '@angular/router/testing' import { NgbModal, NgbModalRef, NgbModule } from '@ng-bootstrap/ng-bootstrap' -import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { of, throwError } from 'rxjs' import { routes } from 'src/app/app-routing.module' import { @@ -174,7 +173,6 @@ describe('TasksComponent', () => { imports: [ NgbModule, RouterTestingModule.withRoutes(routes), - NgxBootstrapIconsModule.pick(allIcons), FormsModule, TasksComponent, PageHeaderComponent, diff --git a/src-ui/src/app/components/admin/tasks/tasks.component.ts b/src-ui/src/app/components/admin/tasks/tasks.component.ts index b548703df9..20f3107ca4 100644 --- a/src-ui/src/app/components/admin/tasks/tasks.component.ts +++ b/src-ui/src/app/components/admin/tasks/tasks.component.ts @@ -9,7 +9,6 @@ import { NgbPaginationModule, NgbPopoverModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { debounceTime, distinctUntilChanged, @@ -22,6 +21,7 @@ import { takeUntil, timer, } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { PaperlessTask, PaperlessTaskStatus, @@ -151,7 +151,7 @@ const TRIGGER_SOURCE_OPTIONS: Array<{ NgbDropdownModule, NgbPaginationModule, NgbPopoverModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class TasksComponent diff --git a/src-ui/src/app/components/admin/trash/trash.component.spec.ts b/src-ui/src/app/components/admin/trash/trash.component.spec.ts index 4ad48dd438..abe000de26 100644 --- a/src-ui/src/app/components/admin/trash/trash.component.spec.ts +++ b/src-ui/src/app/components/admin/trash/trash.component.spec.ts @@ -9,7 +9,6 @@ import { NgbPaginationModule, NgbPopoverModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of, throwError } from 'rxjs' import { ToastService } from 'src/app/services/toast.service' import { TrashService } from 'src/app/services/trash.service' @@ -48,7 +47,6 @@ describe('TrashComponent', () => { ReactiveFormsModule, NgbPopoverModule, NgbPaginationModule, - NgxBootstrapIconsModule.pick(allIcons), TrashComponent, PageHeaderComponent, ConfirmDialogComponent, 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 800a7c084f..b407ad7d66 100644 --- a/src-ui/src/app/components/admin/trash/trash.component.ts +++ b/src-ui/src/app/components/admin/trash/trash.component.ts @@ -6,8 +6,8 @@ import { NgbModal, NgbPaginationModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { takeUntil, tap } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { Document } from 'src/app/data/document' import { SETTINGS_KEYS } from 'src/app/data/ui-settings' import { SettingsService } from 'src/app/services/settings.service' @@ -29,7 +29,7 @@ import { LoadingComponentWithPermissions } from '../../loading-component/loading ReactiveFormsModule, NgbDropdownModule, NgbPaginationModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class TrashComponent diff --git a/src-ui/src/app/components/admin/users-groups/users-groups.component.spec.ts b/src-ui/src/app/components/admin/users-groups/users-groups.component.spec.ts index 8e2551f157..1323ecb7ec 100644 --- a/src-ui/src/app/components/admin/users-groups/users-groups.component.spec.ts +++ b/src-ui/src/app/components/admin/users-groups/users-groups.component.spec.ts @@ -3,7 +3,6 @@ import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http' import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of, throwError } from 'rxjs' import { Group } from 'src/app/data/group' import { User } from 'src/app/data/user' @@ -41,7 +40,6 @@ describe('UsersAndGroupsComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NgxBootstrapIconsModule.pick(allIcons)], providers: [ CustomDatePipe, DatePipe, diff --git a/src-ui/src/app/components/admin/users-groups/users-groups.component.ts b/src-ui/src/app/components/admin/users-groups/users-groups.component.ts index 406e17398d..791b27a49c 100644 --- a/src-ui/src/app/components/admin/users-groups/users-groups.component.ts +++ b/src-ui/src/app/components/admin/users-groups/users-groups.component.ts @@ -1,7 +1,7 @@ import { Component, OnDestroy, OnInit, inject, signal } from '@angular/core' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { Subject, first, takeUntil } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { Group } from 'src/app/data/group' import { User } from 'src/app/data/user' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' @@ -29,7 +29,7 @@ import { ComponentWithPermissions } from '../../with-permissions/with-permission imports: [ PageHeaderComponent, IfPermissionsDirective, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class UsersAndGroupsComponent diff --git a/src-ui/src/app/components/app-frame/app-frame.component.spec.ts b/src-ui/src/app/components/app-frame/app-frame.component.spec.ts index 83cebd8890..2b4c3d63a7 100644 --- a/src-ui/src/app/components/app-frame/app-frame.component.spec.ts +++ b/src-ui/src/app/components/app-frame/app-frame.component.spec.ts @@ -10,7 +10,6 @@ import { BrowserModule, By } from '@angular/platform-browser' import { ActivatedRoute, Router } from '@angular/router' import { RouterTestingModule } from '@angular/router/testing' import { NgbModal, NgbModalModule, NgbModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { provideUiTour } from 'ngx-ui-tour-ng-bootstrap' import { of, throwError } from 'rxjs' import { routes } from 'src/app/app-routing.module' @@ -108,7 +107,6 @@ describe('AppFrameComponent', () => { ReactiveFormsModule, DragDropModule, NgbModalModule, - NgxBootstrapIconsModule.pick(allIcons), AppFrameComponent, IfPermissionsDirective, GlobalSearchComponent, 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 4f9a02f6ec..54caff0582 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 @@ -23,10 +23,10 @@ import { NgbNavModule, NgbPopoverModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { TourNgBootstrap } from 'ngx-ui-tour-ng-bootstrap' import { Observable } from 'rxjs' import { first } from 'rxjs/operators' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { Document } from 'src/app/data/document' import { SavedView } from 'src/app/data/saved-view' import { @@ -89,7 +89,7 @@ const SCROLL_THRESHOLD = 16 NgbPopoverModule, NgbCollapseModule, NgbNavModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, DragDropModule, TourNgBootstrap, FormsModule, diff --git a/src-ui/src/app/components/app-frame/global-search/global-search.component.spec.ts b/src-ui/src/app/components/app-frame/global-search/global-search.component.spec.ts index 015984b401..d1786da92f 100644 --- a/src-ui/src/app/components/app-frame/global-search/global-search.component.spec.ts +++ b/src-ui/src/app/components/app-frame/global-search/global-search.component.spec.ts @@ -10,7 +10,6 @@ import { NgbModalModule, NgbModalRef, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of } from 'rxjs' import { DataType } from 'src/app/data/datatype' import { @@ -138,7 +137,6 @@ describe('GlobalSearchComponent', () => { NgbDropdownModule, FormsModule, ReactiveFormsModule, - NgxBootstrapIconsModule.pick(allIcons), GlobalSearchComponent, ], providers: [ diff --git a/src-ui/src/app/components/app-frame/global-search/global-search.component.ts b/src-ui/src/app/components/app-frame/global-search/global-search.component.ts index 80f9ce8c20..1cc3597bd6 100644 --- a/src-ui/src/app/components/app-frame/global-search/global-search.component.ts +++ b/src-ui/src/app/components/app-frame/global-search/global-search.component.ts @@ -17,8 +17,8 @@ import { NgbModal, NgbModalRef, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { Subject, debounceTime, distinctUntilChanged, filter } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { DataType } from 'src/app/data/datatype' import { FILTER_FULLTEXT_QUERY, @@ -65,7 +65,7 @@ import { WorkflowEditDialogComponent } from '../../common/edit-dialog/workflow-e CustomDatePipe, FormsModule, ReactiveFormsModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, NgbDropdownModule, NgTemplateOutlet, ], diff --git a/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.spec.ts b/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.spec.ts index bad2fdb6b1..da551496c2 100644 --- a/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.spec.ts +++ b/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.spec.ts @@ -1,7 +1,6 @@ import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http' import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { Subject } from 'rxjs' import { Toast, ToastLevel, ToastService } from 'src/app/services/toast.service' import { ToastsDropdownComponent } from './toasts-dropdown.component' @@ -41,10 +40,7 @@ describe('ToastsDropdownComponent', () => { beforeEach(async () => { TestBed.configureTestingModule({ - imports: [ - ToastsDropdownComponent, - NgxBootstrapIconsModule.pick(allIcons), - ], + imports: [ToastsDropdownComponent], providers: [ provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting(), diff --git a/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.ts b/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.ts index c2b758af4e..c596b7b3d0 100644 --- a/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.ts +++ b/src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.ts @@ -12,8 +12,8 @@ import { NgbDropdownModule, NgbProgressbarModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { Subscription, interval, map } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { Toast, ToastLevel, ToastService } from 'src/app/services/toast.service' import { ToastComponent } from '../../common/toast/toast.component' @@ -25,7 +25,7 @@ import { ToastComponent } from '../../common/toast/toast.component' ToastComponent, NgbDropdownModule, NgbProgressbarModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class ToastsDropdownComponent { diff --git a/src-ui/src/app/components/chat/chat/chat.component.spec.ts b/src-ui/src/app/components/chat/chat/chat.component.spec.ts index 7bf4129a9c..b38cef7efa 100644 --- a/src-ui/src/app/components/chat/chat/chat.component.spec.ts +++ b/src-ui/src/app/components/chat/chat/chat.component.spec.ts @@ -4,7 +4,6 @@ import { ElementRef } from '@angular/core' import { ComponentFixture, TestBed } from '@angular/core/testing' import { NavigationEnd, Router } from '@angular/router' import { RouterTestingModule } from '@angular/router/testing' -import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { Subject } from 'rxjs' import { CHAT_METADATA_DELIMITER, @@ -22,11 +21,7 @@ describe('ChatComponent', () => { beforeEach(async () => { TestBed.configureTestingModule({ - imports: [ - NgxBootstrapIconsModule.pick(allIcons), - RouterTestingModule, - ChatComponent, - ], + imports: [RouterTestingModule, ChatComponent], providers: [ provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting(), diff --git a/src-ui/src/app/components/chat/chat/chat.component.ts b/src-ui/src/app/components/chat/chat/chat.component.ts index a69a735c43..f4fbaafb0f 100644 --- a/src-ui/src/app/components/chat/chat/chat.component.ts +++ b/src-ui/src/app/components/chat/chat/chat.component.ts @@ -9,8 +9,8 @@ import { import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { NavigationEnd, Router, RouterModule } from '@angular/router' import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { filter, map, Subscription } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { MarkdownPipe } from 'src/app/pipes/markdown.pipe' import { ChatMessage, @@ -27,7 +27,7 @@ const SLOW_RESPONSE_DELAY_MS = 8000 FormsModule, ReactiveFormsModule, RouterModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, NgbDropdownModule, MarkdownPipe, ], diff --git a/src-ui/src/app/components/common/clearable-badge/clearable-badge.component.spec.ts b/src-ui/src/app/components/common/clearable-badge/clearable-badge.component.spec.ts index 50cb5c3bb7..eec6651564 100644 --- a/src-ui/src/app/components/common/clearable-badge/clearable-badge.component.spec.ts +++ b/src-ui/src/app/components/common/clearable-badge/clearable-badge.component.spec.ts @@ -1,5 +1,4 @@ import { ComponentFixture, TestBed } from '@angular/core/testing' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { ClearableBadgeComponent } from './clearable-badge.component' describe('ClearableBadgeComponent', () => { @@ -8,10 +7,7 @@ describe('ClearableBadgeComponent', () => { beforeEach(async () => { TestBed.configureTestingModule({ - imports: [ - NgxBootstrapIconsModule.pick(allIcons), - ClearableBadgeComponent, - ], + imports: [ClearableBadgeComponent], }).compileComponents() fixture = TestBed.createComponent(ClearableBadgeComponent) diff --git a/src-ui/src/app/components/common/clearable-badge/clearable-badge.component.ts b/src-ui/src/app/components/common/clearable-badge/clearable-badge.component.ts index 0ee3661106..36775674b1 100644 --- a/src-ui/src/app/components/common/clearable-badge/clearable-badge.component.ts +++ b/src-ui/src/app/components/common/clearable-badge/clearable-badge.component.ts @@ -1,11 +1,11 @@ import { Component, computed, EventEmitter, input, Output } from '@angular/core' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' @Component({ selector: 'pngx-clearable-badge', templateUrl: './clearable-badge.component.html', styleUrls: ['./clearable-badge.component.scss'], - imports: [NgxBootstrapIconsModule], + imports: [BootstrapIconComponent], }) export class ClearableBadgeComponent { readonly number = input(undefined) diff --git a/src-ui/src/app/components/common/confirm-button/confirm-button.component.spec.ts b/src-ui/src/app/components/common/confirm-button/confirm-button.component.spec.ts index 6f9d3819ca..3076a30d3e 100644 --- a/src-ui/src/app/components/common/confirm-button/confirm-button.component.spec.ts +++ b/src-ui/src/app/components/common/confirm-button/confirm-button.component.spec.ts @@ -1,7 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing' import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { ConfirmButtonComponent } from './confirm-button.component' describe('ConfirmButtonComponent', () => { @@ -10,11 +9,7 @@ describe('ConfirmButtonComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ - NgbPopoverModule, - NgxBootstrapIconsModule.pick(allIcons), - ConfirmButtonComponent, - ], + imports: [NgbPopoverModule, ConfirmButtonComponent], }).compileComponents() fixture = TestBed.createComponent(ConfirmButtonComponent) diff --git a/src-ui/src/app/components/common/confirm-button/confirm-button.component.ts b/src-ui/src/app/components/common/confirm-button/confirm-button.component.ts index 7ed79308bb..be32b44458 100644 --- a/src-ui/src/app/components/common/confirm-button/confirm-button.component.ts +++ b/src-ui/src/app/components/common/confirm-button/confirm-button.component.ts @@ -6,13 +6,13 @@ import { ViewChild, } from '@angular/core' import { NgbPopover, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' @Component({ selector: 'pngx-confirm-button', templateUrl: './confirm-button.component.html', styleUrl: './confirm-button.component.scss', - imports: [NgbPopoverModule, NgxBootstrapIconsModule], + imports: [NgbPopoverModule, BootstrapIconComponent], }) export class ConfirmButtonComponent { @Input() diff --git a/src-ui/src/app/components/common/confirm-dialog/merge-as-versions-confirm-dialog/merge-as-versions-confirm-dialog.component.spec.ts b/src-ui/src/app/components/common/confirm-dialog/merge-as-versions-confirm-dialog/merge-as-versions-confirm-dialog.component.spec.ts index 939eaa31de..6d4074d52d 100644 --- a/src-ui/src/app/components/common/confirm-dialog/merge-as-versions-confirm-dialog/merge-as-versions-confirm-dialog.component.spec.ts +++ b/src-ui/src/app/components/common/confirm-dialog/merge-as-versions-confirm-dialog/merge-as-versions-confirm-dialog.component.spec.ts @@ -2,7 +2,6 @@ import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http' import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of } from 'rxjs' import { DocumentService } from 'src/app/services/rest/document.service' import { MergeAsVersionsConfirmDialogComponent } from './merge-as-versions-confirm-dialog.component' @@ -14,10 +13,7 @@ describe('MergeAsVersionsConfirmDialogComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ - NgxBootstrapIconsModule.pick(allIcons), - MergeAsVersionsConfirmDialogComponent, - ], + imports: [MergeAsVersionsConfirmDialogComponent], providers: [ NgbActiveModal, provideHttpClient(withInterceptorsFromDi()), diff --git a/src-ui/src/app/components/common/confirm-dialog/merge-as-versions-confirm-dialog/merge-as-versions-confirm-dialog.component.ts b/src-ui/src/app/components/common/confirm-dialog/merge-as-versions-confirm-dialog/merge-as-versions-confirm-dialog.component.ts index a05e3ab1b2..fc2526c4fb 100644 --- a/src-ui/src/app/components/common/confirm-dialog/merge-as-versions-confirm-dialog/merge-as-versions-confirm-dialog.component.ts +++ b/src-ui/src/app/components/common/confirm-dialog/merge-as-versions-confirm-dialog/merge-as-versions-confirm-dialog.component.ts @@ -6,8 +6,8 @@ import { import { AsyncPipe } from '@angular/common' import { Component, OnInit, computed, inject, signal } from '@angular/core' import { FormsModule } from '@angular/forms' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { takeUntil } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { Document } from 'src/app/data/document' import { CorrespondentNamePipe } from 'src/app/pipes/correspondent-name.pipe' import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe' @@ -24,7 +24,7 @@ import { ConfirmDialogComponent } from '../confirm-dialog.component' CustomDatePipe, DragDropModule, FormsModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class MergeAsVersionsConfirmDialogComponent diff --git a/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.spec.ts b/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.spec.ts index e9b99763a6..49774449ac 100644 --- a/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.spec.ts +++ b/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.spec.ts @@ -3,7 +3,6 @@ import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of } from 'rxjs' import { DocumentService } from 'src/app/services/rest/document.service' import { MergeConfirmDialogComponent } from './merge-confirm-dialog.component' @@ -15,12 +14,7 @@ describe('MergeConfirmDialogComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ - NgxBootstrapIconsModule.pick(allIcons), - ReactiveFormsModule, - FormsModule, - MergeConfirmDialogComponent, - ], + imports: [ReactiveFormsModule, FormsModule, MergeConfirmDialogComponent], providers: [ NgbActiveModal, provideHttpClient(withInterceptorsFromDi()), diff --git a/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.ts b/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.ts index e852e5a933..d924d3ee80 100644 --- a/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.ts +++ b/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.ts @@ -6,8 +6,8 @@ import { import { AsyncPipe } from '@angular/common' import { Component, OnInit, inject, signal } from '@angular/core' import { FormsModule, ReactiveFormsModule } from '@angular/forms' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { takeUntil } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { Document } from 'src/app/data/document' import { CorrespondentNamePipe } from 'src/app/pipes/correspondent-name.pipe' import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe' @@ -26,7 +26,7 @@ import { ConfirmDialogComponent } from '../confirm-dialog.component' DragDropModule, FormsModule, ReactiveFormsModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class MergeConfirmDialogComponent diff --git a/src-ui/src/app/components/common/confirm-dialog/password-removal-confirm-dialog/password-removal-confirm-dialog.component.spec.ts b/src-ui/src/app/components/common/confirm-dialog/password-removal-confirm-dialog/password-removal-confirm-dialog.component.spec.ts index a1449511b0..217663b55c 100644 --- a/src-ui/src/app/components/common/confirm-dialog/password-removal-confirm-dialog/password-removal-confirm-dialog.component.spec.ts +++ b/src-ui/src/app/components/common/confirm-dialog/password-removal-confirm-dialog/password-removal-confirm-dialog.component.spec.ts @@ -1,7 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing' import { By } from '@angular/platform-browser' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { PasswordRemovalConfirmDialogComponent } from './password-removal-confirm-dialog.component' describe('PasswordRemovalConfirmDialogComponent', () => { @@ -11,10 +10,7 @@ describe('PasswordRemovalConfirmDialogComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ providers: [NgbActiveModal], - imports: [ - NgxBootstrapIconsModule.pick(allIcons), - PasswordRemovalConfirmDialogComponent, - ], + imports: [PasswordRemovalConfirmDialogComponent], }).compileComponents() fixture = TestBed.createComponent(PasswordRemovalConfirmDialogComponent) diff --git a/src-ui/src/app/components/common/confirm-dialog/password-removal-confirm-dialog/password-removal-confirm-dialog.component.ts b/src-ui/src/app/components/common/confirm-dialog/password-removal-confirm-dialog/password-removal-confirm-dialog.component.ts index 28e78fc881..cdfd973fcc 100644 --- a/src-ui/src/app/components/common/confirm-dialog/password-removal-confirm-dialog/password-removal-confirm-dialog.component.ts +++ b/src-ui/src/app/components/common/confirm-dialog/password-removal-confirm-dialog/password-removal-confirm-dialog.component.ts @@ -1,13 +1,13 @@ import { Component } from '@angular/core' import { FormsModule } from '@angular/forms' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { ConfirmDialogComponent } from '../confirm-dialog.component' @Component({ selector: 'pngx-password-removal-confirm-dialog', templateUrl: './password-removal-confirm-dialog.component.html', styleUrls: ['./password-removal-confirm-dialog.component.scss'], - imports: [FormsModule, NgxBootstrapIconsModule], + imports: [FormsModule, BootstrapIconComponent], }) export class PasswordRemovalConfirmDialogComponent extends ConfirmDialogComponent { updateDocument: boolean = true diff --git a/src-ui/src/app/components/common/confirm-dialog/rotate-confirm-dialog/rotate-confirm-dialog.component.spec.ts b/src-ui/src/app/components/common/confirm-dialog/rotate-confirm-dialog/rotate-confirm-dialog.component.spec.ts index 6e0bca287d..91aa7a9804 100644 --- a/src-ui/src/app/components/common/confirm-dialog/rotate-confirm-dialog/rotate-confirm-dialog.component.spec.ts +++ b/src-ui/src/app/components/common/confirm-dialog/rotate-confirm-dialog/rotate-confirm-dialog.component.spec.ts @@ -2,7 +2,6 @@ import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http' import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { RotateConfirmDialogComponent } from './rotate-confirm-dialog.component' describe('RotateConfirmDialogComponent', () => { @@ -11,10 +10,7 @@ describe('RotateConfirmDialogComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ - NgxBootstrapIconsModule.pick(allIcons), - RotateConfirmDialogComponent, - ], + imports: [RotateConfirmDialogComponent], providers: [ NgbActiveModal, provideHttpClient(withInterceptorsFromDi()), diff --git a/src-ui/src/app/components/common/confirm-dialog/rotate-confirm-dialog/rotate-confirm-dialog.component.ts b/src-ui/src/app/components/common/confirm-dialog/rotate-confirm-dialog/rotate-confirm-dialog.component.ts index 18d844ef92..395d0aa517 100644 --- a/src-ui/src/app/components/common/confirm-dialog/rotate-confirm-dialog/rotate-confirm-dialog.component.ts +++ b/src-ui/src/app/components/common/confirm-dialog/rotate-confirm-dialog/rotate-confirm-dialog.component.ts @@ -1,6 +1,6 @@ import { NgStyle } from '@angular/common' import { Component, inject, signal } from '@angular/core' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { DocumentService } from 'src/app/services/rest/document.service' import { ConfirmDialogComponent } from '../confirm-dialog.component' @@ -8,7 +8,7 @@ import { ConfirmDialogComponent } from '../confirm-dialog.component' selector: 'pngx-rotate-confirm-dialog', templateUrl: './rotate-confirm-dialog.component.html', styleUrl: './rotate-confirm-dialog.component.scss', - imports: [NgStyle, NgxBootstrapIconsModule], + imports: [NgStyle, BootstrapIconComponent], }) export class RotateConfirmDialogComponent extends ConfirmDialogComponent { documentService = inject(DocumentService) diff --git a/src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.spec.ts b/src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.spec.ts index e00a6e0d14..57fcd798e0 100644 --- a/src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.spec.ts +++ b/src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.spec.ts @@ -10,7 +10,6 @@ import { NgbModalRef, } from '@ng-bootstrap/ng-bootstrap' import { NgSelectModule } from '@ng-select/ng-select' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of } from 'rxjs' import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field' import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service' @@ -49,7 +48,6 @@ describe('CustomFieldsDropdownComponent', () => { ReactiveFormsModule, NgbModalModule, NgbDropdownModule, - NgxBootstrapIconsModule.pick(allIcons), CustomFieldsDropdownComponent, SelectComponent, ], diff --git a/src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.ts b/src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.ts index 6d920742ab..d822bb373e 100644 --- a/src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.ts +++ b/src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.ts @@ -12,8 +12,8 @@ import { } from '@angular/core' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { NgbDropdownModule, NgbModal } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { first, takeUntil } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { CustomField, DATA_TYPE_LABELS } from 'src/app/data/custom-field' import { CustomFieldInstance } from 'src/app/data/custom-field-instance' import { @@ -34,7 +34,7 @@ import { CustomFieldEditDialogComponent } from '../edit-dialog/custom-field-edit styleUrls: ['./custom-fields-dropdown.component.scss'], imports: [ NgbDropdownModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, FormsModule, ReactiveFormsModule, ], diff --git a/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.spec.ts b/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.spec.ts index 7062be77ad..5439af84b3 100644 --- a/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.spec.ts +++ b/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.spec.ts @@ -5,7 +5,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { NgbDateAdapter, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap' import { NgSelectModule } from '@ng-select/ng-select' -import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { of } from 'rxjs' import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field' import { @@ -67,7 +66,6 @@ describe('CustomFieldsQueryDropdownComponent', () => { await TestBed.configureTestingModule({ imports: [ NgbDropdownModule, - NgxBootstrapIconsModule.pick(allIcons), NgSelectModule, FormsModule, ReactiveFormsModule, diff --git a/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.ts b/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.ts index 874655e11d..b93f119c7a 100644 --- a/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.ts +++ b/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.ts @@ -24,8 +24,8 @@ import { NgbDropdownModule, } from '@ng-bootstrap/ng-bootstrap' import { NgSelectComponent, NgSelectModule } from '@ng-select/ng-select' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { first, Subject, Subscription, takeUntil } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field' import { CUSTOM_FIELD_QUERY_MAX_ATOMS, @@ -235,7 +235,7 @@ export class CustomFieldQueriesModel { NgClass, NgTemplateOutlet, NgSelectModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, NgbDropdownModule, ], }) diff --git a/src-ui/src/app/components/common/dates-dropdown/dates-dropdown.component.spec.ts b/src-ui/src/app/components/common/dates-dropdown/dates-dropdown.component.spec.ts index 91e06c4282..5ef904fa71 100644 --- a/src-ui/src/app/components/common/dates-dropdown/dates-dropdown.component.spec.ts +++ b/src-ui/src/app/components/common/dates-dropdown/dates-dropdown.component.spec.ts @@ -4,7 +4,6 @@ import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { NgbModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe' import { SettingsService } from 'src/app/services/settings.service' import { ClearableBadgeComponent } from '../clearable-badge/clearable-badge.component' @@ -26,7 +25,6 @@ describe('DatesDropdownComponent', () => { NgbModule, FormsModule, ReactiveFormsModule, - NgxBootstrapIconsModule.pick(allIcons), DatesDropdownComponent, ClearableBadgeComponent, CustomDatePipe, diff --git a/src-ui/src/app/components/common/dates-dropdown/dates-dropdown.component.ts b/src-ui/src/app/components/common/dates-dropdown/dates-dropdown.component.ts index 9fc81bc7c5..d1a3183c6d 100644 --- a/src-ui/src/app/components/common/dates-dropdown/dates-dropdown.component.ts +++ b/src-ui/src/app/components/common/dates-dropdown/dates-dropdown.component.ts @@ -1,3 +1,4 @@ +import { _IdGenerator } from '@angular/cdk/a11y' import { NgClass, NgTemplateOutlet } from '@angular/common' import { Component, @@ -15,15 +16,14 @@ import { NgbDropdownModule, } from '@ng-bootstrap/ng-bootstrap' import { NgSelectModule } from '@ng-select/ng-select' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { Subject, Subscription } from 'rxjs' import { debounceTime } from 'rxjs/operators' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe' import { SettingsService } from 'src/app/services/settings.service' import { ISODateAdapter } from 'src/app/utils/ngb-iso-date-adapter' import { pngxPopperOptions } from 'src/app/utils/popper-options' import { ClearableBadgeComponent } from '../clearable-badge/clearable-badge.component' -import { _IdGenerator } from '@angular/cdk/a11y' export interface DateSelection { createdTo?: string @@ -57,7 +57,7 @@ export enum RelativeDate { imports: [ ClearableBadgeComponent, CustomDatePipe, - NgxBootstrapIconsModule, + BootstrapIconComponent, NgbDatepickerModule, NgbDropdownModule, NgSelectModule, diff --git a/src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.spec.ts b/src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.spec.ts index 970c7f3649..7cd936f7ce 100644 --- a/src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.spec.ts +++ b/src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.spec.ts @@ -6,7 +6,6 @@ import { ElementRef, QueryList } from '@angular/core' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { NgbActiveModal, NgbModule } from '@ng-bootstrap/ng-bootstrap' import { NgSelectModule } from '@ng-select/ng-select' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { CustomFieldDataType } from 'src/app/data/custom-field' import { IfOwnerDirective } from 'src/app/directives/if-owner.directive' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' @@ -28,7 +27,6 @@ describe('CustomFieldEditDialogComponent', () => { ReactiveFormsModule, NgSelectModule, NgbModule, - NgxBootstrapIconsModule.pick(allIcons), CustomFieldEditDialogComponent, IfPermissionsDirective, IfOwnerDirective, diff --git a/src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.ts index 78fd7e748d..774f43e7b4 100644 --- a/src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.ts +++ b/src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.ts @@ -15,8 +15,8 @@ import { ReactiveFormsModule, } from '@angular/forms' import { NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { takeUntil } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { CustomField, CustomFieldDataType, @@ -41,7 +41,7 @@ const SELECT_OPTION_PAGE_SIZE = 8 FormsModule, ReactiveFormsModule, NgbPaginationModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class CustomFieldEditDialogComponent diff --git a/src-ui/src/app/components/common/edit-dialog/group-edit-dialog/group-edit-dialog.component.spec.ts b/src-ui/src/app/components/common/edit-dialog/group-edit-dialog/group-edit-dialog.component.spec.ts index b7002853b0..d5ad8dac8e 100644 --- a/src-ui/src/app/components/common/edit-dialog/group-edit-dialog/group-edit-dialog.component.spec.ts +++ b/src-ui/src/app/components/common/edit-dialog/group-edit-dialog/group-edit-dialog.component.spec.ts @@ -4,7 +4,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { NgbActiveModal, NgbModule } from '@ng-bootstrap/ng-bootstrap' import { NgSelectModule } from '@ng-select/ng-select' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { IfOwnerDirective } from 'src/app/directives/if-owner.directive' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { SettingsService } from 'src/app/services/settings.service' @@ -27,7 +26,6 @@ describe('GroupEditDialogComponent', () => { ReactiveFormsModule, NgSelectModule, NgbModule, - NgxBootstrapIconsModule.pick(allIcons), GroupEditDialogComponent, IfPermissionsDirective, IfOwnerDirective, diff --git a/src-ui/src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.spec.ts b/src-ui/src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.spec.ts index c16130a18e..6a4f7c2483 100644 --- a/src-ui/src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.spec.ts +++ b/src-ui/src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.spec.ts @@ -4,7 +4,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { NgbActiveModal, NgbModule } from '@ng-bootstrap/ng-bootstrap' import { NgSelectModule } from '@ng-select/ng-select' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { IfOwnerDirective } from 'src/app/directives/if-owner.directive' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { SettingsService } from 'src/app/services/settings.service' @@ -28,7 +27,6 @@ describe('TagEditDialogComponent', () => { ReactiveFormsModule, NgSelectModule, NgbModule, - NgxBootstrapIconsModule.pick(allIcons), TagEditDialogComponent, IfPermissionsDirective, IfOwnerDirective, diff --git a/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.spec.ts b/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.spec.ts index 0769eaaf41..287bc2326b 100644 --- a/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.spec.ts +++ b/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.spec.ts @@ -8,7 +8,6 @@ import { } from '@angular/forms' import { NgbActiveModal, NgbModule } from '@ng-bootstrap/ng-bootstrap' import { NgSelectModule } from '@ng-select/ng-select' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of, throwError } from 'rxjs' import { IfOwnerDirective } from 'src/app/directives/if-owner.directive' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' @@ -39,7 +38,6 @@ describe('UserEditDialogComponent', () => { ReactiveFormsModule, NgSelectModule, NgbModule, - NgxBootstrapIconsModule.pick(allIcons), UserEditDialogComponent, IfPermissionsDirective, IfOwnerDirective, diff --git a/src-ui/src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts index a89c87cf92..4a89b22778 100644 --- a/src-ui/src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts +++ b/src-ui/src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts @@ -15,8 +15,8 @@ import { ReactiveFormsModule, } from '@angular/forms' import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { Subscription, catchError, map, of, takeUntil } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { Correspondent } from 'src/app/data/correspondent' import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field' import { DocumentType } from 'src/app/data/document-type' @@ -496,7 +496,7 @@ const FILTER_HANDLERS: Record = { NgbAccordionModule, NgTemplateOutlet, DragDropModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class WorkflowEditDialogComponent diff --git a/src-ui/src/app/components/common/email-document-dialog/email-document-dialog.component.spec.ts b/src-ui/src/app/components/common/email-document-dialog/email-document-dialog.component.spec.ts index ca078bab6a..5302fcddc6 100644 --- a/src-ui/src/app/components/common/email-document-dialog/email-document-dialog.component.spec.ts +++ b/src-ui/src/app/components/common/email-document-dialog/email-document-dialog.component.spec.ts @@ -3,7 +3,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing' import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http' import { provideHttpClientTesting } from '@angular/common/http/testing' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of, throwError } from 'rxjs' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { PermissionsService } from 'src/app/services/permissions.service' @@ -20,11 +19,7 @@ describe('EmailDocumentDialogComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ - EmailDocumentDialogComponent, - IfPermissionsDirective, - NgxBootstrapIconsModule.pick(allIcons), - ], + imports: [EmailDocumentDialogComponent, IfPermissionsDirective], providers: [ provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting(), diff --git a/src-ui/src/app/components/common/email-document-dialog/email-document-dialog.component.ts b/src-ui/src/app/components/common/email-document-dialog/email-document-dialog.component.ts index c97d8be0f5..2c16f1fb40 100644 --- a/src-ui/src/app/components/common/email-document-dialog/email-document-dialog.component.ts +++ b/src-ui/src/app/components/common/email-document-dialog/email-document-dialog.component.ts @@ -1,7 +1,6 @@ import { Component, effect, inject, signal } from '@angular/core' import { FormsModule } from '@angular/forms' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { DocumentService } from 'src/app/services/rest/document.service' import { ToastService } from 'src/app/services/toast.service' import { LoadingComponentWithPermissions } from '../../loading-component/loading.component' @@ -10,7 +9,7 @@ import { LoadingComponentWithPermissions } from '../../loading-component/loading selector: 'pngx-email-document-dialog', templateUrl: './email-document-dialog.component.html', styleUrl: './email-document-dialog.component.scss', - imports: [FormsModule, NgxBootstrapIconsModule], + imports: [FormsModule], }) export class EmailDocumentDialogComponent extends LoadingComponentWithPermissions { private activeModal = inject(NgbActiveModal) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts index 7cf2083aa0..7eb75026a0 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts @@ -2,7 +2,6 @@ import { ScrollingModule } from '@angular/cdk/scrolling' import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http' import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { NEVER, Subject } from 'rxjs' import { NEGATIVE_NULL_FILTER_VALUE } from 'src/app/data/filter-rule-type' import { @@ -63,7 +62,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () => provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting(), ], - imports: [NgxBootstrapIconsModule.pick(allIcons), ScrollingModule], + imports: [ScrollingModule], }).compileComponents() hotkeyService = TestBed.inject(HotKeyService) diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts index fdebc7003a..8463cb0d36 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts @@ -20,8 +20,8 @@ import { NgbDropdownModule, NgbModalRef, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { Subject, filter, first, merge, takeUntil } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { NEGATIVE_NULL_FILTER_VALUE } from 'src/app/data/filter-rule-type' import { MatchingModel } from 'src/app/data/matching-model' import { ObjectWithPermissions } from 'src/app/data/object-with-permissions' @@ -706,7 +706,7 @@ export class FilterableDropdownSelectionModel { ToggleableDropdownButtonComponent, FormsModule, ReactiveFormsModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, NgbDropdownModule, NgClass, ScrollingModule, diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts index 4d202580c8..8c4cc02f9b 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, Output } from '@angular/core' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { MatchingModel } from 'src/app/data/matching-model' import { Tag } from 'src/app/data/tag' import { TagComponent } from '../../tag/tag.component' @@ -15,7 +15,7 @@ export enum ToggleableItemState { selector: 'pngx-toggleable-dropdown-button', templateUrl: './toggleable-dropdown-button.component.html', styleUrls: ['./toggleable-dropdown-button.component.scss'], - imports: [TagComponent, NgxBootstrapIconsModule], + imports: [TagComponent, BootstrapIconComponent], }) export class ToggleableDropdownButtonComponent { @Input() diff --git a/src-ui/src/app/components/common/input/check/check.component.ts b/src-ui/src/app/components/common/input/check/check.component.ts index 82e2667243..53f995a081 100644 --- a/src-ui/src/app/components/common/input/check/check.component.ts +++ b/src-ui/src/app/components/common/input/check/check.component.ts @@ -5,7 +5,7 @@ import { NG_VALUE_ACCESSOR, ReactiveFormsModule, } from '@angular/forms' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { AbstractInputComponent } from '../abstract-input' @Component({ @@ -19,7 +19,7 @@ import { AbstractInputComponent } from '../abstract-input' selector: 'pngx-input-check', templateUrl: './check.component.html', styleUrls: ['./check.component.scss'], - imports: [FormsModule, ReactiveFormsModule, NgClass, NgxBootstrapIconsModule], + imports: [FormsModule, ReactiveFormsModule, NgClass, BootstrapIconComponent], }) export class CheckComponent extends AbstractInputComponent { constructor() { diff --git a/src-ui/src/app/components/common/input/color/color.component.spec.ts b/src-ui/src/app/components/common/input/color/color.component.spec.ts index 427a878734..8727870101 100644 --- a/src-ui/src/app/components/common/input/color/color.component.spec.ts +++ b/src-ui/src/app/components/common/input/color/color.component.spec.ts @@ -5,7 +5,6 @@ import { ReactiveFormsModule, } from '@angular/forms' import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { ColorSliderModule } from 'ngx-color/slider' import { ColorComponent } from './color.component' @@ -22,7 +21,6 @@ describe('ColorComponent', () => { ReactiveFormsModule, NgbPopoverModule, ColorSliderModule, - NgxBootstrapIconsModule.pick(allIcons), ColorComponent, ], }).compileComponents() diff --git a/src-ui/src/app/components/common/input/color/color.component.ts b/src-ui/src/app/components/common/input/color/color.component.ts index 5f83d593f4..f31721f712 100644 --- a/src-ui/src/app/components/common/input/color/color.component.ts +++ b/src-ui/src/app/components/common/input/color/color.component.ts @@ -5,8 +5,8 @@ import { ReactiveFormsModule, } from '@angular/forms' import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { ColorSliderModule } from 'ngx-color/slider' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { randomColor } from 'src/app/utils/color' import { AbstractInputComponent } from '../abstract-input' @@ -22,7 +22,7 @@ import { AbstractInputComponent } from '../abstract-input' templateUrl: './color.component.html', styleUrls: ['./color.component.scss'], imports: [ - NgxBootstrapIconsModule, + BootstrapIconComponent, NgbPopoverModule, FormsModule, ReactiveFormsModule, diff --git a/src-ui/src/app/components/common/input/custom-fields-values/custom-fields-values.component.ts b/src-ui/src/app/components/common/input/custom-fields-values/custom-fields-values.component.ts index 65a2bea8a6..76832c33bb 100644 --- a/src-ui/src/app/components/common/input/custom-fields-values/custom-fields-values.component.ts +++ b/src-ui/src/app/components/common/input/custom-fields-values/custom-fields-values.component.ts @@ -14,7 +14,7 @@ import { } from '@angular/forms' import { RouterModule } from '@angular/router' import { NgSelectModule } from '@ng-select/ng-select' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field' import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service' import { AbstractInputComponent } from '../abstract-input' @@ -52,7 +52,7 @@ import { UrlComponent } from '../url/url.component' FormsModule, ReactiveFormsModule, RouterModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, TextAreaComponent, ], }) diff --git a/src-ui/src/app/components/common/input/date/date.component.spec.ts b/src-ui/src/app/components/common/input/date/date.component.spec.ts index c8bf9b2e21..ca98d38494 100644 --- a/src-ui/src/app/components/common/input/date/date.component.spec.ts +++ b/src-ui/src/app/components/common/input/date/date.component.spec.ts @@ -4,7 +4,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing' import { NG_VALUE_ACCESSOR } from '@angular/forms' import { RouterModule } from '@angular/router' import { NgbDateParserFormatter } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { routes } from 'src/app/app-routing.module' import { LocalizedDateParserFormatter } from 'src/app/utils/ngb-date-parser-formatter' import { DateComponent } from './date.component' @@ -16,10 +15,7 @@ describe('DateComponent', () => { beforeEach(async () => { TestBed.configureTestingModule({ - imports: [ - NgxBootstrapIconsModule.pick(allIcons), - RouterModule.forRoot(routes), - ], + imports: [RouterModule.forRoot(routes)], providers: [ { provide: NgbDateParserFormatter, diff --git a/src-ui/src/app/components/common/input/date/date.component.ts b/src-ui/src/app/components/common/input/date/date.component.ts index 5a10cce188..94979760ae 100644 --- a/src-ui/src/app/components/common/input/date/date.component.ts +++ b/src-ui/src/app/components/common/input/date/date.component.ts @@ -19,7 +19,7 @@ import { NgbDatepickerModule, NgbDateStruct, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { SettingsService } from 'src/app/services/settings.service' import { AbstractInputComponent } from '../abstract-input' @@ -39,7 +39,7 @@ import { AbstractInputComponent } from '../abstract-input' FormsModule, ReactiveFormsModule, RouterModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class DateComponent diff --git a/src-ui/src/app/components/common/input/document-link/document-link.component.spec.ts b/src-ui/src/app/components/common/input/document-link/document-link.component.spec.ts index be479f2a4f..630e9d050b 100644 --- a/src-ui/src/app/components/common/input/document-link/document-link.component.spec.ts +++ b/src-ui/src/app/components/common/input/document-link/document-link.component.spec.ts @@ -5,7 +5,6 @@ import { NG_VALUE_ACCESSOR } from '@angular/forms' import { By } from '@angular/platform-browser' import { provideRouter } from '@angular/router' import { NgSelectComponent } from '@ng-select/ng-select' -import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { of, Subject, throwError } from 'rxjs' import { FILTER_SIMPLE_TITLE } from 'src/app/data/filter-rule-type' import { DocumentService } from 'src/app/services/rest/document.service' @@ -37,7 +36,7 @@ describe('DocumentLinkComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [DocumentLinkComponent, NgxBootstrapIconsModule.pick(allIcons)], + imports: [DocumentLinkComponent], providers: [ provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting(), diff --git a/src-ui/src/app/components/common/input/document-link/document-link.component.ts b/src-ui/src/app/components/common/input/document-link/document-link.component.ts index fb8106d1db..cec2f158ea 100644 --- a/src-ui/src/app/components/common/input/document-link/document-link.component.ts +++ b/src-ui/src/app/components/common/input/document-link/document-link.component.ts @@ -15,7 +15,6 @@ import { } from '@angular/forms' import { RouterModule } from '@angular/router' import { NgSelectModule } from '@ng-select/ng-select' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { catchError, concat, @@ -28,6 +27,7 @@ import { takeUntil, tap, } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { Document } from 'src/app/data/document' import { FILTER_SIMPLE_TITLE } from 'src/app/data/filter-rule-type' import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe' @@ -53,7 +53,7 @@ import { AbstractInputComponent } from '../abstract-input' RouterModule, NgTemplateOutlet, NgSelectModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class DocumentLinkComponent diff --git a/src-ui/src/app/components/common/input/entries/entries.component.spec.ts b/src-ui/src/app/components/common/input/entries/entries.component.spec.ts index 692b9c0b87..9b8f946cfc 100644 --- a/src-ui/src/app/components/common/input/entries/entries.component.spec.ts +++ b/src-ui/src/app/components/common/input/entries/entries.component.spec.ts @@ -4,7 +4,6 @@ import { NG_VALUE_ACCESSOR, ReactiveFormsModule, } from '@angular/forms' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { EntriesComponent } from './entries.component' describe('EntriesComponent', () => { @@ -13,12 +12,7 @@ describe('EntriesComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ - FormsModule, - ReactiveFormsModule, - NgxBootstrapIconsModule.pick(allIcons), - EntriesComponent, - ], + imports: [FormsModule, ReactiveFormsModule, EntriesComponent], }).compileComponents() }) diff --git a/src-ui/src/app/components/common/input/entries/entries.component.ts b/src-ui/src/app/components/common/input/entries/entries.component.ts index cbf5de1d4e..6af3196363 100644 --- a/src-ui/src/app/components/common/input/entries/entries.component.ts +++ b/src-ui/src/app/components/common/input/entries/entries.component.ts @@ -4,7 +4,7 @@ import { NG_VALUE_ACCESSOR, ReactiveFormsModule, } from '@angular/forms' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { AbstractInputComponent } from '../abstract-input' @Component({ @@ -18,7 +18,7 @@ import { AbstractInputComponent } from '../abstract-input' selector: 'pngx-input-entries', templateUrl: './entries.component.html', styleUrl: './entries.component.scss', - imports: [FormsModule, ReactiveFormsModule, NgxBootstrapIconsModule], + imports: [FormsModule, ReactiveFormsModule, BootstrapIconComponent], }) export class EntriesComponent extends AbstractInputComponent { entries = [] diff --git a/src-ui/src/app/components/common/input/monetary/monetary.component.ts b/src-ui/src/app/components/common/input/monetary/monetary.component.ts index b0d6c5b09e..8f6a7c84f6 100644 --- a/src-ui/src/app/components/common/input/monetary/monetary.component.ts +++ b/src-ui/src/app/components/common/input/monetary/monetary.component.ts @@ -5,7 +5,7 @@ import { NG_VALUE_ACCESSOR, ReactiveFormsModule, } from '@angular/forms' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { AbstractInputComponent } from '../abstract-input' @Component({ @@ -23,7 +23,7 @@ import { AbstractInputComponent } from '../abstract-input' CurrencyPipe, FormsModule, ReactiveFormsModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class MonetaryComponent extends AbstractInputComponent { diff --git a/src-ui/src/app/components/common/input/number/number.component.ts b/src-ui/src/app/components/common/input/number/number.component.ts index ee701a5042..a6253905c7 100644 --- a/src-ui/src/app/components/common/input/number/number.component.ts +++ b/src-ui/src/app/components/common/input/number/number.component.ts @@ -4,7 +4,7 @@ import { NG_VALUE_ACCESSOR, ReactiveFormsModule, } from '@angular/forms' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { DocumentService } from 'src/app/services/rest/document.service' import { AbstractInputComponent } from '../abstract-input' @@ -19,7 +19,7 @@ import { AbstractInputComponent } from '../abstract-input' selector: 'pngx-input-number', templateUrl: './number.component.html', styleUrls: ['./number.component.scss'], - imports: [FormsModule, ReactiveFormsModule, NgxBootstrapIconsModule], + imports: [FormsModule, ReactiveFormsModule, BootstrapIconComponent], }) export class NumberComponent extends AbstractInputComponent { private documentService = inject(DocumentService) diff --git a/src-ui/src/app/components/common/input/password/password.component.spec.ts b/src-ui/src/app/components/common/input/password/password.component.spec.ts index 3343e6ac5a..d0a4a89bcb 100644 --- a/src-ui/src/app/components/common/input/password/password.component.spec.ts +++ b/src-ui/src/app/components/common/input/password/password.component.spec.ts @@ -5,7 +5,6 @@ import { ReactiveFormsModule, } from '@angular/forms' import { By } from '@angular/platform-browser' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { PasswordComponent } from './password.component' describe('PasswordComponent', () => { @@ -16,12 +15,7 @@ describe('PasswordComponent', () => { beforeEach(async () => { TestBed.configureTestingModule({ providers: [], - imports: [ - FormsModule, - ReactiveFormsModule, - NgxBootstrapIconsModule.pick(allIcons), - PasswordComponent, - ], + imports: [FormsModule, ReactiveFormsModule, PasswordComponent], }).compileComponents() fixture = TestBed.createComponent(PasswordComponent) diff --git a/src-ui/src/app/components/common/input/password/password.component.ts b/src-ui/src/app/components/common/input/password/password.component.ts index 3af5d66739..35f0ab054c 100644 --- a/src-ui/src/app/components/common/input/password/password.component.ts +++ b/src-ui/src/app/components/common/input/password/password.component.ts @@ -4,7 +4,7 @@ import { NG_VALUE_ACCESSOR, ReactiveFormsModule, } from '@angular/forms' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { AbstractInputComponent } from '../abstract-input' @Component({ @@ -18,7 +18,7 @@ import { AbstractInputComponent } from '../abstract-input' selector: 'pngx-input-password', templateUrl: './password.component.html', styleUrls: ['./password.component.scss'], - imports: [FormsModule, ReactiveFormsModule, NgxBootstrapIconsModule], + imports: [FormsModule, ReactiveFormsModule, BootstrapIconComponent], }) export class PasswordComponent extends AbstractInputComponent { @Input() diff --git a/src-ui/src/app/components/common/input/select/select.component.ts b/src-ui/src/app/components/common/input/select/select.component.ts index 888d3b5ed8..1fd2db3b7b 100644 --- a/src-ui/src/app/components/common/input/select/select.component.ts +++ b/src-ui/src/app/components/common/input/select/select.component.ts @@ -12,7 +12,7 @@ import { } from '@angular/forms' import { RouterModule } from '@angular/router' import { NgSelectModule } from '@ng-select/ng-select' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { matchesSearchText } from 'src/app/utils/text-search' import { AbstractInputComponent } from '../abstract-input' @@ -32,7 +32,7 @@ import { AbstractInputComponent } from '../abstract-input' FormsModule, ReactiveFormsModule, RouterModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class SelectComponent extends AbstractInputComponent { diff --git a/src-ui/src/app/components/common/input/tags/tags.component.spec.ts b/src-ui/src/app/components/common/input/tags/tags.component.spec.ts index 728713dd7a..184a6284a8 100644 --- a/src-ui/src/app/components/common/input/tags/tags.component.spec.ts +++ b/src-ui/src/app/components/common/input/tags/tags.component.spec.ts @@ -15,7 +15,6 @@ import { NgbPopoverModule, } from '@ng-bootstrap/ng-bootstrap' import { NgSelectModule } from '@ng-select/ng-select' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of } from 'rxjs' import { DEFAULT_MATCHING_ALGORITHM, @@ -71,7 +70,6 @@ describe('TagsComponent', () => { NgbModalModule, NgbAccordionModule, NgbPopoverModule, - NgxBootstrapIconsModule.pick(allIcons), TagsComponent, TagEditDialogComponent, TextComponent, diff --git a/src-ui/src/app/components/common/input/tags/tags.component.ts b/src-ui/src/app/components/common/input/tags/tags.component.ts index 1410db99b8..b0db1f3d3a 100644 --- a/src-ui/src/app/components/common/input/tags/tags.component.ts +++ b/src-ui/src/app/components/common/input/tags/tags.component.ts @@ -18,8 +18,8 @@ import { import { RouterModule } from '@angular/router' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' import { NgSelectComponent, NgSelectModule } from '@ng-select/ng-select' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { first, firstValueFrom, tap } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { Tag } from 'src/app/data/tag' import { TagService } from 'src/app/services/rest/tag.service' import { matchesSearchText } from 'src/app/utils/text-search' @@ -44,7 +44,7 @@ import { TagComponent } from '../../tag/tag.component' FormsModule, ReactiveFormsModule, RouterModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class TagsComponent implements OnInit, ControlValueAccessor { diff --git a/src-ui/src/app/components/common/input/text/text.component.ts b/src-ui/src/app/components/common/input/text/text.component.ts index 8572547a77..cd648229ca 100644 --- a/src-ui/src/app/components/common/input/text/text.component.ts +++ b/src-ui/src/app/components/common/input/text/text.component.ts @@ -5,7 +5,7 @@ import { ReactiveFormsModule, } from '@angular/forms' import { RouterLink } from '@angular/router' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { AbstractInputComponent } from '../abstract-input' @Component({ @@ -22,7 +22,7 @@ import { AbstractInputComponent } from '../abstract-input' imports: [ FormsModule, ReactiveFormsModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, RouterLink, ], }) diff --git a/src-ui/src/app/components/common/input/textarea/textarea.component.ts b/src-ui/src/app/components/common/input/textarea/textarea.component.ts index 527afda925..f67c917086 100644 --- a/src-ui/src/app/components/common/input/textarea/textarea.component.ts +++ b/src-ui/src/app/components/common/input/textarea/textarea.component.ts @@ -4,7 +4,7 @@ import { NG_VALUE_ACCESSOR, ReactiveFormsModule, } from '@angular/forms' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { AbstractInputComponent } from '../abstract-input' @Component({ @@ -18,7 +18,7 @@ import { AbstractInputComponent } from '../abstract-input' selector: 'pngx-input-textarea', templateUrl: './textarea.component.html', styleUrls: ['./textarea.component.scss'], - imports: [FormsModule, ReactiveFormsModule, NgxBootstrapIconsModule], + imports: [FormsModule, ReactiveFormsModule, BootstrapIconComponent], }) export class TextAreaComponent extends AbstractInputComponent { @Input() diff --git a/src-ui/src/app/components/common/input/url/url.component.spec.ts b/src-ui/src/app/components/common/input/url/url.component.spec.ts index 73feb11480..2e919b4be6 100644 --- a/src-ui/src/app/components/common/input/url/url.component.spec.ts +++ b/src-ui/src/app/components/common/input/url/url.component.spec.ts @@ -4,7 +4,6 @@ import { NG_VALUE_ACCESSOR, ReactiveFormsModule, } from '@angular/forms' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { UrlComponent } from './url.component' describe('TextComponent', () => { @@ -15,12 +14,7 @@ describe('TextComponent', () => { beforeEach(async () => { TestBed.configureTestingModule({ providers: [], - imports: [ - FormsModule, - ReactiveFormsModule, - NgxBootstrapIconsModule.pick(allIcons), - UrlComponent, - ], + imports: [FormsModule, ReactiveFormsModule, UrlComponent], }).compileComponents() fixture = TestBed.createComponent(UrlComponent) diff --git a/src-ui/src/app/components/common/input/url/url.component.ts b/src-ui/src/app/components/common/input/url/url.component.ts index ac28e2d0ab..84fce47cc1 100644 --- a/src-ui/src/app/components/common/input/url/url.component.ts +++ b/src-ui/src/app/components/common/input/url/url.component.ts @@ -4,7 +4,7 @@ import { NG_VALUE_ACCESSOR, ReactiveFormsModule, } from '@angular/forms' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { AbstractInputComponent } from '../abstract-input' @Component({ @@ -18,7 +18,7 @@ import { AbstractInputComponent } from '../abstract-input' selector: 'pngx-input-url', templateUrl: './url.component.html', styleUrls: ['./url.component.scss'], - imports: [NgxBootstrapIconsModule, FormsModule, ReactiveFormsModule], + imports: [BootstrapIconComponent, FormsModule, ReactiveFormsModule], }) export class UrlComponent extends AbstractInputComponent { constructor() { diff --git a/src-ui/src/app/components/common/page-header/page-header.component.spec.ts b/src-ui/src/app/components/common/page-header/page-header.component.spec.ts index 603dcd028f..57f3b58394 100644 --- a/src-ui/src/app/components/common/page-header/page-header.component.spec.ts +++ b/src-ui/src/app/components/common/page-header/page-header.component.spec.ts @@ -1,7 +1,6 @@ import { Clipboard } from '@angular/cdk/clipboard' import { ComponentFixture, TestBed } from '@angular/core/testing' import { Title } from '@angular/platform-browser' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { environment } from 'src/environments/environment' import { PageHeaderComponent } from './page-header.component' @@ -14,7 +13,7 @@ describe('PageHeaderComponent', () => { beforeEach(async () => { TestBed.configureTestingModule({ providers: [], - imports: [NgxBootstrapIconsModule.pick(allIcons), PageHeaderComponent], + imports: [PageHeaderComponent], }).compileComponents() titleService = TestBed.inject(Title) 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 a0a1cc3645..578bc7a65a 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 @@ -2,15 +2,15 @@ import { Clipboard } from '@angular/cdk/clipboard' import { Component, effect, 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' import { TourNgBootstrap } from 'ngx-ui-tour-ng-bootstrap' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { environment } from 'src/environments/environment' @Component({ selector: 'pngx-page-header', templateUrl: './page-header.component.html', styleUrls: ['./page-header.component.scss'], - imports: [NgbPopoverModule, NgxBootstrapIconsModule, TourNgBootstrap], + imports: [NgbPopoverModule, BootstrapIconComponent, TourNgBootstrap], }) export class PageHeaderComponent { private titleService = inject(Title) diff --git a/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.spec.ts b/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.spec.ts index 41fee5a7e3..95005c1ba6 100644 --- a/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.spec.ts +++ b/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.spec.ts @@ -2,7 +2,6 @@ import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http' import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { DocumentService } from 'src/app/services/rest/document.service' import { PDFEditorComponent } from './pdf-editor.component' @@ -12,7 +11,7 @@ describe('PDFEditorComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [PDFEditorComponent, NgxBootstrapIconsModule.pick(allIcons)], + imports: [PDFEditorComponent], providers: [ provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting(), diff --git a/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.ts b/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.ts index 8ba4580625..5088486f36 100644 --- a/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.ts +++ b/src-ui/src/app/components/common/pdf-editor/pdf-editor.component.ts @@ -6,7 +6,7 @@ import { import { Component, inject, signal } from '@angular/core' import { FormsModule } from '@angular/forms' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { SETTINGS_KEYS } from 'src/app/data/ui-settings' import { DocumentService } from 'src/app/services/rest/document.service' import { SettingsService } from 'src/app/services/settings.service' @@ -33,7 +33,7 @@ interface PageOperation { imports: [ DragDropModule, FormsModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, PngxPdfViewerComponent, ], }) diff --git a/src-ui/src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.spec.ts b/src-ui/src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.spec.ts index 81d620ff1b..8538e9892e 100644 --- a/src-ui/src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.spec.ts +++ b/src-ui/src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.spec.ts @@ -4,7 +4,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { NgbModule } from '@ng-bootstrap/ng-bootstrap' import { NgSelectModule } from '@ng-select/ng-select' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of } from 'rxjs' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { PermissionsService } from 'src/app/services/permissions.service' @@ -31,7 +30,6 @@ describe('PermissionsFilterDropdownComponent', () => { FormsModule, ReactiveFormsModule, NgbModule, - NgxBootstrapIconsModule.pick(allIcons), PermissionsFilterDropdownComponent, ClearableBadgeComponent, IfPermissionsDirective, diff --git a/src-ui/src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.ts b/src-ui/src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.ts index c0e115567b..020fb23dbe 100644 --- a/src-ui/src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.ts +++ b/src-ui/src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.ts @@ -11,8 +11,8 @@ import { import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap' import { NgSelectComponent } from '@ng-select/ng-select' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { first } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { User } from 'src/app/data/user' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { @@ -62,7 +62,7 @@ export enum OwnerFilterType { NgbDropdownModule, NgSelectComponent, NgClass, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class PermissionsFilterDropdownComponent extends ComponentWithPermissions { diff --git a/src-ui/src/app/components/common/permissions-select/permissions-select.component.spec.ts b/src-ui/src/app/components/common/permissions-select/permissions-select.component.spec.ts index dd932843b1..fbf4d4fea0 100644 --- a/src-ui/src/app/components/common/permissions-select/permissions-select.component.spec.ts +++ b/src-ui/src/app/components/common/permissions-select/permissions-select.component.spec.ts @@ -3,7 +3,6 @@ import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { NG_VALUE_ACCESSOR } from '@angular/forms' import { By } from '@angular/platform-browser' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { SETTINGS_KEYS } from 'src/app/data/ui-settings' import { PermissionAction, @@ -34,10 +33,7 @@ describe('PermissionsSelectComponent', () => { beforeEach(async () => { TestBed.configureTestingModule({ - imports: [ - NgxBootstrapIconsModule.pick(allIcons), - PermissionsSelectComponent, - ], + imports: [PermissionsSelectComponent], providers: [ provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting(), diff --git a/src-ui/src/app/components/common/permissions-select/permissions-select.component.ts b/src-ui/src/app/components/common/permissions-select/permissions-select.component.ts index 52030ac2cf..19785aa742 100644 --- a/src-ui/src/app/components/common/permissions-select/permissions-select.component.ts +++ b/src-ui/src/app/components/common/permissions-select/permissions-select.component.ts @@ -10,7 +10,7 @@ import { ReactiveFormsModule, } from '@angular/forms' import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { SETTINGS_KEYS } from 'src/app/data/ui-settings' import { PermissionAction, @@ -33,7 +33,7 @@ import { ComponentWithPermissions } from '../../with-permissions/with-permission styleUrls: ['./permissions-select.component.scss'], imports: [ KeyValuePipe, - NgxBootstrapIconsModule, + BootstrapIconComponent, NgbPopoverModule, FormsModule, ReactiveFormsModule, diff --git a/src-ui/src/app/components/common/preview-popup/preview-popup.component.spec.ts b/src-ui/src/app/components/common/preview-popup/preview-popup.component.spec.ts index 3194729ff8..10c62ea130 100644 --- a/src-ui/src/app/components/common/preview-popup/preview-popup.component.spec.ts +++ b/src-ui/src/app/components/common/preview-popup/preview-popup.component.spec.ts @@ -7,7 +7,6 @@ import { } from '@angular/common/http' import { provideHttpClientTesting } from '@angular/common/http/testing' import { By } from '@angular/platform-browser' -import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { of, throwError } from 'rxjs' import { SETTINGS_KEYS } from 'src/app/data/ui-settings' import { DocumentService } from 'src/app/services/rest/document.service' @@ -33,7 +32,6 @@ describe('PreviewPopupComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [NgxBootstrapIconsModule.pick(allIcons)], providers: [ provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting(), diff --git a/src-ui/src/app/components/common/preview-popup/preview-popup.component.ts b/src-ui/src/app/components/common/preview-popup/preview-popup.component.ts index fc7ce7e4bc..07a4e195ce 100644 --- a/src-ui/src/app/components/common/preview-popup/preview-popup.component.ts +++ b/src-ui/src/app/components/common/preview-popup/preview-popup.component.ts @@ -9,8 +9,8 @@ import { } from '@angular/core' import { NgbPopover, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap' import { Options } from '@popperjs/core' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { first, Subject, takeUntil } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { Document } from 'src/app/data/document' import { SETTINGS_KEYS } from 'src/app/data/ui-settings' import { DocumentTitlePipe } from 'src/app/pipes/document-title.pipe' @@ -29,7 +29,7 @@ import { PdfRenderMode } from '../pdf-viewer/pdf-viewer.types' DocumentTitlePipe, PngxPdfViewerComponent, SafeUrlPipe, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class PreviewPopupComponent implements OnDestroy { diff --git a/src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.spec.ts b/src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.spec.ts index aaf70737c2..942b9cec6b 100644 --- a/src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.spec.ts +++ b/src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.spec.ts @@ -9,7 +9,6 @@ import { NgbModalModule, NgbPopoverModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { NEVER, of, Subject, throwError } from 'rxjs' import { ProfileService } from 'src/app/services/profile.service' import { ToastService } from 'src/app/services/toast.service' @@ -50,7 +49,6 @@ describe('ProfileEditDialogComponent', () => { FormsModule, NgbModalModule, NgbAccordionModule, - NgxBootstrapIconsModule.pick(allIcons), NgbPopoverModule, ProfileEditDialogComponent, TextComponent, diff --git a/src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.ts b/src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.ts index 1b1489d282..6caf28f65f 100644 --- a/src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.ts +++ b/src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.ts @@ -11,8 +11,8 @@ import { NgbActiveModal, NgbPopoverModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { takeUntil } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { SocialAccount, SocialAccountProvider, @@ -38,7 +38,7 @@ import { TextComponent } from '../input/text/text.component' ReactiveFormsModule, NgbAccordionModule, NgbPopoverModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class ProfileEditDialogComponent diff --git a/src-ui/src/app/components/common/share-link-bundle-dialog/share-link-bundle-dialog.component.spec.ts b/src-ui/src/app/components/common/share-link-bundle-dialog/share-link-bundle-dialog.component.spec.ts index 7d40135248..7c9ba1c169 100644 --- a/src-ui/src/app/components/common/share-link-bundle-dialog/share-link-bundle-dialog.component.spec.ts +++ b/src-ui/src/app/components/common/share-link-bundle-dialog/share-link-bundle-dialog.component.spec.ts @@ -1,7 +1,6 @@ import { Clipboard } from '@angular/cdk/clipboard' import { ComponentFixture, TestBed } from '@angular/core/testing' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { FileVersion } from 'src/app/data/share-link' import { ShareLinkBundleStatus, @@ -29,10 +28,7 @@ describe('ShareLinkBundleDialogComponent', () => { toastService = new MockToastService() TestBed.configureTestingModule({ - imports: [ - ShareLinkBundleDialogComponent, - NgxBootstrapIconsModule.pick(allIcons), - ], + imports: [ShareLinkBundleDialogComponent], providers: [ NgbActiveModal, { provide: ToastService, useValue: toastService }, diff --git a/src-ui/src/app/components/common/share-link-bundle-dialog/share-link-bundle-dialog.component.ts b/src-ui/src/app/components/common/share-link-bundle-dialog/share-link-bundle-dialog.component.ts index 1a80bc75fd..155fe25fe6 100644 --- a/src-ui/src/app/components/common/share-link-bundle-dialog/share-link-bundle-dialog.component.ts +++ b/src-ui/src/app/components/common/share-link-bundle-dialog/share-link-bundle-dialog.component.ts @@ -2,7 +2,7 @@ import { Clipboard } from '@angular/cdk/clipboard' import { CommonModule } from '@angular/common' import { Component, inject, signal } from '@angular/core' import { FormBuilder, FormGroup, ReactiveFormsModule } from '@angular/forms' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { Document } from 'src/app/data/document' import { FileVersion, @@ -26,7 +26,7 @@ import { ConfirmDialogComponent } from '../confirm-dialog/confirm-dialog.compone imports: [ CommonModule, ReactiveFormsModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, FileSizePipe, DocumentTitlePipe, ], diff --git a/src-ui/src/app/components/common/share-links-dialog/share-links-dialog.component.spec.ts b/src-ui/src/app/components/common/share-links-dialog/share-links-dialog.component.spec.ts index 3e6be2e94d..c4da477f15 100644 --- a/src-ui/src/app/components/common/share-links-dialog/share-links-dialog.component.spec.ts +++ b/src-ui/src/app/components/common/share-links-dialog/share-links-dialog.component.spec.ts @@ -8,7 +8,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { By } from '@angular/platform-browser' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of, throwError } from 'rxjs' import { FileVersion, ShareLink } from 'src/app/data/share-link' import { ShareLinkService } from 'src/app/services/rest/share-link.service' @@ -26,12 +25,7 @@ describe('ShareLinksDialogComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ - ShareLinksDialogComponent, - NgxBootstrapIconsModule.pick(allIcons), - FormsModule, - ReactiveFormsModule, - ], + imports: [ShareLinksDialogComponent, FormsModule, ReactiveFormsModule], providers: [ provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting(), diff --git a/src-ui/src/app/components/common/share-links-dialog/share-links-dialog.component.ts b/src-ui/src/app/components/common/share-links-dialog/share-links-dialog.component.ts index f3d4b8f271..18c4c6e8dc 100644 --- a/src-ui/src/app/components/common/share-links-dialog/share-links-dialog.component.ts +++ b/src-ui/src/app/components/common/share-links-dialog/share-links-dialog.component.ts @@ -2,8 +2,8 @@ import { Clipboard } from '@angular/cdk/clipboard' import { Component, OnInit, effect, inject, input, signal } from '@angular/core' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { first } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { FileVersion, SHARE_LINK_EXPIRATION_OPTIONS, @@ -17,7 +17,7 @@ import { environment } from 'src/environments/environment' selector: 'pngx-share-links-dialog', templateUrl: './share-links-dialog.component.html', styleUrls: ['./share-links-dialog.component.scss'], - imports: [FormsModule, ReactiveFormsModule, NgxBootstrapIconsModule], + imports: [FormsModule, ReactiveFormsModule, BootstrapIconComponent], }) export class ShareLinksDialogComponent implements OnInit { private activeModal = inject(NgbActiveModal) diff --git a/src-ui/src/app/components/common/suggestions-dropdown/suggestions-dropdown.component.spec.ts b/src-ui/src/app/components/common/suggestions-dropdown/suggestions-dropdown.component.spec.ts index 6cc7cb1733..122b669480 100644 --- a/src-ui/src/app/components/common/suggestions-dropdown/suggestions-dropdown.component.spec.ts +++ b/src-ui/src/app/components/common/suggestions-dropdown/suggestions-dropdown.component.spec.ts @@ -1,6 +1,5 @@ import { ComponentFixture, TestBed } from '@angular/core/testing' import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { SuggestionSource } from 'src/app/data/ui-settings' import { SuggestionsDropdownComponent } from './suggestions-dropdown.component' @@ -10,11 +9,7 @@ describe('SuggestionsDropdownComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ - NgbDropdownModule, - NgxBootstrapIconsModule.pick(allIcons), - SuggestionsDropdownComponent, - ], + imports: [NgbDropdownModule, SuggestionsDropdownComponent], providers: [], }) fixture = TestBed.createComponent(SuggestionsDropdownComponent) 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 73086ab12c..6dcfb467d1 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 @@ -6,14 +6,14 @@ import { input, } from '@angular/core' import { NgbDropdown, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { DocumentSuggestions } from 'src/app/data/document-suggestions' import { SuggestionSource } from 'src/app/data/ui-settings' import { pngxPopperOptions } from 'src/app/utils/popper-options' @Component({ selector: 'pngx-suggestions-dropdown', - imports: [NgbDropdownModule, NgxBootstrapIconsModule], + imports: [NgbDropdownModule, BootstrapIconComponent], templateUrl: './suggestions-dropdown.component.html', styleUrl: './suggestions-dropdown.component.scss', }) diff --git a/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.spec.ts b/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.spec.ts index df65f76789..86f608a3ed 100644 --- a/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.spec.ts +++ b/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.spec.ts @@ -18,7 +18,6 @@ import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http' import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { Subject, of, throwError } from 'rxjs' import { PaperlessTaskType } from 'src/app/data/paperless-task' import { @@ -88,10 +87,7 @@ describe('SystemStatusDialogComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ - SystemStatusDialogComponent, - NgxBootstrapIconsModule.pick(allIcons), - ], + imports: [SystemStatusDialogComponent], providers: [ NgbActiveModal, provideHttpClient(withInterceptorsFromDi()), diff --git a/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.ts b/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.ts index cf99824008..eb84d93d3b 100644 --- a/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.ts +++ b/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.ts @@ -13,8 +13,8 @@ import { NgbPopoverModule, NgbProgressbarModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { Subject, takeUntil } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { PaperlessTaskType } from 'src/app/data/paperless-task' import { SystemStatus, @@ -42,7 +42,7 @@ import { environment } from 'src/environments/environment' NgbProgressbarModule, CustomDatePipe, FileSizePipe, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class SystemStatusDialogComponent implements OnInit, OnDestroy { diff --git a/src-ui/src/app/components/common/toast/toast.component.spec.ts b/src-ui/src/app/components/common/toast/toast.component.spec.ts index ff73f30387..365f16a448 100644 --- a/src-ui/src/app/components/common/toast/toast.component.spec.ts +++ b/src-ui/src/app/components/common/toast/toast.component.spec.ts @@ -4,7 +4,6 @@ import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { Clipboard } from '@angular/cdk/clipboard' -import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { ToastLevel } from 'src/app/services/toast.service' import { ToastComponent } from './toast.component' @@ -33,7 +32,7 @@ describe('ToastComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ToastComponent, NgxBootstrapIconsModule.pick(allIcons)], + imports: [ToastComponent], providers: [ DatePipe, provideHttpClient(withInterceptorsFromDi()), diff --git a/src-ui/src/app/components/common/toast/toast.component.ts b/src-ui/src/app/components/common/toast/toast.component.ts index 61e5eb88c2..27bee856cf 100644 --- a/src-ui/src/app/components/common/toast/toast.component.ts +++ b/src-ui/src/app/components/common/toast/toast.component.ts @@ -17,8 +17,8 @@ import { NgbToast, NgbToastModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { Subscription, interval, takeWhile } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe' import { Toast, ToastLevel } from 'src/app/services/toast.service' @@ -28,7 +28,7 @@ import { Toast, ToastLevel } from 'src/app/services/toast.service' DecimalPipe, NgbToastModule, NgbProgressbarModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], templateUrl: './toast.component.html', styleUrl: './toast.component.scss', diff --git a/src-ui/src/app/components/common/toasts/toasts.component.spec.ts b/src-ui/src/app/components/common/toasts/toasts.component.spec.ts index be9ca10241..baa1fe15f4 100644 --- a/src-ui/src/app/components/common/toasts/toasts.component.spec.ts +++ b/src-ui/src/app/components/common/toasts/toasts.component.spec.ts @@ -2,7 +2,6 @@ import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http' import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { By } from '@angular/platform-browser' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { Subject } from 'rxjs' import { Toast, ToastService } from 'src/app/services/toast.service' import { MAX_VISIBLE_TOASTS, ToastsComponent } from './toasts.component' @@ -27,7 +26,7 @@ describe('ToastsComponent', () => { beforeEach(async () => { TestBed.configureTestingModule({ - imports: [ToastsComponent, NgxBootstrapIconsModule.pick(allIcons)], + imports: [ToastsComponent], providers: [ provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting(), diff --git a/src-ui/src/app/components/common/toasts/toasts.component.ts b/src-ui/src/app/components/common/toasts/toasts.component.ts index d37b2f6812..de383ca790 100644 --- a/src-ui/src/app/components/common/toasts/toasts.component.ts +++ b/src-ui/src/app/components/common/toasts/toasts.component.ts @@ -4,7 +4,6 @@ import { NgbAccordionModule, NgbProgressbarModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { Toast, ToastService } from 'src/app/services/toast.service' import { ToastComponent } from '../toast/toast.component' @@ -17,12 +16,7 @@ export const MAX_VISIBLE_TOASTS = 3 selector: 'pngx-toasts', templateUrl: './toasts.component.html', styleUrls: ['./toasts.component.scss'], - imports: [ - ToastComponent, - NgbAccordionModule, - NgbProgressbarModule, - NgxBootstrapIconsModule, - ], + imports: [ToastComponent, NgbAccordionModule, NgbProgressbarModule], }) export class ToastsComponent { toastService = inject(ToastService) diff --git a/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.spec.ts b/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.spec.ts index 6780b154b9..74f19a7193 100644 --- a/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.spec.ts +++ b/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.spec.ts @@ -2,7 +2,6 @@ import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http' import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { RouterTestingModule } from '@angular/router/testing' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { routes } from 'src/app/app-routing.module' import { PermissionsGuard } from 'src/app/guards/permissions.guard' import { PermissionsService } from 'src/app/services/permissions.service' @@ -41,7 +40,6 @@ describe('UploadStatusTrayComponent', () => { TestBed.configureTestingModule({ imports: [ RouterTestingModule.withRoutes(routes), - NgxBootstrapIconsModule.pick(allIcons), UploadStatusTrayComponent, ], providers: [ diff --git a/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.ts b/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.ts index c87cc31c8f..acd7774e62 100644 --- a/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.ts +++ b/src-ui/src/app/components/common/upload-status-tray/upload-status-tray.component.ts @@ -6,7 +6,7 @@ import { NgbAlertModule, NgbProgressbarModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { ComponentWithPermissions } from 'src/app/components/with-permissions/with-permissions.component' import { SETTINGS_KEYS } from 'src/app/data/ui-settings' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' @@ -35,7 +35,7 @@ import { RouterModule, NgbAlertModule, NgbProgressbarModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class UploadStatusTrayComponent extends ComponentWithPermissions { diff --git a/src-ui/src/app/components/dashboard/dashboard.component.spec.ts b/src-ui/src/app/components/dashboard/dashboard.component.spec.ts index 77da49c0a3..00be84e2a6 100644 --- a/src-ui/src/app/components/dashboard/dashboard.component.spec.ts +++ b/src-ui/src/app/components/dashboard/dashboard.component.spec.ts @@ -5,7 +5,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing' import { By } from '@angular/platform-browser' import { RouterTestingModule } from '@angular/router/testing' import { NgbAlertModule } from '@ng-bootstrap/ng-bootstrap' -import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { provideUiTour, TourNgBootstrap, @@ -81,7 +80,6 @@ describe('DashboardComponent', () => { RouterTestingModule, TourNgBootstrap, DragDropModule, - NgxBootstrapIconsModule.pick(allIcons), DashboardComponent, StatisticsWidgetComponent, PageHeaderComponent, diff --git a/src-ui/src/app/components/dashboard/dashboard.component.ts b/src-ui/src/app/components/dashboard/dashboard.component.ts index 5002bf5bf4..0f903df22b 100644 --- a/src-ui/src/app/components/dashboard/dashboard.component.ts +++ b/src-ui/src/app/components/dashboard/dashboard.component.ts @@ -7,8 +7,8 @@ import { } from '@angular/cdk/drag-drop' import { Component, inject, signal } from '@angular/core' import { RouterModule } from '@angular/router' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { TourNgBootstrap, TourService } from 'ngx-ui-tour-ng-bootstrap' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { SavedView } from 'src/app/data/saved-view' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { SavedViewService } from 'src/app/services/rest/saved-view.service' @@ -35,7 +35,7 @@ import { WelcomeWidgetComponent } from './widgets/welcome-widget/welcome-widget. IfPermissionsDirective, DragDropModule, TourNgBootstrap, - NgxBootstrapIconsModule, + BootstrapIconComponent, RouterModule, ], }) diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.spec.ts b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.spec.ts index b985bcb26a..e0432b6eb9 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.spec.ts +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.spec.ts @@ -11,7 +11,6 @@ import { By } from '@angular/platform-browser' import { Router } from '@angular/router' import { RouterTestingModule } from '@angular/router/testing' import { NgbModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { Subject, of, throwError } from 'rxjs' import { routes } from 'src/app/app-routing.module' import { CustomFieldDisplayComponent } from 'src/app/components/common/custom-field-display/custom-field-display.component' @@ -121,7 +120,6 @@ describe('SavedViewWidgetComponent', () => { NgbModule, RouterTestingModule.withRoutes(routes), DragDropModule, - NgxBootstrapIconsModule.pick(allIcons), SavedViewWidgetComponent, WidgetFrameComponent, IfPermissionsDirective, diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts index 6cbf186984..09988c8992 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts @@ -11,8 +11,8 @@ import { } from '@angular/core' import { Router, RouterModule } from '@angular/router' import { NgbPopover } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { Subject, takeUntil } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { CustomFieldDisplayComponent } from 'src/app/components/common/custom-field-display/custom-field-display.component' import { PreviewPopupComponent } from 'src/app/components/common/preview-popup/preview-popup.component' import { TagComponent } from 'src/app/components/common/tag/tag.component' @@ -80,7 +80,7 @@ import { WidgetFrameComponent } from '../widget-frame/widget-frame.component' NgClass, NgStyle, RouterModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class SavedViewWidgetComponent diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.spec.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.spec.ts index 7fe99bb41a..312319a110 100644 --- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.spec.ts +++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.spec.ts @@ -3,7 +3,6 @@ import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { By } from '@angular/platform-browser' import { RouterTestingModule } from '@angular/router/testing' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { provideUiTour } from 'ngx-ui-tour-ng-bootstrap' import { routes } from 'src/app/app-routing.module' import { PermissionsGuard } from 'src/app/guards/permissions.guard' @@ -20,7 +19,6 @@ describe('UploadFileWidgetComponent', () => { TestBed.configureTestingModule({ imports: [ RouterTestingModule.withRoutes(routes), - NgxBootstrapIconsModule.pick(allIcons), UploadFileWidgetComponent, ], providers: [ diff --git a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts index 550701edfd..2a0280cfa8 100644 --- a/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts +++ b/src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts @@ -1,6 +1,6 @@ import { Component, inject } from '@angular/core' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { TourNgBootstrap } from 'ngx-ui-tour-ng-bootstrap' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { ComponentWithPermissions } from 'src/app/components/with-permissions/with-permissions.component' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { UploadDocumentsService } from 'src/app/services/upload-documents.service' @@ -13,7 +13,7 @@ import { WidgetFrameComponent } from '../widget-frame/widget-frame.component' imports: [ WidgetFrameComponent, IfPermissionsDirective, - NgxBootstrapIconsModule, + BootstrapIconComponent, TourNgBootstrap, ], }) diff --git a/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.ts b/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.ts index a3965202ff..a5ca6b18b2 100644 --- a/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.ts +++ b/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.ts @@ -1,13 +1,13 @@ import { DragDropModule } from '@angular/cdk/drag-drop' import { NgTemplateOutlet } from '@angular/common' import { AfterViewInit, Component, input, signal } from '@angular/core' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' @Component({ selector: 'pngx-widget-frame', templateUrl: './widget-frame.component.html', styleUrls: ['./widget-frame.component.scss'], - imports: [DragDropModule, NgxBootstrapIconsModule, NgTemplateOutlet], + imports: [DragDropModule, BootstrapIconComponent, NgTemplateOutlet], }) export class WidgetFrameComponent implements AfterViewInit { readonly show = signal(false) diff --git a/src-ui/src/app/components/document-detail/document-barcodes/document-barcodes.component.spec.ts b/src-ui/src/app/components/document-detail/document-barcodes/document-barcodes.component.spec.ts index 6b40b7bc75..090f71f993 100644 --- a/src-ui/src/app/components/document-detail/document-barcodes/document-barcodes.component.spec.ts +++ b/src-ui/src/app/components/document-detail/document-barcodes/document-barcodes.component.spec.ts @@ -1,6 +1,5 @@ import { Clipboard } from '@angular/cdk/clipboard' import { ComponentFixture, TestBed } from '@angular/core/testing' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { DocumentBarcodesComponent } from './document-barcodes.component' const barcodes = [ @@ -16,10 +15,7 @@ describe('DocumentBarcodesComponent', () => { beforeEach(async () => { TestBed.configureTestingModule({ - imports: [ - DocumentBarcodesComponent, - NgxBootstrapIconsModule.pick(allIcons), - ], + imports: [DocumentBarcodesComponent], }).compileComponents() fixture = TestBed.createComponent(DocumentBarcodesComponent) diff --git a/src-ui/src/app/components/document-detail/document-barcodes/document-barcodes.component.ts b/src-ui/src/app/components/document-detail/document-barcodes/document-barcodes.component.ts index e246db0c3e..3b64a9e219 100644 --- a/src-ui/src/app/components/document-detail/document-barcodes/document-barcodes.component.ts +++ b/src-ui/src/app/components/document-detail/document-barcodes/document-barcodes.component.ts @@ -1,12 +1,12 @@ import { Clipboard } from '@angular/cdk/clipboard' import { Component, inject, input, OnDestroy, signal } from '@angular/core' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { DocumentBarcode } from 'src/app/data/document-barcode' @Component({ selector: 'pngx-document-barcodes', templateUrl: './document-barcodes.component.html', - imports: [NgxBootstrapIconsModule], + imports: [BootstrapIconComponent], }) export class DocumentBarcodesComponent implements OnDestroy { private readonly clipboard = inject(Clipboard) diff --git a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts index a9f6ccb675..f5a94bfd04 100644 --- a/src-ui/src/app/components/document-detail/document-detail.component.spec.ts +++ b/src-ui/src/app/components/document-detail/document-detail.component.spec.ts @@ -22,7 +22,6 @@ import { NgbModal, NgbModalRef, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { DeviceDetectorService } from 'ngx-device-detector' import { Subject, of, throwError } from 'rxjs' import { routes } from 'src/app/app-routing.module' @@ -152,11 +151,7 @@ describe('DocumentDetailComponent', () => { beforeEach(async () => { TestBed.configureTestingModule({ - imports: [ - DocumentDetailComponent, - RouterModule.forRoot(routes), - NgxBootstrapIconsModule.pick(allIcons), - ], + imports: [DocumentDetailComponent, RouterModule.forRoot(routes)], providers: [ DocumentTitlePipe, { 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 8b1e7da9db..b47937eef9 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 @@ -26,7 +26,6 @@ import { NgbNavModule, } from '@ng-bootstrap/ng-bootstrap' import { dirtyCheck, DirtyComponent } from '@ngneat/dirty-check-forms' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { DeviceDetectorService } from 'ngx-device-detector' import { BehaviorSubject, merge, Observable, of, Subject, timer } from 'rxjs' import { @@ -41,6 +40,7 @@ import { takeUntil, tap, } from 'rxjs/operators' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { Correspondent } from 'src/app/data/correspondent' import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field' import { CustomFieldInstance } from 'src/app/data/custom-field-instance' @@ -198,7 +198,7 @@ interface IncomingDocumentUpdate { SafeUrlPipe, NgbNavModule, NgbDropdownModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, TextAreaComponent, RouterModule, PngxPdfViewerComponent, diff --git a/src-ui/src/app/components/document-detail/document-history/document-history.component.spec.ts b/src-ui/src/app/components/document-detail/document-history/document-history.component.spec.ts index 1b00482101..32b34ca604 100644 --- a/src-ui/src/app/components/document-detail/document-history/document-history.component.spec.ts +++ b/src-ui/src/app/components/document-detail/document-history/document-history.component.spec.ts @@ -4,7 +4,6 @@ import { DatePipe } from '@angular/common' import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http' import { provideHttpClientTesting } from '@angular/common/http/testing' import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of } from 'rxjs' import { AuditLogAction } from 'src/app/data/auditlog-entry' import { DataType } from 'src/app/data/datatype' @@ -27,11 +26,7 @@ describe('DocumentHistoryComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ - DocumentHistoryComponent, - NgbCollapseModule, - NgxBootstrapIconsModule.pick(allIcons), - ], + imports: [DocumentHistoryComponent, NgbCollapseModule], providers: [ DatePipe, provideHttpClient(withInterceptorsFromDi()), 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 37d999139c..398c42d76c 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,7 +1,6 @@ import { AsyncPipe, KeyValuePipe, TitleCasePipe } from '@angular/common' 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, forkJoin, map, of, shareReplay } from 'rxjs' import { AuditLogAction, AuditLogEntry } from 'src/app/data/auditlog-entry' import { DataType } from 'src/app/data/datatype' @@ -23,7 +22,6 @@ import { UserService } from 'src/app/services/rest/user.service' AsyncPipe, KeyValuePipe, TitleCasePipe, - NgxBootstrapIconsModule, ], }) export class DocumentHistoryComponent implements OnInit { diff --git a/src-ui/src/app/components/document-detail/document-version-dropdown/document-version-dropdown.component.spec.ts b/src-ui/src/app/components/document-detail/document-version-dropdown/document-version-dropdown.component.spec.ts index 15c813c4ef..8335f84d07 100644 --- a/src-ui/src/app/components/document-detail/document-version-dropdown/document-version-dropdown.component.spec.ts +++ b/src-ui/src/app/components/document-detail/document-version-dropdown/document-version-dropdown.component.spec.ts @@ -3,13 +3,12 @@ import { SimpleChange, signal } from '@angular/core' import { ComponentFixture, TestBed } from '@angular/core/testing' import { By } from '@angular/platform-browser' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { Subject, of, throwError } from 'rxjs' import { DocumentVersionInfo } from 'src/app/data/document' import { PermissionAction, - PermissionsService, PermissionType, + PermissionsService, } from 'src/app/services/permissions.service' import { DocumentService } from 'src/app/services/rest/document.service' import { SettingsService } from 'src/app/services/settings.service' @@ -64,10 +63,7 @@ describe('DocumentVersionDropdownComponent', () => { } await TestBed.configureTestingModule({ - imports: [ - DocumentVersionDropdownComponent, - NgxBootstrapIconsModule.pick(allIcons), - ], + imports: [DocumentVersionDropdownComponent], providers: [ DatePipe, { diff --git a/src-ui/src/app/components/document-detail/document-version-dropdown/document-version-dropdown.component.ts b/src-ui/src/app/components/document-detail/document-version-dropdown/document-version-dropdown.component.ts index b408d7d1d5..7ee1897300 100644 --- a/src-ui/src/app/components/document-detail/document-version-dropdown/document-version-dropdown.component.ts +++ b/src-ui/src/app/components/document-detail/document-version-dropdown/document-version-dropdown.component.ts @@ -12,7 +12,6 @@ import { } from '@angular/core' import { FormsModule } from '@angular/forms' import { NgbDropdownModule, NgbModal } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { merge, of, Subject } from 'rxjs' import { filter, @@ -24,6 +23,7 @@ import { takeUntil, tap, } from 'rxjs/operators' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { DocumentVersionInfo } from 'src/app/data/document' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe' @@ -44,7 +44,7 @@ import { AddExistingDocumentVersionDialogComponent } from './add-existing-docume imports: [ FormsModule, NgbDropdownModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ConfirmButtonComponent, IfPermissionsDirective, SlicePipe, diff --git a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.spec.ts b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.spec.ts index f70df72027..ae77542cea 100644 --- a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.spec.ts +++ b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.spec.ts @@ -1,5 +1,4 @@ import { ComponentFixture, TestBed } from '@angular/core/testing' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { MetadataCollapseComponent } from './metadata-collapse.component' const metadata = [ @@ -24,10 +23,7 @@ describe('MetadataCollapseComponent', () => { beforeEach(async () => { TestBed.configureTestingModule({ providers: [], - imports: [ - MetadataCollapseComponent, - NgxBootstrapIconsModule.pick(allIcons), - ], + imports: [MetadataCollapseComponent], }).compileComponents() fixture = TestBed.createComponent(MetadataCollapseComponent) diff --git a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts index 586170e886..ff99e56aee 100644 --- a/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts +++ b/src-ui/src/app/components/document-detail/metadata-collapse/metadata-collapse.component.ts @@ -1,12 +1,12 @@ import { Component, Input } from '@angular/core' import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' @Component({ selector: 'pngx-metadata-collapse', templateUrl: './metadata-collapse.component.html', styleUrls: ['./metadata-collapse.component.scss'], - imports: [NgbCollapseModule, NgxBootstrapIconsModule], + imports: [NgbCollapseModule, BootstrapIconComponent], }) export class MetadataCollapseComponent { constructor() {} diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts index b80c886f9d..97be61b070 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts @@ -9,7 +9,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing' import { By } from '@angular/platform-browser' import { Router } from '@angular/router' import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap' -import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { of, throwError } from 'rxjs' import { Correspondent } from 'src/app/data/correspondent' import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field' @@ -88,7 +87,7 @@ describe('BulkEditorComponent', () => { beforeEach(async () => { TestBed.configureTestingModule({ - imports: [BulkEditorComponent, NgxBootstrapIconsModule.pick(allIcons)], + imports: [BulkEditorComponent], providers: [ PermissionsService, { 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 5600c977a0..067138b3a2 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 @@ -19,7 +19,6 @@ import { NgbModalRef, } from '@ng-bootstrap/ng-bootstrap' import { saveAs } from 'file-saver' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { first, map, @@ -29,6 +28,7 @@ import { takeUntil, tap, } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { ConfirmDialogComponent } from 'src/app/components/common/confirm-dialog/confirm-dialog.component' import { CustomField } from 'src/app/data/custom-field' import { MatchingModel } from 'src/app/data/matching-model' @@ -92,7 +92,7 @@ import { CustomFieldsBulkEditDialogComponent } from './custom-fields-bulk-edit-d FormsModule, ReactiveFormsModule, NgbDropdownModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class BulkEditorComponent diff --git a/src-ui/src/app/components/document-list/bulk-editor/custom-fields-bulk-edit-dialog/custom-fields-bulk-edit-dialog.component.ts b/src-ui/src/app/components/document-list/bulk-editor/custom-fields-bulk-edit-dialog/custom-fields-bulk-edit-dialog.component.ts index ae521ac406..e4eda79c89 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/custom-fields-bulk-edit-dialog/custom-fields-bulk-edit-dialog.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/custom-fields-bulk-edit-dialog/custom-fields-bulk-edit-dialog.component.ts @@ -6,8 +6,8 @@ import { ReactiveFormsModule, } from '@angular/forms' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { first } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { CheckComponent } from 'src/app/components/common/input/check/check.component' import { DateComponent } from 'src/app/components/common/input/date/date.component' import { DocumentLinkComponent } from 'src/app/components/common/input/document-link/document-link.component' @@ -38,7 +38,7 @@ import { TextAreaComponent } from '../../../common/input/textarea/textarea.compo UrlComponent, FormsModule, ReactiveFormsModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, TextAreaComponent, ], }) diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.spec.ts b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.spec.ts index 53ba36deef..f7f1b907bb 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.spec.ts +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.spec.ts @@ -9,7 +9,6 @@ import { NgbProgressbarModule, NgbTooltipModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe' import { DocumentTitlePipe } from 'src/app/pipes/document-title.pipe' import { IsNumberPipe } from 'src/app/pipes/is-number.pipe' @@ -47,7 +46,6 @@ describe('DocumentCardLargeComponent', () => { NgbPopoverModule, NgbTooltipModule, NgbProgressbarModule, - NgxBootstrapIconsModule.pick(allIcons), DocumentCardLargeComponent, DocumentTitlePipe, CustomDatePipe, 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 cd3259e942..293b3ddd2f 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 @@ -13,7 +13,7 @@ import { NgbProgressbarModule, NgbTooltipModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { DEFAULT_DISPLAY_FIELDS, DisplayField, @@ -54,7 +54,7 @@ import { LoadingComponentWithPermissions } from '../../loading-component/loading RouterModule, NgbTooltipModule, NgbProgressbarModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class DocumentCardLargeComponent diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.spec.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.spec.ts index 88f143d713..2b5b3245d4 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.spec.ts +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.spec.ts @@ -4,7 +4,6 @@ import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { By } from '@angular/platform-browser' import { RouterTestingModule } from '@angular/router/testing' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { TagComponent } from '../../common/tag/tag.component' import { DocumentCardSmallComponent } from './document-card-small.component' @@ -32,11 +31,7 @@ describe('DocumentCardSmallComponent', () => { beforeEach(async () => { TestBed.configureTestingModule({ - imports: [ - RouterTestingModule, - NgxBootstrapIconsModule.pick(allIcons), - DocumentCardSmallComponent, - ], + imports: [RouterTestingModule, DocumentCardSmallComponent], providers: [ DatePipe, provideHttpClient(withInterceptorsFromDi()), 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 e1d86c3f56..784b47ce08 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 @@ -13,7 +13,7 @@ import { NgbProgressbarModule, NgbTooltipModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { DEFAULT_DISPLAY_FIELDS, DisplayField, @@ -54,7 +54,7 @@ import { LoadingComponentWithPermissions } from '../../loading-component/loading RouterModule, NgbTooltipModule, NgbProgressbarModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class DocumentCardSmallComponent diff --git a/src-ui/src/app/components/document-list/document-list.component.spec.ts b/src-ui/src/app/components/document-list/document-list.component.spec.ts index 202e8f9ac7..a8a8c31344 100644 --- a/src-ui/src/app/components/document-list/document-list.component.spec.ts +++ b/src-ui/src/app/components/document-list/document-list.component.spec.ts @@ -15,7 +15,6 @@ import { NgbModal, NgbModalRef, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { provideUiTour } from 'ngx-ui-tour-ng-bootstrap' import { Subject, of, throwError } from 'rxjs' import { routes } from 'src/app/app-routing.module' @@ -92,11 +91,7 @@ describe('DocumentListComponent', () => { beforeEach(async () => { TestBed.configureTestingModule({ - imports: [ - RouterTestingModule.withRoutes(routes), - NgxBootstrapIconsModule.pick(allIcons), - DocumentListComponent, - ], + imports: [RouterTestingModule.withRoutes(routes), DocumentListComponent], providers: [ FilterPipe, CustomDatePipe, diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index 739a1c8a30..56bf03dd81 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -21,9 +21,9 @@ import { NgbModal, NgbPaginationModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { TourNgBootstrap } from 'ngx-ui-tour-ng-bootstrap' import { filter, first, map, Subject, switchMap, takeUntil } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { DEFAULT_DISPLAY_FIELDS, DisplayField, @@ -94,7 +94,7 @@ import { SaveViewConfigDialogComponent } from './save-view-config-dialog/save-vi CorrespondentNamePipe, DocumentTypeNamePipe, StoragePathNamePipe, - NgxBootstrapIconsModule, + BootstrapIconComponent, AsyncPipe, FormsModule, ReactiveFormsModule, diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.spec.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.spec.ts index d7fc239594..96a2507263 100644 --- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.spec.ts +++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.spec.ts @@ -15,7 +15,6 @@ import { NgbTypeaheadModule, } from '@ng-bootstrap/ng-bootstrap' import { NgSelectComponent, NgSelectModule } from '@ng-select/ng-select' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { provideUiTour } from 'ngx-ui-tour-ng-bootstrap' import { of, throwError } from 'rxjs' import { Correspondent } from 'src/app/data/correspondent' @@ -198,7 +197,6 @@ describe('FilterEditorComponent', () => { FormsModule, ReactiveFormsModule, NgbDatepickerModule, - NgxBootstrapIconsModule.pick(allIcons), NgbTypeaheadModule, NgSelectModule, FilterEditorComponent, 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 1aabd7b646..10818fe846 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 @@ -18,7 +18,6 @@ import { NgbTypeahead, NgbTypeaheadModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { TourNgBootstrap } from 'ngx-ui-tour-ng-bootstrap' import { Observable, Subject, from } from 'rxjs' import { @@ -30,6 +29,7 @@ import { switchMap, takeUntil, } from 'rxjs/operators' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { CustomField } from 'src/app/data/custom-field' import { CustomFieldQueryLogicalOperator, @@ -266,7 +266,7 @@ const DUPLICATES_FILTER_MODIFIER_OPTIONS = [ CustomFieldsQueryDropdownComponent, DatesDropdownComponent, PermissionsFilterDropdownComponent, - NgxBootstrapIconsModule, + BootstrapIconComponent, NgbDropdownModule, NgbTypeaheadModule, FormsModule, diff --git a/src-ui/src/app/components/document-notes/document-notes.component.spec.ts b/src-ui/src/app/components/document-notes/document-notes.component.spec.ts index 85b8c95709..09f78ded43 100644 --- a/src-ui/src/app/components/document-notes/document-notes.component.spec.ts +++ b/src-ui/src/app/components/document-notes/document-notes.component.spec.ts @@ -4,7 +4,6 @@ import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { By } from '@angular/platform-browser' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of, throwError } from 'rxjs' import { DocumentNote } from 'src/app/data/document-note' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' @@ -59,7 +58,6 @@ describe('DocumentNotesComponent', () => { imports: [ FormsModule, ReactiveFormsModule, - NgxBootstrapIconsModule.pick(allIcons), DocumentNotesComponent, CustomDatePipe, IfPermissionsDirective, diff --git a/src-ui/src/app/components/document-notes/document-notes.component.ts b/src-ui/src/app/components/document-notes/document-notes.component.ts index 19dbdf486e..85ee157e80 100644 --- a/src-ui/src/app/components/document-notes/document-notes.component.ts +++ b/src-ui/src/app/components/document-notes/document-notes.component.ts @@ -13,7 +13,7 @@ import { FormsModule, ReactiveFormsModule, } from '@angular/forms' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { DocumentNote } from 'src/app/data/document-note' import { User } from 'src/app/data/user' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' @@ -32,7 +32,7 @@ import { ComponentWithPermissions } from '../with-permissions/with-permissions.c CustomDatePipe, FormsModule, ReactiveFormsModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class DocumentNotesComponent extends ComponentWithPermissions { diff --git a/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.spec.ts b/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.spec.ts index 4fbd77be04..57f6dd2a64 100644 --- a/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.spec.ts +++ b/src-ui/src/app/components/manage/document-attributes/custom-fields/custom-fields.component.spec.ts @@ -12,7 +12,6 @@ import { NgbPaginationModule, NgbPopoverModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of, throwError } from 'rxjs' import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field' import { @@ -61,7 +60,6 @@ describe('CustomFieldsComponent', () => { ReactiveFormsModule, NgbModalModule, NgbPopoverModule, - NgxBootstrapIconsModule.pick(allIcons), RouterTestingModule, CustomFieldsComponent, IfPermissionsDirective, 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 5d861acef1..eb84fb5a29 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 @@ -5,8 +5,8 @@ import { NgbModal, NgbPaginationModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { takeUntil, tap } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { ConfirmDialogComponent } from 'src/app/components/common/confirm-dialog/confirm-dialog.component' import { CustomFieldEditDialogComponent } from 'src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component' import { EditDialogMode } from 'src/app/components/common/edit-dialog/edit-dialog.component' @@ -34,7 +34,7 @@ import { ToastService } from 'src/app/services/toast.service' IfPermissionsDirective, NgbDropdownModule, NgbPaginationModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, RouterModule, ], }) diff --git a/src-ui/src/app/components/manage/document-attributes/document-attributes.component.spec.ts b/src-ui/src/app/components/manage/document-attributes/document-attributes.component.spec.ts index b40c356926..324fedafc4 100644 --- a/src-ui/src/app/components/manage/document-attributes/document-attributes.component.spec.ts +++ b/src-ui/src/app/components/manage/document-attributes/document-attributes.component.spec.ts @@ -7,18 +7,17 @@ import { Router, } from '@angular/router' import { RouterTestingModule } from '@angular/router/testing' -import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { Subject } from 'rxjs' import { PermissionAction, PermissionsService, PermissionType, } from 'src/app/services/permissions.service' +import { CustomFieldsComponent } from './custom-fields/custom-fields.component' import { DocumentAttributesComponent, DocumentAttributesSectionKind, } from './document-attributes.component' -import { CustomFieldsComponent } from './custom-fields/custom-fields.component' import { ManagementListComponent } from './management-list/management-list.component' @Component({ @@ -41,7 +40,6 @@ describe('DocumentAttributesComponent', () => { TestBed.configureTestingModule({ imports: [ RouterTestingModule, - NgxBootstrapIconsModule.pick(allIcons), DocumentAttributesComponent, DummySectionComponent, ], 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 0ff7474079..4c61d2828b 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 @@ -14,8 +14,8 @@ import { NgbNavChangeEvent, NgbNavModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { Subject, takeUntil } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { PermissionAction, @@ -64,7 +64,7 @@ interface DocumentAttributesSection { NgbNavModule, NgbDropdownModule, NgComponentOutlet, - NgxBootstrapIconsModule, + BootstrapIconComponent, IfPermissionsDirective, ClearableBadgeComponent, ], diff --git a/src-ui/src/app/components/manage/document-attributes/management-list/correspondent-list/correspondent-list.component.spec.ts b/src-ui/src/app/components/manage/document-attributes/management-list/correspondent-list/correspondent-list.component.spec.ts index 35f04fd8a4..75f4728895 100644 --- a/src-ui/src/app/components/manage/document-attributes/management-list/correspondent-list/correspondent-list.component.spec.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/correspondent-list/correspondent-list.component.spec.ts @@ -4,7 +4,6 @@ import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of } from 'rxjs' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { SortableDirective } from 'src/app/directives/sortable.directive' @@ -23,7 +22,6 @@ describe('CorrespondentListComponent', () => { NgbPaginationModule, FormsModule, ReactiveFormsModule, - NgxBootstrapIconsModule.pick(allIcons), CorrespondentListComponent, SortableDirective, PageHeaderComponent, diff --git a/src-ui/src/app/components/manage/document-attributes/management-list/correspondent-list/correspondent-list.component.ts b/src-ui/src/app/components/manage/document-attributes/management-list/correspondent-list/correspondent-list.component.ts index 8f12aaf7a0..60c0a58d8b 100644 --- a/src-ui/src/app/components/manage/document-attributes/management-list/correspondent-list/correspondent-list.component.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/correspondent-list/correspondent-list.component.ts @@ -6,7 +6,7 @@ import { NgbDropdownModule, NgbPaginationModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { CorrespondentEditDialogComponent } from 'src/app/components/common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component' import { Correspondent } from 'src/app/data/correspondent' import { FILTER_HAS_CORRESPONDENT_ANY } from 'src/app/data/filter-rule-type' @@ -32,7 +32,7 @@ import { ManagementListComponent } from '../management-list.component' NgTemplateOutlet, NgbDropdownModule, NgbPaginationModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class CorrespondentListComponent extends ManagementListComponent { diff --git a/src-ui/src/app/components/manage/document-attributes/management-list/document-type-list/document-type-list.component.spec.ts b/src-ui/src/app/components/manage/document-attributes/management-list/document-type-list/document-type-list.component.spec.ts index c8931cdc2e..cc98f4412c 100644 --- a/src-ui/src/app/components/manage/document-attributes/management-list/document-type-list/document-type-list.component.spec.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/document-type-list/document-type-list.component.spec.ts @@ -4,7 +4,6 @@ import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of } from 'rxjs' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { SortableDirective } from 'src/app/directives/sortable.directive' @@ -23,7 +22,6 @@ describe('DocumentTypeListComponent', () => { NgbPaginationModule, FormsModule, ReactiveFormsModule, - NgxBootstrapIconsModule.pick(allIcons), DocumentTypeListComponent, SortableDirective, PageHeaderComponent, diff --git a/src-ui/src/app/components/manage/document-attributes/management-list/document-type-list/document-type-list.component.ts b/src-ui/src/app/components/manage/document-attributes/management-list/document-type-list/document-type-list.component.ts index cafe038d20..b1490f37fd 100644 --- a/src-ui/src/app/components/manage/document-attributes/management-list/document-type-list/document-type-list.component.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/document-type-list/document-type-list.component.ts @@ -6,7 +6,7 @@ import { NgbDropdownModule, NgbPaginationModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { DocumentTypeEditDialogComponent } from 'src/app/components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component' import { DocumentType } from 'src/app/data/document-type' import { FILTER_HAS_DOCUMENT_TYPE_ANY } from 'src/app/data/filter-rule-type' @@ -30,7 +30,7 @@ import { ManagementListComponent } from '../management-list.component' NgTemplateOutlet, NgbDropdownModule, NgbPaginationModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class DocumentTypeListComponent extends ManagementListComponent { diff --git a/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.spec.ts b/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.spec.ts index 4e2d173217..5697e9f7de 100644 --- a/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.spec.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/management-list.component.spec.ts @@ -16,7 +16,6 @@ import { NgbModalRef, NgbPaginationModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of, throwError } from 'rxjs' import { routes } from 'src/app/app-routing.module' import { FILTER_HAS_TAGS_ALL } from 'src/app/data/filter-rule-type' @@ -86,7 +85,6 @@ describe('ManagementListComponent', () => { ReactiveFormsModule, NgbModalModule, RouterTestingModule.withRoutes(routes), - NgxBootstrapIconsModule.pick(allIcons), TagListComponent, SortableDirective, PageHeaderComponent, diff --git a/src-ui/src/app/components/manage/document-attributes/management-list/storage-path-list/storage-path-list.component.spec.ts b/src-ui/src/app/components/manage/document-attributes/management-list/storage-path-list/storage-path-list.component.spec.ts index d2b75ca56a..98dcd1ff6d 100644 --- a/src-ui/src/app/components/manage/document-attributes/management-list/storage-path-list/storage-path-list.component.spec.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/storage-path-list/storage-path-list.component.spec.ts @@ -4,7 +4,6 @@ import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of } from 'rxjs' import { StoragePath } from 'src/app/data/storage-path' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' @@ -24,7 +23,6 @@ describe('StoragePathListComponent', () => { NgbPaginationModule, FormsModule, ReactiveFormsModule, - NgxBootstrapIconsModule.pick(allIcons), StoragePathListComponent, SortableDirective, PageHeaderComponent, diff --git a/src-ui/src/app/components/manage/document-attributes/management-list/storage-path-list/storage-path-list.component.ts b/src-ui/src/app/components/manage/document-attributes/management-list/storage-path-list/storage-path-list.component.ts index 14129544e9..77e2472b32 100644 --- a/src-ui/src/app/components/manage/document-attributes/management-list/storage-path-list/storage-path-list.component.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/storage-path-list/storage-path-list.component.ts @@ -6,7 +6,7 @@ import { NgbDropdownModule, NgbPaginationModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { StoragePathEditDialogComponent } from 'src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component' import { FILTER_HAS_STORAGE_PATH_ANY } from 'src/app/data/filter-rule-type' import { StoragePath } from 'src/app/data/storage-path' @@ -30,7 +30,7 @@ import { ManagementListComponent } from '../management-list.component' NgTemplateOutlet, NgbDropdownModule, NgbPaginationModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class StoragePathListComponent extends ManagementListComponent { diff --git a/src-ui/src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.spec.ts b/src-ui/src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.spec.ts index 3d45a9186e..abb95de924 100644 --- a/src-ui/src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.spec.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.spec.ts @@ -4,7 +4,6 @@ import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of } from 'rxjs' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { SortableDirective } from 'src/app/directives/sortable.directive' @@ -24,7 +23,6 @@ describe('TagListComponent', () => { NgbPaginationModule, FormsModule, ReactiveFormsModule, - NgxBootstrapIconsModule.pick(allIcons), TagListComponent, SortableDirective, PageHeaderComponent, diff --git a/src-ui/src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.ts b/src-ui/src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.ts index f221fd5724..42ae91c49f 100644 --- a/src-ui/src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.ts +++ b/src-ui/src/app/components/manage/document-attributes/management-list/tag-list/tag-list.component.ts @@ -6,7 +6,7 @@ import { NgbDropdownModule, NgbPaginationModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { TagEditDialogComponent } from 'src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component' import { FILTER_HAS_TAGS_ALL } from 'src/app/data/filter-rule-type' import { Tag } from 'src/app/data/tag' @@ -30,7 +30,7 @@ import { ManagementListComponent } from '../management-list.component' NgTemplateOutlet, NgbDropdownModule, NgbPaginationModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class TagListComponent extends ManagementListComponent { diff --git a/src-ui/src/app/components/manage/mail/mail.component.spec.ts b/src-ui/src/app/components/manage/mail/mail.component.spec.ts index b3b3fa1191..6bd0071aa7 100644 --- a/src-ui/src/app/components/manage/mail/mail.component.spec.ts +++ b/src-ui/src/app/components/manage/mail/mail.component.spec.ts @@ -14,7 +14,6 @@ import { NgbModule, } from '@ng-bootstrap/ng-bootstrap' import { NgSelectModule } from '@ng-select/ng-select' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of, throwError } from 'rxjs' import { routes } from 'src/app/app-routing.module' import { MailAccount, MailAccountType } from 'src/app/data/mail-account' @@ -76,7 +75,6 @@ describe('MailComponent', () => { ReactiveFormsModule, NgbAlertModule, NgSelectModule, - NgxBootstrapIconsModule.pick(allIcons), MailComponent, PageHeaderComponent, IfPermissionsDirective, 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 483f387de0..22dd9786d9 100644 --- a/src-ui/src/app/components/manage/mail/mail.component.ts +++ b/src-ui/src/app/components/manage/mail/mail.component.ts @@ -2,8 +2,8 @@ import { Component, OnDestroy, OnInit, inject, signal } from '@angular/core' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { ActivatedRoute } from '@angular/router' import { NgbDropdownModule, NgbModal } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { Subject, first, takeUntil, tap } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { MailAccount, MailAccountType } from 'src/app/data/mail-account' import { MailRule } from 'src/app/data/mail-rule' import { ObjectWithPermissions } from 'src/app/data/object-with-permissions' @@ -39,7 +39,7 @@ import { ProcessedMailDialogComponent } from './processed-mail-dialog/processed- FormsModule, ReactiveFormsModule, NgbDropdownModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class MailComponent diff --git a/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.spec.ts b/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.spec.ts index 13da4e7842..0d87cc9f2a 100644 --- a/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.spec.ts +++ b/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.spec.ts @@ -8,7 +8,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing' import { FormsModule } from '@angular/forms' import { By } from '@angular/platform-browser' import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { ToastService } from 'src/app/services/toast.service' import { environment } from 'src/environments/environment' import { ProcessedMailDialogComponent } from './processed-mail-dialog.component' @@ -47,11 +46,7 @@ describe('ProcessedMailDialogComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [ - ProcessedMailDialogComponent, - FormsModule, - NgxBootstrapIconsModule.pick(allIcons), - ], + imports: [ProcessedMailDialogComponent, FormsModule], providers: [ DatePipe, NgbActiveModal, diff --git a/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.ts b/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.ts index 867fe3aeb7..f77f4be774 100644 --- a/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.ts +++ b/src-ui/src/app/components/manage/mail/processed-mail-dialog/processed-mail-dialog.component.ts @@ -7,7 +7,7 @@ import { NgbPopoverModule, NgbTooltipModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { ConfirmButtonComponent } from 'src/app/components/common/confirm-button/confirm-button.component' import { MailRule } from 'src/app/data/mail-rule' import { ProcessedMail } from 'src/app/data/processed-mail' @@ -23,7 +23,7 @@ import { ToastService } from 'src/app/services/toast.service' NgbPagination, NgbPopoverModule, NgbTooltipModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, FormsModule, ReactiveFormsModule, SlicePipe, diff --git a/src-ui/src/app/components/manage/saved-views/saved-views.component.spec.ts b/src-ui/src/app/components/manage/saved-views/saved-views.component.spec.ts index 9c3fb406ee..d941ebcb87 100644 --- a/src-ui/src/app/components/manage/saved-views/saved-views.component.spec.ts +++ b/src-ui/src/app/components/manage/saved-views/saved-views.component.spec.ts @@ -6,7 +6,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { By } from '@angular/platform-browser' import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { Subject, of, throwError } from 'rxjs' import { SavedView } from 'src/app/data/saved-view' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' @@ -54,7 +53,6 @@ describe('SavedViewsComponent', () => { TestBed.configureTestingModule({ imports: [ NgbModule, - NgxBootstrapIconsModule.pick(allIcons), ReactiveFormsModule, FormsModule, DragDropModule, 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 c69711b714..8deeb349e5 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 @@ -1,10 +1,10 @@ import { AsyncPipe } from '@angular/common' import { Component, - OnDestroy, - OnInit, computed, inject, + OnDestroy, + OnInit, signal, } from '@angular/core' import { @@ -15,8 +15,8 @@ import { } from '@angular/forms' import { NgbModal, NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap' import { dirtyCheck } from '@ngneat/dirty-check-forms' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { BehaviorSubject, Observable, of, switchMap, takeUntil } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { PermissionsDialogComponent } from 'src/app/components/common/permissions-dialog/permissions-dialog.component' import { DisplayMode } from 'src/app/data/document' import { SavedView } from 'src/app/data/saved-view' @@ -56,7 +56,7 @@ import { LoadingComponentWithPermissions } from '../../loading-component/loading ReactiveFormsModule, AsyncPipe, NgbPaginationModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class SavedViewsComponent diff --git a/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.spec.ts b/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.spec.ts index bde7eeb06a..23bab8f8de 100644 --- a/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.spec.ts +++ b/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.spec.ts @@ -1,6 +1,5 @@ import { Clipboard } from '@angular/cdk/clipboard' import { ComponentFixture, TestBed } from '@angular/core/testing' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of, throwError } from 'rxjs' import { FileVersion } from 'src/app/data/share-link' import { @@ -44,10 +43,7 @@ describe('ShareLinkBundleListComponent', () => { service.rebuildBundle.mockReturnValue(of(sampleBundle())) TestBed.configureTestingModule({ - imports: [ - ShareLinkBundleListComponent, - NgxBootstrapIconsModule.pick(allIcons), - ], + imports: [ShareLinkBundleListComponent], providers: [ { provide: ShareLinkBundleService, useValue: service }, { provide: ToastService, useValue: toastService }, diff --git a/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.ts b/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.ts index 16f4be5672..0cf32c4785 100644 --- a/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.ts +++ b/src-ui/src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.ts @@ -6,8 +6,10 @@ import { NgbPaginationModule, NgbPopoverModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { Subject, catchError, of, switchMap, takeUntil, timer } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' +import { ConfirmButtonComponent } from 'src/app/components/common/confirm-button/confirm-button.component' +import { LoadingComponentWithPermissions } from 'src/app/components/loading-component/loading.component' import { FileVersion } from 'src/app/data/share-link' import { SHARE_LINK_BUNDLE_FILE_VERSION_LABELS, @@ -25,8 +27,6 @@ import { ShareLinkBundleService } from 'src/app/services/rest/share-link-bundle. import { SettingsService } from 'src/app/services/settings.service' import { ToastService } from 'src/app/services/toast.service' import { environment } from 'src/environments/environment' -import { ConfirmButtonComponent } from 'src/app/components/common/confirm-button/confirm-button.component' -import { LoadingComponentWithPermissions } from 'src/app/components/loading-component/loading.component' @Component({ selector: 'pngx-share-link-bundle-list', @@ -38,7 +38,7 @@ import { LoadingComponentWithPermissions } from 'src/app/components/loading-comp FormsModule, NgbPaginationModule, NgbPopoverModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, SortableDirective, FileSizePipe, ], diff --git a/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.spec.ts b/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.spec.ts index 655fdcb75f..6fd3dd669d 100644 --- a/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.spec.ts +++ b/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.spec.ts @@ -1,7 +1,6 @@ import { Clipboard } from '@angular/cdk/clipboard' import { ComponentFixture, TestBed } from '@angular/core/testing' import { RouterTestingModule } from '@angular/router/testing' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of, throwError } from 'rxjs' import { FileVersion, ShareLink } from 'src/app/data/share-link' import { SETTINGS_KEYS } from 'src/app/data/ui-settings' @@ -38,11 +37,7 @@ describe('ShareLinkListComponent', () => { } TestBed.configureTestingModule({ - imports: [ - ShareLinkListComponent, - NgxBootstrapIconsModule.pick(allIcons), - RouterTestingModule, - ], + imports: [ShareLinkListComponent, RouterTestingModule], providers: [ { provide: ShareLinkService, useValue: service }, { provide: ToastService, useValue: toastService }, diff --git a/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.ts b/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.ts index b13d217018..1919ac6482 100644 --- a/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.ts +++ b/src-ui/src/app/components/manage/share-links/share-link-list/share-link-list.component.ts @@ -4,8 +4,8 @@ import { Component, OnInit, inject, signal } from '@angular/core' import { FormsModule } from '@angular/forms' import { RouterModule } from '@angular/router' import { NgbPaginationModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { takeUntil } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { ConfirmButtonComponent } from 'src/app/components/common/confirm-button/confirm-button.component' import { LoadingComponentWithPermissions } from 'src/app/components/loading-component/loading.component' import { FileVersion, ShareLink } from 'src/app/data/share-link' @@ -36,7 +36,7 @@ import { environment } from 'src/environments/environment' FormsModule, IfPermissionsDirective, NgbPaginationModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, RouterModule, SortableDirective, ], diff --git a/src-ui/src/app/components/manage/share-links/share-links.component.spec.ts b/src-ui/src/app/components/manage/share-links/share-links.component.spec.ts index 36c46dd2c2..45666a7886 100644 --- a/src-ui/src/app/components/manage/share-links/share-links.component.spec.ts +++ b/src-ui/src/app/components/manage/share-links/share-links.component.spec.ts @@ -1,7 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing' import { ActivatedRoute, convertToParamMap, Router } from '@angular/router' import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of } from 'rxjs' import { PermissionAction, @@ -21,12 +20,7 @@ describe('ShareLinksComponent', () => { const configure = async (type: string = null) => { await TestBed.configureTestingModule({ - imports: [ - ShareLinksComponent, - NgbNavModule, - NgxBootstrapIconsModule.pick(allIcons), - PageHeaderComponent, - ], + imports: [ShareLinksComponent, NgbNavModule, PageHeaderComponent], providers: [ PermissionsService, { diff --git a/src-ui/src/app/components/manage/workflows/workflows.component.spec.ts b/src-ui/src/app/components/manage/workflows/workflows.component.spec.ts index 7a64b0b724..a2bb173198 100644 --- a/src-ui/src/app/components/manage/workflows/workflows.component.spec.ts +++ b/src-ui/src/app/components/manage/workflows/workflows.component.spec.ts @@ -10,7 +10,6 @@ import { NgbPaginationModule, NgbPopoverModule, } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { of, throwError } from 'rxjs' import { Workflow } from 'src/app/data/workflow' import { WorkflowActionType } from 'src/app/data/workflow-action' @@ -87,7 +86,6 @@ describe('WorkflowsComponent', () => { ReactiveFormsModule, NgbModalModule, NgbPopoverModule, - NgxBootstrapIconsModule.pick(allIcons), WorkflowsComponent, IfPermissionsDirective, PageHeaderComponent, 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 810519606b..71af147329 100644 --- a/src-ui/src/app/components/manage/workflows/workflows.component.ts +++ b/src-ui/src/app/components/manage/workflows/workflows.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit, inject, signal } from '@angular/core' import { FormsModule, ReactiveFormsModule } from '@angular/forms' import { NgbDropdownModule, NgbModal } from '@ng-bootstrap/ng-bootstrap' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { takeUntil, tap } from 'rxjs' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { Workflow } from 'src/app/data/workflow' import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive' import { PermissionsService } from 'src/app/services/permissions.service' @@ -27,7 +27,7 @@ import { LoadingComponentWithPermissions } from '../../loading-component/loading FormsModule, ReactiveFormsModule, NgbDropdownModule, - NgxBootstrapIconsModule, + BootstrapIconComponent, ], }) export class WorkflowsComponent diff --git a/src-ui/src/app/components/not-found/not-found.component.spec.ts b/src-ui/src/app/components/not-found/not-found.component.spec.ts index 219c6c1f9e..6d6a7b00a7 100644 --- a/src-ui/src/app/components/not-found/not-found.component.spec.ts +++ b/src-ui/src/app/components/not-found/not-found.component.spec.ts @@ -3,7 +3,6 @@ import { provideHttpClientTesting } from '@angular/common/http/testing' import { ComponentFixture, TestBed } from '@angular/core/testing' import { By } from '@angular/platform-browser' import { RouterModule } from '@angular/router' -import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons' import { routes } from 'src/app/app-routing.module' import { LogoComponent } from '../common/logo/logo.component' import { NotFoundComponent } from './not-found.component' @@ -14,12 +13,7 @@ describe('NotFoundComponent', () => { beforeEach(async () => { TestBed.configureTestingModule({ - imports: [ - NgxBootstrapIconsModule.pick(allIcons), - NotFoundComponent, - LogoComponent, - RouterModule.forRoot(routes), - ], + imports: [NotFoundComponent, LogoComponent, RouterModule.forRoot(routes)], providers: [ provideHttpClient(withInterceptorsFromDi()), provideHttpClientTesting(), diff --git a/src-ui/src/app/components/not-found/not-found.component.ts b/src-ui/src/app/components/not-found/not-found.component.ts index 44cd103ecb..feab9ea14d 100644 --- a/src-ui/src/app/components/not-found/not-found.component.ts +++ b/src-ui/src/app/components/not-found/not-found.component.ts @@ -1,13 +1,13 @@ import { Component } from '@angular/core' import { RouterModule } from '@angular/router' -import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' +import { BootstrapIconComponent } from 'src/app/components/common/bootstrap-icon/bootstrap-icon.component' import { LogoComponent } from '../common/logo/logo.component' @Component({ selector: 'pngx-not-found', templateUrl: './not-found.component.html', styleUrls: ['./not-found.component.scss'], - imports: [LogoComponent, NgxBootstrapIconsModule, RouterModule], + imports: [LogoComponent, BootstrapIconComponent, RouterModule], }) export class NotFoundComponent { constructor() {} diff --git a/src-ui/src/app/guards/dirty-saved-view.guard.spec.ts b/src-ui/src/app/guards/dirty-saved-view.guard.spec.ts index a7611cd785..4ddeb0a494 100644 --- a/src-ui/src/app/guards/dirty-saved-view.guard.spec.ts +++ b/src-ui/src/app/guards/dirty-saved-view.guard.spec.ts @@ -3,7 +3,6 @@ import { provideHttpClientTesting } from '@angular/common/http/testing' import { TestBed } from '@angular/core/testing' import { RouterTestingModule } from '@angular/router/testing' import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap' -import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons' import { provideUiTour } from 'ngx-ui-tour-ng-bootstrap' import { routes } from '../app-routing.module' import { ConfirmDialogComponent } from '../components/common/confirm-dialog/confirm-dialog.component' @@ -19,11 +18,7 @@ describe('DirtySavedViewGuard', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ - RouterTestingModule.withRoutes(routes), - ConfirmDialogComponent, - NgxBootstrapIconsModule.pick(allIcons), - ], + imports: [RouterTestingModule.withRoutes(routes), ConfirmDialogComponent], providers: [ DirtySavedViewGuard, SettingsService, diff --git a/src-ui/src/main.ts b/src-ui/src/main.ts index c52f5f4c5d..ddd7a1706e 100644 --- a/src-ui/src/main.ts +++ b/src-ui/src/main.ts @@ -22,163 +22,6 @@ import { NgbModule, } from '@ng-bootstrap/ng-bootstrap' import { NgSelectModule } from '@ng-select/ng-select' -import { - NgxBootstrapIconsModule, - airplane, - archive, - arrowClockwise, - arrowCounterclockwise, - arrowDown, - arrowDownUp, - arrowLeft, - arrowRepeat, - arrowReturnLeft, - arrowRight, - arrowRightShort, - arrowUpRight, - asterisk, - bank, - basket, - bell, - bodyText, - bookmark, - boxArrowInRight, - boxArrowUp, - boxArrowUpRight, - boxes, - braces, - briefcase, - building, - calculator, - calendar, - calendarEvent, - calendarEventFill, - camera, - cardChecklist, - cardHeading, - caretDown, - caretUp, - cash, - chatLeftText, - chatSquareDots, - check, - check2All, - checkAll, - checkCircle, - checkCircleFill, - checkLg, - chevronDoubleLeft, - chevronDoubleRight, - chevronDown, - chevronRight, - chevronUp, - circle, - clipboard, - clipboardCheck, - clipboardCheckFill, - clipboardFill, - clockHistory, - cpu, - creditCard, - dash, - dashCircle, - diagram3, - dice5, - doorOpen, - download, - envelope, - envelopeAt, - envelopeAtFill, - exclamationCircleFill, - exclamationTriangle, - exclamationTriangleFill, - eye, - fileEarmark, - fileEarmarkArrowUp, - fileEarmarkCheck, - fileEarmarkDiff, - fileEarmarkFill, - fileEarmarkLock, - fileEarmarkMedical, - fileEarmarkMinus, - fileEarmarkPerson, - fileEarmarkPlus, - fileEarmarkRichtext, - fileEarmarkSpreadsheet, - fileText, - files, - filter, - folder, - folderFill, - funnel, - gear, - globe2, - google, - grid, - gripVertical, - hash, - hddStack, - heart, - house, - inbox, - infoCircle, - journalBookmarkFill, - journals, - lightbulb, - link, - list, - listNested, - listTask, - listUl, - microsoft, - newspaper, - nodePlus, - paperclip, - pencil, - people, - peopleFill, - person, - personCircle, - personFill, - personFillLock, - personLock, - personSquare, - playFill, - plus, - plusCircle, - printer, - questionCircle, - receipt, - safe, - scissors, - search, - send, - shop, - slashCircle, - sliders2Vertical, - sortAlphaDown, - sortAlphaUpAlt, - stack, - stars, - tag, - tagFill, - tags, - telephone, - textIndentLeft, - textLeft, - threeDots, - threeDotsVertical, - trash, - truck, - uiRadios, - unlock, - upcScan, - wallet2, - windowStack, - x, - xCircle, - xLg, -} from 'ngx-bootstrap-icons' import { ColorSliderModule } from 'ngx-color/slider' import { CookieService } from 'ngx-cookie-service' import { AppRoutingModule } from './app/app-routing.module' @@ -279,163 +122,6 @@ function initializeApp() { return settings.initializeSettings() } -const icons = { - airplane, - archive, - arrowClockwise, - arrowCounterclockwise, - arrowDown, - arrowDownUp, - arrowLeft, - arrowRepeat, - arrowReturnLeft, - arrowRight, - arrowRightShort, - arrowUpRight, - asterisk, - bank, - basket, - bell, - braces, - bodyText, - bookmark, - boxArrowInRight, - boxArrowUp, - boxArrowUpRight, - boxes, - briefcase, - building, - calculator, - calendar, - calendarEvent, - calendarEventFill, - camera, - cardChecklist, - cardHeading, - caretDown, - caretUp, - chatLeftText, - chatSquareDots, - check, - check2All, - checkAll, - checkCircle, - checkCircleFill, - checkLg, - chevronDoubleLeft, - chevronDoubleRight, - chevronDown, - chevronRight, - chevronUp, - circle, - clipboard, - clipboardCheck, - clipboardCheckFill, - clipboardFill, - clockHistory, - cpu, - cash, - creditCard, - dash, - dashCircle, - diagram3, - dice5, - doorOpen, - download, - envelope, - envelopeAt, - envelopeAtFill, - exclamationCircleFill, - exclamationTriangle, - exclamationTriangleFill, - eye, - fileEarmark, - fileEarmarkArrowUp, - fileEarmarkCheck, - fileEarmarkDiff, - fileEarmarkFill, - fileEarmarkLock, - fileEarmarkMedical, - fileEarmarkMinus, - fileEarmarkPerson, - fileEarmarkPlus, - fileEarmarkRichtext, - fileEarmarkSpreadsheet, - files, - fileText, - filter, - folder, - folderFill, - funnel, - gear, - globe2, - google, - grid, - gripVertical, - hash, - hddStack, - heart, - house, - inbox, - infoCircle, - journalBookmarkFill, - journals, - lightbulb, - link, - list, - listNested, - listTask, - listUl, - microsoft, - newspaper, - nodePlus, - pencil, - paperclip, - people, - peopleFill, - person, - personCircle, - personFill, - personFillLock, - personLock, - personSquare, - playFill, - plus, - plusCircle, - printer, - questionCircle, - receipt, - safe, - scissors, - search, - send, - slashCircle, - shop, - sliders2Vertical, - sortAlphaDown, - sortAlphaUpAlt, - stack, - stars, - tagFill, - tag, - tags, - textIndentLeft, - textLeft, - telephone, - threeDots, - threeDotsVertical, - trash, - truck, - uiRadios, - unlock, - upcScan, - wallet2, - windowStack, - x, - xCircle, - xLg, -} - bootstrapApplication(AppComponent, { providers: [ provideZonelessChangeDetection(), @@ -447,8 +133,7 @@ bootstrapApplication(AppComponent, { ReactiveFormsModule, NgSelectModule, ColorSliderModule, - DragDropModule, - NgxBootstrapIconsModule.pick(icons) + DragDropModule ), provideAppInitializer(initializeApp), DatePipe,